diff --git a/browser/styles/index.styl b/browser/styles/index.styl
new file mode 100644
index 00000000..a00ef8a5
--- /dev/null
+++ b/browser/styles/index.styl
@@ -0,0 +1,32 @@
+$brand-color = #2BAC8F
+
+$danger-color = red
+$danger-lighten-color = #FFE5E6
+
+
+/*
+* # Border
+*/
+$border-color = #D0D0D0
+$active-border-color = #369DCD
+
+$default-border = solid 1px $border-color
+$active-border = solid 1px $active-border-color
+
+/**
+* # Modal Stuff
+* These will be moved lib/modal
+*/
+
+$modal-z-index = 1002
+$modal-background = white
+$modal-margin = 64px auto 0
+$modal-border-radius = 5px
+
+modal()
+  position relative
+  z-index $modal-z-index
+  margin $modal-margin
+  background-color $modal-background
+  overflow hidden
+  border-radius $modal-border-radius
diff --git a/browser/styles/main/index.styl b/browser/styles/main/index.styl
index 69bce492..25d81076 100644
--- a/browser/styles/main/index.styl
+++ b/browser/styles/main/index.styl
@@ -1,4 +1,3 @@
-@import '../../../node_modules/nib/lib/nib'
 @import '../vars'
 @import '../mixins/*'
 global-reset()
diff --git a/webpack-production.config.js b/webpack-production.config.js
index 5ef9440e..cbb9cbc2 100644
--- a/webpack-production.config.js
+++ b/webpack-production.config.js
@@ -14,7 +14,7 @@ var config = Object.assign({}, skeleton, {
       {
         test: /\.styl?$/,
         exclude: /(node_modules|bower_components)/,
-        loader: 'style-loader!css-loader!stylus-loader'
+        loader: 'style!css?modules&importLoaders=1&localIdentName=[path]___[name]__[local]___[hash:base64:5]!stylus?sourceMap'
       }
     ]
   },
diff --git a/webpack.config.js b/webpack.config.js
index 5078168f..2cc1131c 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -12,7 +12,7 @@ var config = Object.assign({}, skeleton, {
       {
         test: /\.styl?$/,
         exclude: /(node_modules|bower_components)/,
-        loader: 'style-loader!css-loader!stylus-loader'
+        loader: 'style!css?modules&importLoaders=1&localIdentName=[path]___[name]__[local]___[hash:base64:5]!stylus?sourceMap'
       }
     ]
   },