diff --git a/build.js b/build.js
index 374f241..6008d45 100644
--- a/build.js
+++ b/build.js
@@ -2,8 +2,11 @@
 var exec = require('child_process').exec;
 
 var executable = (!process.argv[3].indexOf('server')) ? 'webpack-dev-server' : 'webpack';
-var cmdLine = '"./node_modules/.bin/' + executable + '"';
+var cmdLine = `"./node_modules/.bin/${executable}"`;
 var environ = (!process.argv[2].indexOf('development')) ? 'development' : 'production';
+
+cmdLine += (environ === 'production' && executable === 'webpack-dev-server') ? ' --hot --inline' : '';
+
 var command;
 
 if (process.platform === 'win32') {
diff --git a/package.json b/package.json
index 618a110..dc01389 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,7 @@
     "babel-preset-es2015": "6.18.0",
     "babel-preset-react": "6.22.0",
     "css-loader": "0.14.5",
-    "extract-text-webpack-plugin": "2.0.0-beta.5",
+    "extract-text-webpack-plugin": "^2",
     "file-loader": "0.8.5",
     "html-webpack-plugin": "2.26.0",
     "node-sass": "3.12.2",
diff --git a/webpack.config.js b/webpack.config.js
index 4dfe22f..9d7dfb1 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -98,9 +98,9 @@ module.exports = {
       {
         test: /\.scss$/,
         use: isProd ?
-          extractCSS.extract({
-            fallbackLoader: 'style-loader',
-            loader: ['css-loader', 'sass-loader'],
+          ExtractTextPlugin.extract({
+            fallback: 'style-loader',
+            use: ['css-loader', 'sass-loader'],
           }) :
           ['style-loader', 'css-loader', 'sass-loader']
       },