diff --git a/editors/default/src/Default.js b/editors/default/src/Default.js
index a84771513baa737dd848300d9d9f9009b8599930..293753920728c2e58ea1f0fdd2afe284096f12e8 100644
--- a/editors/default/src/Default.js
+++ b/editors/default/src/Default.js
@@ -1,8 +1,6 @@
 import React, { Component } from "react";
 import { Wax, CreateSchema } from "wax-prosemirror-core";
 import { DefaultSchema } from "wax-prosemirror-schema";
-import "wax-prosemirror-layouts/layouts/default-layout.css";
-import "wax-prosemirror-themes/themes/default-theme.css";
 
 const plugins = [];
 const keys = {};
@@ -14,14 +12,7 @@ const options = {
 class Default extends Component {
   render() {
     return (
-      <Wax
-        options={options}
-        autoFocus
-        placeholder="Type Something..."
-        theme="default"
-        layout="default"
-        debug
-      />
+      <Wax options={options} autoFocus placeholder="Type Something..." debug />
     );
   }
 }
diff --git a/editors/xpub/.gitignore b/editors/xpub/.gitignore
deleted file mode 100644
index 4d29575de80483b005c29bfcac5061cd2f45313e..0000000000000000000000000000000000000000
--- a/editors/xpub/.gitignore
+++ /dev/null
@@ -1,23 +0,0 @@
-# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
-
-# dependencies
-/node_modules
-/.pnp
-.pnp.js
-
-# testing
-/coverage
-
-# production
-/build
-
-# misc
-.DS_Store
-.env.local
-.env.development.local
-.env.test.local
-.env.production.local
-
-npm-debug.log*
-yarn-debug.log*
-yarn-error.log*
diff --git a/editors/xpub/README.md b/editors/xpub/README.md
deleted file mode 100644
index 89b278ae3edb64263849deb1bc26cca15fa96bf2..0000000000000000000000000000000000000000
--- a/editors/xpub/README.md
+++ /dev/null
@@ -1,68 +0,0 @@
-This project was bootstrapped with [Create React App](https://github.com/facebook/create-react-app).
-
-## Available Scripts
-
-In the project directory, you can run:
-
-### `yarn start`
-
-Runs the app in the development mode.<br />
-Open [http://localhost:3000](http://localhost:3000) to view it in the browser.
-
-The page will reload if you make edits.<br />
-You will also see any lint errors in the console.
-
-### `yarn test`
-
-Launches the test runner in the interactive watch mode.<br />
-See the section about [running tests](https://facebook.github.io/create-react-app/docs/running-tests) for more information.
-
-### `yarn build`
-
-Builds the app for production to the `build` folder.<br />
-It correctly bundles React in production mode and optimizes the build for the best performance.
-
-The build is minified and the filenames include the hashes.<br />
-Your app is ready to be deployed!
-
-See the section about [deployment](https://facebook.github.io/create-react-app/docs/deployment) for more information.
-
-### `yarn eject`
-
-**Note: this is a one-way operation. Once you `eject`, you can’t go back!**
-
-If you aren’t satisfied with the build tool and configuration choices, you can `eject` at any time. This command will remove the single build dependency from your project.
-
-Instead, it will copy all the configuration files and the transitive dependencies (Webpack, Babel, ESLint, etc) right into your project so you have full control over them. All of the commands except `eject` will still work, but they will point to the copied scripts so you can tweak them. At this point you’re on your own.
-
-You don’t have to ever use `eject`. The curated feature set is suitable for small and middle deployments, and you shouldn’t feel obligated to use this feature. However we understand that this tool wouldn’t be useful if you couldn’t customize it when you are ready for it.
-
-## Learn More
-
-You can learn more in the [Create React App documentation](https://facebook.github.io/create-react-app/docs/getting-started).
-
-To learn React, check out the [React documentation](https://reactjs.org/).
-
-### Code Splitting
-
-This section has moved here: https://facebook.github.io/create-react-app/docs/code-splitting
-
-### Analyzing the Bundle Size
-
-This section has moved here: https://facebook.github.io/create-react-app/docs/analyzing-the-bundle-size
-
-### Making a Progressive Web App
-
-This section has moved here: https://facebook.github.io/create-react-app/docs/making-a-progressive-web-app
-
-### Advanced Configuration
-
-This section has moved here: https://facebook.github.io/create-react-app/docs/advanced-configuration
-
-### Deployment
-
-This section has moved here: https://facebook.github.io/create-react-app/docs/deployment
-
-### `yarn build` fails to minify
-
-This section has moved here: https://facebook.github.io/create-react-app/docs/troubleshooting#npm-run-build-fails-to-minify
diff --git a/editors/xpub/config-overrides.js b/editors/xpub/config-overrides.js
deleted file mode 100644
index 226a6d61568d46344441bf1925b56904e5aa3194..0000000000000000000000000000000000000000
--- a/editors/xpub/config-overrides.js
+++ /dev/null
@@ -1,43 +0,0 @@
-module.exports = function override(config, env) {
-  config.module = {
-    rules: [
-      {
-        oneOf: [
-          {
-            test: /\.js$/,
-            loader: "babel-loader",
-            exclude: /node_modules/,
-            options: {
-              presets: [
-                [require("@babel/preset-env"), { modules: false }],
-                require("@babel/preset-react")
-              ],
-              plugins: [require("@babel/plugin-proposal-class-properties")]
-            }
-          },
-          {
-            test: /\.module\.css$/,
-            use: [
-              "style-loader",
-              {
-                loader: "css-loader",
-                options: {
-                  modules: true
-                }
-              }
-            ]
-          },
-          {
-            test: /\.css$/,
-            use: ["style-loader", "css-loader"]
-          },
-          {
-            test: /\.svg$/,
-            use: "svg-inline-loader"
-          }
-        ]
-      }
-    ]
-  };
-  return config;
-};
diff --git a/editors/xpub/package-lock.json b/editors/xpub/package-lock.json
deleted file mode 100644
index 4bf1a5b8eeb6af7fa94d9a60191d5f462a27180c..0000000000000000000000000000000000000000
--- a/editors/xpub/package-lock.json
+++ /dev/null
@@ -1,82 +0,0 @@
-{
-  "name": "xpub",
-  "version": "0.0.2",
-  "lockfileVersion": 1,
-  "requires": true,
-  "dependencies": {
-    "js-tokens": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
-      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
-    },
-    "loose-envify": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
-      "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
-      "requires": {
-        "js-tokens": "^3.0.0 || ^4.0.0"
-      }
-    },
-    "object-assign": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM="
-    },
-    "prop-types": {
-      "version": "15.7.2",
-      "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.7.2.tgz",
-      "integrity": "sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==",
-      "requires": {
-        "loose-envify": "^1.4.0",
-        "object-assign": "^4.1.1",
-        "react-is": "^16.8.1"
-      }
-    },
-    "react": {
-      "version": "16.11.0",
-      "requires": {
-        "loose-envify": "^1.1.0",
-        "object-assign": "^4.1.1",
-        "prop-types": "^15.6.2"
-      }
-    },
-    "react-app-rewired": {
-      "version": "2.1.4",
-      "resolved": "https://registry.npmjs.org/react-app-rewired/-/react-app-rewired-2.1.4.tgz",
-      "integrity": "sha512-OEd3xWIqk+6HJyi4/uogBphbZqaZXOIv+Mz/DWLZKdzmWdYpXJgeatHcFUjWfj/vsJIDLMI2KaS/FwdAwlkTGw==",
-      "dev": true,
-      "requires": {
-        "semver": "^5.6.0"
-      }
-    },
-    "react-dom": {
-      "version": "16.11.0",
-      "requires": {
-        "loose-envify": "^1.1.0",
-        "object-assign": "^4.1.1",
-        "prop-types": "^15.6.2",
-        "scheduler": "^0.17.0"
-      }
-    },
-    "react-is": {
-      "version": "16.11.0",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.11.0.tgz",
-      "integrity": "sha512-gbBVYR2p8mnriqAwWx9LbuUrShnAuSCNnuPGyc7GJrMVQtPDAh8iLpv7FRuMPFb56KkaVZIYSz1PrjI9q0QPCw=="
-    },
-    "scheduler": {
-      "version": "0.17.0",
-      "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.17.0.tgz",
-      "integrity": "sha512-7rro8Io3tnCPuY4la/NuI5F2yfESpnfZyT6TtkXnSWVkcu0BCDJ+8gk5ozUaFaxpIyNuWAPXrH0yFcSi28fnDA==",
-      "requires": {
-        "loose-envify": "^1.1.0",
-        "object-assign": "^4.1.1"
-      }
-    },
-    "semver": {
-      "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
-      "dev": true
-    }
-  }
-}
diff --git a/editors/xpub/package.json b/editors/xpub/package.json
deleted file mode 100644
index c05ecd1d8e66f5756d8aa195b0bb29ba2da2f4d2..0000000000000000000000000000000000000000
--- a/editors/xpub/package.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "name": "xpub",
-  "version": "0.0.2",
-  "private": true,
-  "dependencies": {
-    "react": "^16.8.6",
-    "react-dom": "^16.8.6",
-    "styled-components": "^4.2.0",
-    "wax-prosemirror-core": "^0.0.2",
-    "wax-prosemirror-schema": "^0.0.2",
-    "wax-prosemirror-themes": "^0.0.2"
-  },
-  "scripts": {
-    "start": "react-app-rewired start",
-    "build": "react-app-rewired build",
-    "test": "react-app-rewired test --env=jsdom",
-    "eject": "react-scripts eject"
-  },
-  "eslintConfig": {
-    "extends": "react-app"
-  },
-  "browserslist": [
-    ">0.2%",
-    "not dead",
-    "not ie <= 11",
-    "not op_mini all"
-  ],
-  "devDependencies": {
-    "babel-eslint": "10.0.3",
-    "babel-loader": "8.0.6",
-    "react-app-rewired": "^2.1.1",
-    "react-scripts": "3.2.0"
-  }
-}
\ No newline at end of file
diff --git a/editors/xpub/public/favicon.ico b/editors/xpub/public/favicon.ico
deleted file mode 100644
index c2c86b859eaa20639adf92ff979c2be8d580433e..0000000000000000000000000000000000000000
Binary files a/editors/xpub/public/favicon.ico and /dev/null differ
diff --git a/editors/xpub/public/index.html b/editors/xpub/public/index.html
deleted file mode 100644
index c240d2ca8b0f6337eb440695f17829e3bada5ed1..0000000000000000000000000000000000000000
--- a/editors/xpub/public/index.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta charset="utf-8" />
-    <link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
-    <meta name="viewport" content="width=device-width, initial-scale=1" />
-    <meta name="theme-color" content="#000000" />
-    <meta
-      name="description"
-      content="Web site created using create-react-app"
-    />
-    <link rel="apple-touch-icon" href="logo192.png" />
-    <!--
-      manifest.json provides metadata used when your web app is installed on a
-      user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
-    -->
-    <link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
-    <!--
-      Notice the use of %PUBLIC_URL% in the tags above.
-      It will be replaced with the URL of the `public` folder during the build.
-      Only files inside the `public` folder can be referenced from the HTML.
-
-      Unlike "/favicon.ico" or "favicon.ico", "%PUBLIC_URL%/favicon.ico" will
-      work correctly both with client-side routing and a non-root public URL.
-      Learn how to configure a non-root public URL by running `npm run build`.
-    -->
-    <title>React App</title>
-  </head>
-  <body>
-    <noscript>You need to enable JavaScript to run this app.</noscript>
-    <div id="root"></div>
-    <!--
-      This HTML file is a template.
-      If you open it directly in the browser, you will see an empty page.
-
-      You can add webfonts, meta tags, or analytics to this file.
-      The build step will place the bundled scripts into the <body> tag.
-
-      To begin the development, run `npm start` or `yarn start`.
-      To create a production bundle, use `npm run build` or `yarn build`.
-    -->
-  </body>
-</html>
diff --git a/editors/xpub/public/logo192.png b/editors/xpub/public/logo192.png
deleted file mode 100644
index fa313abf53936aefc517dbd583b724a57199d415..0000000000000000000000000000000000000000
Binary files a/editors/xpub/public/logo192.png and /dev/null differ
diff --git a/editors/xpub/public/logo512.png b/editors/xpub/public/logo512.png
deleted file mode 100644
index bd5d4b5e235ab9d880c202a6a7f7d3e35e115d8c..0000000000000000000000000000000000000000
Binary files a/editors/xpub/public/logo512.png and /dev/null differ
diff --git a/editors/xpub/public/manifest.json b/editors/xpub/public/manifest.json
deleted file mode 100644
index 080d6c77ac21bb2ef88a6992b2b73ad93daaca92..0000000000000000000000000000000000000000
--- a/editors/xpub/public/manifest.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "short_name": "React App",
-  "name": "Create React App Sample",
-  "icons": [
-    {
-      "src": "favicon.ico",
-      "sizes": "64x64 32x32 24x24 16x16",
-      "type": "image/x-icon"
-    },
-    {
-      "src": "logo192.png",
-      "type": "image/png",
-      "sizes": "192x192"
-    },
-    {
-      "src": "logo512.png",
-      "type": "image/png",
-      "sizes": "512x512"
-    }
-  ],
-  "start_url": ".",
-  "display": "standalone",
-  "theme_color": "#000000",
-  "background_color": "#ffffff"
-}
diff --git a/editors/xpub/public/robots.txt b/editors/xpub/public/robots.txt
deleted file mode 100644
index 01b0f9a10733b39c3bbeba1ccb1521d866f8e3a5..0000000000000000000000000000000000000000
--- a/editors/xpub/public/robots.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-# https://www.robotstxt.org/robotstxt.html
-User-agent: *
diff --git a/editors/xpub/src/Xpub.js b/editors/xpub/src/Xpub.js
deleted file mode 100644
index 58157344e455bdc649bb03eeffb2422ef562cb06..0000000000000000000000000000000000000000
--- a/editors/xpub/src/Xpub.js
+++ /dev/null
@@ -1,24 +0,0 @@
-import React, { Component } from "react";
-import { Wax, CreateSchema } from "wax-prosemirror-core";
-import { XpubSchema } from "wax-prosemirror-schema";
-import "wax-prosemirror-themes/themes/default-theme.css";
-
-const options = {
-  schema: new CreateSchema(XpubSchema)
-};
-
-class Xpub extends Component {
-  render() {
-    return (
-      <Wax
-        options={options}
-        readonly
-        theme="default"
-        readonly
-        value="<p>this is a par</p> <h1>this is a heading</h1><ul><li> one list</li></ul>"
-      />
-    );
-  }
-}
-
-export default Xpub;
diff --git a/editors/xpub/src/index.js b/editors/xpub/src/index.js
deleted file mode 100644
index 0ddc7b4634d41b801fc37174e6f7e5d9e0db2807..0000000000000000000000000000000000000000
--- a/editors/xpub/src/index.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import React from "react";
-import ReactDOM from "react-dom";
-import Xpub from "./Xpub";
-import * as serviceWorker from "./serviceWorker";
-
-ReactDOM.render(<Xpub />, document.getElementById("root"));
-
-// If you want your app to work offline and load faster, you can change
-// unregister() to register() below. Note this comes with some pitfalls.
-// Learn more about service workers: https://bit.ly/CRA-PWA
-serviceWorker.unregister();
diff --git a/editors/xpub/src/serviceWorker.js b/editors/xpub/src/serviceWorker.js
deleted file mode 100644
index f8c7e50c201765c456ddbf21e9ea5b3e6a936920..0000000000000000000000000000000000000000
--- a/editors/xpub/src/serviceWorker.js
+++ /dev/null
@@ -1,135 +0,0 @@
-// This optional code is used to register a service worker.
-// register() is not called by default.
-
-// This lets the app load faster on subsequent visits in production, and gives
-// it offline capabilities. However, it also means that developers (and users)
-// will only see deployed updates on subsequent visits to a page, after all the
-// existing tabs open on the page have been closed, since previously cached
-// resources are updated in the background.
-
-// To learn more about the benefits of this model and instructions on how to
-// opt-in, read https://bit.ly/CRA-PWA
-
-const isLocalhost = Boolean(
-  window.location.hostname === 'localhost' ||
-    // [::1] is the IPv6 localhost address.
-    window.location.hostname === '[::1]' ||
-    // 127.0.0.1/8 is considered localhost for IPv4.
-    window.location.hostname.match(
-      /^127(?:\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)){3}$/
-    )
-);
-
-export function register(config) {
-  if (process.env.NODE_ENV === 'production' && 'serviceWorker' in navigator) {
-    // The URL constructor is available in all browsers that support SW.
-    const publicUrl = new URL(process.env.PUBLIC_URL, window.location.href);
-    if (publicUrl.origin !== window.location.origin) {
-      // Our service worker won't work if PUBLIC_URL is on a different origin
-      // from what our page is served on. This might happen if a CDN is used to
-      // serve assets; see https://github.com/facebook/create-react-app/issues/2374
-      return;
-    }
-
-    window.addEventListener('load', () => {
-      const swUrl = `${process.env.PUBLIC_URL}/service-worker.js`;
-
-      if (isLocalhost) {
-        // This is running on localhost. Let's check if a service worker still exists or not.
-        checkValidServiceWorker(swUrl, config);
-
-        // Add some additional logging to localhost, pointing developers to the
-        // service worker/PWA documentation.
-        navigator.serviceWorker.ready.then(() => {
-          console.log(
-            'This web app is being served cache-first by a service ' +
-              'worker. To learn more, visit https://bit.ly/CRA-PWA'
-          );
-        });
-      } else {
-        // Is not localhost. Just register service worker
-        registerValidSW(swUrl, config);
-      }
-    });
-  }
-}
-
-function registerValidSW(swUrl, config) {
-  navigator.serviceWorker
-    .register(swUrl)
-    .then(registration => {
-      registration.onupdatefound = () => {
-        const installingWorker = registration.installing;
-        if (installingWorker == null) {
-          return;
-        }
-        installingWorker.onstatechange = () => {
-          if (installingWorker.state === 'installed') {
-            if (navigator.serviceWorker.controller) {
-              // At this point, the updated precached content has been fetched,
-              // but the previous service worker will still serve the older
-              // content until all client tabs are closed.
-              console.log(
-                'New content is available and will be used when all ' +
-                  'tabs for this page are closed. See https://bit.ly/CRA-PWA.'
-              );
-
-              // Execute callback
-              if (config && config.onUpdate) {
-                config.onUpdate(registration);
-              }
-            } else {
-              // At this point, everything has been precached.
-              // It's the perfect time to display a
-              // "Content is cached for offline use." message.
-              console.log('Content is cached for offline use.');
-
-              // Execute callback
-              if (config && config.onSuccess) {
-                config.onSuccess(registration);
-              }
-            }
-          }
-        };
-      };
-    })
-    .catch(error => {
-      console.error('Error during service worker registration:', error);
-    });
-}
-
-function checkValidServiceWorker(swUrl, config) {
-  // Check if the service worker can be found. If it can't reload the page.
-  fetch(swUrl)
-    .then(response => {
-      // Ensure service worker exists, and that we really are getting a JS file.
-      const contentType = response.headers.get('content-type');
-      if (
-        response.status === 404 ||
-        (contentType != null && contentType.indexOf('javascript') === -1)
-      ) {
-        // No service worker found. Probably a different app. Reload the page.
-        navigator.serviceWorker.ready.then(registration => {
-          registration.unregister().then(() => {
-            window.location.reload();
-          });
-        });
-      } else {
-        // Service worker found. Proceed as normal.
-        registerValidSW(swUrl, config);
-      }
-    })
-    .catch(() => {
-      console.log(
-        'No internet connection found. App is running in offline mode.'
-      );
-    });
-}
-
-export function unregister() {
-  if ('serviceWorker' in navigator) {
-    navigator.serviceWorker.ready.then(registration => {
-      registration.unregister();
-    });
-  }
-}
diff --git a/package.json b/package.json
index 8b36e8208495a79c12f878c22a4f64c73b3e67c0..bf77290a1418ad3105466778a339fd81b31f7e46 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,8 @@
   "version": "0.0.1",
   "main": "index.js",
   "author": "Collaborative Knowledge Foundation",
-  "description": "Monorepo for wax-prosemirror, its components and its integrations",
+  "description":
+    "Monorepo for wax-prosemirror, its components and its integrations",
   "repository": {
     "type": "git",
     "url": "git@gitlab.coko.foundation:wax/wax-prosemirror.git"
@@ -12,13 +13,13 @@
   "private": true,
   "scripts": {
     "bootstrap": "lerna bootstrap --no-ci --hoist",
-    "clean": "yarn run clean:artifacts && yarn run clean:packages && yarn run clean:root",
+    "clean":
+      "yarn run clean:artifacts && yarn run clean:packages && yarn run clean:root",
     "clean:artifacts": "lerna run clean --parallel",
     "clean:packages": "lerna clean --yes",
     "clean:root": "rm -rf node_modules",
     "reset": "yarn clean && yarn",
     "build": "lerna run build --concurrency=1 --stream",
-"xpub": "cd editors/xpub && yarn start",
     "editoria": "cd editors/editoria && yarn start",
     "default": "cd editors/default && yarn start"
   },
diff --git a/wax-prosemirror-layouts/src/layouts/EditoriaLayout.js b/wax-prosemirror-layouts/src/layouts/EditoriaLayout.js
index 55dbff4a456b9a3dc08af396e740f1d23d881d57..1391398c83db937419dac022c5b1c1d590b6ecfd 100644
--- a/wax-prosemirror-layouts/src/layouts/EditoriaLayout.js
+++ b/wax-prosemirror-layouts/src/layouts/EditoriaLayout.js
@@ -1,6 +1,5 @@
 import styled from "styled-components";
 import React, { Fragment } from "react";
-
 import { MainMenuBar, SideMenuBar } from "wax-prosemirror-components";
 
 const WaxSurfaceContainer = styled.div`