diff --git a/config/descriptions.yaml b/config/descriptions.yaml
index 950cb53e105..2de88c008f5 100644
--- a/config/descriptions.yaml
+++ b/config/descriptions.yaml
@@ -44,5 +44,6 @@ simon: "A FreeSewing pattern for a button down shirt"
 sven: "A FreeSewing pattern for a straightforward sweater"
 tamiko: "A FreeSewing pattern for a zero-waste top"
 trayvon: "A FreeSewing pattern for a tie"
+tutorial: "A FreeSewing pattern for a baby bib that's used in our tutorial"
 utils: "A collection of utilities shared across freesewing frontend projects"
 wahid: "A FreeSewing pattern for a classic fitted waistcoat"
diff --git a/packages/aaron/example/package.json b/packages/aaron/example/package.json
index 0de6814a8c6..bee602bd1cd 100644
--- a/packages/aaron/example/package.json
+++ b/packages/aaron/example/package.json
@@ -11,16 +11,13 @@
     "@freesewing/models": "beta",
     "@freesewing/mui-theme": "beta",
     "@freesewing/pattern-info": "beta",
-    "@freesewing/plugin-debug": "beta",
-    "@freesewing/plugin-designer": "beta",
+    "@freesewing/plugin-bundle": "beta",
     "@freesewing/plugin-i18n": "beta",
     "@freesewing/plugin-svgattr": "beta",
-    "@freesewing/plugin-theme": "beta",
-    "@freesewing/plugin-validate": "beta",
     "@freesewing/utils": "beta",
-    "@material-ui/core": "^3.9.3",
-    "@material-ui/icons": "^3.0.2",
-    "@material-ui/lab": "^3.0.0-alpha.30",
+    "@material-ui/core": "^4.0.1",
+    "@material-ui/icons": "^4.0.1",
+    "@material-ui/lab": "^v4.0.0-alpha.14",
     "pattern": "link:..",
     "prismjs": "1.16.0",
     "react": "^16.8",
diff --git a/packages/aaron/example/src/App.js b/packages/aaron/example/src/App.js
index ec5968e9a60..e7936330e5d 100644
--- a/packages/aaron/example/src/App.js
+++ b/packages/aaron/example/src/App.js
@@ -1,6 +1,6 @@
 import React from "react";
 import freesewing from "@freesewing/core";
-import { Workbench } from "@freesewing/components";
+import Workbench from "@freesewing/components/Workbench";
 import "typeface-roboto-condensed";
 import "@freesewing/css-theme";
 
diff --git a/packages/aaron/package.json b/packages/aaron/package.json
index 293f03279ba..099df73a59a 100644
--- a/packages/aaron/package.json
+++ b/packages/aaron/package.json
@@ -34,13 +34,21 @@
     "start": "rollup -c -w"
   },
   "peerDependencies": {
-    "@freesewing/brian": "^2.0.0-beta.11",
-    "@freesewing/core": "^2.0.0-beta.11",
-    "@freesewing/plugin-bundle": "^2.0.0-beta.11"
+    "@freesewing/core": "^2.0.0-beta.12",
+    "@freesewing/plugin-bundle": "^2.0.0-beta.12",
+    "@freesewing/brian": "^2.0.0-beta.12"
   },
+  "dependencies": {},
   "devDependencies": {
+    "react": "^16.4.1",
+    "react-dom": "^16.4.1",
     "@babel/plugin-proposal-class-properties": "^7.0.0",
+    "babel-eslint": "10.0.1",
+    "eslint": "^5.16.0",
+    "babel-jest": "24.7.1",
+    "jest": "24.7.1",
     "@freesewing/components": "^2.0.0-beta.12",
+    "@freesewing/rendertest": "^2.0.0-beta.12",
     "@freesewing/css-theme": "^2.0.0-beta.12",
     "@freesewing/i18n": "^2.0.0-beta.12",
     "@freesewing/mui-theme": "^2.0.0-beta.12",
@@ -48,23 +56,12 @@
     "@freesewing/plugin-bust": "^2.0.0-beta.12",
     "@freesewing/plugin-buttons": "^2.0.0-beta.12",
     "@freesewing/plugin-flip": "^2.0.0-beta.12",
-    "@freesewing/rendertest": "^2.0.0-beta.12",
     "@freesewing/utils": "^2.0.0-beta.12",
-    "@material-ui/core": "3.9.3",
-    "@material-ui/icons": "3.0.2",
-    "@material-ui/lab": "3.0.0-alpha.30",
     "@svgr/rollup": "^2.4.1",
-    "babel-eslint": "10.0.1",
-    "babel-jest": "24.7.1",
     "cross-env": "^5.1.4",
-    "eslint": "^5.16.0",
     "gh-pages": "^1.2.0",
-    "jest": "24.7.1",
-    "prop-types": "15.7.2",
-    "react": "^16.4.1",
-    "react-dom": "^16.4.1",
-    "react-intl": "2.8.0",
     "react-scripts": "^3.0.0",
+    "webpack": "4.29.6",
     "rollup": "^0.64.1",
     "rollup-plugin-babel": "^4.0.1",
     "rollup-plugin-babel-minify": "^7.0.0",
@@ -74,7 +71,11 @@
     "rollup-plugin-peer-deps-external": "^2.2.0",
     "rollup-plugin-postcss": "^1.6.2",
     "rollup-plugin-url": "^1.4.0",
-    "webpack": "4.29.6"
+    "@material-ui/core": "3.9.3",
+    "@material-ui/icons": "3.0.2",
+    "@material-ui/lab": "3.0.0-alpha.30",
+    "react-intl": "2.8.0",
+    "prop-types": "15.7.2"
   },
   "files": [
     "dist/*",
diff --git a/packages/bent/example/package.json b/packages/bent/example/package.json
index f196464f985..faf64d65d95 100644
--- a/packages/bent/example/package.json
+++ b/packages/bent/example/package.json
@@ -11,16 +11,13 @@
     "@freesewing/models": "beta",
     "@freesewing/mui-theme": "beta",
     "@freesewing/pattern-info": "beta",
-    "@freesewing/plugin-debug": "beta",
-    "@freesewing/plugin-designer": "beta",
+    "@freesewing/plugin-bundle": "beta",
     "@freesewing/plugin-i18n": "beta",
     "@freesewing/plugin-svgattr": "beta",
-    "@freesewing/plugin-theme": "beta",
-    "@freesewing/plugin-validate": "beta",
     "@freesewing/utils": "beta",
-    "@material-ui/core": "^3.9.3",
-    "@material-ui/icons": "^3.0.2",
-    "@material-ui/lab": "^3.0.0-alpha.30",
+    "@material-ui/core": "^4.0.1",
+    "@material-ui/icons": "^4.0.1",
+    "@material-ui/lab": "^v4.0.0-alpha.14",
     "pattern": "link:..",
     "prismjs": "1.16.0",
     "react": "^16.8",
diff --git a/packages/bent/example/src/App.js b/packages/bent/example/src/App.js
index ec5968e9a60..e7936330e5d 100644
--- a/packages/bent/example/src/App.js
+++ b/packages/bent/example/src/App.js
@@ -1,6 +1,6 @@
 import React from "react";
 import freesewing from "@freesewing/core";
-import { Workbench } from "@freesewing/components";
+import Workbench from "@freesewing/components/Workbench";
 import "typeface-roboto-condensed";
 import "@freesewing/css-theme";
 
diff --git a/packages/bent/package.json b/packages/bent/package.json
index acfcd8d82de..7f766e61490 100644
--- a/packages/bent/package.json
+++ b/packages/bent/package.json
@@ -34,13 +34,21 @@
     "start": "rollup -c -w"
   },
   "peerDependencies": {
-    "@freesewing/brian": "^2.0.0-beta.11",
-    "@freesewing/core": "^2.0.0-beta.11",
-    "@freesewing/plugin-bundle": "^2.0.0-beta.11"
+    "@freesewing/core": "^2.0.0-beta.12",
+    "@freesewing/plugin-bundle": "^2.0.0-beta.12",
+    "@freesewing/brian": "^2.0.0-beta.12"
   },
+  "dependencies": {},
   "devDependencies": {
+    "react": "^16.4.1",
+    "react-dom": "^16.4.1",
     "@babel/plugin-proposal-class-properties": "^7.0.0",
+    "babel-eslint": "10.0.1",
+    "eslint": "^5.16.0",
+    "babel-jest": "24.7.1",
+    "jest": "24.7.1",
     "@freesewing/components": "^2.0.0-beta.12",
+    "@freesewing/rendertest": "^2.0.0-beta.12",
     "@freesewing/css-theme": "^2.0.0-beta.12",
     "@freesewing/i18n": "^2.0.0-beta.12",
     "@freesewing/mui-theme": "^2.0.0-beta.12",
@@ -48,23 +56,12 @@
     "@freesewing/plugin-bust": "^2.0.0-beta.12",
     "@freesewing/plugin-buttons": "^2.0.0-beta.12",
     "@freesewing/plugin-flip": "^2.0.0-beta.12",
-    "@freesewing/rendertest": "^2.0.0-beta.12",
     "@freesewing/utils": "^2.0.0-beta.12",
-    "@material-ui/core": "3.9.3",
-    "@material-ui/icons": "3.0.2",
-    "@material-ui/lab": "3.0.0-alpha.30",
     "@svgr/rollup": "^2.4.1",
-    "babel-eslint": "10.0.1",
-    "babel-jest": "24.7.1",
     "cross-env": "^5.1.4",
-    "eslint": "^5.16.0",
     "gh-pages": "^1.2.0",
-    "jest": "24.7.1",
-    "prop-types": "15.7.2",
-    "react": "^16.4.1",
-    "react-dom": "^16.4.1",
-    "react-intl": "2.8.0",
     "react-scripts": "^3.0.0",
+    "webpack": "4.29.6",
     "rollup": "^0.64.1",
     "rollup-plugin-babel": "^4.0.1",
     "rollup-plugin-babel-minify": "^7.0.0",
@@ -74,7 +71,11 @@
     "rollup-plugin-peer-deps-external": "^2.2.0",
     "rollup-plugin-postcss": "^1.6.2",
     "rollup-plugin-url": "^1.4.0",
-    "webpack": "4.29.6"
+    "@material-ui/core": "3.9.3",
+    "@material-ui/icons": "3.0.2",
+    "@material-ui/lab": "3.0.0-alpha.30",
+    "react-intl": "2.8.0",
+    "prop-types": "15.7.2"
   },
   "files": [
     "dist/*",
diff --git a/packages/brian/example/package.json b/packages/brian/example/package.json
index 3d28a8021a0..0e464445cb9 100644
--- a/packages/brian/example/package.json
+++ b/packages/brian/example/package.json
@@ -11,16 +11,13 @@
     "@freesewing/models": "beta",
     "@freesewing/mui-theme": "beta",
     "@freesewing/pattern-info": "beta",
-    "@freesewing/plugin-debug": "beta",
-    "@freesewing/plugin-designer": "beta",
+    "@freesewing/plugin-bundle": "beta",
     "@freesewing/plugin-i18n": "beta",
     "@freesewing/plugin-svgattr": "beta",
-    "@freesewing/plugin-theme": "beta",
-    "@freesewing/plugin-validate": "beta",
     "@freesewing/utils": "beta",
-    "@material-ui/core": "^3.9.3",
-    "@material-ui/icons": "^3.0.2",
-    "@material-ui/lab": "^3.0.0-alpha.30",
+    "@material-ui/core": "^4.0.1",
+    "@material-ui/icons": "^4.0.1",
+    "@material-ui/lab": "^v4.0.0-alpha.14",
     "pattern": "link:..",
     "prismjs": "1.16.0",
     "react": "^16.8",
diff --git a/packages/brian/example/src/App.js b/packages/brian/example/src/App.js
index ec5968e9a60..e7936330e5d 100644
--- a/packages/brian/example/src/App.js
+++ b/packages/brian/example/src/App.js
@@ -1,6 +1,6 @@
 import React from "react";
 import freesewing from "@freesewing/core";
-import { Workbench } from "@freesewing/components";
+import Workbench from "@freesewing/components/Workbench";
 import "typeface-roboto-condensed";
 import "@freesewing/css-theme";
 
diff --git a/packages/brian/package.json b/packages/brian/package.json
index c37cca8e680..1d815f04976 100644
--- a/packages/brian/package.json
+++ b/packages/brian/package.json
@@ -34,12 +34,20 @@
     "start": "rollup -c -w"
   },
   "peerDependencies": {
-    "@freesewing/core": "^2.0.0-beta.11",
-    "@freesewing/plugin-bundle": "^2.0.0-beta.11"
+    "@freesewing/core": "^2.0.0-beta.12",
+    "@freesewing/plugin-bundle": "^2.0.0-beta.12"
   },
+  "dependencies": {},
   "devDependencies": {
+    "react": "^16.4.1",
+    "react-dom": "^16.4.1",
     "@babel/plugin-proposal-class-properties": "^7.0.0",
+    "babel-eslint": "10.0.1",
+    "eslint": "^5.16.0",
+    "babel-jest": "24.7.1",
+    "jest": "24.7.1",
     "@freesewing/components": "^2.0.0-beta.12",
+    "@freesewing/rendertest": "^2.0.0-beta.12",
     "@freesewing/css-theme": "^2.0.0-beta.12",
     "@freesewing/i18n": "^2.0.0-beta.12",
     "@freesewing/mui-theme": "^2.0.0-beta.12",
@@ -47,23 +55,12 @@
     "@freesewing/plugin-bust": "^2.0.0-beta.12",
     "@freesewing/plugin-buttons": "^2.0.0-beta.12",
     "@freesewing/plugin-flip": "^2.0.0-beta.12",
-    "@freesewing/rendertest": "^2.0.0-beta.12",
     "@freesewing/utils": "^2.0.0-beta.12",
-    "@material-ui/core": "3.9.3",
-    "@material-ui/icons": "3.0.2",
-    "@material-ui/lab": "3.0.0-alpha.30",
     "@svgr/rollup": "^2.4.1",
-    "babel-eslint": "10.0.1",
-    "babel-jest": "24.7.1",
     "cross-env": "^5.1.4",
-    "eslint": "^5.16.0",
     "gh-pages": "^1.2.0",
-    "jest": "24.7.1",
-    "prop-types": "15.7.2",
-    "react": "^16.4.1",
-    "react-dom": "^16.4.1",
-    "react-intl": "2.8.0",
     "react-scripts": "^3.0.0",
+    "webpack": "4.29.6",
     "rollup": "^0.64.1",
     "rollup-plugin-babel": "^4.0.1",
     "rollup-plugin-babel-minify": "^7.0.0",
@@ -73,7 +70,11 @@
     "rollup-plugin-peer-deps-external": "^2.2.0",
     "rollup-plugin-postcss": "^1.6.2",
     "rollup-plugin-url": "^1.4.0",
-    "webpack": "4.29.6"
+    "@material-ui/core": "3.9.3",
+    "@material-ui/icons": "3.0.2",
+    "@material-ui/lab": "3.0.0-alpha.30",
+    "react-intl": "2.8.0",
+    "prop-types": "15.7.2"
   },
   "files": [
     "dist/*",
diff --git a/packages/bruce/example/package.json b/packages/bruce/example/package.json
index d9d35a4a320..21b8e23f82e 100644
--- a/packages/bruce/example/package.json
+++ b/packages/bruce/example/package.json
@@ -11,16 +11,13 @@
     "@freesewing/models": "beta",
     "@freesewing/mui-theme": "beta",
     "@freesewing/pattern-info": "beta",
-    "@freesewing/plugin-debug": "beta",
-    "@freesewing/plugin-designer": "beta",
+    "@freesewing/plugin-bundle": "beta",
     "@freesewing/plugin-i18n": "beta",
     "@freesewing/plugin-svgattr": "beta",
-    "@freesewing/plugin-theme": "beta",
-    "@freesewing/plugin-validate": "beta",
     "@freesewing/utils": "beta",
-    "@material-ui/core": "^3.9.3",
-    "@material-ui/icons": "^3.0.2",
-    "@material-ui/lab": "^3.0.0-alpha.30",
+    "@material-ui/core": "^4.0.1",
+    "@material-ui/icons": "^4.0.1",
+    "@material-ui/lab": "^v4.0.0-alpha.14",
     "pattern": "link:..",
     "prismjs": "1.16.0",
     "react": "^16.8",
diff --git a/packages/bruce/example/src/App.js b/packages/bruce/example/src/App.js
index ec5968e9a60..e7936330e5d 100644
--- a/packages/bruce/example/src/App.js
+++ b/packages/bruce/example/src/App.js
@@ -1,6 +1,6 @@
 import React from "react";
 import freesewing from "@freesewing/core";
-import { Workbench } from "@freesewing/components";
+import Workbench from "@freesewing/components/Workbench";
 import "typeface-roboto-condensed";
 import "@freesewing/css-theme";
 
diff --git a/packages/bruce/package.json b/packages/bruce/package.json
index 46fe61b03e7..d0e2bae56f0 100644
--- a/packages/bruce/package.json
+++ b/packages/bruce/package.json
@@ -34,12 +34,20 @@
     "start": "rollup -c -w"
   },
   "peerDependencies": {
-    "@freesewing/core": "^2.0.0-beta.11",
-    "@freesewing/plugin-bundle": "^2.0.0-beta.11"
+    "@freesewing/core": "^2.0.0-beta.12",
+    "@freesewing/plugin-bundle": "^2.0.0-beta.12"
   },
