diff --git a/wax-prosemirror-components/rollup.config.js b/wax-prosemirror-components/rollup.config.js
index 728bcc5bae0a57f09925b3d5af73478f5b640849..642c08508ab2e030c466219a202ce2848fed8e00 100644
--- a/wax-prosemirror-components/rollup.config.js
+++ b/wax-prosemirror-components/rollup.config.js
@@ -12,13 +12,7 @@ export default {
     {
       file: "dist/index.js",
       format: "cjs",
-      sourcemap: true,
-      globals: {
-        "@fortawesome/react-fontawesome": "reactFontawesome",
-        "react-dropdown": "reactDropdown",
-        "prop-types": "propTypes",
-        "prosemirror-tables": "prosemirrorTables"
-      }
+      sourcemap: true
     }
   ],
   plugins: [
@@ -34,7 +28,6 @@ export default {
     resolve(),
     babel({
       presets: [
-        "react-app",
         [require("@babel/preset-env"), { modules: false }],
         require("@babel/preset-react")
       ],
@@ -48,12 +41,5 @@ export default {
     }),
     commonjs(),
     terser()
-  ],
-  external: [
-    "@fortawesome/react-fontawesome",
-    "react-dropdown",
-    "uuid",
-    "prop-types",
-    "prosemirror-tables"
   ]
 };
diff --git a/wax-prosemirror-core/rollup.config.js b/wax-prosemirror-core/rollup.config.js
index 728bcc5bae0a57f09925b3d5af73478f5b640849..5180ef8a1166388eaccb3a8681f2207a195ccdd1 100644
--- a/wax-prosemirror-core/rollup.config.js
+++ b/wax-prosemirror-core/rollup.config.js
@@ -3,7 +3,6 @@ import commonjs from "@rollup/plugin-commonjs";
 import external from "rollup-plugin-peer-deps-external";
 import postcss from "rollup-plugin-postcss";
 import resolve from "@rollup/plugin-node-resolve";
-import url from "@rollup/plugin-url";
 import { terser } from "rollup-plugin-terser";
 
 export default {
@@ -12,13 +11,7 @@ export default {
     {
       file: "dist/index.js",
       format: "cjs",
-      sourcemap: true,
-      globals: {
-        "@fortawesome/react-fontawesome": "reactFontawesome",
-        "react-dropdown": "reactDropdown",
-        "prop-types": "propTypes",
-        "prosemirror-tables": "prosemirrorTables"
-      }
+      sourcemap: true
     }
   ],
   plugins: [
@@ -30,11 +23,9 @@ export default {
     external({
       includeDependencies: true
     }),
-    url(),
     resolve(),
     babel({
       presets: [
-        "react-app",
         [require("@babel/preset-env"), { modules: false }],
         require("@babel/preset-react")
       ],
@@ -54,6 +45,7 @@ export default {
     "react-dropdown",
     "uuid",
     "prop-types",
-    "prosemirror-tables"
+    "prosemirror-tables",
+    "wax-prosemirror-schema"
   ]
 };
diff --git a/wax-prosemirror-core/src/Application.js b/wax-prosemirror-core/src/Application.js
index 5113c263bfe0d6282bf184b1bc0f2f8cfca22721..fbe681b5c98b31c0f0d5dee7d39fd2901d41d387 100644
--- a/wax-prosemirror-core/src/Application.js
+++ b/wax-prosemirror-core/src/Application.js
@@ -1,6 +1,6 @@
 import { Container } from "inversify";
 import "reflect-metadata";
-import deepmerge from "deepmerge";
+//import deepmerge from "deepmerge";
 import Config from "./config/Config";
 import defaultConfig from "./config/defaultConfig";
 import PmPlugins from "./PmPlugins";
diff --git a/wax-prosemirror-layouts/package.json b/wax-prosemirror-layouts/package.json
index 1bc3b44e876573830116e8e7fc02a6a9cb6787c6..3c7a6cf8ecb1781beb96f9d4fedb25ae5213e135 100644
--- a/wax-prosemirror-layouts/package.json
+++ b/wax-prosemirror-layouts/package.json
@@ -10,7 +10,9 @@
     "build": "BABEL_ENV=production rollup -c"
   },
   "dependencies": {
-    "@pubsweet/ui-toolkit": "^2.2.13",
-    "react-panelgroup": "^1.0.10"
+    "react-panelgroup": "^1.0.10",
+    "react": "^16.8.6",
+    "react-dom": "^16.8.6",
+    "styled-components": "^4.2.0"
   }
 }
diff --git a/wax-prosemirror-layouts/rollup.config.js b/wax-prosemirror-layouts/rollup.config.js
index 8aedc21b429824cb393dd0b7425adc1dfd5da985..ae5c52fc0853d8da47362581a9f50df3f4795d8f 100644
--- a/wax-prosemirror-layouts/rollup.config.js
+++ b/wax-prosemirror-layouts/rollup.config.js
@@ -12,10 +12,7 @@ export default {
     {
       file: "dist/index.js",
       format: "cjs",
-      sourcemap: true,
-      globals: {
-        "@emotion/unitless": "unitLess"
-      }
+      sourcemap: true
     }
   ],
   plugins: [
@@ -31,7 +28,6 @@ export default {
     resolve(),
     babel({
       presets: [
-        "react-app",
         [require("@babel/preset-env"), { modules: false }],
         require("@babel/preset-react")
       ],
@@ -46,5 +42,14 @@ export default {
     commonjs(),
     terser()
   ],
-  external: ["@emotion/unitless"]
+  external: [
+    "@fortawesome/react-fontawesome",
+    "react-dropdown",
+    "inversify",
+    "prosemirror-dev-tools",
+    "lodash",
+    "react-is",
+    "uuid",
+    "wax-prosemirror-schema"
+  ]
 };
diff --git a/wax-prosemirror-plugins/rollup.config.js b/wax-prosemirror-plugins/rollup.config.js
index 728bcc5bae0a57f09925b3d5af73478f5b640849..642c08508ab2e030c466219a202ce2848fed8e00 100644
--- a/wax-prosemirror-plugins/rollup.config.js
+++ b/wax-prosemirror-plugins/rollup.config.js
@@ -12,13 +12,7 @@ export default {
     {
       file: "dist/index.js",
       format: "cjs",
-      sourcemap: true,
-      globals: {
-        "@fortawesome/react-fontawesome": "reactFontawesome",
-        "react-dropdown": "reactDropdown",
-        "prop-types": "propTypes",
-        "prosemirror-tables": "prosemirrorTables"
-      }
+      sourcemap: true
     }
   ],
   plugins: [
@@ -34,7 +28,6 @@ export default {
     resolve(),
     babel({
       presets: [
-        "react-app",
         [require("@babel/preset-env"), { modules: false }],
         require("@babel/preset-react")
       ],
@@ -48,12 +41,5 @@ export default {
     }),
     commonjs(),
     terser()
-  ],
-  external: [
-    "@fortawesome/react-fontawesome",
-    "react-dropdown",
-    "uuid",
-    "prop-types",
-    "prosemirror-tables"
   ]
 };
diff --git a/wax-prosemirror-schema/rollup.config.js b/wax-prosemirror-schema/rollup.config.js
index 728bcc5bae0a57f09925b3d5af73478f5b640849..09fcf43a85a1298aee3566459cdc61b13b57a134 100644
--- a/wax-prosemirror-schema/rollup.config.js
+++ b/wax-prosemirror-schema/rollup.config.js
@@ -12,13 +12,7 @@ export default {
     {
       file: "dist/index.js",
       format: "cjs",
-      sourcemap: true,
-      globals: {
-        "@fortawesome/react-fontawesome": "reactFontawesome",
-        "react-dropdown": "reactDropdown",
-        "prop-types": "propTypes",
-        "prosemirror-tables": "prosemirrorTables"
-      }
+      sourcemap: true
     }
   ],
   plugins: [
@@ -34,7 +28,6 @@ export default {
     resolve(),
     babel({
       presets: [
-        "react-app",
         [require("@babel/preset-env"), { modules: false }],
         require("@babel/preset-react")
       ],
@@ -49,11 +42,5 @@ export default {
     commonjs(),
     terser()
   ],
-  external: [
-    "@fortawesome/react-fontawesome",
-    "react-dropdown",
-    "uuid",
-    "prop-types",
-    "prosemirror-tables"
-  ]
+  external: ["uuid"]
 };
diff --git a/wax-prosemirror-services/rollup.config.js b/wax-prosemirror-services/rollup.config.js
index 728bcc5bae0a57f09925b3d5af73478f5b640849..8551d0e30f6a985426cad70a3756bca519f705fd 100644
--- a/wax-prosemirror-services/rollup.config.js
+++ b/wax-prosemirror-services/rollup.config.js
@@ -3,7 +3,6 @@ import commonjs from "@rollup/plugin-commonjs";
 import external from "rollup-plugin-peer-deps-external";
 import postcss from "rollup-plugin-postcss";
 import resolve from "@rollup/plugin-node-resolve";
-import url from "@rollup/plugin-url";
 import { terser } from "rollup-plugin-terser";
 
 export default {
@@ -12,13 +11,7 @@ export default {
     {
       file: "dist/index.js",
       format: "cjs",
-      sourcemap: true,
-      globals: {
-        "@fortawesome/react-fontawesome": "reactFontawesome",
-        "react-dropdown": "reactDropdown",
-        "prop-types": "propTypes",
-        "prosemirror-tables": "prosemirrorTables"
-      }
+      sourcemap: true
     }
   ],
   plugins: [
@@ -30,11 +23,9 @@ export default {
     external({
       includeDependencies: true
     }),
-    url(),
     resolve(),
     babel({
       presets: [
-        "react-app",
         [require("@babel/preset-env"), { modules: false }],
         require("@babel/preset-react")
       ],
@@ -49,11 +40,5 @@ export default {
     commonjs(),
     terser()
   ],
-  external: [
-    "@fortawesome/react-fontawesome",
-    "react-dropdown",
-    "uuid",
-    "prop-types",
-    "prosemirror-tables"
-  ]
+  external: ["uuid", "react", "react-dom", "wax-prosemirror-schema", "lodash"]
 };
diff --git a/wax-prosemirror-services/src/LinkService/LinkTool.js b/wax-prosemirror-services/src/LinkService/LinkTool.js
index 40061c47ec2aa9712ef407b9839e815a92e94826..424444dc10ebe7dfb291a9a75dae804e73f6e2b2 100644
--- a/wax-prosemirror-services/src/LinkService/LinkTool.js
+++ b/wax-prosemirror-services/src/LinkService/LinkTool.js
@@ -1,5 +1,4 @@
 import { injectable } from "inversify";
-import { isEqual } from "lodash";
 import { toggleMark } from "prosemirror-commands";
 import { Commands } from "wax-prosemirror-utilities";
 import Tools from "../lib/Tools";
diff --git a/wax-prosemirror-themes/rollup.config.js b/wax-prosemirror-themes/rollup.config.js
index 8aedc21b429824cb393dd0b7425adc1dfd5da985..57c69e1347723bc32344ea645a783be4b686eb3d 100644
--- a/wax-prosemirror-themes/rollup.config.js
+++ b/wax-prosemirror-themes/rollup.config.js
@@ -12,10 +12,7 @@ export default {
     {
       file: "dist/index.js",
       format: "cjs",
-      sourcemap: true,
-      globals: {
-        "@emotion/unitless": "unitLess"
-      }
+      sourcemap: true
     }
   ],
   plugins: [
@@ -31,7 +28,6 @@ export default {
     resolve(),
     babel({
       presets: [
-        "react-app",
         [require("@babel/preset-env"), { modules: false }],
         require("@babel/preset-react")
       ],
@@ -46,5 +42,5 @@ export default {
     commonjs(),
     terser()
   ],
-  external: ["@emotion/unitless"]
+  external: ["styled-components"]
 };
diff --git a/wax-prosemirror-utilities/rollup.config.js b/wax-prosemirror-utilities/rollup.config.js
index 728bcc5bae0a57f09925b3d5af73478f5b640849..09fcf43a85a1298aee3566459cdc61b13b57a134 100644
--- a/wax-prosemirror-utilities/rollup.config.js
+++ b/wax-prosemirror-utilities/rollup.config.js
@@ -12,13 +12,7 @@ export default {
     {
       file: "dist/index.js",
       format: "cjs",
-      sourcemap: true,
-      globals: {
-        "@fortawesome/react-fontawesome": "reactFontawesome",
-        "react-dropdown": "reactDropdown",
-        "prop-types": "propTypes",
-        "prosemirror-tables": "prosemirrorTables"
-      }
+      sourcemap: true
     }
   ],
   plugins: [
@@ -34,7 +28,6 @@ export default {
     resolve(),
     babel({
       presets: [
-        "react-app",
         [require("@babel/preset-env"), { modules: false }],
         require("@babel/preset-react")
       ],
@@ -49,11 +42,5 @@ export default {
     commonjs(),
     terser()
   ],
-  external: [
-    "@fortawesome/react-fontawesome",
-    "react-dropdown",
-    "uuid",
-    "prop-types",
-    "prosemirror-tables"
-  ]
+  external: ["uuid"]
 };