diff --git a/wax-prosemirror-components/rollup.config.js b/wax-prosemirror-components/rollup.config.js
index 776c3cdd2683ca66099b63794a196d3a1603d46d..24921acbc8a720ca8d890a5d305cc732e8cb991f 100644
--- a/wax-prosemirror-components/rollup.config.js
+++ b/wax-prosemirror-components/rollup.config.js
@@ -22,7 +22,7 @@ export default {
       runtimeHelpers: true,
     }),
     commonjs(),
-    // terser(),
+    terser(),
   ],
   external: [
     'wax-prosemirror-themes',
diff --git a/wax-prosemirror-core/rollup.config.js b/wax-prosemirror-core/rollup.config.js
index 15579cf57b7c5b6f2cc5e46a7de7b13ddaba4a99..f2b2c1be262df063f9b65f54b44ac8f463e43e14 100644
--- a/wax-prosemirror-core/rollup.config.js
+++ b/wax-prosemirror-core/rollup.config.js
@@ -26,7 +26,7 @@ export default {
       runtimeHelpers: true,
     }),
     commonjs(),
-    // terser(),
+    terser(),
   ],
   external: [
     '@fortawesome/react-fontawesome',
diff --git a/wax-prosemirror-layouts/rollup.config.js b/wax-prosemirror-layouts/rollup.config.js
index 63bc022a1cf9e6e7d1ba75b7f0debfc20b525fef..15f2b480f1c1af25b3bbd637047338b2aca0e2b2 100644
--- a/wax-prosemirror-layouts/rollup.config.js
+++ b/wax-prosemirror-layouts/rollup.config.js
@@ -22,7 +22,7 @@ export default {
       runtimeHelpers: true,
     }),
     commonjs(),
-    // terser(),
+    terser(),
   ],
   external: [
     '@fortawesome/react-fontawesome',
diff --git a/wax-prosemirror-plugins/rollup.config.js b/wax-prosemirror-plugins/rollup.config.js
index 77ded1e2e3d7d5c9537e671cca11a154dfe791b2..1f3d57d4d114931c934f1d85a97d2340decdcf17 100644
--- a/wax-prosemirror-plugins/rollup.config.js
+++ b/wax-prosemirror-plugins/rollup.config.js
@@ -21,6 +21,6 @@ export default {
       runtimeHelpers: true,
     }),
     commonjs(),
-    // terser(),
+    terser(),
   ],
 };
diff --git a/wax-prosemirror-schema/rollup.config.js b/wax-prosemirror-schema/rollup.config.js
index a2329d43dc9b596480b94aa0959afe51e5115c87..43dfe7a1068c7266816a3b636d9c6a0bc3d39910 100644
--- a/wax-prosemirror-schema/rollup.config.js
+++ b/wax-prosemirror-schema/rollup.config.js
@@ -21,7 +21,7 @@ export default {
       runtimeHelpers: true,
     }),
     commonjs(),
-    // terser(),
+    terser(),
   ],
   external: ['uuid', 'wax-prosemirror-utilities'],
 };
diff --git a/wax-prosemirror-services/rollup.config.js b/wax-prosemirror-services/rollup.config.js
index 9104a937f8191df3cbc19a85afd62c8880ec29c3..7e63479d193d24d2d3c9b56d1e6bb1c5f6d17704 100644
--- a/wax-prosemirror-services/rollup.config.js
+++ b/wax-prosemirror-services/rollup.config.js
@@ -26,7 +26,7 @@ export default {
       runtimeHelpers: true,
     }),
     commonjs(),
