diff --git a/package.json b/package.json
index 7511b872..767e502d 100644
--- a/package.json
+++ b/package.json
@@ -1,55 +1,62 @@
 {
-  "name"                          : "react-toolbox",
-  "version"                       : "0.6.28",
-  "description"                   : "A set of complementary tools to ReactJS.",
-  "homepage"                      : "http://zetapath.com",
-  "author"                        : "Javi Jimenez Villar <hi@soyjavi.com> (http://soyjavi.com/)",
-  "main"                          : "./components",
-  "directories" : {
-    "react-toolbox"               : "./react-toolbox/components"
+  "name": "react-toolbox",
+  "version": "0.6.28",
+  "description": "A set of complementary tools to ReactJS.",
+  "homepage": "http://zetapath.com",
+  "author": "Javi Jimenez Villar <hi@soyjavi.com> (http://soyjavi.com/)",
+  "main": "./components",
+  "directories": {
+    "react-toolbox": "./react-toolbox/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",
-    "test"                        : "karma start",
-    "test:watch"                  : "karma start --no-single-run"
+  "scripts": {
+    "start": "npm run build & npm run server",
+    "server": "webpack-dev-server --hot",
+    "build": "webpack",
+    "watch": "webpack --watch",
+    "deploy": "NODE_ENV=production webpack -p",
+    "test": "karma start",
+    "test:watch": "karma start --no-single-run"
   },
-  "bugs" : {
-    "url"                         : "https://github.com/soyjavi/react-toolbox/issues",
-    "email"                       : "issues@react-toolbox.com"
+  "bugs": {
+    "url": "https://github.com/react-toolbox/react-toolbox/issues",
+    "email": "issues@react-toolbox.com"
   },
-  "keywords"                      : [ "react", "react-component", "material design", "toolkit", "components"],
-  "license"                       : "MIT",
-  "dependencies" : {
-    "react"                       : "^0.13.2"
+  "keywords": [
+    "react",
+    "react-component",
+    "material design",
+    "toolkit",
+    "components"
+  ],
+  "license": "MIT",
+  "dependencies": {
+    "react": "^0.13.2"
   },
   "devDependencies": {
-    "autoprefixer-core"           : "^5.1.11",
-    "babel-core"                  : "^5.8.23",
-    "babel-loader"                : "^5.3.2",
-    "babel-runtime"               : "^5.8.20",
-    "css-loader"                  : "^0.14.5",
-    "eslint"                      : "^1.3.1",
-    "eslint-plugin-react"         : "^3.3.1",
-    "extract-text-webpack-plugin" : "^0.8.1",
-    "expect"                      : "^1.8.0",
-    "karma"                       : "^0.13.3",
-    "karma-chrome-launcher"       : "^0.2.0",
-    "karma-cli"                   : "^0.1.0",
-    "karma-mocha"                 : "^0.2.0",
-    "karma-phantomjs-launcher"    : "~0.1",
-    "karma-webpack"               : "^1.7.0",
-    "node-libs-browser"           : "^0.5.2",
-    "phantomjs-polyfill"          : "0.0.1",
-    "postcss-loader"              : "^0.4.3",
-    "sinon"                       : "git://github.com/cjohansen/Sinon.JS#sinon-2.0",
-    "style-loader"                : "^0.12.3",
-    "stylus-loader"               : "^1.2.0",
-    "webpack"                     : "1.10.1",
-    "webpack-dev-server"          : "*"
+    "autoprefixer-core": "^5.1.11",
+    "babel-core": "^5.8.23",
+    "babel-loader": "^5.3.2",
+    "babel-runtime": "^5.8.20",
+    "css-loader": "^0.14.5",
+    "eslint": "^1.3.1",
+    "eslint-plugin-react": "^3.3.1",
+    "expect": "^1.8.0",
+    "extract-text-webpack-plugin": "^0.8.1",
+    "karma": "^0.13.3",
+    "karma-chrome-launcher": "^0.2.0",
+    "karma-cli": "^0.1.0",
+    "karma-mocha": "^0.2.0",
+    "karma-phantomjs-launcher": "~0.1",
+    "karma-webpack": "^1.7.0",
+    "node-libs-browser": "^0.5.2",
+    "phantomjs-polyfill": "0.0.1",
+    "postcss-loader": "^0.4.3",
+    "react-hot-loader": "^1.3.0",
+    "sinon": "git://github.com/cjohansen/Sinon.JS#sinon-2.0",
+    "style-loader": "^0.12.3",
+    "stylus-loader": "^1.2.0",
+    "webpack": "1.10.1",
+    "webpack-dev-server": "*"
   },
-  "repository"                    : "github:soyjavi/react-toolbox"
+  "repository": "github:react-toolbox/react-toolbox"
 }
diff --git a/webpack.config.js b/webpack.config.js
index d05411f4..7e2d3560 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -26,7 +26,7 @@ module.exports = {
   module: {
     noParse: [node_modules + '/react/dist/*.js'],
     loaders: [
-      { test: /(\.js|\.jsx)$/, exclude: /(node_modules)/, loader: 'babel?optional=runtime' },
+      { test: /(\.js|\.jsx)$/, exclude: /(node_modules)/, loaders: ['react-hot', 'babel'] },
       { test: /\.styl$/, loader: ExtractTextPlugin.extract('style-loader', 'css-loader?modules&importLoaders=1&localIdentName=[name]__[local]___[hash:base64:5]!postcss-loader!stylus-loader!') }
     ]
   },