diff --git a/packages/netlify-cms-core/src/components/Editor/EditorPreviewPane/EditorPreview.js b/packages/netlify-cms-core/src/components/Editor/EditorPreviewPane/EditorPreview.js
index 2ee61e3d..52cec09f 100644
--- a/packages/netlify-cms-core/src/components/Editor/EditorPreviewPane/EditorPreview.js
+++ b/packages/netlify-cms-core/src/components/Editor/EditorPreviewPane/EditorPreview.js
@@ -24,7 +24,7 @@ export default class Preview extends React.Component {
     return (
       <PreviewContainer>
         {fields.filter(isVisible).map(field => (
-          <div>{widgetFor(field.get('name'))}</div>
+          <div key={field.get('name')}>{widgetFor(field.get('name'))}</div>
         ))}
       </PreviewContainer>
     );
diff --git a/packages/netlify-cms-core/src/components/EditorWidgets/Boolean/Boolean.css b/packages/netlify-cms-core/src/components/EditorWidgets/Boolean/Boolean.css
deleted file mode 100644
index b56b8545..00000000
--- a/packages/netlify-cms-core/src/components/EditorWidgets/Boolean/Boolean.css
+++ /dev/null
@@ -1,9 +0,0 @@
-.nc-booleanControl-switch {
-  & .nc-toggle-background {
-    background-color: var(--textFieldBorderColor);
-  }
-
-  & .nc-toggle-active .nc-toggle-background {
-    background-color: var(--colorActive);
-  }
-}
diff --git a/packages/netlify-cms-core/src/components/EditorWidgets/index.js b/packages/netlify-cms-core/src/components/EditorWidgets/index.js
index d556b6e2..2bdd6971 100644
--- a/packages/netlify-cms-core/src/components/EditorWidgets/index.js
+++ b/packages/netlify-cms-core/src/components/EditorWidgets/index.js
@@ -23,7 +23,6 @@ import ObjectControl from './Object/ObjectControl';
 import ObjectPreview from './Object/ObjectPreview';
 import RelationControl from './Relation/RelationControl';
 import RelationPreview from './Relation/RelationPreview';
-import BooleanControl from './Boolean/BooleanControl';
 
 registerWidget('text', TextControl, TextPreview);
 registerWidget('number', NumberControl, NumberPreview);
@@ -36,5 +35,4 @@ registerWidget('datetime', DateTimeControl, DateTimePreview);
 registerWidget('select', SelectControl, SelectPreview);
 registerWidget('object', ObjectControl, ObjectPreview);
 registerWidget('relation', RelationControl, RelationPreview);
-registerWidget('boolean', BooleanControl);
 registerWidget('unknown', UnknownControl, UnknownPreview);
diff --git a/packages/netlify-cms-ui-default/src/Toggle.js b/packages/netlify-cms-ui-default/src/Toggle.js
index 0761c51f..1225ef23 100644
--- a/packages/netlify-cms-ui-default/src/Toggle.js
+++ b/packages/netlify-cms-ui-default/src/Toggle.js
@@ -1,67 +1,67 @@
 import React from 'react'
-import styled, { css, cx } from 'react-emotion';
+import styled, { css } from 'react-emotion';
 import ReactToggled from 'react-toggled';
 import { colors, colorsRaw, shadows, transitions } from './styles';
 
-const styles = {
-  switch: css`
-    display: inline-flex;
-    align-items: center;
-    justify-content: center;
-    position: relative;
-    width: 40px;
-    height: 20px;
-    cursor: pointer;
-  `,
-  switchHandle: css`
-    ${shadows.dropDeep};
-    position: absolute;
-    left: 0;
-    top: 0;
-    width: 20px;
-    height: 20px;
-    border-radius: 50%;
-    background-color: ${colorsRaw.white};
-    transition: transform ${transitions.main};
-  `,
-  switchHandleActive: css`
+const ToggleContainer = styled.span`
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  position: relative;
+  width: 40px;
+  height: 20px;
+  cursor: pointer;
+`
+
+const ToggleHandle = styled.span`
+  ${shadows.dropDeep};
+  position: absolute;
+  left: 0;
+  top: 0;
+  width: 20px;
+  height: 20px;
+  border-radius: 50%;
+  background-color: ${colorsRaw.white};
+  transition: transform ${transitions.main};
+
+  ${props => props.isActive && css`
     transform: translateX(20px);
-  `,
-  switchBackground: css`
-    width: 34px;
-    height: 14px;
-    border-radius: 10px;
-    background-color: ${colors.active};
-  `,
-};
+  `}
+`
+
+const ToggleBackground = styled.span`
+  width: 34px;
+  height: 14px;
+  border-radius: 10px;
+  background-color: ${colors.active};
+`
 
 const Toggle = ({
   active,
   onChange,
-  className,
-  classNameBackground,
-  classNameSwitch,
+  renderBackground,
   onFocus,
-  onBlur
-}) =>
+  onBlur,
+  Container = ToggleContainer,
+  Background = ToggleBackground,
+  Handle = ToggleHandle,
+}) => (
   <ReactToggled on={active} onToggle={onChange}>
     {({on, getElementTogglerProps}) => (
-      <span
-        className={cx(styles.switch, className)}
+      <Container
         role="switch"
         aria-checked={on.toString()}
         onFocus={onFocus}
         onBlur={onBlur}
         {...getElementTogglerProps()}
       >
-        <span className={cx(styles.switchBackground, classNameBackground)}/>
-        <span className={cx(
-          styles.switchHandle,
-          classNameSwitch,
-          { [styles.switchHandleActive]: on },
-        )}/>
-      </span>
+        <Background isActive={on}/>
+        <Handle isActive={on}/>
+      </Container>
     )}
-  </ReactToggled>;
+  </ReactToggled>
+);
 
