diff --git a/wax-prosemirror-components/rollup.config.js b/wax-prosemirror-components/rollup.config.js
index bfdfebdd95ecf4267cef09493cfde21340825173..15a09995a2e3d1017029309f556bd57e0c2b029e 100644
--- a/wax-prosemirror-components/rollup.config.js
+++ b/wax-prosemirror-components/rollup.config.js
@@ -1,7 +1,6 @@
 import babel from "rollup-plugin-babel";
 import commonjs from "@rollup/plugin-commonjs";
 import external from "rollup-plugin-peer-deps-external";
-import postcss from "rollup-plugin-postcss";
 import { terser } from "rollup-plugin-terser";
 
 export default {
@@ -14,19 +13,11 @@ export default {
     }
   ],
   plugins: [
-    postcss({
-      plugins: [],
-      minimize: true,
-      sourceMap: "inline"
-    }),
     external({
       includeDependencies: true
     }),
     babel({
-      presets: [
-        [require("@babel/preset-env"), { modules: false }],
-        require("@babel/preset-react")
-      ],
+      presets: ["react-app"],
       plugins: [
         ["@babel/plugin-proposal-decorators", { legacy: true }],
         "babel-plugin-parameter-decorator",
diff --git a/wax-prosemirror-core/rollup.config.js b/wax-prosemirror-core/rollup.config.js
index 908c215327cff7c2bcb55a174e69c2091b667fb8..64b68c8961bf90c6ff2ab9c1735b8b964cabbee8 100644
--- a/wax-prosemirror-core/rollup.config.js
+++ b/wax-prosemirror-core/rollup.config.js
@@ -1,7 +1,6 @@
 import babel from "rollup-plugin-babel";
 import commonjs from "@rollup/plugin-commonjs";
 import external from "rollup-plugin-peer-deps-external";
-import postcss from "rollup-plugin-postcss";
 import { terser } from "rollup-plugin-terser";
 
 export default {
@@ -14,19 +13,11 @@ export default {
     }
   ],
   plugins: [
-    postcss({
-      plugins: [],
-      minimize: true,
-      sourceMap: "inline"
-    }),
     external({
       includeDependencies: true
     }),
     babel({
-      presets: [
-        [require("@babel/preset-env"), { modules: false }],
-        require("@babel/preset-react")
-      ],
+      presets: ["react-app"],
       plugins: [
         ["@babel/plugin-proposal-decorators", { legacy: true }],
         "babel-plugin-parameter-decorator",
diff --git a/wax-prosemirror-layouts/rollup.config.js b/wax-prosemirror-layouts/rollup.config.js
index e82c070a1626475891b7ca685653dc9e62de8bee..8003f54586ac909eb593a6a6cfca6e9b851c37af 100644
--- a/wax-prosemirror-layouts/rollup.config.js
+++ b/wax-prosemirror-layouts/rollup.config.js
@@ -1,7 +1,6 @@
 import babel from "rollup-plugin-babel";
 import commonjs from "@rollup/plugin-commonjs";
 import external from "rollup-plugin-peer-deps-external";
-import postcss from "rollup-plugin-postcss";
 import { terser } from "rollup-plugin-terser";
 
 export default {
@@ -14,19 +13,11 @@ export default {
     }
   ],
   plugins: [
-    postcss({
-      plugins: [],
-      minimize: true,
-      sourceMap: "inline"
-    }),
     external({
       includeDependencies: true
     }),
     babel({
-      presets: [
-        [require("@babel/preset-env"), { modules: false }],
-        require("@babel/preset-react")
-      ],
+      presets: ["react-app"],
       plugins: [
         ["@babel/plugin-proposal-decorators", { legacy: true }],
         "babel-plugin-parameter-decorator",
diff --git a/wax-prosemirror-plugins/rollup.config.js b/wax-prosemirror-plugins/rollup.config.js
index a25cbc39e161eab718bf42e3f2cbde7afb3f2667..f43c40919d03fced0270d46b8a1aa16435b08a36 100644
--- a/wax-prosemirror-plugins/rollup.config.js
+++ b/wax-prosemirror-plugins/rollup.config.js
@@ -1,7 +1,6 @@
 import babel from "rollup-plugin-babel";
 import commonjs from "@rollup/plugin-commonjs";
 import external from "rollup-plugin-peer-deps-external";
-import postcss from "rollup-plugin-postcss";
 import { terser } from "rollup-plugin-terser";
 
 export default {
@@ -14,19 +13,11 @@ export default {
     }
   ],
   plugins: [
-    postcss({
-      plugins: [],
-      minimize: true,
-      sourceMap: "inline"
-    }),
     external({
       includeDependencies: true
     }),
     babel({
-      presets: [
-        [require("@babel/preset-env"), { modules: false }],
-        require("@babel/preset-react")
-      ],
+      presets: ["react-app"],
       plugins: [
         ["@babel/plugin-proposal-decorators", { legacy: true }],
         "babel-plugin-parameter-decorator",
diff --git a/wax-prosemirror-schema/rollup.config.js b/wax-prosemirror-schema/rollup.config.js
index 3fb2ea5f164089948000506d20f8334311f613f2..1ab72128a5dbb74dccfd9354e1c10bbdc14b8dd2 100644
--- a/wax-prosemirror-schema/rollup.config.js
+++ b/wax-prosemirror-schema/rollup.config.js
@@ -1,7 +1,6 @@
 import babel from "rollup-plugin-babel";
 import commonjs from "@rollup/plugin-commonjs";
 import external from "rollup-plugin-peer-deps-external";
-import postcss from "rollup-plugin-postcss";
 import { terser } from "rollup-plugin-terser";
 
 export default {
@@ -14,19 +13,11 @@ export default {
     }
   ],
   plugins: [
-    postcss({
-      plugins: [],
-      minimize: true,
-      sourceMap: "inline"
-    }),
     external({
       includeDependencies: true
     }),
     babel({
-      presets: [
-        [require("@babel/preset-env"), { modules: false }],
-        require("@babel/preset-react")
-      ],
+      presets: ["react-app"],
       plugins: [
         ["@babel/plugin-proposal-decorators", { legacy: true }],
         "babel-plugin-parameter-decorator",
diff --git a/wax-prosemirror-services/rollup.config.js b/wax-prosemirror-services/rollup.config.js
index 21ba2c5dc8e1b07fd34a8d9e0b4e3991a0874262..8454fc6a129e8c6960e0515ee3a086c303d85bf7 100644
--- a/wax-prosemirror-services/rollup.config.js
+++ b/wax-prosemirror-services/rollup.config.js
@@ -1,7 +1,6 @@
 import babel from "rollup-plugin-babel";
 import commonjs from "@rollup/plugin-commonjs";
 import external from "rollup-plugin-peer-deps-external";
-import postcss from "rollup-plugin-postcss";
 import { terser } from "rollup-plugin-terser";
 
 export default {
@@ -14,19 +13,11 @@ export default {
     }
   ],
   plugins: [
-    postcss({
-      plugins: [],
-      minimize: true,
-      sourceMap: "inline"
-    }),
     external({
       includeDependencies: true
     }),
     babel({
-      presets: [
-        [require("@babel/preset-env"), { modules: false }],
-        require("@babel/preset-react")
-      ],
+      presets: ["react-app"],
       plugins: [
         ["@babel/plugin-proposal-decorators", { legacy: true }],
         "babel-plugin-parameter-decorator",
diff --git a/wax-prosemirror-services/src/lib/ToolGroup.js b/wax-prosemirror-services/src/lib/ToolGroup.js
index b2b0d2744601b7f54441b4a539f09078f5e0e2dd..327401a5310cede5211439d1514be08ec7107b64 100644
--- a/wax-prosemirror-services/src/lib/ToolGroup.js
+++ b/wax-prosemirror-services/src/lib/ToolGroup.js
@@ -1,6 +1,7 @@
 import React, { useState } from "react";
 import { injectable } from "inversify";
 import { ToolGroupComponent } from "wax-prosemirror-components";
+import { v4 as uuidv4 } from "uuid";
 
 @injectable()
 export default class ToolGroup {
@@ -53,7 +54,7 @@ export default class ToolGroup {
     const { name } = this.constructor;
     return (
       <ToolGroupComponent
-        key={`groupName-${name}`}
+        key={uuidv4()}
         view={view}
         tools={this._tools}
         title={this.title}
diff --git a/wax-prosemirror-themes/rollup.config.js b/wax-prosemirror-themes/rollup.config.js
index 853ae3605f12dc553e998c90d9d90d87954506c1..8e356c8ef36a0e0ea784aaf76bb44fa9387ec2eb 100644
--- a/wax-prosemirror-themes/rollup.config.js
+++ b/wax-prosemirror-themes/rollup.config.js
@@ -1,7 +1,6 @@
 import babel from "rollup-plugin-babel";
 import commonjs from "@rollup/plugin-commonjs";
 import external from "rollup-plugin-peer-deps-external";
-import postcss from "rollup-plugin-postcss";
 import { terser } from "rollup-plugin-terser";
 
 export default {
@@ -14,19 +13,11 @@ export default {
     }
   ],
   plugins: [
-    postcss({
-      plugins: [],
-      minimize: true,
-      sourceMap: "inline"
-    }),
     external({
       includeDependencies: true
     }),
     babel({
-      presets: [
-        [require("@babel/preset-env"), { modules: false }],
-        require("@babel/preset-react")
-      ],
+      presets: ["react-app"],
       plugins: [
         ["@babel/plugin-proposal-decorators", { legacy: true }],
         "babel-plugin-parameter-decorator",
diff --git a/wax-prosemirror-utilities/rollup.config.js b/wax-prosemirror-utilities/rollup.config.js
index 3fb2ea5f164089948000506d20f8334311f613f2..1ab72128a5dbb74dccfd9354e1c10bbdc14b8dd2 100644
--- a/wax-prosemirror-utilities/rollup.config.js
+++ b/wax-prosemirror-utilities/rollup.config.js
@@ -1,7 +1,6 @@
 import babel from "rollup-plugin-babel";
 import commonjs from "@rollup/plugin-commonjs";
 import external from "rollup-plugin-peer-deps-external";
-import postcss from "rollup-plugin-postcss";
 import { terser } from "rollup-plugin-terser";
 
 export default {
@@ -14,19 +13,11 @@ export default {
     }
   ],
   plugins: [
-    postcss({
-      plugins: [],
-      minimize: true,
-      sourceMap: "inline"
-    }),
     external({
       includeDependencies: true
     }),
     babel({
-      presets: [
-        [require("@babel/preset-env"), { modules: false }],
-        require("@babel/preset-react")
-      ],
+      presets: ["react-app"],
       plugins: [
         ["@babel/plugin-proposal-decorators", { legacy: true }],
         "babel-plugin-parameter-decorator",