+  "dependencies": {},
   "devDependencies": {
+    "react": "^16.4.1",
+    "react-dom": "^16.4.1",
     "@babel/plugin-proposal-class-properties": "^7.0.0",
+    "babel-eslint": "10.0.1",
+    "eslint": "^5.16.0",
+    "babel-jest": "24.7.1",
+    "jest": "24.7.1",
     "@freesewing/components": "^2.0.0-beta.12",
+    "@freesewing/rendertest": "^2.0.0-beta.12",
     "@freesewing/css-theme": "^2.0.0-beta.12",
     "@freesewing/i18n": "^2.0.0-beta.12",
     "@freesewing/mui-theme": "^2.0.0-beta.12",
@@ -47,23 +55,12 @@
     "@freesewing/plugin-bust": "^2.0.0-beta.12",
     "@freesewing/plugin-buttons": "^2.0.0-beta.12",
     "@freesewing/plugin-flip": "^2.0.0-beta.12",
-    "@freesewing/rendertest": "^2.0.0-beta.12",
     "@freesewing/utils": "^2.0.0-beta.12",
-    "@material-ui/core": "3.9.3",
-    "@material-ui/icons": "3.0.2",
-    "@material-ui/lab": "3.0.0-alpha.30",
     "@svgr/rollup": "^2.4.1",
-    "babel-eslint": "10.0.1",
-    "babel-jest": "24.7.1",
     "cross-env": "^5.1.4",
-    "eslint": "^5.16.0",
     "gh-pages": "^1.2.0",
-    "jest": "24.7.1",
-    "prop-types": "15.7.2",
-    "react": "^16.4.1",
-    "react-dom": "^16.4.1",
-    "react-intl": "2.8.0",
     "react-scripts": "^3.0.0",
+    "webpack": "4.29.6",
     "rollup": "^0.64.1",
     "rollup-plugin-babel": "^4.0.1",
     "rollup-plugin-babel-minify": "^7.0.0",
@@ -73,7 +70,11 @@
     "rollup-plugin-peer-deps-external": "^2.2.0",
     "rollup-plugin-postcss": "^1.6.2",
     "rollup-plugin-url": "^1.4.0",
-    "webpack": "4.29.6"
+    "@material-ui/core": "3.9.3",
+    "@material-ui/icons": "3.0.2",
+    "@material-ui/lab": "3.0.0-alpha.30",
+    "react-intl": "2.8.0",
+    "prop-types": "15.7.2"
   },
   "files": [
     "dist/*",
diff --git a/packages/carlita/example/package.json b/packages/carlita/example/package.json
index 44447e57962..97f7a2cd02e 100644
--- a/packages/carlita/example/package.json
+++ b/packages/carlita/example/package.json
@@ -11,16 +11,13 @@
     "@freesewing/models": "beta",
     "@freesewing/mui-theme": "beta",
     "@freesewing/pattern-info": "beta",
-    "@freesewing/plugin-debug": "beta",
-    "@freesewing/plugin-designer": "beta",
+    "@freesewing/plugin-bundle": "beta",
     "@freesewing/plugin-i18n": "beta",
     "@freesewing/plugin-svgattr": "beta",
-    "@freesewing/plugin-theme": "beta",
-    "@freesewing/plugin-validate": "beta",
     "@freesewing/utils": "beta",
-    "@material-ui/core": "^3.9.3",
-    "@material-ui/icons": "^3.0.2",
-    "@material-ui/lab": "^3.0.0-alpha.30",
+    "@material-ui/core": "^4.0.1",
+    "@material-ui/icons": "^4.0.1",
+    "@material-ui/lab": "^v4.0.0-alpha.14",
     "pattern": "link:..",
     "prismjs": "1.16.0",
     "react": "^16.8",
diff --git a/packages/carlita/example/src/App.js b/packages/carlita/example/src/App.js
index ec5968e9a60..e7936330e5d 100644
--- a/packages/carlita/example/src/App.js
+++ b/packages/carlita/example/src/App.js
@@ -1,6 +1,6 @@
 import React from "react";
 import freesewing from "@freesewing/core";
-import { Workbench } from "@freesewing/components";
+import Workbench from "@freesewing/components/Workbench";
 import "typeface-roboto-condensed";
 import "@freesewing/css-theme";
 
diff --git a/packages/carlita/package.json b/packages/carlita/package.json
index be3737b42c7..00d5fdd0b96 100644
--- a/packages/carlita/package.json
+++ b/packages/carlita/package.json
@@ -34,16 +34,24 @@
     "start": "rollup -c -w"
   },
   "peerDependencies": {
-    "@freesewing/bent": "^2.0.0-beta.11",
-    "@freesewing/carlton": "^2.0.0-beta.11",
-    "@freesewing/core": "^2.0.0-beta.11",
-    "@freesewing/plugin-bundle": "^2.0.0-beta.11",
-    "@freesewing/plugin-bust": "^2.0.0-beta.11",
-    "@freesewing/plugin-buttons": "^2.0.0-beta.11"
+    "@freesewing/core": "^2.0.0-beta.12",
+    "@freesewing/plugin-bundle": "^2.0.0-beta.12",
+    "@freesewing/bent": "^2.0.0-beta.12",
+    "@freesewing/carlton": "^2.0.0-beta.12",
+    "@freesewing/plugin-bust": "^2.0.0-beta.12",
+    "@freesewing/plugin-buttons": "^2.0.0-beta.12"
   },
+  "dependencies": {},
   "devDependencies": {
+    "react": "^16.4.1",
+    "react-dom": "^16.4.1",
     "@babel/plugin-proposal-class-properties": "^7.0.0",
+    "babel-eslint": "10.0.1",
+    "eslint": "^5.16.0",
+    "babel-jest": "24.7.1",
+    "jest": "24.7.1",
     "@freesewing/components": "^2.0.0-beta.12",
+    "@freesewing/rendertest": "^2.0.0-beta.12",
     "@freesewing/css-theme": "^2.0.0-beta.12",
     "@freesewing/i18n": "^2.0.0-beta.12",
     "@freesewing/mui-theme": "^2.0.0-beta.12",
@@ -51,23 +59,12 @@
     "@freesewing/plugin-bust": "^2.0.0-beta.12",
     "@freesewing/plugin-buttons": "^2.0.0-beta.12",
     "@freesewing/plugin-flip": "^2.0.0-beta.12",
-    "@freesewing/rendertest": "^2.0.0-beta.12",
     "@freesewing/utils": "^2.0.0-beta.12",
-    "@material-ui/core": "3.9.3",
-    "@material-ui/icons": "3.0.2",
-    "@material-ui/lab": "3.0.0-alpha.30",
     "@svgr/rollup": "^2.4.1",
-    "babel-eslint": "10.0.1",
-    "babel-jest": "24.7.1",
     "cross-env": "^5.1.4",
-    "eslint": "^5.16.0",
     "gh-pages": "^1.2.0",
-    "jest": "24.7.1",
-    "prop-types": "15.7.2",
-    "react": "^16.4.1",
-    "react-dom": "^16.4.1",
-    "react-intl": "2.8.0",
     "react-scripts": "^3.0.0",
+    "webpack": "4.29.6",
     "rollup": "^0.64.1",
     "rollup-plugin-babel": "^4.0.1",
     "rollup-plugin-babel-minify": "^7.0.0",
@@ -77,7 +74,11 @@
     "rollup-plugin-peer-deps-external": "^2.2.0",
     "rollup-plugin-postcss": "^1.6.2",
     "rollup-plugin-url": "^1.4.0",
-    "webpack": "4.29.6"
+    "@material-ui/core": "3.9.3",
+    "@material-ui/icons": "3.0.2",
+    "@material-ui/lab": "3.0.0-alpha.30",
+    "react-intl": "2.8.0",
+    "prop-types": "15.7.2"
   },
   "files": [
     "dist/*",
diff --git a/packages/carlton/example/package.json b/packages/carlton/example/package.json
index ec5fd614203..1e7780fd06f 100644
--- a/packages/carlton/example/package.json
+++ b/packages/carlton/example/package.json
@@ -11,16 +11,13 @@
     "@freesewing/models": "beta",
     "@freesewing/mui-theme": "beta",
     "@freesewing/pattern-info": "beta",
-    "@freesewing/plugin-debug": "beta",
-    "@freesewing/plugin-designer": "beta",
+    "@freesewing/plugin-bundle": "beta",
     "@freesewing/plugin-i18n": "beta",
     "@freesewing/plugin-svgattr": "beta",
-    "@freesewing/plugin-theme": "beta",
-    "@freesewing/plugin-validate": "beta",
     "@freesewing/utils": "beta",
-    "@material-ui/core": "^3.9.3",
-    "@material-ui/icons": "^3.0.2",
-    "@material-ui/lab": "^3.0.0-alpha.30",
+    "@material-ui/core": "^4.0.1",
+    "@material-ui/icons": "^4.0.1",
+    "@material-ui/lab": "^v4.0.0-alpha.14",
     "pattern": "link:..",
     "prismjs": "1.16.0",
     "react": "^16.8",
diff --git a/packages/carlton/example/src/App.js b/packages/carlton/example/src/App.js
index ec5968e9a60..e7936330e5d 100644
--- a/packages/carlton/example/src/App.js
+++ b/packages/carlton/example/src/App.js
@@ -1,6 +1,6 @@
 import React from "react";
 import freesewing from "@freesewing/core";
-import { Workbench } from "@freesewing/components";
+import Workbench from "@freesewing/components/Workbench";
 import "typeface-roboto-condensed";
 import "@freesewing/css-theme";
 
diff --git a/packages/carlton/package.json b/packages/carlton/package.json
index 7f5a4062a67..f9711d62a14 100644
--- a/packages/carlton/package.json
+++ b/packages/carlton/package.json
@@ -34,14 +34,22 @@
     "start": "rollup -c -w"
   },
   "peerDependencies": {
-    "@freesewing/bent": "^2.0.0-beta.11",
-    "@freesewing/core": "^2.0.0-beta.11",
-    "@freesewing/plugin-bundle": "^2.0.0-beta.11",
-    "@freesewing/plugin-buttons": "^2.0.0-beta.11"
+    "@freesewing/core": "^2.0.0-beta.12",
+    "@freesewing/plugin-bundle": "^2.0.0-beta.12",
+    "@freesewing/bent": "^2.0.0-beta.12",
+    "@freesewing/plugin-buttons": "^2.0.0-beta.12"
   },
+  "dependencies": {},
   "devDependencies": {
+    "react": "^16.4.1",
+    "react-dom": "^16.4.1",
     "@babel/plugin-proposal-class-properties": "^7.0.0",
+    "babel-eslint": "10.0.1",
+    "eslint": "^5.16.0",
+    "babel-jest": "24.7.1",
+    "jest": "24.7.1",
     "@freesewing/components": "^2.0.0-beta.12",
+    "@freesewing/rendertest": "^2.0.0-beta.12",
     "@freesewing/css-theme": "^2.0.0-beta.12",
     "@freesewing/i18n": "^2.0.0-beta.12",
     "@freesewing/mui-theme": "^2.0.0-beta.12",
@@ -49,23 +57,12 @@
     "@freesewing/plugin-bust": "^2.0.0-beta.12",
     "@freesewing/plugin-buttons": "^2.0.0-beta.12",
     "@freesewing/plugin-flip": "^2.0.0-beta.12",
-    "@freesewing/rendertest": "^2.0.0-beta.12",
     "@freesewing/utils": "^2.0.0-beta.12",
-    "@material-ui/core": "3.9.3",
-    "@material-ui/icons": "3.0.2",
-    "@material-ui/lab": "3.0.0-alpha.30",
     "@svgr/rollup": "^2.4.1",
-    "babel-eslint": "10.0.1",
-    "babel-jest": "24.7.1",
     "cross-env": "^5.1.4",
-    "eslint": "^5.16.0",
     "gh-pages": "^1.2.0",
-    "jest": "24.7.1",
-    "prop-types": "15.7.2",
-    "react": "^16.4.1",
-    "react-dom": "^16.4.1",
-    "react-intl": "2.8.0",
     "react-scripts": "^3.0.0",
+    "webpack": "4.29.6",
     "rollup": "^0.64.1",
     "rollup-plugin-babel": "^4.0.1",
     "rollup-plugin-babel-minify": "^7.0.0",
@@ -75,7 +72,11 @@
     "rollup-plugin-peer-deps-external": "^2.2.0",
     "rollup-plugin-postcss": "^1.6.2",
     "rollup-plugin-url": "^1.4.0",
-    "webpack": "4.29.6"
+    "@material-ui/core": "3.9.3",
+    "@material-ui/icons": "3.0.2",
+    "@material-ui/lab": "3.0.0-alpha.30",
+    "react-intl": "2.8.0",
+    "prop-types": "15.7.2"
   },
   "files": [
     "dist/*",
diff --git a/packages/cathrin/example/package.json b/packages/cathrin/example/package.json
index aef55d66989..d9aefb1f9b5 100644
--- a/packages/cathrin/example/package.json
+++ b/packages/cathrin/example/package.json
@@ -11,16 +11,13 @@
     "@freesewing/models": "beta",
     "@freesewing/mui-theme": "beta",
     "@freesewing/pattern-info": "beta",
-    "@freesewing/plugin-debug": "beta",
-    "@freesewing/plugin-designer": "beta",
+    "@freesewing/plugin-bundle": "beta",
     "@freesewing/plugin-i18n": "beta",
     "@freesewing/plugin-svgattr": "beta",
-    "@freesewing/plugin-theme": "beta",
-    "@freesewing/plugin-validate": "beta",
     "@freesewing/utils": "beta",
-    "@material-ui/core": "^3.9.3",
-    "@material-ui/icons": "^3.0.2",
-    "@material-ui/lab": "^3.0.0-alpha.30",
+    "@material-ui/core": "^4.0.1",
+    "@material-ui/icons": "^4.0.1",
+    "@material-ui/lab": "^v4.0.0-alpha.14",
     "pattern": "link:..",
     "prismjs": "1.16.0",
     "react": "^16.8",
diff --git a/packages/cathrin/example/src/App.js b/packages/cathrin/example/src/App.js
index ec5968e9a60..e7936330e5d 100644
--- a/packages/cathrin/example/src/App.js
+++ b/packages/cathrin/example/src/App.js
@@ -1,6 +1,6 @@
 import React from "react";
 import freesewing from "@freesewing/core";
-import { Workbench } from "@freesewing/components";
+import Workbench from "@freesewing/components/Workbench";
 import "typeface-roboto-condensed";
 import "@freesewing/css-theme";
 
diff --git a/packages/cathrin/package.json b/packages/cathrin/package.json
index d3d0347a783..1b63e40bc01 100644
--- a/packages/cathrin/package.json
+++ b/packages/cathrin/package.json
@@ -34,12 +34,20 @@
     "start": "rollup -c -w"
   },
   "peerDependencies": {
-    "@freesewing/core": "^2.0.0-beta.11",
-    "@freesewing/plugin-bundle": "^2.0.0-beta.11"
+    "@freesewing/core": "^2.0.0-beta.12",
+    "@freesewing/plugin-bundle": "^2.0.0-beta.12"
   },
