diff --git a/config/exceptions.yaml b/config/exceptions.yaml
index 893c2701047..db199bd25c3 100644
--- a/config/exceptions.yaml
+++ b/config/exceptions.yaml
@@ -6,6 +6,9 @@ customRollup:
   - components
   - core
 packageJson:
+  components:
+    # react-scripts doesn't handle .mjs files correctly
+    module: '!'
   create-freesewing-pattern:
     bin:
       create-freesewing-pattern: index.js
diff --git a/config/scripts.yaml b/config/scripts.yaml
index b78b46bd7b6..54a8b702e71 100644
--- a/config/scripts.yaml
+++ b/config/scripts.yaml
@@ -21,6 +21,9 @@ css-theme:
 components:
   test: "echo \"{{name}}: No tests configured. Perhaps you'd like to do this?\" && exit 0"
   storybook: "start-storybook -p 6663"
+  # react-scripts doesn't handle .mjs files correctly
+  modulebuild: '!'
+  build: "npm run clean && npm run nodebuild"
 core:
   test: "BABEL_ENV=production nyc mocha tests/*.test.js"
   report: "BABEL_ENV=production nyc report --reporter=html mocha --compilers js:babel-core/register tests/*.test.js"
diff --git a/packages/components/package.json b/packages/components/package.json
index 96c5993646e..7b9e57fdb26 100644
--- a/packages/components/package.json
+++ b/packages/components/package.json
@@ -14,12 +14,10 @@
     "react"
   ],
   "main": "dist/index.js",
-  "module": "dist/index.mjs",
   "scripts": {
     "clean": "rimraf dist",
     "nodebuild": "BABEL_ENV=production rollup -c -o dist/index.js -f cjs",
-    "modulebuild": "BABEL_ENV=production rollup -c -o dist/index.mjs -f es",
-    "build": "npm run clean && npm run nodebuild && npm run modulebuild",
+    "build": "npm run clean && npm run nodebuild",
     "test": "echo \"components: No tests configured. Perhaps you'd like to do this?\" && exit 0",
     "pubtest": "npm publish --registry http://localhost:6662",
     "pubforce": "npm publish",
@@ -27,18 +25,18 @@
     "storybook": "start-storybook -p 6663"
   },
   "peerDependencies": {
-    "@freesewing/css-theme": "^2.0.0-alpha.13",
-    "@freesewing/i18n": "^2.0.0-alpha.13",
-    "@freesewing/mui-theme": "^2.0.0-alpha.13",
-    "@freesewing/pattern-info": "^2.0.0-alpha.13",
-    "@freesewing/utils": "^2.0.0-alpha.13",
+    "react": "^16.4.1",
+    "prop-types": "15.7.2",
+    "@freesewing/pattern-info": "^2.0.0-alpha.14",
+    "@freesewing/mui-theme": "^2.0.0-alpha.14",
+    "@freesewing/css-theme": "^2.0.0-alpha.14",
+    "typeface-roboto-condensed": "latest",
+    "@freesewing/i18n": "^2.0.0-alpha.14",
+    "@freesewing/utils": "^2.0.0-alpha.14",
+    "react-intl": "^2.8.0",
     "@material-ui/core": "^3.9.3",
     "@material-ui/icons": "^3.0.2",
-    "@material-ui/lab": "^3.0.0-alpha.30",
-    "prop-types": "15.7.2",
-    "react": "^16.4.1",
-    "react-intl": "^2.8.0",
-    "typeface-roboto-condensed": "latest"
+    "@material-ui/lab": "^3.0.0-alpha.30"
   },
   "files": [
     "dist/*",
diff --git a/packages/components/src/Ogol/index.js b/packages/components/src/Ogol/index.js
index 1ddd1184486..f24d5bdde72 100644
--- a/packages/components/src/Ogol/index.js
+++ b/packages/components/src/Ogol/index.js
@@ -1,7 +1,7 @@
 import React from "react";
 import PropTypes from "prop-types";
 
-const Logo = props => {
+const Ogol = props => {
   return (
     <svg
       xmlns="http://www.w3.org/2000/svg"
@@ -19,15 +19,15 @@ const Logo = props => {
   );
 };
 
-Logo.propTypes = {
+Ogol.propTypes = {
   size: PropTypes.number,
   embed: PropTypes.bool
 };
 
-Logo.defaultProps = {
+Ogol.defaultProps = {
   size: 24,
   embed: false,
   color: "#fff"
 };
 
-export default Logo;
+export default Ogol;
diff --git a/packages/components/src/Workbench/index.js b/packages/components/src/Workbench/index.js
index cf8ec0ebd47..3691ca4eaa5 100644
--- a/packages/components/src/Workbench/index.js
+++ b/packages/components/src/Workbench/index.js
@@ -4,9 +4,9 @@ import withGist from "../withGist";
 import { FormattedMessage, IntlProvider } from "react-intl";
 import Button from "@material-ui/core/Button";
 import { MuiThemeProvider, createMuiTheme } from "@material-ui/core/styles";
-import { i18n, strings } from "@freesewing/i18n";
+import { strings } from "@freesewing/i18n";
 import Navbar from "../Navbar";
-import { defaultGist, storage, partList } from "@freesewing/utils";
+import { defaultGist, storage } from "@freesewing/utils";
 import { dark, light } from "@freesewing/mui-theme";
 import Logo from "../Logo";
 import withLanguage from "../withLanguage";
diff --git a/packages/components/src/index.js b/packages/components/src/index.js
index 4b80de7e1f0..93885fcc928 100644
--- a/packages/components/src/index.js
+++ b/packages/components/src/index.js
@@ -1,4 +1,4 @@
-export { default as draftConfigurator } from "./DraftConfigurator";
+export { default as DraftConfigurator } from "./DraftConfigurator";
 export { default as Emblem } from "./Emblem";
 export { default as Logo } from "./Logo";
 export { default as Navbar } from "./Navbar";