diff --git a/webpack/webpack.config.dev.js b/webpack/webpack.config.dev.js
index 009789c..5d0735a 100644
--- a/webpack/webpack.config.dev.js
+++ b/webpack/webpack.config.dev.js
@@ -23,8 +23,9 @@ const webpackConfig = {
   entry: {
     main: [
       'babel-polyfill',
-      'webpack-hot-middleware/client?path=' + host + '__webpack_hmr',
       'react-hot-loader/patch',
+      'webpack-dev-server/client?' + host,
+      'webpack/hot/only-dev-server',
       'font-awesome-loader!./src/assets/fontawesome/font-awesome.config.js',
       'bootstrap-loader',
       srcPath + 'index'
@@ -196,13 +197,30 @@ const webpackConfig = {
       filename: distPath + 'index.html'
     }),
     new webpack.HotModuleReplacementPlugin(),
+    new webpack.NamedModulesPlugin(),
+    new webpack.NoEmitOnErrorsPlugin(),
     new webpack.DefinePlugin({
       'process.env': {
-        'NODE_ENV': JSON.stringify('development')
+        NODE_ENV: JSON.stringify('development')
       }
     }),
     webpackIsomorphicToolsPlugin.development()
   ],
+  devServer: {
+    host: hostname,
+    port,
+    historyApiFallback: true,
+    hot: true,
+    compress: true,
+    contentBase: distPath,
+    headers: { 'Access-Control-Allow-Origin': '*' },
+    publicPath: host,
+    quiet: false,
+    noInfo: false,
+    stats: { colors: true },
+    index: 'index.html',
+
+  },
   resolve: {
     extensions: ['.js', '.jsx'],
   }
diff --git a/webpack/webpack.devServer.js b/webpack/webpack.devServer.js
deleted file mode 100644
index e2edf08..0000000
--- a/webpack/webpack.devServer.js
+++ /dev/null
@@ -1,33 +0,0 @@
-import express from 'express';
-import webpack from 'webpack';
-import webpackDevMiddleware from 'webpack-dev-middleware';
-import webpackHotMiddleware from 'webpack-hot-middleware';
-import historyApiFallback from 'connect-history-api-fallback';
-import webpackConfig from './webpack.config.dev';
-import config from '../src/config';
-
-const compiler = webpack(webpackConfig);
-const host = config.host;
-const port = config.hotLoadPort;
-const serverOptions = {
-  noInfo: true,
-  quiet: true,
-  lazy: false,
-  publicPath: webpackConfig.output.publicPath,
-  index: 'index.html',
-  headers: { 'Access-Control-Allow-Origin': '*' },
-  stats: { colors: true }
-};
-
-const app = express();
-app.use(historyApiFallback());
-app.use(webpackDevMiddleware(compiler, serverOptions));
-app.use(webpackHotMiddleware(compiler));
-
-app.listen(port, (err) => {
-  if (err) {
-    console.error(`=> OMG!!! 🙀 ${err}`);
-  } else {
-    console.info('==> 🚧  Webpack development server listening at http://%s:%s', host, port);
-  }
-});