-    // terser(),
+    terser(),
   ],
   external: [
     'uuid',
diff --git a/wax-prosemirror-services/src/BaseService/RedoService/Redo.js b/wax-prosemirror-services/src/BaseService/RedoService/Redo.js
index ead618d61970d486bce07f0177e7a843bdd43a59..095a111d3ecada49add4c7162de42e5fe7723353 100644
--- a/wax-prosemirror-services/src/BaseService/RedoService/Redo.js
+++ b/wax-prosemirror-services/src/BaseService/RedoService/Redo.js
@@ -9,6 +9,7 @@ class Redo extends Tools {
   title = 'Redo last undone change';
   content = icons.redo;
   onlyOnMain = true;
+  name = 'Redo';
 
   get run() {
     return (state, dispatch) => {
diff --git a/wax-prosemirror-services/src/BaseService/SaveService/Save.js b/wax-prosemirror-services/src/BaseService/SaveService/Save.js
index 6d43004adf21cbb16378d24b8a9cc6dff0a19770..ea7c9c3db018029dd48c87aa21e0748391b7fb24 100644
--- a/wax-prosemirror-services/src/BaseService/SaveService/Save.js
+++ b/wax-prosemirror-services/src/BaseService/SaveService/Save.js
@@ -1,11 +1,13 @@
-import Tools from "../../lib/Tools";
-import { injectable } from "inversify";
-import { icons } from "wax-prosemirror-components";
+import Tools from '../../lib/Tools';
+import { injectable } from 'inversify';
+import { icons } from 'wax-prosemirror-components';
 
+export default
 @injectable()
-export default class Save extends Tools {
-  title = "Save changes";
+class Save extends Tools {
+  title = 'Save changes';
   content = icons.save;
+  name = 'Save';
 
   get run() {}
 
diff --git a/wax-prosemirror-services/src/BaseService/UndoService/Undo.js b/wax-prosemirror-services/src/BaseService/UndoService/Undo.js
index 071547dce0e39abd149b34da784a7869c59d152b..6351636115b1054ff66e9fca91dc91d0b702c552 100644
--- a/wax-prosemirror-services/src/BaseService/UndoService/Undo.js
+++ b/wax-prosemirror-services/src/BaseService/UndoService/Undo.js
@@ -9,6 +9,7 @@ class Undo extends Tools {
   title = 'Undo last change';
   content = icons.undo;
   onlyOnMain = true;
+  name = 'Undo';
 
   get run() {
     return (state, dispatch) => {
diff --git a/wax-prosemirror-services/src/CodeBlockService/CodeBlockTool.js b/wax-prosemirror-services/src/CodeBlockService/CodeBlockTool.js
index b533ca58d0d42ce09caa904241a45b79d1401789..49bba48d517a3287aeaacc3a6bfb7503336a8b20 100644
--- a/wax-prosemirror-services/src/CodeBlockService/CodeBlockTool.js
+++ b/wax-prosemirror-services/src/CodeBlockService/CodeBlockTool.js
@@ -7,6 +7,7 @@ import Tools from '../lib/Tools';
 class CodeBlockTool extends Tools {
   title = 'Insert Code Block';
   content = icons.code_block;
+  name = 'CodeBlockTool';
 
   get run() {
     return (state, dispatch) => {
diff --git a/wax-prosemirror-services/src/DisplayBlockLevel/AuthorService/Author.js b/wax-prosemirror-services/src/DisplayBlockLevel/AuthorService/Author.js
index a3ee0f83e7593b9738f3fe690814b3e8ae182cd0..eef6df395685f07c6710aaec1d4c93ace215ed29 100644
--- a/wax-prosemirror-services/src/DisplayBlockLevel/AuthorService/Author.js
+++ b/wax-prosemirror-services/src/DisplayBlockLevel/AuthorService/Author.js
@@ -6,6 +6,7 @@ import Tools from '../../lib/Tools';
 class Author extends Tools {
   title = 'Change to Author';
   content = 'Author';
+  name = 'Author';
 
   get run() {
     return (state, dispatch) => {
diff --git a/wax-prosemirror-services/src/DisplayBlockLevel/EpigraphPoetryService/EpigraphPoetry.js b/wax-prosemirror-services/src/DisplayBlockLevel/EpigraphPoetryService/EpigraphPoetry.js
index b0637041a9e2dbd9312e494bed0600736a2344ef..86703bcc9a7adb099cbbafc975ef5c54037aed69 100644
--- a/wax-prosemirror-services/src/DisplayBlockLevel/EpigraphPoetryService/EpigraphPoetry.js
+++ b/wax-prosemirror-services/src/DisplayBlockLevel/EpigraphPoetryService/EpigraphPoetry.js
@@ -6,6 +6,7 @@ import Tools from '../../lib/Tools';
 class EpigraphPoetry extends Tools {
   title = 'Change to Epigraph Poetry';
   content = 'Epigraph Poetry';
+  name = 'EpigraphPoetry';
 
   get run() {
     return (state, dispatch) => {
diff --git a/wax-prosemirror-services/src/DisplayBlockLevel/EpigraphProseService/EpigraphProse.js b/wax-prosemirror-services/src/DisplayBlockLevel/EpigraphProseService/EpigraphProse.js
index 7ec1f1494876e32a27d6517b48550182bbdb1ab4..170d559d8fcb443cc9284fc47cbca5d3f3331330 100644
--- a/wax-prosemirror-services/src/DisplayBlockLevel/EpigraphProseService/EpigraphProse.js
+++ b/wax-prosemirror-services/src/DisplayBlockLevel/EpigraphProseService/EpigraphProse.js
@@ -7,6 +7,7 @@ export default
 class EpigraphProse extends Tools {
   title = 'Change to Epigraph Prose';
   content = 'Epigraph Prose';
+  name = 'EpigraphProse';
 
   get run() {
     return (state, dispatch) => {
diff --git a/wax-prosemirror-services/src/DisplayBlockLevel/HeadingService/Heading1.js b/wax-prosemirror-services/src/DisplayBlockLevel/HeadingService/Heading1.js
index ce22bd8b3883fbd00c86878c3c1eb729cde7e8f7..c064fd69544ea3ed6ba6fba0840badd77e2403b3 100644
--- a/wax-prosemirror-services/src/DisplayBlockLevel/HeadingService/Heading1.js
+++ b/wax-prosemirror-services/src/DisplayBlockLevel/HeadingService/Heading1.js
@@ -7,6 +7,7 @@ export default
 class Heading1 extends Tools {
   title = 'Change to heading level 1';
   content = 'Heading 1';
+  name = 'Heading1';
 
   get run() {
     return (state, dispatch) => {
diff --git a/wax-prosemirror-services/src/DisplayBlockLevel/HeadingService/Heading2.js b/wax-prosemirror-services/src/DisplayBlockLevel/HeadingService/Heading2.js
index da42959866840a0d4a823b2c634cd9250cf61850..061b45e86aca54e7d6a118d4943ab5a1ff2cea9c 100644
--- a/wax-prosemirror-services/src/DisplayBlockLevel/HeadingService/Heading2.js
+++ b/wax-prosemirror-services/src/DisplayBlockLevel/HeadingService/Heading2.js
@@ -7,6 +7,7 @@ export default
 class Heading2 extends Tools {
   title = 'Change to heading level 2';
   content = 'Heading 2';
+  name = 'Heading2';
 
   get run() {
     return (state, dispatch) => {
diff --git a/wax-prosemirror-services/src/DisplayBlockLevel/HeadingService/Heading3.js b/wax-prosemirror-services/src/DisplayBlockLevel/HeadingService/Heading3.js
index 1706b0c14c1329d717e37ddddd8a1a7d1d5464a5..642e44d3401ba3a0ecfa1a5ed9f3f4c7752e0417 100644
--- a/wax-prosemirror-services/src/DisplayBlockLevel/HeadingService/Heading3.js
+++ b/wax-prosemirror-services/src/DisplayBlockLevel/HeadingService/Heading3.js
@@ -7,6 +7,7 @@ export default
 class Heading3 extends Tools {
   title = 'Change to heading level 3';
   content = 'Heading 3';
+  name = 'Heading3';
 
   get run() {
     return (state, dispatch) => {
diff --git a/wax-prosemirror-services/src/DisplayBlockLevel/SubTitleService/SubTitle.js b/wax-prosemirror-services/src/DisplayBlockLevel/SubTitleService/SubTitle.js
index d8957703e8782056a3ebced585220b614e534a7e..ee18810ff1b2fad7eb702a8d0be737b437232f5d 100644
--- a/wax-prosemirror-services/src/DisplayBlockLevel/SubTitleService/SubTitle.js
+++ b/wax-prosemirror-services/src/DisplayBlockLevel/SubTitleService/SubTitle.js
@@ -6,6 +6,7 @@ import { Commands } from 'wax-prosemirror-utilities';
 export default class SubTitle extends Tools {
   title = 'Change to Subtitle';
   content = 'Subtitle';
+  name = 'SubTitle';
 
   get run() {
     return (state, dispatch) => {
diff --git a/wax-prosemirror-services/src/DisplayBlockLevel/TitleService/Title.js b/wax-prosemirror-services/src/DisplayBlockLevel/TitleService/Title.js
index 7548b7b705127f95cbac7ecad04f9c20a15573e0..37a70eb6ad32b05e75c4e3cf001e1ac117759565 100644
--- a/wax-prosemirror-services/src/DisplayBlockLevel/TitleService/Title.js
+++ b/wax-prosemirror-services/src/DisplayBlockLevel/TitleService/Title.js
@@ -6,6 +6,7 @@ import { Commands } from 'wax-prosemirror-utilities';
 export default class Title extends Tools {
   title = 'Change to Title';
   content = 'Title';
+  name = 'Title';
 
   get run() {
     return (state, dispatch) => {
diff --git a/wax-prosemirror-services/src/ImageService/Image.js b/wax-prosemirror-services/src/ImageService/Image.js
index 726284945fc44ffcc7c6fdb70f81e6c66b78e673..83c3f235c3c7673f25f348a7b72ff631e11f8e4f 100644
--- a/wax-prosemirror-services/src/ImageService/Image.js
+++ b/wax-prosemirror-services/src/ImageService/Image.js
@@ -12,6 +12,7 @@ export default
 class Image extends Tools {
   title = 'Insert image';
   content = icons.image;
+  name = 'Image';
 
   get run() {
     return () => true;
diff --git a/wax-prosemirror-services/src/InlineAnnotations/CodeService/Code.js b/wax-prosemirror-services/src/InlineAnnotations/CodeService/Code.js
index a6ccd2ffc87c4f27e79ca74971b30843a9d9b965..413d7b842f2ecc449550ef0a029deb65428a0851 100644
--- a/wax-prosemirror-services/src/InlineAnnotations/CodeService/Code.js
+++ b/wax-prosemirror-services/src/InlineAnnotations/CodeService/Code.js
@@ -1,14 +1,15 @@
 import { toggleMark } from 'prosemirror-commands';
 import { Commands } from 'wax-prosemirror-utilities';
-import Tools from '../../lib/Tools';
 import { injectable } from 'inversify';
 import { icons } from 'wax-prosemirror-components';
+import Tools from '../../lib/Tools';
 
 export default
 @injectable()
 class Code extends Tools {
   title = 'Toggle code';
   content = icons.code;
+  name = 'Code';
 
   get run() {
     return (state, dispatch) => {
diff --git a/wax-prosemirror-services/src/InlineAnnotations/EmphasisService/Emphasis.js b/wax-prosemirror-services/src/InlineAnnotations/EmphasisService/Emphasis.js
index 89f79677f31fa78149b2057830d1f7c70216cf71..afacd594df18c469bec40fed3ef4e4c9c3e5a3f8 100644
--- a/wax-prosemirror-services/src/InlineAnnotations/EmphasisService/Emphasis.js
+++ b/wax-prosemirror-services/src/InlineAnnotations/EmphasisService/Emphasis.js
@@ -1,14 +1,15 @@
 import { toggleMark } from 'prosemirror-commands';
 import { Commands } from 'wax-prosemirror-utilities';
-import Tools from '../../lib/Tools';
 import { injectable } from 'inversify';
 import { icons } from 'wax-prosemirror-components';
+import Tools from '../../lib/Tools';
 
 export default
 @injectable()
 class Emphasis extends Tools {
   title = 'Toggle emphasis';
   content = icons.em;
+  name = 'Emphasis';
 
   get run() {
     return (state, dispatch) => {
diff --git a/wax-prosemirror-services/src/InlineAnnotations/StrikeThroughService/StrikeThrough.js b/wax-prosemirror-services/src/InlineAnnotations/StrikeThroughService/StrikeThrough.js
index 60b3be5674f90452c9906f61e624d3c3598503ee..f070bc17d53b4bfc5a0330f0d612f8fa2bef3b4b 100644
--- a/wax-prosemirror-services/src/InlineAnnotations/StrikeThroughService/StrikeThrough.js
+++ b/wax-prosemirror-services/src/InlineAnnotations/StrikeThroughService/StrikeThrough.js
@@ -1,13 +1,15 @@
-import { toggleMark } from "prosemirror-commands";
-import { Commands } from "wax-prosemirror-utilities";
-import Tools from "../../lib/Tools";
-import { injectable } from "inversify";
-import { icons } from "wax-prosemirror-components";
+import { toggleMark } from 'prosemirror-commands';
+import { Commands } from 'wax-prosemirror-utilities';
+import { injectable } from 'inversify';
+import { icons } from 'wax-prosemirror-components';
+import Tools from '../../lib/Tools';
 
+export default
 @injectable()
-export default class StrikeThrough extends Tools {
-  title = "Toggle strikethrough";
+class StrikeThrough extends Tools {
+  title = 'Toggle strikethrough';
   content = icons.strikethrough;
+  name = 'StrikeThrough';
 
   get run() {
     return (state, dispatch) => {
@@ -18,7 +20,7 @@ export default class StrikeThrough extends Tools {
   get active() {
     return state => {
       return Commands.markActive(state.config.schema.marks.strikethrough)(
-        state
+        state,
       );
     };
   }
diff --git a/wax-prosemirror-services/src/InlineAnnotations/StrongService/Strong.js b/wax-prosemirror-services/src/InlineAnnotations/StrongService/Strong.js
index 989f238a202e87c833a1ff3564dda91fc85db9c0..ef85988a5c4e22db00ea89bb7c30216990de7e45 100644
--- a/wax-prosemirror-services/src/InlineAnnotations/StrongService/Strong.js
+++ b/wax-prosemirror-services/src/InlineAnnotations/StrongService/Strong.js
@@ -1,13 +1,15 @@
-import { toggleMark } from "prosemirror-commands";
-import { Commands } from "wax-prosemirror-utilities";
-import Tools from "../../lib/Tools";
-import { injectable } from "inversify";
-import { icons } from "wax-prosemirror-components";
+import { toggleMark } from 'prosemirror-commands';
+import { Commands } from 'wax-prosemirror-utilities';
+import Tools from '../../lib/Tools';
+import { injectable } from 'inversify';
+import { icons } from 'wax-prosemirror-components';
 
+export default
 @injectable()
-export default class Strong extends Tools {
-  title = "Toggle strong";
+class Strong extends Tools {
+  title = 'Toggle strong';
   content = icons.strong;
+  name = 'Strong';
 
   get run() {
     return (state, dispatch) => {
diff --git a/wax-prosemirror-services/src/InlineAnnotations/SubscriptService/Subscript.js b/wax-prosemirror-services/src/InlineAnnotations/SubscriptService/Subscript.js
index 9bfd47526d644e0b2ad386f3ef1ea86790308749..9e5e1941054e0f18653f0285fb0eebd710624616 100644
--- a/wax-prosemirror-services/src/InlineAnnotations/SubscriptService/Subscript.js
+++ b/wax-prosemirror-services/src/InlineAnnotations/SubscriptService/Subscript.js
@@ -1,13 +1,15 @@
-import { toggleMark } from "prosemirror-commands";
-import { Commands } from "wax-prosemirror-utilities";
-import Tools from "../../lib/Tools";
-import { injectable } from "inversify";
-import { icons } from "wax-prosemirror-components";
+import { toggleMark } from 'prosemirror-commands';
+import { Commands } from 'wax-prosemirror-utilities';
+import { injectable } from 'inversify';
+import { icons } from 'wax-prosemirror-components';
+import Tools from '../../lib/Tools';
 
+export default
 @injectable()
-export default class Subscript extends Tools {
-  title = "Toggle subscript";
+class Subscript extends Tools {
+  title = 'Toggle subscript';
   content = icons.subscript;
+  name = 'Subscript';
 
   get run() {
     return (state, dispatch) => {
diff --git a/wax-prosemirror-services/src/InlineAnnotations/SuperscriptService/Superscript.js b/wax-prosemirror-services/src/InlineAnnotations/SuperscriptService/Superscript.js
index f502bbf7cad0b3572ccbed451d7f9c013c506e71..64fbd2a46b8bf71cbab10aa0238d61aabc822d0b 100644
--- a/wax-prosemirror-services/src/InlineAnnotations/SuperscriptService/Superscript.js
+++ b/wax-prosemirror-services/src/InlineAnnotations/SuperscriptService/Superscript.js
@@ -1,13 +1,15 @@
-import { toggleMark } from "prosemirror-commands";
-import { Commands } from "wax-prosemirror-utilities";
-import Tools from "../../lib/Tools";
-import { injectable } from "inversify";
-import { icons } from "wax-prosemirror-components";
+import { toggleMark } from 'prosemirror-commands';
+import { Commands } from 'wax-prosemirror-utilities';
+import { injectable } from 'inversify';
+import { icons } from 'wax-prosemirror-components';
+import Tools from '../../lib/Tools';
 
+export default
 @injectable()
-export default class Superscript extends Tools {
-  title = "Toggle superscript";
+class Superscript extends Tools {
+  title = 'Toggle superscript';
   content = icons.superscript;
+  name = 'Superscript';
 
   get run() {
     return (state, dispatch) => {
diff --git a/wax-prosemirror-services/src/InlineAnnotations/UnderlineService/Underline.js b/wax-prosemirror-services/src/InlineAnnotations/UnderlineService/Underline.js
index 168dcb15f4194f9f1970758044ac1b0a9da969eb..9947a98175c75c16c86393c9e859baf58c955abc 100644
--- a/wax-prosemirror-services/src/InlineAnnotations/UnderlineService/Underline.js
+++ b/wax-prosemirror-services/src/InlineAnnotations/UnderlineService/Underline.js
@@ -1,13 +1,15 @@
-import { toggleMark } from "prosemirror-commands";
-import { Commands } from "wax-prosemirror-utilities";
-import Tools from "../../lib/Tools";
-import { injectable } from "inversify";
-import { icons } from "wax-prosemirror-components";
+import { toggleMark } from 'prosemirror-commands';
+import { Commands } from 'wax-prosemirror-utilities';
+import { injectable } from 'inversify';
+import { icons } from 'wax-prosemirror-components';
+import Tools from '../../lib/Tools';
 
+export default
 @injectable()
-export default class Underline extends Tools {
-  title = "Toggle underline";
+class Underline extends Tools {
+  title = 'Toggle underline';
   content = icons.underline;
+  name = 'Underline';
 
   get run() {
     return (state, dispatch) => {
diff --git a/wax-prosemirror-services/src/LinkService/LinkTool.js b/wax-prosemirror-services/src/LinkService/LinkTool.js
index 424444dc10ebe7dfb291a9a75dae804e73f6e2b2..ca9e24b66860e87bc89894898302f6a346abaee7 100644
--- a/wax-prosemirror-services/src/LinkService/LinkTool.js
+++ b/wax-prosemirror-services/src/LinkService/LinkTool.js
@@ -1,13 +1,14 @@
-import { injectable } from "inversify";
-import { toggleMark } from "prosemirror-commands";
-import { Commands } from "wax-prosemirror-utilities";
-import Tools from "../lib/Tools";
-import { icons } from "wax-prosemirror-components";
+import { injectable } from 'inversify';
+import { toggleMark } from 'prosemirror-commands';
+import { Commands } from 'wax-prosemirror-utilities';
+import Tools from '../lib/Tools';
+import { icons } from 'wax-prosemirror-components';
 
 @injectable()
 export default class LinkTool extends Tools {
-  title = "Add or remove link";
+  title = 'Add or remove link';
   content = icons.link;
+  name = 'LinkTool';
 
   get run() {
     return (state, dispatch) => {
diff --git a/wax-prosemirror-services/src/ListsService/BulletListService/BulletList.js b/wax-prosemirror-services/src/ListsService/BulletListService/BulletList.js
index eab23cb2aeed0cb9a17d45a288e2a9c0056f32c6..7eaed9bc1b3819b7f38a51ad78eb7a7118f65863 100644
--- a/wax-prosemirror-services/src/ListsService/BulletListService/BulletList.js
+++ b/wax-prosemirror-services/src/ListsService/BulletListService/BulletList.js
@@ -1,13 +1,15 @@
-import Tools from '../../lib/Tools';
 import { injectable } from 'inversify';
 import { icons } from 'wax-prosemirror-components';
 import { wrapInList } from 'prosemirror-schema-list';
 import { Commands } from 'wax-prosemirror-utilities';
+import Tools from '../../lib/Tools';
 
+export default
 @injectable()
-export default class BulletList extends Tools {
+class BulletList extends Tools {
   title = 'Wrap in bullet list';
   content = icons.bullet_list;
+  name = 'BulletList';
 
   get run() {
     return (state, dispatch) => {
diff --git a/wax-prosemirror-services/src/ListsService/JoinUpService/JoinUp.js b/wax-prosemirror-services/src/ListsService/JoinUpService/JoinUp.js
index 0e5907bd1df9856bfab4e5e0c48945455deeddcc..41239d9867c259c4dae361f2b8a08ef2d510ca6c 100644
--- a/wax-prosemirror-services/src/ListsService/JoinUpService/JoinUp.js
+++ b/wax-prosemirror-services/src/ListsService/JoinUpService/JoinUp.js
@@ -1,12 +1,14 @@
-import { joinUp } from "prosemirror-commands";
-import Tools from "../../lib/Tools";
-import { injectable } from "inversify";
-import { icons } from "wax-prosemirror-components";
+import { joinUp } from 'prosemirror-commands';
+import Tools from '../../lib/Tools';
+import { injectable } from 'inversify';
+import { icons } from 'wax-prosemirror-components';
 
+export default
 @injectable()
-export default class JoinUp extends Tools {
-  title = "Join with above block";
+class JoinUp extends Tools {
+  title = 'Join with above block';
   content = icons.join_up;
+  name = 'JoinUp';
 
   get run() {
     return joinUp;
diff --git a/wax-prosemirror-services/src/ListsService/LiftService/Lift.js b/wax-prosemirror-services/src/ListsService/LiftService/Lift.js
index 2bf47008298dbb902e098d2741378d8d1a048a38..452d24663b00073189e5bb79ea653cbc4acc5b1d 100644
--- a/wax-prosemirror-services/src/ListsService/LiftService/Lift.js
+++ b/wax-prosemirror-services/src/ListsService/LiftService/Lift.js
@@ -1,12 +1,14 @@
-import { lift } from "prosemirror-commands";
-import Tools from "../../lib/Tools";
-import { injectable } from "inversify";
-import { icons } from "wax-prosemirror-components";
+import { lift } from 'prosemirror-commands';
+import Tools from '../../lib/Tools';
+import { injectable } from 'inversify';
+import { icons } from 'wax-prosemirror-components';
 
+export default
 @injectable()
-export default class Lift extends Tools {
-  title = "Lift out of enclosing block";
+class Lift extends Tools {
+  title = 'Lift out of enclosing block';
   content = icons.lift;
+  name = 'Lift';
 
   get run() {
     return lift;
diff --git a/wax-prosemirror-services/src/ListsService/OrderedListService/OrderedList.js b/wax-prosemirror-services/src/ListsService/OrderedListService/OrderedList.js
index e421df0959c0bf438c0cbaa1e521ef14bee452b9..7cf174b453862fef49cc07df1e1681f6ef3b33c1 100644
--- a/wax-prosemirror-services/src/ListsService/OrderedListService/OrderedList.js
+++ b/wax-prosemirror-services/src/ListsService/OrderedListService/OrderedList.js
@@ -8,6 +8,7 @@ import { Commands } from 'wax-prosemirror-utilities';
 export default class OrderedList extends Tools {
   title = 'Wrap in ordered list';
   content = icons.ordered_list;
+  name = 'OrderedList';
 
   get run() {
     return (state, dispatch) => {
diff --git a/wax-prosemirror-services/src/NoteService/Note.js b/wax-prosemirror-services/src/NoteService/Note.js
index 75f04f45bf6f20e74c2be08b321cac8c502ef211..c86840e98279c6f880ca42d40250a9e493e3d5fa 100644
--- a/wax-prosemirror-services/src/NoteService/Note.js
+++ b/wax-prosemirror-services/src/NoteService/Note.js
@@ -4,10 +4,12 @@ import { icons } from 'wax-prosemirror-components';
 import { Fragment } from 'prosemirror-model';
 import { v4 as uuidv4 } from 'uuid';
 
+export default
 @injectable()
-export default class Note extends Tools {
+class Note extends Tools {
   title = 'Insert Note';
   content = icons.footnote;
+  name = 'Note';
 
   get run() {
     return (state, dispatch) => {
diff --git a/wax-prosemirror-services/src/TablesService/EditTableService/TableDropDownOptions.js b/wax-prosemirror-services/src/TablesService/EditTableService/TableDropDownOptions.js
index d487015827e81304ab6657b82022bce028de1569..411384c05bd3143b819784f07b159f1681ba7c1d 100644
--- a/wax-prosemirror-services/src/TablesService/EditTableService/TableDropDownOptions.js
+++ b/wax-prosemirror-services/src/TablesService/EditTableService/TableDropDownOptions.js
@@ -11,6 +11,7 @@ import Tools from '../../lib/Tools';
 export default class TableDropDownOptions extends Tools {
   title = 'Select Options';
   content = 'table';
+  name = 'TableDropDownOptions';
 
   get run() {
     return (state, dispatch, tableFn) => {
diff --git a/wax-prosemirror-services/src/TablesService/InsertTableService/Table.js b/wax-prosemirror-services/src/TablesService/InsertTableService/Table.js
index 5e0f685052a5810b6257f12d6277c687ce829826..00ae9ee39ccfc93ae4375254b669c2e1c48a648d 100644
--- a/wax-prosemirror-services/src/TablesService/InsertTableService/Table.js
+++ b/wax-prosemirror-services/src/TablesService/InsertTableService/Table.js
@@ -8,6 +8,7 @@ export default
 class Table extends Tools {
   title = 'Insert table';
   content = icons.table;
+  name = 'Table';
 
   get run() {
     return (state, dispatch) => {
diff --git a/wax-prosemirror-services/src/TextBlockLevel/BlockQuoteService/BlockQuote.js b/wax-prosemirror-services/src/TextBlockLevel/BlockQuoteService/BlockQuote.js
index 2c2e9ceb26b7c9f3f63c167e86e6f1fc4f28f3cd..e2e0d3c6ab3019a344dce61dd0f4b4c410993677 100644
--- a/wax-prosemirror-services/src/TextBlockLevel/BlockQuoteService/BlockQuote.js
+++ b/wax-prosemirror-services/src/TextBlockLevel/BlockQuoteService/BlockQuote.js
@@ -6,6 +6,7 @@ import { wrapIn } from 'prosemirror-commands';
 class BlockQuote extends Tools {
   title = 'Change to Block Quote';
   content = 'Block Quote';
+  name = 'BlockQuote';
 
   get run() {
     return (state, dispatch) => {
diff --git a/wax-prosemirror-services/src/TextBlockLevel/ExtractPoetryService/ExtractPoetry.js b/wax-prosemirror-services/src/TextBlockLevel/ExtractPoetryService/ExtractPoetry.js
index 8ec0b529daece7882dab92478265c3188039ee21..529cc75c3accf8a48e5a29fdf02912081e5053a2 100644
--- a/wax-prosemirror-services/src/TextBlockLevel/ExtractPoetryService/ExtractPoetry.js
+++ b/wax-prosemirror-services/src/TextBlockLevel/ExtractPoetryService/ExtractPoetry.js
@@ -1,11 +1,12 @@
-import Tools from '../../lib/Tools';
 import { injectable } from 'inversify';
 import { Commands } from 'wax-prosemirror-utilities';
+import Tools from '../../lib/Tools';
 
 @injectable()
 class ExtractPoetry extends Tools {
   title = 'Change to Extract Poetry';
   content = 'Extract Poetry';
+  name = 'ExtractPoetry';
 
   get run() {
     return (state, dispatch) => {
diff --git a/wax-prosemirror-services/src/TextBlockLevel/ExtractProseService/ExtractProse.js b/wax-prosemirror-services/src/TextBlockLevel/ExtractProseService/ExtractProse.js
index c3acd93e47c225ffde0d9132a92965edecd2f7fc..7e2d707b1952212b230a843f4c07a05c6c8571a7 100644
--- a/wax-prosemirror-services/src/TextBlockLevel/ExtractProseService/ExtractProse.js
+++ b/wax-prosemirror-services/src/TextBlockLevel/ExtractProseService/ExtractProse.js
@@ -1,11 +1,12 @@
-import Tools from '../../lib/Tools';
 import { injectable } from 'inversify';
 import { Commands } from 'wax-prosemirror-utilities';
+import Tools from '../../lib/Tools';
 
 @injectable()
 class ExtractProse extends Tools {
   title = 'Change to Extract Prose';
   content = 'Extract Prose';
+  name = 'ExtractProse';
 
   get run() {
     return (state, dispatch) => {
diff --git a/wax-prosemirror-services/src/TextBlockLevel/ParagraphContinuedService/ParagraphContinued.js b/wax-prosemirror-services/src/TextBlockLevel/ParagraphContinuedService/ParagraphContinued.js
index c3d9b03ed90bdbb62b3c6849c326b818deacc7ba..926eb25882765d5906992f7dddfb0ba5fee33ea9 100644
--- a/wax-prosemirror-services/src/TextBlockLevel/ParagraphContinuedService/ParagraphContinued.js
+++ b/wax-prosemirror-services/src/TextBlockLevel/ParagraphContinuedService/ParagraphContinued.js
@@ -1,11 +1,12 @@
-import Tools from '../../lib/Tools';
 import { injectable } from 'inversify';
 import { Commands } from 'wax-prosemirror-utilities';
+import Tools from '../../lib/Tools';
 
 @injectable()
 class ParagraphContinued extends Tools {
   title = 'Change to Paragraph Continued';
   content = 'Paragraph Continued';
+  name = 'ParagraphContinued';
 
   get run() {
     return (state, dispatch) => {
diff --git a/wax-prosemirror-services/src/TextBlockLevel/ParagraphService/Paragraph.js b/wax-prosemirror-services/src/TextBlockLevel/ParagraphService/Paragraph.js
index 918ae7607b1538c5b28e0c0f966d523429d0a60f..f7c892c42b6901266de0765c3be819bff5c53ff3 100644
--- a/wax-prosemirror-services/src/TextBlockLevel/ParagraphService/Paragraph.js
+++ b/wax-prosemirror-services/src/TextBlockLevel/ParagraphService/Paragraph.js
@@ -2,10 +2,12 @@ import Tools from '../../lib/Tools';
 import { injectable } from 'inversify';
 import { Commands } from 'wax-prosemirror-utilities';
 
+export default 
 @injectable()
-export default class Paragraph extends Tools {
+class Paragraph extends Tools {
   title = 'Change to Paragraph';
   content = 'Paragraph';
+  name = 'Paragraph';
 
   get run() {
     return (state, dispatch) => {
diff --git a/wax-prosemirror-services/src/TextBlockLevel/SourceNoteService/SourceNote.js b/wax-prosemirror-services/src/TextBlockLevel/SourceNoteService/SourceNote.js
index b40a17d1d27fd6fde502925b614d984fe621a4d6..c641f496c8f74db8f7b72652261e6c2909eafb92 100644
--- a/wax-prosemirror-services/src/TextBlockLevel/SourceNoteService/SourceNote.js
+++ b/wax-prosemirror-services/src/TextBlockLevel/SourceNoteService/SourceNote.js
@@ -6,6 +6,7 @@ import { Commands } from 'wax-prosemirror-utilities';
 class SourceNote extends Tools {
   title = 'Change to Source Note';
   content = 'Source Note';
+  name = 'SourceNote';
 
   get run() {
     return (state, dispatch) => {
diff --git a/wax-prosemirror-services/src/TrackChangeService/AcceptTrackChangeService/AcceptTrackChange.js b/wax-prosemirror-services/src/TrackChangeService/AcceptTrackChangeService/AcceptTrackChange.js
index 6eae10118879945f2cabbb1678071ae6c3c65bdc..dc63a32a7d8b5416553217a9605ff8709f231785 100644
--- a/wax-prosemirror-services/src/TrackChangeService/AcceptTrackChangeService/AcceptTrackChange.js
+++ b/wax-prosemirror-services/src/TrackChangeService/AcceptTrackChangeService/AcceptTrackChange.js
@@ -9,6 +9,7 @@ export default
 class AcceptTrackChange extends Tools {
   title = 'Accept Changes';
   content = 'Accept';
+  name = 'AcceptTrackChange';
 
   get run() {
     return (state, dispatch) => {
diff --git a/wax-prosemirror-services/src/TrackChangeService/EnableTrackChangeService/EnableTrackChange.js b/wax-prosemirror-services/src/TrackChangeService/EnableTrackChangeService/EnableTrackChange.js
index cc34abaef3f0808681d71b24ab6da2f701ca337b..9ad60b2b5edb938786aee79ca379bddf32752cb8 100644
--- a/wax-prosemirror-services/src/TrackChangeService/EnableTrackChangeService/EnableTrackChange.js
+++ b/wax-prosemirror-services/src/TrackChangeService/EnableTrackChangeService/EnableTrackChange.js
@@ -10,6 +10,7 @@ export default
 class EnableTrackChange extends Tools {
   title = 'Toggle Track Changes';
   content = 'track changes';
+  name = 'EnableTrackChange';
 
   get run() {
     return state => {
diff --git a/wax-prosemirror-services/src/TrackChangeService/RejectTrackChangeService/RejectTrackChange.js b/wax-prosemirror-services/src/TrackChangeService/RejectTrackChangeService/RejectTrackChange.js
index 24d68f97e671cb6f8d4384940760875401f8b337..e7edca812ed8d376e08d39bdbec748ea4e5f3b87 100644
--- a/wax-prosemirror-services/src/TrackChangeService/RejectTrackChangeService/RejectTrackChange.js
+++ b/wax-prosemirror-services/src/TrackChangeService/RejectTrackChangeService/RejectTrackChange.js
@@ -14,6 +14,7 @@ export default
 class RejectTrackChange extends Tools {
   title = 'Reject Changes';
   content = 'Reject';
+  name = 'RejectTrackChange';
 
   get run() {
     return (state, dispatch) => {
diff --git a/wax-prosemirror-services/src/lib/ToolGroup.js b/wax-prosemirror-services/src/lib/ToolGroup.js
index 5c5b0c79296057058b1d6af088fb54f6319e9b99..93ce54c133e1d655e7239f7c61dbc1b603937977 100644
--- a/wax-prosemirror-services/src/lib/ToolGroup.js
+++ b/wax-prosemirror-services/src/lib/ToolGroup.js
@@ -18,7 +18,7 @@ export default class ToolGroup {
 
     if (include.length > 0) {
       this._tools.map(tool => {
-        if (include.includes(tool.constructor.name)) {
+        if (include.includes(tool.name)) {
           tool.displayTool();
         } else {
           tool.hideTool();
@@ -26,7 +26,7 @@ export default class ToolGroup {
       });
     } else {
       this._tools.map(tool => {
-        if (exclude.includes(tool.constructor.name)) {
+        if (exclude.includes(tool.name)) {
           tool.hideTool();
         }
       });
@@ -38,7 +38,6 @@ export default class ToolGroup {
     if (more.length > 0) {
       this._tools.map(tool => {
         if (more.includes(tool.name)) {
-          console.log(tool);
           tool.hideInToolGroup();
         } else {
           tool.displayInToolGroup();
diff --git a/wax-prosemirror-services/src/lib/Tools.js b/wax-prosemirror-services/src/lib/Tools.js
index 7480015a604ba7af8448382c725de41ee192d4f6..4d9e90bfdbfb16f6d775a42ea7ec9eb2c91df3a6 100644
--- a/wax-prosemirror-services/src/lib/Tools.js
+++ b/wax-prosemirror-services/src/lib/Tools.js
@@ -13,7 +13,7 @@ class Tools {
   onlyOnMain = false;
   config = {};
   pmplugins = {};
-  name = name;
+  name = 'name';
   constructor(@inject('Config') config, @inject('PmPlugins') pmplugins) {
     this.config = config;
     this.pmplugins = pmplugins;
diff --git a/wax-prosemirror-themes/rollup.config.js b/wax-prosemirror-themes/rollup.config.js
index 8e17dca193a2ef10e475f47c0a5a8020c67b86e9..3c39189e3e4b21268c49f26122e133aa961bb395 100644
--- a/wax-prosemirror-themes/rollup.config.js
+++ b/wax-prosemirror-themes/rollup.config.js
@@ -21,7 +21,7 @@ export default {
       runtimeHelpers: true,
     }),
     commonjs(),
-    // terser(),
+    terser(),
   ],
   external: ['styled-components'],
 };
diff --git a/wax-prosemirror-utilities/rollup.config.js b/wax-prosemirror-utilities/rollup.config.js
index 04222edfb6a5195cf85d9215974279aeb85317ea..be04b116222fce4550cc56a4ca3a6cd9371ff618 100644
--- a/wax-prosemirror-utilities/rollup.config.js
+++ b/wax-prosemirror-utilities/rollup.config.js
@@ -21,7 +21,7 @@ export default {
       runtimeHelpers: true,
     }),
     commonjs(),
-    // terser(),
+    terser(),
   ],
   external: ['uuid'],
 };