+  "dependencies": {},
   "devDependencies": {
+    "react": "^16.4.1",
+    "react-dom": "^16.4.1",
     "@babel/plugin-proposal-class-properties": "^7.0.0",
+    "babel-eslint": "10.0.1",
+    "eslint": "^5.16.0",
+    "babel-jest": "24.7.1",
+    "jest": "24.7.1",
     "@freesewing/components": "^2.0.0-beta.12",
+    "@freesewing/rendertest": "^2.0.0-beta.12",
     "@freesewing/css-theme": "^2.0.0-beta.12",
     "@freesewing/i18n": "^2.0.0-beta.12",
     "@freesewing/mui-theme": "^2.0.0-beta.12",
@@ -47,23 +55,12 @@
     "@freesewing/plugin-bust": "^2.0.0-beta.12",
     "@freesewing/plugin-buttons": "^2.0.0-beta.12",
     "@freesewing/plugin-flip": "^2.0.0-beta.12",
-    "@freesewing/rendertest": "^2.0.0-beta.12",
     "@freesewing/utils": "^2.0.0-beta.12",
-    "@material-ui/core": "3.9.3",
-    "@material-ui/icons": "3.0.2",
-    "@material-ui/lab": "3.0.0-alpha.30",
     "@svgr/rollup": "^2.4.1",
-    "babel-eslint": "10.0.1",
-    "babel-jest": "24.7.1",
     "cross-env": "^5.1.4",
-    "eslint": "^5.16.0",
     "gh-pages": "^1.2.0",
-    "jest": "24.7.1",
-    "prop-types": "15.7.2",
-    "react": "^16.4.1",
-    "react-dom": "^16.4.1",
-    "react-intl": "2.8.0",
     "react-scripts": "^3.0.0",
+    "webpack": "4.29.6",
     "rollup": "^0.64.1",
     "rollup-plugin-babel": "^4.0.1",
     "rollup-plugin-babel-minify": "^7.0.0",
@@ -73,7 +70,11 @@
     "rollup-plugin-peer-deps-external": "^2.2.0",
     "rollup-plugin-postcss": "^1.6.2",
     "rollup-plugin-url": "^1.4.0",
-    "webpack": "4.29.6"
+    "@material-ui/core": "3.9.3",
+    "@material-ui/icons": "3.0.2",
+    "@material-ui/lab": "3.0.0-alpha.30",
+    "react-intl": "2.8.0",
+    "prop-types": "15.7.2"
   },
   "files": [
     "dist/*",
diff --git a/packages/components/package.json b/packages/components/package.json
index 1223fed2ba1..3d104907d01 100644
--- a/packages/components/package.json
+++ b/packages/components/package.json
@@ -26,23 +26,25 @@
     "watch": "BABEL_ENV=production rollup -c -w -o dist/index.js -f cjs"
   },
   "peerDependencies": {
-    "@freesewing/core": "^2.0.0-beta.11",
-    "@freesewing/css-theme": "^2.0.0-beta.11",
-    "@freesewing/examples": "^2.0.0-beta.11",
-    "@freesewing/i18n": "^2.0.0-beta.11",
-    "@freesewing/mui-theme": "^2.0.0-beta.11",
-    "@freesewing/pattern-info": "^2.0.0-beta.11",
-    "@freesewing/rendertest": "^2.0.0-beta.11",
-    "@freesewing/utils": "^2.0.0-beta.11",
+    "react": "^16.8",
+    "prop-types": "15.7.2",
+    "@freesewing/pattern-info": "^2.0.0-beta.12",
+    "@freesewing/mui-theme": "^2.0.0-beta.12",
+    "@freesewing/css-theme": "^2.0.0-beta.12",
+    "@freesewing/core": "^2.0.0-beta.12",
+    "@freesewing/examples": "^2.0.0-beta.12",
+    "@freesewing/rendertest": "^2.0.0-beta.12",
+    "typeface-roboto-condensed": "latest",
+    "@freesewing/i18n": "^2.0.0-beta.12",
+    "@freesewing/utils": "^2.0.0-beta.12",
+    "react-intl": "^2.8.0",
     "@material-ui/core": "^4.0.1",
     "@material-ui/icons": "^4.0.1",
     "@material-ui/lab": "^v4.0.0-alpha.14",
-    "prismjs": "1.16.0",
-    "prop-types": "15.7.2",
-    "react": "^16.8",
-    "react-intl": "^2.8.0",
-    "typeface-roboto-condensed": "latest"
+    "prismjs": "1.16.0"
   },