-export default styled(Toggle)``
+const StyledToggle = styled(Toggle)``;
+
+export { StyledToggle as default, ToggleContainer, ToggleBackground, ToggleHandle };
diff --git a/packages/netlify-cms-ui-default/src/index.js b/packages/netlify-cms-ui-default/src/index.js
index 15961dd7..13b44e15 100644
--- a/packages/netlify-cms-ui-default/src/index.js
+++ b/packages/netlify-cms-ui-default/src/index.js
@@ -2,7 +2,7 @@ export Dropdown, { DropdownItem, DropdownButton, StyledDropdownButton } from './
 export Icon from './Icon';
 export ListItemTopBar from './ListItemTopBar';
 export Loader from './Loader';
-export Toggle from './Toggle';
+export Toggle, { ToggleContainer, ToggleBackground, ToggleHandle } from './Toggle';
 export AuthenticationPage from './AuthenticationPage';
 export WidgetPreviewContainer from './WidgetPreviewContainer';
 export {
diff --git a/packages/netlify-cms-widget-boolean/package.json b/packages/netlify-cms-widget-boolean/package.json
new file mode 100644
index 00000000..2d2428d1
--- /dev/null
+++ b/packages/netlify-cms-widget-boolean/package.json
@@ -0,0 +1,29 @@
+{
+  "name": "netlify-cms-widget-boolean",
+  "description": "Widget for editing boolean values in Netlify CMS.",
+  "version": "2.0.0-alpha.0",
+  "main": "dist/netlify-cms-widget-boolean.js",
+  "license": "MIT",
+  "keywords": [
+    "netlify",
+    "netlify-cms",
+    "widget",
+    "boolean"
+  ],
+  "sideEffects": false,
+  "scripts": {
+    "watch": "webpack -w",
+    "build": "webpack"
+  },
+  "devDependencies": {
+    "webpack": "^4.16.1",
+    "webpack-cli": "^3.1.0"
+  },
+  "peerDependencies": {
+    "lodash": "^4.17.10",
+    "netlify-cms-ui-default": "^2.0.0-alpha.0",
+    "prop-types": "^15.5.10",
+    "react": "^16.4.1",
+    "react-immutable-proptypes": "^2.1.0"
+  }
+}
diff --git a/packages/netlify-cms-core/src/components/EditorWidgets/Boolean/BooleanControl.js b/packages/netlify-cms-widget-boolean/src/BooleanControl.js
similarity index 72%
rename from packages/netlify-cms-core/src/components/EditorWidgets/Boolean/BooleanControl.js
rename to packages/netlify-cms-widget-boolean/src/BooleanControl.js
index a528b035..0efd1672 100644
--- a/packages/netlify-cms-core/src/components/EditorWidgets/Boolean/BooleanControl.js
+++ b/packages/netlify-cms-widget-boolean/src/BooleanControl.js
@@ -1,8 +1,13 @@
 import PropTypes from 'prop-types';
 import React from 'react';
-import ImmutablePropTypes from "react-immutable-proptypes";
+import ImmutablePropTypes from 'react-immutable-proptypes';
+import styled from 'react-emotion';
 import { isBoolean } from 'lodash';
-import { Toggle } from 'netlify-cms-ui-default';
+import { Toggle, ToggleBackground, colors } from 'netlify-cms-ui-default';
+
+const BooleanBackground = styled(ToggleBackground)`
+  background-color: ${props => props.isActive ? colors.active : colors.textFieldBorder};
+`
 
 export default class BooleanControl extends React.Component {
   render() {
@@ -16,13 +21,14 @@ export default class BooleanControl extends React.Component {
       setInactiveStyle
     } = this.props;
     return (
-      <div className={`${classNameWrapper} nc-booleanControl-switch`}>
+      <div>
         <Toggle
           id={forID}
           active={isBoolean(value) ? value : field.get('defaultValue', false)}
           onChange={onChange}
           onFocus={setActiveStyle}
           onBlur={setInactiveStyle}
+          Background={BooleanBackground}
         />
       </div>
     );
diff --git a/packages/netlify-cms-widget-boolean/src/index.js b/packages/netlify-cms-widget-boolean/src/index.js
new file mode 100644
index 00000000..3b172e90
--- /dev/null
+++ b/packages/netlify-cms-widget-boolean/src/index.js
@@ -0,0 +1 @@
+export BooleanControl from './BooleanControl';
diff --git a/packages/netlify-cms-widget-boolean/webpack.config.js b/packages/netlify-cms-widget-boolean/webpack.config.js
new file mode 100644
index 00000000..42edd361
--- /dev/null
+++ b/packages/netlify-cms-widget-boolean/webpack.config.js
@@ -0,0 +1,3 @@
+const { getConfig } = require('../../scripts/webpack.js');
+
+module.exports = getConfig();