diff --git a/components/Settings.js b/components/Settings.js
index dee6519..6d0ebab 100644
--- a/components/Settings.js
+++ b/components/Settings.js
@@ -1,6 +1,10 @@
 import React from 'react'
 import enhanceWithClickOutside from 'react-click-outside'
 import SettingsIcon from './svg/Settings'
+import ThemeSelect from './ThemeSelect'
+import Slider from './Slider'
+import Toggle from './Toggle'
+import { PALETTE } from '../lib/constants'
 
 class Settings extends React.Component {
   constructor(props) {
@@ -26,23 +30,11 @@ class Settings extends React.Component {
           <SettingsIcon />
         </div>
         <div className="settings-settings">
-          <div className="window-theme">
-            <span className="label">Theme</span>
-            <div className="themes">
-              <div className="theme"></div>
-              <div className="theme"></div>
-              <div className="theme"></div>
-            </div>
-          </div>
-          <div className="toggle">
-            <span className="label">Drop shadow</span>
-          </div>
-          <div className="toggle">
-            <span className="label">Window controls</span>
-          </div>
-          <div className="slider">
-            <span className="label">Padding (horizontal)</span>
-          </div>
+          <ThemeSelect onChange={this.props.onChange} />
+          <Toggle label="Drop shadow" onChange={this.props.onChange}/>
+          <Toggle label="Window controls" onChange={this.props.onChange}/>
+          <Slider label="Padding (vertical)" onChange={this.props.onChange}/>
+          <Slider label="Padding (horizontal)" onChange={this.props.onChange}/>
         </div>
         <style jsx>{`
           .settings-container {
@@ -80,14 +72,12 @@ class Settings extends React.Component {
 
           .settings-settings {
             display: none;
-            border: 0.5px solid #333;
-            height: 208px;
-            width: 152px;
-            padding: 8px;
+            border: 0.5px solid #000;
+            width: 184px;
             border-radius: 3px;
             position: absolute;
             margin-top: 120px;
-            background: #000;
+            background: ${PALETTE.EDITOR_BG};
           }
         `}</style>
       </div>
diff --git a/components/Toggle.js b/components/Toggle.js
new file mode 100644
index 0000000..1768e92
--- /dev/null
+++ b/components/Toggle.js
@@ -0,0 +1,34 @@
+import React from 'react'
+import Checkmark from './svg/Checkmark'
+
+export default class extends React.Component {
+  constructor(props) {
+    super()
+    this.state = { isEnabled: props.enabled || false }
+    this.toggle = this.toggle.bind(this)
+  }
+
+  toggle() {
+    this.setState({ isEnabled: !this.state.isEnabled })
+  }
+
+  render() {
+    return (
+      <div className="toggle" onClick={this.toggle}>
+        <span className="label">{this.props.label}</span>
+        { this.state.isEnabled ? <Checkmark /> : null }
+        <style jsx>{`
+          .toggle {
+            display: flex;
+            align-items: center;
+            justify-content: space-between;
+            cursor: pointer;
+            user-select: none;
+            padding: 8px;
+            border-bottom: solid 1px #000;
+          }
+        `}</style>
+      </div>
+    )
+  }
+}
diff --git a/components/Toolbar.js b/components/Toolbar.js
index dc4dfd0..dae638b 100644
--- a/components/Toolbar.js
+++ b/components/Toolbar.js
@@ -13,7 +13,7 @@ const Toolbar = (props) => (
       onChange={props.onBGChange}
       bg={props.bg}
     />
-    <Settings />
+    <Settings onChange={props.onSettingsChange} />
     <div className="buttons">
       <Button
         onClick={props.upload}
diff --git a/components/svg/Checkmark.js b/components/svg/Checkmark.js
new file mode 100644
index 0000000..3a21a3a
--- /dev/null
+++ b/components/svg/Checkmark.js
@@ -0,0 +1,7 @@
+import React from 'react'
+
+export default () => (
+  <svg xmlns="http://www.w3.org/2000/svg" width="9" height="7" viewBox="0 0 9 7">
+    <polygon fill="#FFFFFF" fillRule="evenodd" points="2.852 5.016 8.275 0 9 .67 2.852 6.344 0 3.711 .713 3.042"/>
+  </svg>
+)