+  "dependencies": {},
+  "devDependencies": {},
   "files": [
     "Blockquote/*",
     "Draft/*",
diff --git a/packages/components/src/Draft/Defs/Snippets/index.js b/packages/components/src/Draft/Defs/Snippets/index.js
index be991625adf..c976d93c63a 100644
--- a/packages/components/src/Draft/Defs/Snippets/index.js
+++ b/packages/components/src/Draft/Defs/Snippets/index.js
@@ -27,6 +27,59 @@ const Snippets = props => {
         {...fill}
       />
     </g>,
+    <radialGradient
+      id="snap-male-grad"
+      cx="50%"
+      cy="50%"
+      r="50%"
+      fx="50%"
+      fy="50%"
+    >
+      <stop
+        offset="30%"
+        style={{ stopColor: "rgb(235,235,235)", stopOpacity: 1 }}
+      />
+      <stop
+        offset="80%"
+        style={{ stopColor: "rgb(100,100,100)", stopOpacity: 1 }}
+      />
+    </radialGradient>,
+    <g id="snap-male">
+      <circle
+        cx="0"
+        cy="0"
+        r="3.4"
+        style={{ stroke: "#666", fill: "#dddddd", strokeWidth: 0.3 }}
+      />
+      <circle
+        cx="0"
+        cy="0"
+        r="1.8"
+        style={{ stroke: "none", fill: "url(#snap-male-grad)" }}
+      />
+      <path
+        style={{ fill: "none", stroke: "#666", strokeWidth: 0.2 }}
+        d="M -2,0 L -3,0 M 2,0 L 3,0 M 0,2 L 0,3 M 0,-2 L 0,-3 M 1.5,1.5 L 2.1,2.1 M -1.5,1.5 L -2.1,2.1 M -1.5,-1.5 L -2.1,-2.1 M 1.5,-1.5 L 2.1,-2.1"
+      />
+    </g>,
+    <g id="snap-female">
+      <circle
+        cx="0"
+        cy="0"
+        r="3.4"
+        style={{ stroke: "#666", fill: "#bbbbbb", strokeWidth: 0.3 }}
+      />
+      <circle
+        cx="0"
+        cy="0"
+        r="2"
+        style={{ stroke: "#666", fill: "#dddddd", strokeWidth: 0.4 }}
+      />
+      <path
+        style={{ fill: "none", stroke: "#666", strokeWidth: 0.5 }}
+        d="M -1.7,-1 L -1.7,1 M 1.7,-1 L 1.7,1"
+      />
+    </g>,
     <g
       id="logo"
       className="snippet logo"
diff --git a/packages/components/src/Workbench/Design/index.js b/packages/components/src/Workbench/Design/index.js
index 5fb198f58e7..2383f39f8a1 100644
--- a/packages/components/src/Workbench/Design/index.js
+++ b/packages/components/src/Workbench/Design/index.js
@@ -153,7 +153,11 @@ const Design = props => {
   for (let part of Object.keys(props.focus)) {
     info.push(
       <h5 key={"part-" + part} style={styles.h5}>
-        parts.<b>{part}</b>
+        parts.<b>{part}</b>(
+        <a href="#logo" onClick={() => props.raiseEvent("part", part)}>
+          Isolate
+        </a>
+        )
       </h5>
     );
     for (let i in props.focus[part].paths) {
diff --git a/packages/components/src/Workbench/DraftPattern/index.js b/packages/components/src/Workbench/DraftPattern/index.js
index b22aa7de587..132267af6f7 100644
--- a/packages/components/src/Workbench/DraftPattern/index.js
+++ b/packages/components/src/Workbench/DraftPattern/index.js
@@ -11,7 +11,10 @@ const DraftPattern = props => {
   const [focus, setFocus] = useState(null);
 
   const raiseEvent = (type, data) => {
-    if (type === "clearFocusAll") return setFocus(null);
+    if (type === "clearFocusAll") {
+      props.updateGist(false, "settings", "only");
+      return setFocus(null);
+    }
     let f = {};
     if (focus !== null) f = { ...focus };
     if (typeof f[data.part] === "undefined")
@@ -22,7 +25,7 @@ const DraftPattern = props => {
     else if (type === "clearFocus") {
       let i = focus[data.part][data.type].indexOf(data.name);
       f[data.part][data.type].splice(i, 1);
-    }
+    } else if (type === "part") props.updateGist(data, "settings", "only");
 
     setFocus(f);
   };
diff --git a/packages/components/src/Workbench/index.js b/packages/components/src/Workbench/index.js
index a959219a38e..f6a15ebfd44 100644
--- a/packages/components/src/Workbench/index.js
+++ b/packages/components/src/Workbench/index.js
@@ -2,7 +2,7 @@ import React, { useState, useEffect } from "react";
 import PropTypes from "prop-types";
 import withGist from "../withGist";
 import { MuiThemeProvider, createMuiTheme } from "@material-ui/core/styles";
-//import Navbar from "../Navbar";
+import Navbar from "../Navbar";
 import { defaultGist, storage } from "@freesewing/utils";
 import { dark, light } from "@freesewing/mui-theme";
 import withLanguage from "../withLanguage";
@@ -176,7 +176,7 @@ const Workbench = props => {
   }
 
   const themes = { dark, light };
-
+  console.log("With navbar");
   return (
     <MuiThemeProvider theme={createMuiTheme(themes[theme])}>
       <div
@@ -184,7 +184,7 @@ const Workbench = props => {
           theme === "light" ? "theme-wrapper light" : "theme-wrapper dark"
         }
       >
-        {display !== "welcome" && false ? (
+        {display !== "welcome" ? (
           <Navbar navs={navs} home={() => saveDisplay("welcome")} />
         ) : null}
         {main}
diff --git a/packages/core/package.json b/packages/core/package.json
index 9e2629bfff2..e7b3122e8e9 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -36,11 +36,13 @@
     "coverage": "BABEL_ENV=production nyc npm test && nyc report --reporter=text-lcov > coverage.lcov && ./node_modules/.bin/codecov",
     "watch": "BABEL_ENV=production rollup -c -w -o dist/index.mjs -f es"
   },
+  "peerDependencies": {},
   "dependencies": {
     "bezier-js": "^2.2.13",
     "bin-pack": "1.0.2",
     "hooks": "^0.3.2"
   },
+  "devDependencies": {},
   "files": [
     "dist/*",
     "README.md",
diff --git a/packages/core/src/part.js b/packages/core/src/part.js
index 4ed0e9cac7f..08652ce212c 100644
--- a/packages/core/src/part.js
+++ b/packages/core/src/part.js
@@ -183,9 +183,6 @@ Part.prototype.inject = function(orig) {
   }
   for (let i in orig.snippets) {
     this.snippets[i] = orig.snippets[i].clone();
-    // Keep link between points and snippet anchor where possible
-    let anchorPoint = findBasePoint(orig.snippets[i].anchor);
-    if (anchorPoint) this.snippets[i].anchor = this.points[i];
   }
 
   return this;
diff --git a/packages/create-freesewing-pattern/package.json b/packages/create-freesewing-pattern/package.json
index 989eb804e11..c86846d0b98 100644
--- a/packages/create-freesewing-pattern/package.json
+++ b/packages/create-freesewing-pattern/package.json
@@ -22,9 +22,8 @@
     "pubforce": "npm publish",
     "symlink": "mkdir -p ./node_modules/@freesewing && cd ./node_modules/@freesewing && ln -s -f ../../../* . && cd -"
   },
+  "peerDependencies": {},
   "dependencies": {
-    "@freesewing/i18n": "^2.0.0-beta.12",
-    "@freesewing/pattern-info": "^2.0.0-beta.12",
     "chalk": "^2.4.2",
     "commander": "^2.19.0",
     "conf": "^2.2.0",
@@ -40,8 +39,11 @@
     "p-each-series": "^1.0.0",
     "parse-git-config": "^3.0.0",
     "validate-npm-package-name": "^3.0.0",
-    "which": "^1.3.1"
+    "which": "^1.3.1",
+    "@freesewing/i18n": "^2.0.0-beta.12",
+    "@freesewing/pattern-info": "^2.0.0-beta.12"
   },
+  "devDependencies": {},
   "files": [
     "lib",
     "template",
diff --git a/packages/create-freesewing-pattern/template/default/example/package.json b/packages/create-freesewing-pattern/template/default/example/package.json
index 79a039f8637..8a6f03c6bee 100644
--- a/packages/create-freesewing-pattern/template/default/example/package.json
+++ b/packages/create-freesewing-pattern/template/default/example/package.json
@@ -11,12 +11,9 @@
     "@freesewing/models": "beta",
     "@freesewing/mui-theme": "beta",
     "@freesewing/pattern-info": "beta",
-    "@freesewing/plugin-debug": "beta",
-    "@freesewing/plugin-designer": "beta",
+    "@freesewing/plugin-bundle": "beta",
     "@freesewing/plugin-i18n": "beta",
     "@freesewing/plugin-svgattr": "beta",
-    "@freesewing/plugin-theme": "beta",
-    "@freesewing/plugin-validate": "beta",
     "@freesewing/utils": "beta",
     "@material-ui/core": "^4.0.1",
     "@material-ui/icons": "^4.0.1",
diff --git a/packages/css-theme/package.json b/packages/css-theme/package.json
index cf4d1443c39..a40e18d74b3 100644
--- a/packages/css-theme/package.json
+++ b/packages/css-theme/package.json
@@ -28,9 +28,11 @@
     "symlink": "mkdir -p ./node_modules/@freesewing && cd ./node_modules/@freesewing && ln -s -f ../../../* . && cd -",
     "watch": "npx node-sass --watch --output-style compressed src/theme.scss dist/theme.css"
   },
+  "peerDependencies": {},
   "dependencies": {
     "open-color": "1.6.3"
   },
+  "devDependencies": {},
   "files": [
     "dist/*",
     "README.md",
diff --git a/packages/examples/example/package.json b/packages/examples/example/package.json
index 086bd9eac1a..73d9c954a75 100644
--- a/packages/examples/example/package.json
+++ b/packages/examples/example/package.json
@@ -11,16 +11,13 @@
     "@freesewing/models": "beta",
     "@freesewing/mui-theme": "beta",
     "@freesewing/pattern-info": "beta",
-    "@freesewing/plugin-debug": "beta",
-    "@freesewing/plugin-designer": "beta",
+    "@freesewing/plugin-bundle": "beta",
     "@freesewing/plugin-i18n": "beta",
     "@freesewing/plugin-svgattr": "beta",
-    "@freesewing/plugin-theme": "beta",
-    "@freesewing/plugin-validate": "beta",
     "@freesewing/utils": "beta",
-    "@material-ui/core": "^3.9.3",
-    "@material-ui/icons": "^3.0.2",
-    "@material-ui/lab": "^3.0.0-alpha.30",
+    "@material-ui/core": "^4.0.1",
+    "@material-ui/icons": "^4.0.1",
+    "@material-ui/lab": "^v4.0.0-alpha.14",
     "pattern": "link:..",
     "prismjs": "1.16.0",
     "react": "^16.8",
diff --git a/packages/examples/example/src/App.js b/packages/examples/example/src/App.js
index ec5968e9a60..e7936330e5d 100644
--- a/packages/examples/example/src/App.js
+++ b/packages/examples/example/src/App.js
@@ -1,6 +1,6 @@
 import React from "react";
 import freesewing from "@freesewing/core";
-import { Workbench } from "@freesewing/components";
+import Workbench from "@freesewing/components/Workbench";
 import "typeface-roboto-condensed";
 import "@freesewing/css-theme";
 
diff --git a/packages/examples/package.json b/packages/examples/package.json
index d107d54cddf..d05b99f91fa 100644
--- a/packages/examples/package.json
+++ b/packages/examples/package.json
@@ -29,12 +29,20 @@
     "start": "rollup -c -w"
   },
   "peerDependencies": {
-    "@freesewing/core": "^2.0.0-beta.11",
-    "@freesewing/plugin-bundle": "^2.0.0-beta.11"
+    "@freesewing/core": "^2.0.0-beta.12",
+    "@freesewing/plugin-bundle": "^2.0.0-beta.12"
   },
+  "dependencies": {},
   "devDependencies": {
+    "react": "^16.4.1",
+    "react-dom": "^16.4.1",
     "@babel/plugin-proposal-class-properties": "^7.0.0",
+    "babel-eslint": "10.0.1",
+    "eslint": "^5.16.0",
+    "babel-jest": "24.7.1",
+    "jest": "24.7.1",
     "@freesewing/components": "^2.0.0-beta.12",
+    "@freesewing/rendertest": "^2.0.0-beta.12",
     "@freesewing/css-theme": "^2.0.0-beta.12",
     "@freesewing/i18n": "^2.0.0-beta.12",
     "@freesewing/mui-theme": "^2.0.0-beta.12",
@@ -42,23 +50,12 @@
     "@freesewing/plugin-bust": "^2.0.0-beta.12",
     "@freesewing/plugin-buttons": "^2.0.0-beta.12",
     "@freesewing/plugin-flip": "^2.0.0-beta.12",
-    "@freesewing/rendertest": "^2.0.0-beta.12",
     "@freesewing/utils": "^2.0.0-beta.12",
-    "@material-ui/core": "3.9.3",
-    "@material-ui/icons": "3.0.2",
-    "@material-ui/lab": "3.0.0-alpha.30",
     "@svgr/rollup": "^2.4.1",
-    "babel-eslint": "10.0.1",
-    "babel-jest": "24.7.1",
     "cross-env": "^5.1.4",
-    "eslint": "^5.16.0",
     "gh-pages": "^1.2.0",
-    "jest": "24.7.1",
-    "prop-types": "15.7.2",
-    "react": "^16.4.1",
-    "react-dom": "^16.4.1",
-    "react-intl": "2.8.0",
     "react-scripts": "^3.0.0",
+    "webpack": "4.29.6",
     "rollup": "^0.64.1",
     "rollup-plugin-babel": "^4.0.1",
     "rollup-plugin-babel-minify": "^7.0.0",
@@ -68,7 +65,11 @@
     "rollup-plugin-peer-deps-external": "^2.2.0",
     "rollup-plugin-postcss": "^1.6.2",
     "rollup-plugin-url": "^1.4.0",
-    "webpack": "4.29.6"
+    "@material-ui/core": "3.9.3",
+    "@material-ui/icons": "3.0.2",
+    "@material-ui/lab": "3.0.0-alpha.30",
+    "react-intl": "2.8.0",
+    "prop-types": "15.7.2"
   },
   "files": [
     "dist/*",
diff --git a/packages/florent/example/package.json b/packages/florent/example/package.json
index 925c22f7410..f1db69aca57 100644
--- a/packages/florent/example/package.json
+++ b/packages/florent/example/package.json
@@ -11,16 +11,13 @@
     "@freesewing/models": "beta",
     "@freesewing/mui-theme": "beta",
     "@freesewing/pattern-info": "beta",
-    "@freesewing/plugin-debug": "beta",
-    "@freesewing/plugin-designer": "beta",
+    "@freesewing/plugin-bundle": "beta",
     "@freesewing/plugin-i18n": "beta",
     "@freesewing/plugin-svgattr": "beta",
-    "@freesewing/plugin-theme": "beta",
-    "@freesewing/plugin-validate": "beta",
     "@freesewing/utils": "beta",
-    "@material-ui/core": "^3.9.3",
-    "@material-ui/icons": "^3.0.2",
-    "@material-ui/lab": "^3.0.0-alpha.30",
+    "@material-ui/core": "^4.0.1",
+    "@material-ui/icons": "^4.0.1",
+    "@material-ui/lab": "^v4.0.0-alpha.14",
     "pattern": "link:..",
     "prismjs": "1.16.0",
     "react": "^16.8",
diff --git a/packages/florent/example/src/App.js b/packages/florent/example/src/App.js
index ec5968e9a60..e7936330e5d 100644
--- a/packages/florent/example/src/App.js
+++ b/packages/florent/example/src/App.js
@@ -1,6 +1,6 @@
 import React from "react";
 import freesewing from "@freesewing/core";
-import { Workbench } from "@freesewing/components";
+import Workbench from "@freesewing/components/Workbench";
 import "typeface-roboto-condensed";
 import "@freesewing/css-theme";
 
diff --git a/packages/florent/package.json b/packages/florent/package.json
index d0f5f7f67ee..cadb8ac638d 100644
--- a/packages/florent/package.json
+++ b/packages/florent/package.json
@@ -34,12 +34,20 @@
     "start": "rollup -c -w"
   },
   "peerDependencies": {
-    "@freesewing/core": "^2.0.0-beta.11",
-    "@freesewing/plugin-bundle": "^2.0.0-beta.11"
+    "@freesewing/core": "^2.0.0-beta.12",
+    "@freesewing/plugin-bundle": "^2.0.0-beta.12"
   },
+  "dependencies": {},
   "devDependencies": {
+    "react": "^16.4.1",
+    "react-dom": "^16.4.1",
     "@babel/plugin-proposal-class-properties": "^7.0.0",
+    "babel-eslint": "10.0.1",
+    "eslint": "^5.16.0",
+    "babel-jest": "24.7.1",
+    "jest": "24.7.1",
     "@freesewing/components": "^2.0.0-beta.12",
+    "@freesewing/rendertest": "^2.0.0-beta.12",
     "@freesewing/css-theme": "^2.0.0-beta.12",
     "@freesewing/i18n": "^2.0.0-beta.12",
     "@freesewing/mui-theme": "^2.0.0-beta.12",
@@ -47,23 +55,12 @@
     "@freesewing/plugin-bust": "^2.0.0-beta.12",
     "@freesewing/plugin-buttons": "^2.0.0-beta.12",
     "@freesewing/plugin-flip": "^2.0.0-beta.12",
-    "@freesewing/rendertest": "^2.0.0-beta.12",
     "@freesewing/utils": "^2.0.0-beta.12",
-    "@material-ui/core": "3.9.3",
-    "@material-ui/icons": "3.0.2",
-    "@material-ui/lab": "3.0.0-alpha.30",
     "@svgr/rollup": "^2.4.1",
-    "babel-eslint": "10.0.1",
-    "babel-jest": "24.7.1",
     "cross-env": "^5.1.4",
-    "eslint": "^5.16.0",
     "gh-pages": "^1.2.0",
-    "jest": "24.7.1",
-    "prop-types": "15.7.2",
-    "react": "^16.4.1",
-    "react-dom": "^16.4.1",
-    "react-intl": "2.8.0",
     "react-scripts": "^3.0.0",
+    "webpack": "4.29.6",
     "rollup": "^0.64.1",
     "rollup-plugin-babel": "^4.0.1",
     "rollup-plugin-babel-minify": "^7.0.0",
@@ -73,7 +70,11 @@
     "rollup-plugin-peer-deps-external": "^2.2.0",
     "rollup-plugin-postcss": "^1.6.2",
     "rollup-plugin-url": "^1.4.0",
-    "webpack": "4.29.6"
+    "@material-ui/core": "3.9.3",
+    "@material-ui/icons": "3.0.2",
+    "@material-ui/lab": "3.0.0-alpha.30",
+    "react-intl": "2.8.0",
+    "prop-types": "15.7.2"
   },
   "files": [
     "dist/*",
diff --git a/packages/huey/example/package.json b/packages/huey/example/package.json
index 5c3a07effe7..42676257fb2 100644
--- a/packages/huey/example/package.json
+++ b/packages/huey/example/package.json
@@ -11,16 +11,13 @@
     "@freesewing/models": "beta",
     "@freesewing/mui-theme": "beta",
     "@freesewing/pattern-info": "beta",
-    "@freesewing/plugin-debug": "beta",
-    "@freesewing/plugin-designer": "beta",
+    "@freesewing/plugin-bundle": "beta",
     "@freesewing/plugin-i18n": "beta",
     "@freesewing/plugin-svgattr": "beta",
-    "@freesewing/plugin-theme": "beta",
-    "@freesewing/plugin-validate": "beta",
     "@freesewing/utils": "beta",
-    "@material-ui/core": "^3.9.3",
-    "@material-ui/icons": "^3.0.2",
-    "@material-ui/lab": "^3.0.0-alpha.30",
+    "@material-ui/core": "^4.0.1",
+    "@material-ui/icons": "^4.0.1",
+    "@material-ui/lab": "^v4.0.0-alpha.14",
     "pattern": "link:..",
     "prismjs": "1.16.0",
     "react": "^16.8",
diff --git a/packages/huey/example/src/App.js b/packages/huey/example/src/App.js
index ec5968e9a60..e7936330e5d 100644
--- a/packages/huey/example/src/App.js
+++ b/packages/huey/example/src/App.js
@@ -1,6 +1,6 @@
 import React from "react";
 import freesewing from "@freesewing/core";
-import { Workbench } from "@freesewing/components";
+import Workbench from "@freesewing/components/Workbench";
 import "typeface-roboto-condensed";
 import "@freesewing/css-theme";
 
diff --git a/packages/huey/package.json b/packages/huey/package.json
index 4710b358ad4..58786b35ce4 100644
--- a/packages/huey/package.json
+++ b/packages/huey/package.json
@@ -34,12 +34,20 @@
     "start": "rollup -c -w"
   },
   "peerDependencies": {
-    "@freesewing/core": "^2.0.0-beta.11",
-    "@freesewing/plugin-bundle": "^2.0.0-beta.11"
+    "@freesewing/core": "^2.0.0-beta.12",
+    "@freesewing/plugin-bundle": "^2.0.0-beta.12"
   },
+  "dependencies": {},
   "devDependencies": {
+    "react": "^16.4.1",
+    "react-dom": "^16.4.1",
     "@babel/plugin-proposal-class-properties": "^7.0.0",
+    "babel-eslint": "10.0.1",
+    "eslint": "^5.16.0",
+    "babel-jest": "24.7.1",
+    "jest": "24.7.1",
     "@freesewing/components": "^2.0.0-beta.12",
+    "@freesewing/rendertest": "^2.0.0-beta.12",
     "@freesewing/css-theme": "^2.0.0-beta.12",
     "@freesewing/i18n": "^2.0.0-beta.12",
     "@freesewing/mui-theme": "^2.0.0-beta.12",
@@ -47,23 +55,12 @@
     "@freesewing/plugin-bust": "^2.0.0-beta.12",
     "@freesewing/plugin-buttons": "^2.0.0-beta.12",
     "@freesewing/plugin-flip": "^2.0.0-beta.12",
-    "@freesewing/rendertest": "^2.0.0-beta.12",
     "@freesewing/utils": "^2.0.0-beta.12",
-    "@material-ui/core": "3.9.3",
-    "@material-ui/icons": "3.0.2",
-    "@material-ui/lab": "3.0.0-alpha.30",
     "@svgr/rollup": "^2.4.1",
-    "babel-eslint": "10.0.1",
-    "babel-jest": "24.7.1",
     "cross-env": "^5.1.4",
-    "eslint": "^5.16.0",
     "gh-pages": "^1.2.0",
-    "jest": "24.7.1",
-    "prop-types": "15.7.2",
-    "react": "^16.4.1",
-    "react-dom": "^16.4.1",
-    "react-intl": "2.8.0",
     "react-scripts": "^3.0.0",
+    "webpack": "4.29.6",
     "rollup": "^0.64.1",
     "rollup-plugin-babel": "^4.0.1",
     "rollup-plugin-babel-minify": "^7.0.0",
@@ -73,7 +70,11 @@
     "rollup-plugin-peer-deps-external": "^2.2.0",
     "rollup-plugin-postcss": "^1.6.2",
     "rollup-plugin-url": "^1.4.0",
-    "webpack": "4.29.6"
+    "@material-ui/core": "3.9.3",
+    "@material-ui/icons": "3.0.2",
+    "@material-ui/lab": "3.0.0-alpha.30",
+    "react-intl": "2.8.0",
+    "prop-types": "15.7.2"
   },
   "files": [
     "dist/*",
diff --git a/packages/hugo/example/package.json b/packages/hugo/example/package.json
index d5b01a236ff..0faaeb6ee99 100644
--- a/packages/hugo/example/package.json
+++ b/packages/hugo/example/package.json
@@ -11,16 +11,13 @@
     "@freesewing/models": "beta",
     "@freesewing/mui-theme": "beta",
     "@freesewing/pattern-info": "beta",
-    "@freesewing/plugin-debug": "beta",
-    "@freesewing/plugin-designer": "beta",
+    "@freesewing/plugin-bundle": "beta",
     "@freesewing/plugin-i18n": "beta",
     "@freesewing/plugin-svgattr": "beta",
-    "@freesewing/plugin-theme": "beta",
-    "@freesewing/plugin-validate": "beta",
     "@freesewing/utils": "beta",
-    "@material-ui/core": "^3.9.3",
-    "@material-ui/icons": "^3.0.2",
-    "@material-ui/lab": "^3.0.0-alpha.30",
+    "@material-ui/core": "^4.0.1",
+    "@material-ui/icons": "^4.0.1",
+    "@material-ui/lab": "^v4.0.0-alpha.14",
     "pattern": "link:..",
     "prismjs": "1.16.0",
     "react": "^16.8",
diff --git a/packages/hugo/example/src/App.js b/packages/hugo/example/src/App.js
index ec5968e9a60..e7936330e5d 100644
--- a/packages/hugo/example/src/App.js
+++ b/packages/hugo/example/src/App.js
@@ -1,6 +1,6 @@
 import React from "react";
 import freesewing from "@freesewing/core";
-import { Workbench } from "@freesewing/components";
+import Workbench from "@freesewing/components/Workbench";
 import "typeface-roboto-condensed";
 import "@freesewing/css-theme";
 
diff --git a/packages/hugo/package.json b/packages/hugo/package.json
index 9991f77f540..1f89a25ae2a 100644
--- a/packages/hugo/package.json
+++ b/packages/hugo/package.json
@@ -34,12 +34,20 @@
     "start": "rollup -c -w"
   },
   "peerDependencies": {
-    "@freesewing/core": "^2.0.0-beta.11",
-    "@freesewing/plugin-bundle": "^2.0.0-beta.11"
+    "@freesewing/core": "^2.0.0-beta.12",
+    "@freesewing/plugin-bundle": "^2.0.0-beta.12"
   },
+  "dependencies": {},
   "devDependencies": {
+    "react": "^16.4.1",
+    "react-dom": "^16.4.1",
     "@babel/plugin-proposal-class-properties": "^7.0.0",
+    "babel-eslint": "10.0.1",
+    "eslint": "^5.16.0",
+    "babel-jest": "24.7.1",
+    "jest": "24.7.1",
     "@freesewing/components": "^2.0.0-beta.12",
+    "@freesewing/rendertest": "^2.0.0-beta.12",
     "@freesewing/css-theme": "^2.0.0-beta.12",
     "@freesewing/i18n": "^2.0.0-beta.12",
     "@freesewing/mui-theme": "^2.0.0-beta.12",
@@ -47,23 +55,12 @@
     "@freesewing/plugin-bust": "^2.0.0-beta.12",
     "@freesewing/plugin-buttons": "^2.0.0-beta.12",
     "@freesewing/plugin-flip": "^2.0.0-beta.12",
-    "@freesewing/rendertest": "^2.0.0-beta.12",
     "@freesewing/utils": "^2.0.0-beta.12",
-    "@material-ui/core": "3.9.3",
-    "@material-ui/icons": "3.0.2",
-    "@material-ui/lab": "3.0.0-alpha.30",
     "@svgr/rollup": "^2.4.1",
-    "babel-eslint": "10.0.1",
-    "babel-jest": "24.7.1",
     "cross-env": "^5.1.4",
-    "eslint": "^5.16.0",
     "gh-pages": "^1.2.0",
-    "jest": "24.7.1",
-    "prop-types": "15.7.2",
-    "react": "^16.4.1",
-    "react-dom": "^16.4.1",
-    "react-intl": "2.8.0",
     "react-scripts": "^3.0.0",
+    "webpack": "4.29.6",
     "rollup": "^0.64.1",
     "rollup-plugin-babel": "^4.0.1",
     "rollup-plugin-babel-minify": "^7.0.0",
@@ -73,7 +70,11 @@
     "rollup-plugin-peer-deps-external": "^2.2.0",
     "rollup-plugin-postcss": "^1.6.2",
     "rollup-plugin-url": "^1.4.0",
-    "webpack": "4.29.6"
+    "@material-ui/core": "3.9.3",
+    "@material-ui/icons": "3.0.2",
+    "@material-ui/lab": "3.0.0-alpha.30",
+    "react-intl": "2.8.0",
+    "prop-types": "15.7.2"
   },
   "files": [
     "dist/*",
diff --git a/packages/i18n/package.json b/packages/i18n/package.json
index 07c34c9a8ec..52c7001ff6e 100644
--- a/packages/i18n/package.json
+++ b/packages/i18n/package.json
@@ -28,8 +28,10 @@
     "symlink": "mkdir -p ./node_modules/@freesewing && cd ./node_modules/@freesewing && ln -s -f ../../../* . && cd -"
   },
   "peerDependencies": {
-    "@freesewing/pattern-info": "^2.0.0-beta.11"
+    "@freesewing/pattern-info": "^2.0.0-beta.12"
   },
+  "dependencies": {},
+  "devDependencies": {},
   "files": [
     "dist/*",
     "README.md",
diff --git a/packages/jaeger/example/package.json b/packages/jaeger/example/package.json
index 1e734e58120..a5d99e95de5 100644
--- a/packages/jaeger/example/package.json
+++ b/packages/jaeger/example/package.json
@@ -11,16 +11,13 @@
     "@freesewing/models": "beta",
     "@freesewing/mui-theme": "beta",
     "@freesewing/pattern-info": "beta",
-    "@freesewing/plugin-debug": "beta",
-    "@freesewing/plugin-designer": "beta",
+    "@freesewing/plugin-bundle": "beta",
     "@freesewing/plugin-i18n": "beta",
     "@freesewing/plugin-svgattr": "beta",
-    "@freesewing/plugin-theme": "beta",
-    "@freesewing/plugin-validate": "beta",
     "@freesewing/utils": "beta",
-    "@material-ui/core": "^3.9.3",
-    "@material-ui/icons": "^3.0.2",
-    "@material-ui/lab": "^3.0.0-alpha.30",
+    "@material-ui/core": "^4.0.1",
+    "@material-ui/icons": "^4.0.1",
+    "@material-ui/lab": "^v4.0.0-alpha.14",
     "pattern": "link:..",
     "prismjs": "1.16.0",
     "react": "^16.8",
diff --git a/packages/jaeger/example/src/App.js b/packages/jaeger/example/src/App.js
index ec5968e9a60..e7936330e5d 100644
--- a/packages/jaeger/example/src/App.js
+++ b/packages/jaeger/example/src/App.js
@@ -1,6 +1,6 @@
 import React from "react";
 import freesewing from "@freesewing/core";
-import { Workbench } from "@freesewing/components";
+import Workbench from "@freesewing/components/Workbench";
 import "typeface-roboto-condensed";
 import "@freesewing/css-theme";
 
diff --git a/packages/jaeger/package.json b/packages/jaeger/package.json
index 4302b7b1a78..61886a6aace 100644
--- a/packages/jaeger/package.json
+++ b/packages/jaeger/package.json
@@ -34,12 +34,20 @@
     "start": "rollup -c -w"
   },
   "peerDependencies": {
-    "@freesewing/core": "^2.0.0-beta.11",
-    "@freesewing/plugin-bundle": "^2.0.0-beta.11"
+    "@freesewing/core": "^2.0.0-beta.12",
+    "@freesewing/plugin-bundle": "^2.0.0-beta.12"
   },
+  "dependencies": {},
   "devDependencies": {
+    "react": "^16.4.1",
+    "react-dom": "^16.4.1",
     "@babel/plugin-proposal-class-properties": "^7.0.0",
+    "babel-eslint": "10.0.1",
+    "eslint": "^5.16.0",
+    "babel-jest": "24.7.1",
+    "jest": "24.7.1",
     "@freesewing/components": "^2.0.0-beta.12",
+    "@freesewing/rendertest": "^2.0.0-beta.12",
     "@freesewing/css-theme": "^2.0.0-beta.12",
     "@freesewing/i18n": "^2.0.0-beta.12",
     "@freesewing/mui-theme": "^2.0.0-beta.12",
@@ -47,23 +55,12 @@
     "@freesewing/plugin-bust": "^2.0.0-beta.12",
     "@freesewing/plugin-buttons": "^2.0.0-beta.12",
     "@freesewing/plugin-flip": "^2.0.0-beta.12",
-    "@freesewing/rendertest": "^2.0.0-beta.12",
     "@freesewing/utils": "^2.0.0-beta.12",
-    "@material-ui/core": "3.9.3",
-    "@material-ui/icons": "3.0.2",
-    "@material-ui/lab": "3.0.0-alpha.30",
     "@svgr/rollup": "^2.4.1",
-    "babel-eslint": "10.0.1",
-    "babel-jest": "24.7.1",
     "cross-env": "^5.1.4",
-    "eslint": "^5.16.0",
     "gh-pages": "^1.2.0",
-    "jest": "24.7.1",
-    "prop-types": "15.7.2",
-    "react": "^16.4.1",
-    "react-dom": "^16.4.1",
-    "react-intl": "2.8.0",
     "react-scripts": "^3.0.0",
+    "webpack": "4.29.6",
     "rollup": "^0.64.1",
     "rollup-plugin-babel": "^4.0.1",
     "rollup-plugin-babel-minify": "^7.0.0",
@@ -73,7 +70,11 @@
     "rollup-plugin-peer-deps-external": "^2.2.0",
     "rollup-plugin-postcss": "^1.6.2",
     "rollup-plugin-url": "^1.4.0",
-    "webpack": "4.29.6"
+    "@material-ui/core": "3.9.3",
+    "@material-ui/icons": "3.0.2",
+    "@material-ui/lab": "3.0.0-alpha.30",
+    "react-intl": "2.8.0",
+    "prop-types": "15.7.2"
   },
   "files": [
     "dist/*",
diff --git a/packages/models/package.json b/packages/models/package.json
index d299d5b06af..9b5e490d62a 100644
--- a/packages/models/package.json
+++ b/packages/models/package.json
@@ -29,6 +29,9 @@
     "pubforce": "npm publish",
     "symlink": "mkdir -p ./node_modules/@freesewing && cd ./node_modules/@freesewing && ln -s -f ../../../* . && cd -"
   },
+  "peerDependencies": {},
+  "dependencies": {},
+  "devDependencies": {},
   "files": [
     "dist/*",
     "README.md",
diff --git a/packages/mui-theme/package.json b/packages/mui-theme/package.json
index 493d1b20929..99cc388010d 100644
--- a/packages/mui-theme/package.json
+++ b/packages/mui-theme/package.json
@@ -32,6 +32,8 @@
     "react": "^16.8",
     "react-dom": "^16.8"
   },
+  "dependencies": {},
+  "devDependencies": {},
   "files": [
     "dist/*",
     "README.md",
diff --git a/packages/pattern-info/package.json b/packages/pattern-info/package.json
index 2013d127d9f..dfb1fbeae18 100644
--- a/packages/pattern-info/package.json
+++ b/packages/pattern-info/package.json
@@ -32,9 +32,11 @@
     "prepare": "node src/prebuild.js"
   },
   "peerDependencies": {
-    "@freesewing/core": "^2.0.0-beta.11",
-    "@freesewing/plugin-bundle": "^2.0.0-beta.11"
+    "@freesewing/core": "^2.0.0-beta.12",
+    "@freesewing/plugin-bundle": "^2.0.0-beta.12"
   },
+  "dependencies": {},
+  "devDependencies": {},
   "files": [
     "dist/*",
     "README.md",
diff --git a/packages/patterns/package.json b/packages/patterns/package.json
index e6a01890dbc..0000b7259ac 100644
--- a/packages/patterns/package.json
+++ b/packages/patterns/package.json
@@ -33,8 +33,8 @@
     "symlink": "mkdir -p ./node_modules/@freesewing && cd ./node_modules/@freesewing && ln -s -f ../../../* . && cd -"
   },
   "peerDependencies": {
-    "@freesewing/core": "^2.0.0-beta.11",
-    "@freesewing/plugin-bundle": "^2.0.0-beta.11"
+    "@freesewing/core": "^2.0.0-beta.12",
+    "@freesewing/plugin-bundle": "^2.0.0-beta.12"
   },
   "dependencies": {
     "@freesewing/aaron": "^2.0.0-beta.12",
@@ -55,6 +55,7 @@
     "@freesewing/trayvon": "^2.0.0-beta.12",
     "@freesewing/wahid": "^2.0.0-beta.12"
   },
+  "devDependencies": {},
   "files": [
     "dist/*",
     "README.md",
diff --git a/packages/plugin-banner/package.json b/packages/plugin-banner/package.json
index 234aa89d7e1..0688a63ba00 100644
--- a/packages/plugin-banner/package.json
+++ b/packages/plugin-banner/package.json
@@ -33,8 +33,10 @@
     "symlink": "mkdir -p ./node_modules/@freesewing && cd ./node_modules/@freesewing && ln -s -f ../../../* . && cd -"
   },
   "peerDependencies": {
-    "@freesewing/core": "^2.0.0-beta.11"
+    "@freesewing/core": "^2.0.0-beta.12"
   },
+  "dependencies": {},
+  "devDependencies": {},
   "files": [
     "dist/*",
     "README.md",
diff --git a/packages/plugin-bundle/package.json b/packages/plugin-bundle/package.json
index ffa6db7104b..65c0fa4854e 100644
--- a/packages/plugin-bundle/package.json
+++ b/packages/plugin-bundle/package.json
@@ -34,18 +34,19 @@
     "symlink": "mkdir -p ./node_modules/@freesewing && cd ./node_modules/@freesewing && ln -s -f ../../../* . && cd -"
   },
   "peerDependencies": {
-    "@freesewing/core": "^2.0.0-beta.11"
+    "@freesewing/core": "^2.0.0-beta.12"
   },
   "dependencies": {
     "@freesewing/plugin-cutonfold": "^2.0.0-beta.12",
     "@freesewing/plugin-dimension": "^2.0.0-beta.12",
     "@freesewing/plugin-grainline": "^2.0.0-beta.12",
     "@freesewing/plugin-logo": "^2.0.0-beta.12",
-    "@freesewing/plugin-round": "^2.0.0-beta.12",
+    "@freesewing/plugin-title": "^2.0.0-beta.12",
     "@freesewing/plugin-scalebox": "^2.0.0-beta.12",
-    "@freesewing/plugin-sprinkle": "^2.0.0-beta.12",
-    "@freesewing/plugin-title": "^2.0.0-beta.12"
+    "@freesewing/plugin-round": "^2.0.0-beta.12",
+    "@freesewing/plugin-sprinkle": "^2.0.0-beta.12"
   },
+  "devDependencies": {},
   "files": [
     "dist/*",
     "README.md",
diff --git a/packages/plugin-bust/package.json b/packages/plugin-bust/package.json
index 31d665e09f4..80f465f149c 100644
--- a/packages/plugin-bust/package.json
+++ b/packages/plugin-bust/package.json
@@ -33,8 +33,10 @@
     "symlink": "mkdir -p ./node_modules/@freesewing && cd ./node_modules/@freesewing && ln -s -f ../../../* . && cd -"
   },
   "peerDependencies": {
-    "@freesewing/core": "^2.0.0-beta.11"
+    "@freesewing/core": "^2.0.0-beta.12"
   },
+  "dependencies": {},
+  "devDependencies": {},
   "files": [
     "dist/*",
     "README.md",
diff --git a/packages/plugin-cutonfold/package.json b/packages/plugin-cutonfold/package.json
index 2208078b9fd..a3920a06ac3 100644
--- a/packages/plugin-cutonfold/package.json
+++ b/packages/plugin-cutonfold/package.json
@@ -33,8 +33,10 @@
     "symlink": "mkdir -p ./node_modules/@freesewing && cd ./node_modules/@freesewing && ln -s -f ../../../* . && cd -"
   },
   "peerDependencies": {
-    "@freesewing/core": "^2.0.0-beta.11"
+    "@freesewing/core": "^2.0.0-beta.12"
   },
+  "dependencies": {},
+  "devDependencies": {},
   "files": [
     "dist/*",
     "README.md",
diff --git a/packages/plugin-debug/package.json b/packages/plugin-debug/package.json
index 4daf0ab44a7..295d453a53a 100644
--- a/packages/plugin-debug/package.json
+++ b/packages/plugin-debug/package.json
@@ -33,8 +33,10 @@
     "symlink": "mkdir -p ./node_modules/@freesewing && cd ./node_modules/@freesewing && ln -s -f ../../../* . && cd -"
   },
   "peerDependencies": {
-    "@freesewing/core": "^2.0.0-beta.11"
+    "@freesewing/core": "^2.0.0-beta.12"
   },
+  "dependencies": {},
+  "devDependencies": {},
   "files": [
     "dist/*",
     "README.md",
diff --git a/packages/plugin-designer/package.json b/packages/plugin-designer/package.json
index eddae67b348..7b8a93b2b57 100644
--- a/packages/plugin-designer/package.json
+++ b/packages/plugin-designer/package.json
@@ -33,8 +33,10 @@
     "symlink": "mkdir -p ./node_modules/@freesewing && cd ./node_modules/@freesewing && ln -s -f ../../../* . && cd -"
   },
   "peerDependencies": {
-    "@freesewing/core": "^2.0.0-beta.11"
+    "@freesewing/core": "^2.0.0-beta.12"
   },
+  "dependencies": {},
+  "devDependencies": {},
   "files": [
     "dist/*",
     "README.md",
diff --git a/packages/plugin-dimension/package.json b/packages/plugin-dimension/package.json
index 31f3acad71a..eeec9db02ea 100644
--- a/packages/plugin-dimension/package.json
+++ b/packages/plugin-dimension/package.json
@@ -33,8 +33,10 @@
     "symlink": "mkdir -p ./node_modules/@freesewing && cd ./node_modules/@freesewing && ln -s -f ../../../* . && cd -"
   },
   "peerDependencies": {
-    "@freesewing/core": "^2.0.0-beta.11"
+    "@freesewing/core": "^2.0.0-beta.12"
   },
+  "dependencies": {},
+  "devDependencies": {},
   "files": [
     "dist/*",
     "README.md",
diff --git a/packages/plugin-flip/package.json b/packages/plugin-flip/package.json
index efe6d3a89a0..091909e8b4c 100644
--- a/packages/plugin-flip/package.json
+++ b/packages/plugin-flip/package.json
@@ -33,8 +33,10 @@
     "symlink": "mkdir -p ./node_modules/@freesewing && cd ./node_modules/@freesewing && ln -s -f ../../../* . && cd -"
   },
   "peerDependencies": {
-    "@freesewing/core": "^2.0.0-beta.11"
+    "@freesewing/core": "^2.0.0-beta.12"
   },
+  "dependencies": {},
+  "devDependencies": {},
   "files": [
     "dist/*",
     "README.md",
diff --git a/packages/plugin-grainline/package.json b/packages/plugin-grainline/package.json
index 826cfeae208..060c4da94c5 100644
--- a/packages/plugin-grainline/package.json
+++ b/packages/plugin-grainline/package.json
@@ -33,8 +33,10 @@
     "symlink": "mkdir -p ./node_modules/@freesewing && cd ./node_modules/@freesewing && ln -s -f ../../../* . && cd -"
   },
   "peerDependencies": {
-    "@freesewing/core": "^2.0.0-beta.11"
+    "@freesewing/core": "^2.0.0-beta.12"
   },
+  "dependencies": {},
+  "devDependencies": {},
   "files": [
     "dist/*",
     "README.md",
diff --git a/packages/plugin-i18n/package.json b/packages/plugin-i18n/package.json
index 3b23d7f1164..7d7450ed1f5 100644
--- a/packages/plugin-i18n/package.json
+++ b/packages/plugin-i18n/package.json
@@ -33,8 +33,10 @@
     "symlink": "mkdir -p ./node_modules/@freesewing && cd ./node_modules/@freesewing && ln -s -f ../../../* . && cd -"
   },
   "peerDependencies": {
-    "@freesewing/core": "^2.0.0-beta.11"
+    "@freesewing/core": "^2.0.0-beta.12"
   },
+  "dependencies": {},
+  "devDependencies": {},
   "files": [
     "dist/*",
     "README.md",
diff --git a/packages/plugin-logo/package.json b/packages/plugin-logo/package.json
index f3b398e5e6d..182a93f9450 100644
--- a/packages/plugin-logo/package.json
+++ b/packages/plugin-logo/package.json
@@ -33,8 +33,10 @@
     "symlink": "mkdir -p ./node_modules/@freesewing && cd ./node_modules/@freesewing && ln -s -f ../../../* . && cd -"
   },
   "peerDependencies": {
-    "@freesewing/core": "^2.0.0-beta.11"
+    "@freesewing/core": "^2.0.0-beta.12"
   },
+  "dependencies": {},
+  "devDependencies": {},
   "files": [
     "dist/*",
     "README.md",
diff --git a/packages/plugin-round/package.json b/packages/plugin-round/package.json
index a2b90d32b0f..ba45b319458 100644
--- a/packages/plugin-round/package.json
+++ b/packages/plugin-round/package.json
@@ -33,8 +33,10 @@
     "symlink": "mkdir -p ./node_modules/@freesewing && cd ./node_modules/@freesewing && ln -s -f ../../../* . && cd -"
   },
   "peerDependencies": {
-    "@freesewing/core": "^2.0.0-beta.11"
+    "@freesewing/core": "^2.0.0-beta.12"
   },
+  "dependencies": {},
+  "devDependencies": {},
   "files": [
     "dist/*",
     "README.md",
diff --git a/packages/plugin-scalebox/package.json b/packages/plugin-scalebox/package.json
index f7d7c8f0308..f3b4eecf6da 100644
--- a/packages/plugin-scalebox/package.json
+++ b/packages/plugin-scalebox/package.json
@@ -33,8 +33,10 @@
     "symlink": "mkdir -p ./node_modules/@freesewing && cd ./node_modules/@freesewing && ln -s -f ../../../* . && cd -"
   },
   "peerDependencies": {
-    "@freesewing/core": "^2.0.0-beta.11"
+    "@freesewing/core": "^2.0.0-beta.12"
   },
+  "dependencies": {},
+  "devDependencies": {},
   "files": [
     "dist/*",
     "README.md",
diff --git a/packages/plugin-sprinkle/package.json b/packages/plugin-sprinkle/package.json
index 75aede35214..11f56e9c25e 100644
--- a/packages/plugin-sprinkle/package.json
+++ b/packages/plugin-sprinkle/package.json
@@ -33,8 +33,10 @@
     "symlink": "mkdir -p ./node_modules/@freesewing && cd ./node_modules/@freesewing && ln -s -f ../../../* . && cd -"
   },
   "peerDependencies": {
-    "@freesewing/core": "^2.0.0-beta.11"
+    "@freesewing/core": "^2.0.0-beta.12"
   },
+  "dependencies": {},
+  "devDependencies": {},
   "files": [
     "dist/*",
     "README.md",
diff --git a/packages/plugin-svgattr/package.json b/packages/plugin-svgattr/package.json
index c424d9152ab..4d567941a6e 100644
--- a/packages/plugin-svgattr/package.json
+++ b/packages/plugin-svgattr/package.json
@@ -33,8 +33,10 @@
     "symlink": "mkdir -p ./node_modules/@freesewing && cd ./node_modules/@freesewing && ln -s -f ../../../* . && cd -"
   },
   "peerDependencies": {
-    "@freesewing/core": "^2.0.0-beta.11"
+    "@freesewing/core": "^2.0.0-beta.12"
   },
+  "dependencies": {},
+  "devDependencies": {},
   "files": [
     "dist/*",
     "README.md",
diff --git a/packages/plugin-theme/package.json b/packages/plugin-theme/package.json
index 3d4a3061154..40a19ea1e42 100644
--- a/packages/plugin-theme/package.json
+++ b/packages/plugin-theme/package.json
@@ -33,8 +33,10 @@
     "symlink": "mkdir -p ./node_modules/@freesewing && cd ./node_modules/@freesewing && ln -s -f ../../../* . && cd -"
   },
   "peerDependencies": {
-    "@freesewing/core": "^2.0.0-beta.11"
+    "@freesewing/core": "^2.0.0-beta.12"
   },
+  "dependencies": {},
+  "devDependencies": {},
   "files": [
     "dist/*",
     "README.md",
diff --git a/packages/plugin-title/package.json b/packages/plugin-title/package.json
index 55ff4a08770..2f825bb09ba 100644
--- a/packages/plugin-title/package.json
+++ b/packages/plugin-title/package.json
@@ -33,8 +33,10 @@
     "symlink": "mkdir -p ./node_modules/@freesewing && cd ./node_modules/@freesewing && ln -s -f ../../../* . && cd -"
   },
   "peerDependencies": {
-    "@freesewing/core": "^2.0.0-beta.11"
+    "@freesewing/core": "^2.0.0-beta.12"
   },
+  "dependencies": {},
+  "devDependencies": {},
   "files": [
     "dist/*",
     "README.md",
diff --git a/packages/plugin-validate/package.json b/packages/plugin-validate/package.json
index 3941c7f691e..f85b4fe8fc9 100644
--- a/packages/plugin-validate/package.json
+++ b/packages/plugin-validate/package.json
@@ -33,8 +33,10 @@
     "symlink": "mkdir -p ./node_modules/@freesewing && cd ./node_modules/@freesewing && ln -s -f ../../../* . && cd -"
   },
   "peerDependencies": {
-    "@freesewing/core": "^2.0.0-beta.11"
+    "@freesewing/core": "^2.0.0-beta.12"
   },
+  "dependencies": {},
+  "devDependencies": {},
   "files": [
     "dist/*",
     "README.md",
diff --git a/packages/rendertest/example/package.json b/packages/rendertest/example/package.json
index 690aacff156..4f6fdbbf99b 100644
--- a/packages/rendertest/example/package.json
+++ b/packages/rendertest/example/package.json
@@ -11,16 +11,13 @@
     "@freesewing/models": "beta",
     "@freesewing/mui-theme": "beta",
     "@freesewing/pattern-info": "beta",
-    "@freesewing/plugin-debug": "beta",
-    "@freesewing/plugin-designer": "beta",
+    "@freesewing/plugin-bundle": "beta",
     "@freesewing/plugin-i18n": "beta",
     "@freesewing/plugin-svgattr": "beta",
-    "@freesewing/plugin-theme": "beta",
-    "@freesewing/plugin-validate": "beta",
     "@freesewing/utils": "beta",
-    "@material-ui/core": "^3.9.3",
-    "@material-ui/icons": "^3.0.2",
-    "@material-ui/lab": "^3.0.0-alpha.30",
+    "@material-ui/core": "^4.0.1",
+    "@material-ui/icons": "^4.0.1",
+    "@material-ui/lab": "^v4.0.0-alpha.14",
     "pattern": "link:..",
     "prismjs": "1.16.0",
     "react": "^16.8",
diff --git a/packages/rendertest/example/src/App.js b/packages/rendertest/example/src/App.js
index ec5968e9a60..e7936330e5d 100644
--- a/packages/rendertest/example/src/App.js
+++ b/packages/rendertest/example/src/App.js
@@ -1,6 +1,6 @@
 import React from "react";
 import freesewing from "@freesewing/core";
-import { Workbench } from "@freesewing/components";
+import Workbench from "@freesewing/components/Workbench";
 import "typeface-roboto-condensed";
 import "@freesewing/css-theme";
 
diff --git a/packages/rendertest/package.json b/packages/rendertest/package.json
index 1a951223b7e..7159f77d04a 100644
--- a/packages/rendertest/package.json
+++ b/packages/rendertest/package.json
@@ -34,12 +34,20 @@
     "start": "rollup -c -w"
   },
   "peerDependencies": {
-    "@freesewing/core": "^2.0.0-beta.11",
-    "@freesewing/plugin-bundle": "^2.0.0-beta.11"
+    "@freesewing/core": "^2.0.0-beta.12",
+    "@freesewing/plugin-bundle": "^2.0.0-beta.12"
   },
+  "dependencies": {},
   "devDependencies": {
+    "react": "^16.4.1",
+    "react-dom": "^16.4.1",
     "@babel/plugin-proposal-class-properties": "^7.0.0",
+    "babel-eslint": "10.0.1",
+    "eslint": "^5.16.0",
+    "babel-jest": "24.7.1",
+    "jest": "24.7.1",
     "@freesewing/components": "^2.0.0-beta.12",
+    "@freesewing/rendertest": "^2.0.0-beta.12",
     "@freesewing/css-theme": "^2.0.0-beta.12",
     "@freesewing/i18n": "^2.0.0-beta.12",
     "@freesewing/mui-theme": "^2.0.0-beta.12",
@@ -47,23 +55,12 @@
     "@freesewing/plugin-bust": "^2.0.0-beta.12",
     "@freesewing/plugin-buttons": "^2.0.0-beta.12",
     "@freesewing/plugin-flip": "^2.0.0-beta.12",
-    "@freesewing/rendertest": "^2.0.0-beta.12",
     "@freesewing/utils": "^2.0.0-beta.12",
-    "@material-ui/core": "3.9.3",
-    "@material-ui/icons": "3.0.2",
-    "@material-ui/lab": "3.0.0-alpha.30",
     "@svgr/rollup": "^2.4.1",
-    "babel-eslint": "10.0.1",
-    "babel-jest": "24.7.1",
     "cross-env": "^5.1.4",
-    "eslint": "^5.16.0",
     "gh-pages": "^1.2.0",
-    "jest": "24.7.1",
-    "prop-types": "15.7.2",
-    "react": "^16.4.1",
-    "react-dom": "^16.4.1",
-    "react-intl": "2.8.0",
     "react-scripts": "^3.0.0",
+    "webpack": "4.29.6",
     "rollup": "^0.64.1",
     "rollup-plugin-babel": "^4.0.1",
     "rollup-plugin-babel-minify": "^7.0.0",
@@ -73,7 +70,11 @@
     "rollup-plugin-peer-deps-external": "^2.2.0",
     "rollup-plugin-postcss": "^1.6.2",
     "rollup-plugin-url": "^1.4.0",
-    "webpack": "4.29.6"
+    "@material-ui/core": "3.9.3",
+    "@material-ui/icons": "3.0.2",
+    "@material-ui/lab": "3.0.0-alpha.30",
+    "react-intl": "2.8.0",
+    "prop-types": "15.7.2"
   },
   "files": [
     "dist/*",
diff --git a/packages/shin/example/package.json b/packages/shin/example/package.json
index 8f16c241453..29c4dde1095 100644
--- a/packages/shin/example/package.json
+++ b/packages/shin/example/package.json
@@ -11,16 +11,13 @@
     "@freesewing/models": "beta",
     "@freesewing/mui-theme": "beta",
     "@freesewing/pattern-info": "beta",
-    "@freesewing/plugin-debug": "beta",
-    "@freesewing/plugin-designer": "beta",
+    "@freesewing/plugin-bundle": "beta",
     "@freesewing/plugin-i18n": "beta",
     "@freesewing/plugin-svgattr": "beta",
-    "@freesewing/plugin-theme": "beta",
-    "@freesewing/plugin-validate": "beta",
     "@freesewing/utils": "beta",
-    "@material-ui/core": "^3.9.3",
-    "@material-ui/icons": "^3.0.2",
-    "@material-ui/lab": "^3.0.0-alpha.30",
+    "@material-ui/core": "^4.0.1",
+    "@material-ui/icons": "^4.0.1",
+    "@material-ui/lab": "^v4.0.0-alpha.14",
     "pattern": "link:..",
     "prismjs": "1.16.0",
     "react": "^16.8",
diff --git a/packages/shin/example/src/App.js b/packages/shin/example/src/App.js
index ec5968e9a60..e7936330e5d 100644
--- a/packages/shin/example/src/App.js
+++ b/packages/shin/example/src/App.js
@@ -1,6 +1,6 @@
 import React from "react";
 import freesewing from "@freesewing/core";
-import { Workbench } from "@freesewing/components";
+import Workbench from "@freesewing/components/Workbench";
 import "typeface-roboto-condensed";
 import "@freesewing/css-theme";
 
diff --git a/packages/shin/package.json b/packages/shin/package.json
index 097ac819541..085eab04e04 100644
--- a/packages/shin/package.json
+++ b/packages/shin/package.json
@@ -34,12 +34,20 @@
     "start": "rollup -c -w"
   },
   "peerDependencies": {
-    "@freesewing/core": "^2.0.0-beta.11",
-    "@freesewing/plugin-bundle": "^2.0.0-beta.11"
+    "@freesewing/core": "^2.0.0-beta.12",
+    "@freesewing/plugin-bundle": "^2.0.0-beta.12"
   },
+  "dependencies": {},
   "devDependencies": {
+    "react": "^16.4.1",
+    "react-dom": "^16.4.1",
     "@babel/plugin-proposal-class-properties": "^7.0.0",
+    "babel-eslint": "10.0.1",
+    "eslint": "^5.16.0",
+    "babel-jest": "24.7.1",
+    "jest": "24.7.1",
     "@freesewing/components": "^2.0.0-beta.12",
+    "@freesewing/rendertest": "^2.0.0-beta.12",
     "@freesewing/css-theme": "^2.0.0-beta.12",
     "@freesewing/i18n": "^2.0.0-beta.12",
     "@freesewing/mui-theme": "^2.0.0-beta.12",
@@ -47,23 +55,12 @@
     "@freesewing/plugin-bust": "^2.0.0-beta.12",
     "@freesewing/plugin-buttons": "^2.0.0-beta.12",
     "@freesewing/plugin-flip": "^2.0.0-beta.12",
-    "@freesewing/rendertest": "^2.0.0-beta.12",
     "@freesewing/utils": "^2.0.0-beta.12",
-    "@material-ui/core": "3.9.3",
-    "@material-ui/icons": "3.0.2",
-    "@material-ui/lab": "3.0.0-alpha.30",
     "@svgr/rollup": "^2.4.1",
-    "babel-eslint": "10.0.1",
-    "babel-jest": "24.7.1",
     "cross-env": "^5.1.4",
-    "eslint": "^5.16.0",
     "gh-pages": "^1.2.0",
-    "jest": "24.7.1",
-    "prop-types": "15.7.2",
-    "react": "^16.4.1",
-    "react-dom": "^16.4.1",
-    "react-intl": "2.8.0",
     "react-scripts": "^3.0.0",
+    "webpack": "4.29.6",
     "rollup": "^0.64.1",
     "rollup-plugin-babel": "^4.0.1",
     "rollup-plugin-babel-minify": "^7.0.0",
@@ -73,7 +70,11 @@
     "rollup-plugin-peer-deps-external": "^2.2.0",
     "rollup-plugin-postcss": "^1.6.2",
     "rollup-plugin-url": "^1.4.0",
-    "webpack": "4.29.6"
+    "@material-ui/core": "3.9.3",
+    "@material-ui/icons": "3.0.2",
+    "@material-ui/lab": "3.0.0-alpha.30",
+    "react-intl": "2.8.0",
+    "prop-types": "15.7.2"
   },
   "files": [
     "dist/*",
diff --git a/packages/simon/example/package.json b/packages/simon/example/package.json
index 16930f68184..81a13feb1a5 100644
--- a/packages/simon/example/package.json
+++ b/packages/simon/example/package.json
@@ -11,16 +11,13 @@
     "@freesewing/models": "beta",
     "@freesewing/mui-theme": "beta",
     "@freesewing/pattern-info": "beta",
-    "@freesewing/plugin-debug": "beta",
-    "@freesewing/plugin-designer": "beta",
+    "@freesewing/plugin-bundle": "beta",
     "@freesewing/plugin-i18n": "beta",
     "@freesewing/plugin-svgattr": "beta",
-    "@freesewing/plugin-theme": "beta",
-    "@freesewing/plugin-validate": "beta",
     "@freesewing/utils": "beta",
-    "@material-ui/core": "^3.9.3",
-    "@material-ui/icons": "^3.0.2",
-    "@material-ui/lab": "^3.0.0-alpha.30",
+    "@material-ui/core": "^4.0.1",
+    "@material-ui/icons": "^4.0.1",
+    "@material-ui/lab": "^v4.0.0-alpha.14",
     "pattern": "link:..",
     "prismjs": "1.16.0",
     "react": "^16.8",
diff --git a/packages/simon/example/src/App.js b/packages/simon/example/src/App.js
index ec5968e9a60..e7936330e5d 100644
--- a/packages/simon/example/src/App.js
+++ b/packages/simon/example/src/App.js
@@ -1,6 +1,6 @@
 import React from "react";
 import freesewing from "@freesewing/core";
-import { Workbench } from "@freesewing/components";
+import Workbench from "@freesewing/components/Workbench";
 import "typeface-roboto-condensed";
 import "@freesewing/css-theme";
 
diff --git a/packages/simon/package.json b/packages/simon/package.json
index 08120cc9bdc..d6f55d2e63c 100644
--- a/packages/simon/package.json
+++ b/packages/simon/package.json
@@ -34,15 +34,23 @@
     "start": "rollup -c -w"
   },
   "peerDependencies": {
-    "@freesewing/brian": "^2.0.0-beta.11",
-    "@freesewing/core": "^2.0.0-beta.11",
-    "@freesewing/plugin-bundle": "^2.0.0-beta.11",
-    "@freesewing/plugin-buttons": "^2.0.0-beta.11",
-    "@freesewing/plugin-flip": "^2.0.0-beta.11"
+    "@freesewing/core": "^2.0.0-beta.12",
+    "@freesewing/plugin-bundle": "^2.0.0-beta.12",
+    "@freesewing/brian": "^2.0.0-beta.12",
+    "@freesewing/plugin-buttons": "^2.0.0-beta.12",
+    "@freesewing/plugin-flip": "^2.0.0-beta.12"
   },
+  "dependencies": {},
   "devDependencies": {
+    "react": "^16.4.1",
+    "react-dom": "^16.4.1",
     "@babel/plugin-proposal-class-properties": "^7.0.0",
+    "babel-eslint": "10.0.1",
+    "eslint": "^5.16.0",
+    "babel-jest": "24.7.1",
+    "jest": "24.7.1",
     "@freesewing/components": "^2.0.0-beta.12",
+    "@freesewing/rendertest": "^2.0.0-beta.12",
     "@freesewing/css-theme": "^2.0.0-beta.12",
     "@freesewing/i18n": "^2.0.0-beta.12",
     "@freesewing/mui-theme": "^2.0.0-beta.12",
@@ -50,23 +58,12 @@
     "@freesewing/plugin-bust": "^2.0.0-beta.12",
     "@freesewing/plugin-buttons": "^2.0.0-beta.12",
     "@freesewing/plugin-flip": "^2.0.0-beta.12",
-    "@freesewing/rendertest": "^2.0.0-beta.12",
     "@freesewing/utils": "^2.0.0-beta.12",
-    "@material-ui/core": "3.9.3",
-    "@material-ui/icons": "3.0.2",
-    "@material-ui/lab": "3.0.0-alpha.30",
     "@svgr/rollup": "^2.4.1",
-    "babel-eslint": "10.0.1",
-    "babel-jest": "24.7.1",
     "cross-env": "^5.1.4",
-    "eslint": "^5.16.0",
     "gh-pages": "^1.2.0",
-    "jest": "24.7.1",
-    "prop-types": "15.7.2",
-    "react": "^16.4.1",
-    "react-dom": "^16.4.1",
-    "react-intl": "2.8.0",
     "react-scripts": "^3.0.0",
+    "webpack": "4.29.6",
     "rollup": "^0.64.1",
     "rollup-plugin-babel": "^4.0.1",
     "rollup-plugin-babel-minify": "^7.0.0",
@@ -76,7 +73,11 @@
     "rollup-plugin-peer-deps-external": "^2.2.0",
     "rollup-plugin-postcss": "^1.6.2",
     "rollup-plugin-url": "^1.4.0",
-    "webpack": "4.29.6"
+    "@material-ui/core": "3.9.3",
+    "@material-ui/icons": "3.0.2",
+    "@material-ui/lab": "3.0.0-alpha.30",
+    "react-intl": "2.8.0",
+    "prop-types": "15.7.2"
   },
   "files": [
     "dist/*",
diff --git a/packages/sven/example/package.json b/packages/sven/example/package.json
index 6ad884294a2..d65e5c889c4 100644
--- a/packages/sven/example/package.json
+++ b/packages/sven/example/package.json
@@ -11,16 +11,13 @@
     "@freesewing/models": "beta",
     "@freesewing/mui-theme": "beta",
     "@freesewing/pattern-info": "beta",
-    "@freesewing/plugin-debug": "beta",
-    "@freesewing/plugin-designer": "beta",
+    "@freesewing/plugin-bundle": "beta",
     "@freesewing/plugin-i18n": "beta",
     "@freesewing/plugin-svgattr": "beta",
-    "@freesewing/plugin-theme": "beta",
-    "@freesewing/plugin-validate": "beta",
     "@freesewing/utils": "beta",
-    "@material-ui/core": "^3.9.3",
-    "@material-ui/icons": "^3.0.2",
-    "@material-ui/lab": "^3.0.0-alpha.30",
+    "@material-ui/core": "^4.0.1",
+    "@material-ui/icons": "^4.0.1",
+    "@material-ui/lab": "^v4.0.0-alpha.14",
     "pattern": "link:..",
     "prismjs": "1.16.0",
     "react": "^16.8",
diff --git a/packages/sven/example/src/App.js b/packages/sven/example/src/App.js
index ec5968e9a60..e7936330e5d 100644
--- a/packages/sven/example/src/App.js
+++ b/packages/sven/example/src/App.js
@@ -1,6 +1,6 @@
 import React from "react";
 import freesewing from "@freesewing/core";
-import { Workbench } from "@freesewing/components";
+import Workbench from "@freesewing/components/Workbench";
 import "typeface-roboto-condensed";
 import "@freesewing/css-theme";
 
diff --git a/packages/sven/package.json b/packages/sven/package.json
index ea3031f1f08..7b476293c3b 100644
--- a/packages/sven/package.json
+++ b/packages/sven/package.json
@@ -34,12 +34,20 @@
     "start": "rollup -c -w"
   },
   "peerDependencies": {
-    "@freesewing/core": "^2.0.0-beta.11",
-    "@freesewing/plugin-bundle": "^2.0.0-beta.11"
+    "@freesewing/core": "^2.0.0-beta.12",
+    "@freesewing/plugin-bundle": "^2.0.0-beta.12"
   },
+  "dependencies": {},
   "devDependencies": {
+    "react": "^16.4.1",
+    "react-dom": "^16.4.1",
     "@babel/plugin-proposal-class-properties": "^7.0.0",
+    "babel-eslint": "10.0.1",
+    "eslint": "^5.16.0",
+    "babel-jest": "24.7.1",
+    "jest": "24.7.1",
     "@freesewing/components": "^2.0.0-beta.12",
+    "@freesewing/rendertest": "^2.0.0-beta.12",
     "@freesewing/css-theme": "^2.0.0-beta.12",
     "@freesewing/i18n": "^2.0.0-beta.12",
     "@freesewing/mui-theme": "^2.0.0-beta.12",
@@ -47,23 +55,12 @@
     "@freesewing/plugin-bust": "^2.0.0-beta.12",
     "@freesewing/plugin-buttons": "^2.0.0-beta.12",
     "@freesewing/plugin-flip": "^2.0.0-beta.12",
-    "@freesewing/rendertest": "^2.0.0-beta.12",
     "@freesewing/utils": "^2.0.0-beta.12",
-    "@material-ui/core": "3.9.3",
-    "@material-ui/icons": "3.0.2",
-    "@material-ui/lab": "3.0.0-alpha.30",
     "@svgr/rollup": "^2.4.1",
-    "babel-eslint": "10.0.1",
-    "babel-jest": "24.7.1",
     "cross-env": "^5.1.4",
-    "eslint": "^5.16.0",
     "gh-pages": "^1.2.0",
-    "jest": "24.7.1",
-    "prop-types": "15.7.2",
-    "react": "^16.4.1",
-    "react-dom": "^16.4.1",
-    "react-intl": "2.8.0",
     "react-scripts": "^3.0.0",
+    "webpack": "4.29.6",
     "rollup": "^0.64.1",
     "rollup-plugin-babel": "^4.0.1",
     "rollup-plugin-babel-minify": "^7.0.0",
@@ -73,7 +70,11 @@
     "rollup-plugin-peer-deps-external": "^2.2.0",
     "rollup-plugin-postcss": "^1.6.2",
     "rollup-plugin-url": "^1.4.0",
-    "webpack": "4.29.6"
+    "@material-ui/core": "3.9.3",
+    "@material-ui/icons": "3.0.2",
+    "@material-ui/lab": "3.0.0-alpha.30",
+    "react-intl": "2.8.0",
+    "prop-types": "15.7.2"
   },
   "files": [
     "dist/*",
diff --git a/packages/tamiko/example/package.json b/packages/tamiko/example/package.json
index 5215ba0bf0d..2def3ab38c9 100644
--- a/packages/tamiko/example/package.json
+++ b/packages/tamiko/example/package.json
@@ -11,16 +11,13 @@
     "@freesewing/models": "beta",
     "@freesewing/mui-theme": "beta",
     "@freesewing/pattern-info": "beta",
-    "@freesewing/plugin-debug": "beta",
-    "@freesewing/plugin-designer": "beta",
+    "@freesewing/plugin-bundle": "beta",
     "@freesewing/plugin-i18n": "beta",
     "@freesewing/plugin-svgattr": "beta",
-    "@freesewing/plugin-theme": "beta",
-    "@freesewing/plugin-validate": "beta",
     "@freesewing/utils": "beta",
-    "@material-ui/core": "^3.9.3",
-    "@material-ui/icons": "^3.0.2",
-    "@material-ui/lab": "^3.0.0-alpha.30",
+    "@material-ui/core": "^4.0.1",
+    "@material-ui/icons": "^4.0.1",
+    "@material-ui/lab": "^v4.0.0-alpha.14",
     "pattern": "link:..",
     "prismjs": "1.16.0",
     "react": "^16.8",
diff --git a/packages/tamiko/example/src/App.js b/packages/tamiko/example/src/App.js
index ec5968e9a60..e7936330e5d 100644
--- a/packages/tamiko/example/src/App.js
+++ b/packages/tamiko/example/src/App.js
@@ -1,6 +1,6 @@
 import React from "react";
 import freesewing from "@freesewing/core";
-import { Workbench } from "@freesewing/components";
+import Workbench from "@freesewing/components/Workbench";
 import "typeface-roboto-condensed";
 import "@freesewing/css-theme";
 
diff --git a/packages/tamiko/package.json b/packages/tamiko/package.json
index a00d0c36b79..415a2ed5a13 100644
--- a/packages/tamiko/package.json
+++ b/packages/tamiko/package.json
@@ -34,12 +34,20 @@
     "start": "rollup -c -w"
   },
   "peerDependencies": {
-    "@freesewing/core": "^2.0.0-beta.11",
-    "@freesewing/plugin-bundle": "^2.0.0-beta.11"
+    "@freesewing/core": "^2.0.0-beta.12",
+    "@freesewing/plugin-bundle": "^2.0.0-beta.12"
   },
+  "dependencies": {},
   "devDependencies": {
+    "react": "^16.4.1",
+    "react-dom": "^16.4.1",
     "@babel/plugin-proposal-class-properties": "^7.0.0",
+    "babel-eslint": "10.0.1",
+    "eslint": "^5.16.0",
+    "babel-jest": "24.7.1",
+    "jest": "24.7.1",
     "@freesewing/components": "^2.0.0-beta.12",
+    "@freesewing/rendertest": "^2.0.0-beta.12",
     "@freesewing/css-theme": "^2.0.0-beta.12",
     "@freesewing/i18n": "^2.0.0-beta.12",
     "@freesewing/mui-theme": "^2.0.0-beta.12",
@@ -47,23 +55,12 @@
     "@freesewing/plugin-bust": "^2.0.0-beta.12",
     "@freesewing/plugin-buttons": "^2.0.0-beta.12",
     "@freesewing/plugin-flip": "^2.0.0-beta.12",
-    "@freesewing/rendertest": "^2.0.0-beta.12",
     "@freesewing/utils": "^2.0.0-beta.12",
-    "@material-ui/core": "3.9.3",
-    "@material-ui/icons": "3.0.2",
-    "@material-ui/lab": "3.0.0-alpha.30",
     "@svgr/rollup": "^2.4.1",
-    "babel-eslint": "10.0.1",
-    "babel-jest": "24.7.1",
     "cross-env": "^5.1.4",
-    "eslint": "^5.16.0",
     "gh-pages": "^1.2.0",
-    "jest": "24.7.1",
-    "prop-types": "15.7.2",
-    "react": "^16.4.1",
-    "react-dom": "^16.4.1",
-    "react-intl": "2.8.0",
     "react-scripts": "^3.0.0",
+    "webpack": "4.29.6",
     "rollup": "^0.64.1",
     "rollup-plugin-babel": "^4.0.1",
     "rollup-plugin-babel-minify": "^7.0.0",
@@ -73,7 +70,11 @@
     "rollup-plugin-peer-deps-external": "^2.2.0",
     "rollup-plugin-postcss": "^1.6.2",
     "rollup-plugin-url": "^1.4.0",
-    "webpack": "4.29.6"
+    "@material-ui/core": "3.9.3",
+    "@material-ui/icons": "3.0.2",
+    "@material-ui/lab": "3.0.0-alpha.30",
+    "react-intl": "2.8.0",
+    "prop-types": "15.7.2"
   },
   "files": [
     "dist/*",
diff --git a/packages/trayvon/example/package.json b/packages/trayvon/example/package.json
index 3d68e3f6786..9dd3205ac2f 100644
--- a/packages/trayvon/example/package.json
+++ b/packages/trayvon/example/package.json
@@ -11,16 +11,13 @@
     "@freesewing/models": "beta",
     "@freesewing/mui-theme": "beta",
     "@freesewing/pattern-info": "beta",
-    "@freesewing/plugin-debug": "beta",
-    "@freesewing/plugin-designer": "beta",
+    "@freesewing/plugin-bundle": "beta",
     "@freesewing/plugin-i18n": "beta",
     "@freesewing/plugin-svgattr": "beta",
-    "@freesewing/plugin-theme": "beta",
-    "@freesewing/plugin-validate": "beta",
     "@freesewing/utils": "beta",
-    "@material-ui/core": "^3.9.3",
-    "@material-ui/icons": "^3.0.2",
-    "@material-ui/lab": "^3.0.0-alpha.30",
+    "@material-ui/core": "^4.0.1",
+    "@material-ui/icons": "^4.0.1",
+    "@material-ui/lab": "^v4.0.0-alpha.14",
     "pattern": "link:..",
     "prismjs": "1.16.0",
     "react": "^16.8",
diff --git a/packages/trayvon/example/src/App.js b/packages/trayvon/example/src/App.js
index ec5968e9a60..e7936330e5d 100644
--- a/packages/trayvon/example/src/App.js
+++ b/packages/trayvon/example/src/App.js
@@ -1,6 +1,6 @@
 import React from "react";
 import freesewing from "@freesewing/core";
-import { Workbench } from "@freesewing/components";
+import Workbench from "@freesewing/components/Workbench";
 import "typeface-roboto-condensed";
 import "@freesewing/css-theme";
 
diff --git a/packages/trayvon/package.json b/packages/trayvon/package.json
index 3f6c6f43962..40cd6d45f85 100644
--- a/packages/trayvon/package.json
+++ b/packages/trayvon/package.json
@@ -34,12 +34,20 @@
     "start": "rollup -c -w"
   },
   "peerDependencies": {
-    "@freesewing/core": "^2.0.0-beta.11",
-    "@freesewing/plugin-bundle": "^2.0.0-beta.11"
+    "@freesewing/core": "^2.0.0-beta.12",
+    "@freesewing/plugin-bundle": "^2.0.0-beta.12"
   },
+  "dependencies": {},
   "devDependencies": {
+    "react": "^16.4.1",
+    "react-dom": "^16.4.1",
     "@babel/plugin-proposal-class-properties": "^7.0.0",
+    "babel-eslint": "10.0.1",
+    "eslint": "^5.16.0",
+    "babel-jest": "24.7.1",
+    "jest": "24.7.1",
     "@freesewing/components": "^2.0.0-beta.12",
+    "@freesewing/rendertest": "^2.0.0-beta.12",
     "@freesewing/css-theme": "^2.0.0-beta.12",
     "@freesewing/i18n": "^2.0.0-beta.12",
     "@freesewing/mui-theme": "^2.0.0-beta.12",
@@ -47,23 +55,12 @@
     "@freesewing/plugin-bust": "^2.0.0-beta.12",
     "@freesewing/plugin-buttons": "^2.0.0-beta.12",
     "@freesewing/plugin-flip": "^2.0.0-beta.12",
-    "@freesewing/rendertest": "^2.0.0-beta.12",
     "@freesewing/utils": "^2.0.0-beta.12",
-    "@material-ui/core": "3.9.3",
-    "@material-ui/icons": "3.0.2",
-    "@material-ui/lab": "3.0.0-alpha.30",
     "@svgr/rollup": "^2.4.1",
-    "babel-eslint": "10.0.1",
-    "babel-jest": "24.7.1",
     "cross-env": "^5.1.4",
-    "eslint": "^5.16.0",
     "gh-pages": "^1.2.0",
-    "jest": "24.7.1",
-    "prop-types": "15.7.2",
-    "react": "^16.4.1",
-    "react-dom": "^16.4.1",
-    "react-intl": "2.8.0",
     "react-scripts": "^3.0.0",
+    "webpack": "4.29.6",
     "rollup": "^0.64.1",
     "rollup-plugin-babel": "^4.0.1",
     "rollup-plugin-babel-minify": "^7.0.0",
@@ -73,7 +70,11 @@
     "rollup-plugin-peer-deps-external": "^2.2.0",
     "rollup-plugin-postcss": "^1.6.2",
     "rollup-plugin-url": "^1.4.0",
-    "webpack": "4.29.6"
+    "@material-ui/core": "3.9.3",
+    "@material-ui/icons": "3.0.2",
+    "@material-ui/lab": "3.0.0-alpha.30",
+    "react-intl": "2.8.0",
+    "prop-types": "15.7.2"
   },
   "files": [
     "dist/*",
diff --git a/packages/utils/package.json b/packages/utils/package.json
index 19bcdf92682..9634b66bb87 100644
--- a/packages/utils/package.json
+++ b/packages/utils/package.json
@@ -28,6 +28,9 @@
     "pubforce": "npm publish",
     "symlink": "mkdir -p ./node_modules/@freesewing && cd ./node_modules/@freesewing && ln -s -f ../../../* . && cd -"
   },
+  "peerDependencies": {},
+  "dependencies": {},
+  "devDependencies": {},
   "files": [
     "dist/*",
     "README.md",
diff --git a/packages/wahid/example/package.json b/packages/wahid/example/package.json
index e39b207d716..6ee744062c7 100644
--- a/packages/wahid/example/package.json
+++ b/packages/wahid/example/package.json
@@ -11,16 +11,13 @@
     "@freesewing/models": "beta",
     "@freesewing/mui-theme": "beta",
     "@freesewing/pattern-info": "beta",
-    "@freesewing/plugin-debug": "beta",
-    "@freesewing/plugin-designer": "beta",
+    "@freesewing/plugin-bundle": "beta",
     "@freesewing/plugin-i18n": "beta",
     "@freesewing/plugin-svgattr": "beta",
-    "@freesewing/plugin-theme": "beta",
-    "@freesewing/plugin-validate": "beta",
     "@freesewing/utils": "beta",
-    "@material-ui/core": "^3.9.3",
-    "@material-ui/icons": "^3.0.2",
-    "@material-ui/lab": "^3.0.0-alpha.30",
+    "@material-ui/core": "^4.0.1",
+    "@material-ui/icons": "^4.0.1",
+    "@material-ui/lab": "^v4.0.0-alpha.14",
     "pattern": "link:..",
     "prismjs": "1.16.0",
     "react": "^16.8",
diff --git a/packages/wahid/example/src/App.js b/packages/wahid/example/src/App.js
index ec5968e9a60..e7936330e5d 100644
--- a/packages/wahid/example/src/App.js
+++ b/packages/wahid/example/src/App.js
@@ -1,6 +1,6 @@
 import React from "react";
 import freesewing from "@freesewing/core";
-import { Workbench } from "@freesewing/components";
+import Workbench from "@freesewing/components/Workbench";
 import "typeface-roboto-condensed";
 import "@freesewing/css-theme";
 
diff --git a/packages/wahid/package.json b/packages/wahid/package.json
index 50a33fe6b29..629ac3240c3 100644
--- a/packages/wahid/package.json
+++ b/packages/wahid/package.json
@@ -34,15 +34,23 @@
     "start": "rollup -c -w"
   },
   "peerDependencies": {
-    "@freesewing/brian": "^2.0.0-beta.11",
-    "@freesewing/core": "^2.0.0-beta.11",
-    "@freesewing/plugin-bundle": "^2.0.0-beta.11",
-    "@freesewing/plugin-buttons": "^2.0.0-beta.11",
-    "@freesewing/plugin-round": "^2.0.0-beta.11"
+    "@freesewing/core": "^2.0.0-beta.12",
+    "@freesewing/plugin-bundle": "^2.0.0-beta.12",
+    "@freesewing/brian": "^2.0.0-beta.12",
+    "@freesewing/plugin-buttons": "^2.0.0-beta.12",
+    "@freesewing/plugin-round": "^2.0.0-beta.12"
   },
+  "dependencies": {},
   "devDependencies": {
+    "react": "^16.4.1",
+    "react-dom": "^16.4.1",
     "@babel/plugin-proposal-class-properties": "^7.0.0",
+    "babel-eslint": "10.0.1",
+    "eslint": "^5.16.0",
+    "babel-jest": "24.7.1",
+    "jest": "24.7.1",
     "@freesewing/components": "^2.0.0-beta.12",
+    "@freesewing/rendertest": "^2.0.0-beta.12",
     "@freesewing/css-theme": "^2.0.0-beta.12",
     "@freesewing/i18n": "^2.0.0-beta.12",
     "@freesewing/mui-theme": "^2.0.0-beta.12",
@@ -50,23 +58,12 @@
     "@freesewing/plugin-bust": "^2.0.0-beta.12",
     "@freesewing/plugin-buttons": "^2.0.0-beta.12",
     "@freesewing/plugin-flip": "^2.0.0-beta.12",
-    "@freesewing/rendertest": "^2.0.0-beta.12",
     "@freesewing/utils": "^2.0.0-beta.12",
-    "@material-ui/core": "3.9.3",
-    "@material-ui/icons": "3.0.2",
-    "@material-ui/lab": "3.0.0-alpha.30",
     "@svgr/rollup": "^2.4.1",
-    "babel-eslint": "10.0.1",
-    "babel-jest": "24.7.1",
     "cross-env": "^5.1.4",
-    "eslint": "^5.16.0",
     "gh-pages": "^1.2.0",
-    "jest": "24.7.1",
-    "prop-types": "15.7.2",
-    "react": "^16.4.1",
-    "react-dom": "^16.4.1",
-    "react-intl": "2.8.0",
     "react-scripts": "^3.0.0",
+    "webpack": "4.29.6",
     "rollup": "^0.64.1",
     "rollup-plugin-babel": "^4.0.1",
     "rollup-plugin-babel-minify": "^7.0.0",
@@ -76,7 +73,11 @@
     "rollup-plugin-peer-deps-external": "^2.2.0",
     "rollup-plugin-postcss": "^1.6.2",
     "rollup-plugin-url": "^1.4.0",
-    "webpack": "4.29.6"
+    "@material-ui/core": "3.9.3",
+    "@material-ui/icons": "3.0.2",
+    "@material-ui/lab": "3.0.0-alpha.30",
+    "react-intl": "2.8.0",
+    "prop-types": "15.7.2"
   },
   "files": [
     "dist/*",