diff --git a/client/modules/App/App.js b/client/modules/App/App.js
index 5598225d..0c69c4e6 100644
--- a/client/modules/App/App.js
+++ b/client/modules/App/App.js
@@ -1,10 +1,12 @@
 import React, { PropTypes } from 'react';
 import { connect } from 'react-redux';
 import DevTools from './components/DevTools';
+import classNames from 'classnames';
 
 class App extends React.Component {
   constructor(props, context) {
     super(props, context);
+    console.log(props);
     this.state = { isMounted: false };
   }
 
@@ -13,8 +15,14 @@ class App extends React.Component {
   }
 
   render() {
+    const theme = this.props.route.theme;
+    const appClass = classNames({
+      app: true,
+      light: theme === 'light',
+      dark: theme === 'dark'
+    });
     return (
-      <div className="app">
+      <div className={appClass}>
         {this.state.isMounted && !window.devToolsExtension && process.env.NODE_ENV === 'development' && <DevTools />}
         {this.props.children}
       </div>
@@ -23,7 +31,10 @@ class App extends React.Component {
 }
 
 App.propTypes = {
-  children: PropTypes.object
+  children: PropTypes.object,
+  route: PropTypes.shape({
+    theme: PropTypes.string.isRequired
+  }).isRequired
 };
 
 export default connect()(App);
diff --git a/client/modules/IDE/pages/IDEView.js b/client/modules/IDE/pages/IDEView.js
index 347ae957..1db87882 100644
--- a/client/modules/IDE/pages/IDEView.js
+++ b/client/modules/IDE/pages/IDEView.js
@@ -27,7 +27,6 @@ import SplitPane from 'react-split-pane';
 import Overlay from '../../App/components/Overlay';
 import SketchList from '../components/SketchList';
 import About from '../components/About';
-import classNames from 'classnames';
 
 class IDEView extends React.Component {
   constructor(props) {
@@ -157,13 +156,8 @@ class IDEView extends React.Component {
   }
 
   render() {
-    let ideClass = classNames({
-      ide: true,
-      light: this.props.preferences.theme === 'light',
-      dark: this.props.preferences.theme === 'dark',
-    });
     return (
-      <div className={ideClass}>
+      <div className="ide">
         {this.props.toast.isVisible && <Toast />}
         <Nav
           user={this.props.user}
diff --git a/client/routes.js b/client/routes.js
index b47056bc..f4549ed7 100644
--- a/client/routes.js
+++ b/client/routes.js
@@ -14,7 +14,7 @@ const checkAuth = (store) => {
 
 const routes = (store) =>
   (
-  <Route path="/" component={App}>
+  <Route path="/" component={App} theme={store.getState().preferences.theme}>
     <IndexRoute component={IDEView} onEnter={checkAuth(store)} />
     <Route path="/login" component={LoginView} />
     <Route path="/signup" component={SignupView} />
diff --git a/client/styles/abstracts/_mixins.scss b/client/styles/abstracts/_mixins.scss
index 53221891..54b836ec 100644
--- a/client/styles/abstracts/_mixins.scss
+++ b/client/styles/abstracts/_mixins.scss
@@ -3,13 +3,12 @@
     .#{$theme} & {
       // Define theme color
       $theme-map : (
-          color-alpha: blue
       ) !global;
       
       @each $key, $submap in $map {
         $value: map-fetch($themes, $theme '#{$key}');
         $theme-map: map-merge($theme-map, ($key: $value)) !global;
-      }
+      } 
       
       @content;
       
diff --git a/client/styles/abstracts/_placeholders.scss b/client/styles/abstracts/_placeholders.scss
index 53cb5890..2ad442eb 100644
--- a/client/styles/abstracts/_placeholders.scss
+++ b/client/styles/abstracts/_placeholders.scss
@@ -93,25 +93,21 @@
 	}
 }
 
-%fake-link {
-	color: $light-inactive-text-color;
-	cursor: pointer;
-	&:hover {
-		color: $light-primary-text-color;
-	}
-}
-
 %preference-option {
-	background-color: $light-button-background-color;
-	color: $light-inactive-text-color;
+	@include themify() {
+		background-color: transparent;
+		color: getThemifyVariable('inactive-text-color');
+		&:hover {
+			color: getThemifyVariable('primary-text-color');
+		}
+	}
 	font-size: #{12 / $base-font-size}rem;
 	cursor: pointer;
 	text-align: left;
 	margin-bottom: #{5 / $base-font-size}rem;
-	border: 0px;
-	&:hover {
-		color: $light-primary-text-color;
-	}
+	border: 0;
+	padding: 0;
+	list-style-type: none;
 }
 
 %modal {
diff --git a/client/styles/base/_base.scss b/client/styles/base/_base.scss
index 003a69ef..4883cc52 100644
--- a/client/styles/base/_base.scss
+++ b/client/styles/base/_base.scss
@@ -7,8 +7,10 @@ html, body {
 }
 
 body, input, button {
+	@include themify() {
+		color: getThemifyVariable('primary-text-color');
+	}
 	font-family: 'Avenir Next', Montserrat, sans-serif;
-	color: $light-primary-text-color;
 }
 
 body {
diff --git a/client/styles/components/_github-button.scss b/client/styles/components/_github-button.scss
index 79a782e1..1adf85d0 100644
--- a/client/styles/components/_github-button.scss
+++ b/client/styles/components/_github-button.scss
@@ -1,10 +1,6 @@
 .github-button {
   @include themify() {
     @extend %button;
-    width: #{300 / $base-font-size}rem;
-    display: flex;
-    justify-content: center;
-    align-items: center;
     & path {
       color: getThemifyVariable('primary-text-color');
     }
@@ -16,6 +12,10 @@
       border-color: getThemifyVariable('secondary-text-color');
     }
   }
+  width: #{300 / $base-font-size}rem;
+  display: flex;
+  justify-content: center;
+  align-items: center;
 }
 
 .github-icon {
diff --git a/client/styles/components/_nav.scss b/client/styles/components/_nav.scss
index 940f6af0..9e89723c 100644
--- a/client/styles/components/_nav.scss
+++ b/client/styles/components/_nav.scss
@@ -16,10 +16,6 @@
 	border-bottom: 2px dashed;
 }
 
-.nav__save, .nav__new {
-	@extend %fake-link;
-}
-
 .nav__item {
 	& + & {
 		margin-left: #{20 / $base-font-size}rem;
diff --git a/client/styles/components/_preferences.scss b/client/styles/components/_preferences.scss
index 1d35772e..a4cd20c2 100644
--- a/client/styles/components/_preferences.scss
+++ b/client/styles/components/_preferences.scss
@@ -88,17 +88,16 @@
 }
 
 .preference__option {
-	@extend %preference-option;
-	list-style-type: none;
-	padding: 0;
-	color: $light-inactive-text-color;
+	@include themify() {
+		@extend %preference-option;
+	}
 }
 
 .preference__preview-button {
-	@extend %preference-option;
-	padding: 0;
-	padding-left: #{110 / $base-font-size}rem;
-	outline: none;
+	@include themify() {
+		@extend %preference-option;
+		padding-left: #{110 / $base-font-size}rem;
+	}
 }
 
 .preference__options {
@@ -108,7 +107,10 @@
 }
 
 .preference__radio-button:checked + .preference__option {
-    color: $light-primary-text-color;
+	@include themify() {	
+		//for some reason this won't work for getThemifyVariable
+	  color: map-get($theme-map, 'primary-text-color');
+	}
 }
 
 .preference--hidden {
diff --git a/client/styles/components/_toolbar.scss b/client/styles/components/_toolbar.scss
index 0cf66900..ea88191f 100644
--- a/client/styles/components/_toolbar.scss
+++ b/client/styles/components/_toolbar.scss
@@ -1,13 +1,13 @@
 .toolbar__play-button {
 	@include themify() {
 		@extend %toolbar-button;
-		margin-right: #{15 / $base-font-size}rem;
 		&--selected {
 			@extend %toolbar-button--selected;
 		}
-		& span {
-			padding-left: #{2 / $base-font-size}rem;
-		}
+	}
+	margin-right: #{15 / $base-font-size}rem;
+	& span {
+		padding-left: #{2 / $base-font-size}rem;
 	}
 }
 
@@ -27,12 +27,12 @@
 .toolbar__preferences-button {
 	@include themify() {
 		@extend %toolbar-button;
-		line-height: #{50 / $base-font-size}rem;
-		margin-left: auto;
 		&--selected {
 			@extend %toolbar-button--selected;
 		}
 	}
+	line-height: #{50 / $base-font-size}rem;
+	margin-left: auto;
 }
 
 .toolbar__logo {