diff --git a/components/CodeImage.js b/components/CodeImage.js
index 27e6458..aafeb36 100644
--- a/components/CodeImage.js
+++ b/components/CodeImage.js
@@ -70,8 +70,12 @@ const DEFAULT_SETTINGS = {
     if (this.state.loading === false) {
       content = (
         <div id="container" style={containerStyle}>
-          { true ? <WindowControls /> : null }
-          <CodeMirror className="CodeMirrorContainer" value={this.props.children} options={options} />
+          { config.windowControls ? <WindowControls /> : null }
+          <CodeMirror
+            className={`CodeMirror__container ${config.dropShadow ? 'dropshadow' : ''}`}
+            value={this.props.children}
+            options={options}
+          />
         </div>
       )
     }
diff --git a/components/Meta.js b/components/Meta.js
index f51daa1..3b9d53b 100644
--- a/components/Meta.js
+++ b/components/Meta.js
@@ -53,7 +53,12 @@ export default () => (
         border: solid 2px #fff;
       }
 
-      .CodeMirrorContainer .CodeMirror {
+      .CodeMirror__container.dropshadow {
+        box-shadow: 0px 3px 15px rgba(0,0,0,0.3);
+        border-radius: 5px;
+      }
+
+      .CodeMirror__container .CodeMirror {
         height: auto;
         min-width: 680px;
         padding: 40px 18px 24px;
diff --git a/components/Settings.js b/components/Settings.js
index 60ca45a..bbbd9ff 100644
--- a/components/Settings.js
+++ b/components/Settings.js
@@ -32,7 +32,7 @@ class Settings extends React.Component {
         <div className="settings-settings">
           <ThemeSelect onChange={this.props.onChange} />
           <Toggle label="Drop shadow" onChange={this.props.onChange.bind(null, 'dropShadow')}/>
-          <Toggle label="Window controls" onChange={this.props.onChange.bind(null, 'windowControls')}/>
+          <Toggle label="Window controls" enabled onChange={this.props.onChange.bind(null, 'windowControls')}/>
           <Slider label="Padding (vertical)" initialValue={16} onChange={this.props.onChange.bind(null, 'paddingVertical')}/>
           <Slider label="Padding (horizontal)" initialValue={32} onChange={this.props.onChange.bind(null, 'paddingHorizontal')}/>
         </div>
diff --git a/pages/index.js b/pages/index.js
index 3109bb1..5537e59 100644
--- a/pages/index.js
+++ b/pages/index.js
@@ -73,7 +73,7 @@ class Index extends React.Component {
               onBGChange={color => this.setState({ background: color })}
               onThemeChange={theme => this.setState({ theme: theme.id })}
               onLanguageChange={language => this.setState({ language })}
-              onSettingsChange={(key, value) => this.setState({ key: value })}
+              onSettingsChange={(key, value) => this.setState({ [key]: value })}
               bg={this.state.background}
             />
             <CodeImage config={this.state}>