diff --git a/components/button.cjsx b/components/button.cjsx
index 31817aba..4f9e9351 100644
--- a/components/button.cjsx
+++ b/components/button.cjsx
@@ -37,7 +37,6 @@ module.exports = React.createClass
 
   # -- Render
   render: ->
-    console.log "ripple", @state.ripple
     <button data-component-button={@props.type}
             onClick={@onClick}
             className={@props.style}
diff --git a/components/style/__constants.styl b/components/style/__constants.styl
index d740c694..ca38c40f 100644
--- a/components/style/__constants.styl
+++ b/components/style/__constants.styl
@@ -1,4 +1,4 @@
-@import url('http://fonts.googleapis.com/css?family=Roboto:300,400,700')
+// @import url('http://fonts.googleapis.com/css?family=Roboto:300,400,700')
 
 // -- Colors
 COLOR                       = #222222
@@ -47,7 +47,7 @@ ANIMATION_DELAY             = (ANIMATION_DURATION / 5)
 // normalize v3.0.2 | MIT License | git.io/normalize
 
 html
-  font-family sans-serif
+  font-family Roboto, sans-serif
   -ms-text-size-adjust 100%
   -webkit-text-size-adjust 100%
 
diff --git a/components/style/button.styl b/components/style/button.styl
index 59e8b3d7..db5f07a5 100644
--- a/components/style/button.styl
+++ b/components/style/button.styl
@@ -5,7 +5,7 @@
   display                       : inline-block
   position                      : relative
   overflow                      : hidden
-  font-weight                   : normal
+  font-weight                   : FONT_WEIGHT_NORMAL
   text-align                    : center
   text-decoration               : none
   white-space                   : nowrap
diff --git a/package.json b/package.json
index 8a373285..560d294d 100644
--- a/package.json
+++ b/package.json
@@ -1,22 +1,36 @@
 {
-  "name": "react-kit",
-  "version": "0.6.7",
-  "description": "",
-  "homepage": "http://zetapath.com",
-  "author": "Zetapath LTD.",
+  "name"        : "react-kit",
+  "version"     : "0.6.13",
+  "description" : "",
+  "homepage"    : "http://zetapath.com",
+  "author"      : "Zetapath LTD.",
+  "main"        : "./components",
+  "scripts": {
+    "start"     : "npm run build & npm run server",
+    "server"    : "webpack-dev-server --hot",
+    "build"     : "webpack",
+    "watch"     : "webpack --watch",
+    "deploy"    : "NODE_ENV=production webpack -p"
+  },
+  "keywords": [
+    "react",
+    "react-component",
+    "material design",
+    "toolkit"
+  ],
+  "license": "MIT",
   "dependencies": {
     "coffee-script": "*"
   },
   "devDependencies": {
-    "css-loader": "^0.14.5",
-    "node-libs-browser": "^0.5.2",
-    "react": "^0.13.2",
-    "style-loader": "^0.12.3",
-    "stylus-loader": "^1.2.0",
-    "webpack": "^1.9.10"
-  },
-  "scripts": {
-    "start" : "webpack-dev-server --devtool eval --watch",
-    "deploy": "NODE_ENV=production webpack -p"
+    "css-loader"                  : "^0.14.5",
+    "classnames"                  : "^2.1.2",
+    "extract-text-webpack-plugin" : "^0.8.1",
+    "node-libs-browser"           : "^0.5.2",
+    "react"                       : "^0.13.2",
+    "react-inline"                : "^0.6.2",
+    "style-loader"                : "^0.12.3",
+    "stylus-loader"               : "^1.2.0",
+    "webpack"                     : "^1.9.10"
   }
 }
diff --git a/spec/index.html b/spec/index.html
index 6b89583d..e6534b26 100644
--- a/spec/index.html
+++ b/spec/index.html
@@ -13,6 +13,8 @@
     <meta name="format-detection" content="telephone=no">
     <meta name="HandheldFriendly" content="True">
     <meta http-equiv="cleartype" content="on">
+    <link href='http://fonts.googleapis.com/css?family=Roboto:300,400,700' rel='stylesheet' type='text/css'>
+    <link href="../build/react-kit.css" rel='stylesheet' type='text/css'>
   </head>
   <body>
     <script src="../node_modules/react/dist/react-with-addons.js"></script>
diff --git a/webpack.config.coffee b/webpack.config.coffee
index 6390a8b0..71f486e9 100644
--- a/webpack.config.coffee
+++ b/webpack.config.coffee
@@ -1,7 +1,9 @@
 "use strict"
 
-pkg           = require "./package.json"
-node_modules  = __dirname + '/node_modules'
+pkg               = require './package.json'
+node_modules      = __dirname + '/node_modules'
+ExtractTextPlugin = require('extract-text-webpack-plugin')
+environment       = process.env.NODE_ENV
 
 module.exports =
   cache       : true
@@ -10,17 +12,17 @@ module.exports =
 
   context     : __dirname + '/spec'
 
-  entry       : ['./index.cjsx']
+  entry       : [ 'webpack/hot/dev-server', './index.cjsx']
 
   output :
-    path      : if process.env.NODE_ENV is 'production' then './dist' else './build'
+    path      : if environment is 'production' then './dist' else './build'
     filename  : pkg.name + '.js'
     publicPath: '/build/'
 
   devServer:
     # contentBase : "./build"
-    # host        : "localhost"
-    # port        : 8000
+    host        : "localhost"
+    port        : 8080
     # colors      : true
     # progress    : true
     # noInfo      : false
@@ -35,5 +37,9 @@ module.exports =
     ,
       test    : /\.coffee$/,  loader: 'coffee-jsx-loader'
     ,
-      test    : /\.styl$/,    loader: 'style-loader!css-loader!stylus-loader?importLoaders=1&minimize!'
+      test    : /\.styl$/,    loader: ExtractTextPlugin.extract('style-loader', 'css-loader!stylus-loader!')
     ]
+
+  plugins: [
+    new ExtractTextPlugin pkg.name + '.css', allChunks: true
+  ]
