diff --git a/package.json b/package.json
index a179d93..0907efd 100644
--- a/package.json
+++ b/package.json
@@ -155,9 +155,9 @@
     "eslint": "^3.15.0",
     "exports-loader": "^0.6.3",
     "expose-loader": "^0.7.1",
-    "extract-text-webpack-plugin": "^1.0.1",
+    "extract-text-webpack-plugin": "^2.0.0-rc.3",
     "file-loader": "^0.9.0",
-    "html-webpack-plugin": "^2.25.0",
+    "html-webpack-plugin": "^2.28.0",
     "imports-loader": "^0.7.0",
     "json-loader": "^0.5.4",
     "less": "^2.7.1",
@@ -166,7 +166,7 @@
     "script-loader": "^0.7.0",
     "style-loader": "^0.13.1",
     "url-loader": "^0.5.7",
-    "webpack": "^1.14.0",
+    "webpack": "^2.2.1",
     "webpack-parallel-uglify-plugin": "^0.2.0"
   }
 }
diff --git a/public/views/includes/header.ejs b/public/views/includes/header.ejs
index 942a89f..e961a27 100644
--- a/public/views/includes/header.ejs
+++ b/public/views/includes/header.ejs
@@ -1,3 +1,3 @@
 <% for (var css in htmlWebpackPlugin.files.css) { %>
-<link href="<%= webpackConfig.output.baseUrl %><%= htmlWebpackPlugin.files.css[css] %>" rel="stylesheet">
+<link href="<%='\<\%- url \%\>'%><%= htmlWebpackPlugin.files.css[css] %>" rel="stylesheet">
 <% } %>
diff --git a/public/views/includes/scripts.ejs b/public/views/includes/scripts.ejs
index 20d4003..a083cd1 100644
--- a/public/views/includes/scripts.ejs
+++ b/public/views/includes/scripts.ejs
@@ -1,3 +1,3 @@
 <% for (var chunk in htmlWebpackPlugin.files.chunks) { %>
-<script src="<%= webpackConfig.output.baseUrl %><%= htmlWebpackPlugin.files.chunks[chunk].entry %>" defer></script>
+<script src="<%= '\<\%- url \%\>' %><%= htmlWebpackPlugin.files.chunks[chunk].entry %>" defer></script>
 <% } %>
diff --git a/webpack.config.js b/webpack.config.js
index 236490b..93edb00 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -13,13 +13,13 @@ module.exports = [Object.assign({}, baseConfig, {
     module: {
         loaders: [{
             test: /\.css$/,
-            loader: ExtractTextPlugin.extract('style-loader', 'css-loader')
+            loader: ExtractTextPlugin.extract({ fallback: 'style-loader', use: 'css-loader' })
         }, {
             test: /\.scss$/,
-            loader: ExtractTextPlugin.extract('style-loader', 'sass-loader')
+            loader: ExtractTextPlugin.extract({ fallback: 'style-loader', use: 'sass-loader' })
         }, {
             test: /\.less$/,
-            loader: ExtractTextPlugin.extract('style-loader', 'less-loader')
+            loader: ExtractTextPlugin.extract({ fallback: 'style-loader', use: 'less-loader' })
         }]
     },
     output: {
diff --git a/webpack.production.js b/webpack.production.js
index 7c690d2..945c176 100644
--- a/webpack.production.js
+++ b/webpack.production.js
@@ -37,13 +37,13 @@ module.exports = [Object.assign({}, baseConfig, {
     module: {
         loaders: [{
             test: /\.css$/,
-            loader: ExtractTextPlugin.extract('style-loader', 'css-loader')
+            loader: ExtractTextPlugin.extract({ fallback: 'style-loader', use: 'css-loader' })
         }, {
             test: /\.scss$/,
-            loader: ExtractTextPlugin.extract('style-loader', 'sass-loader')
+            loader: ExtractTextPlugin.extract({ fallback: 'style-loader', use: 'sass-loader' })
         }, {
             test: /\.less$/,
-            loader: ExtractTextPlugin.extract('style-loader', 'less-loader')
+            loader: ExtractTextPlugin.extract({ fallback: 'style-loader', use: 'less-loader' })
         }]
     },
     output: {
diff --git a/webpackBaseConfig.js b/webpackBaseConfig.js
index 1e28609..49a1ea4 100644
--- a/webpackBaseConfig.js
+++ b/webpackBaseConfig.js
@@ -151,7 +151,7 @@ module.exports = {
                 context: path.join(__dirname, 'node_modules/reveal.js'),
                 from: 'css',
                 to: 'reveal.js/'
-                },
+            },
             {
                 context: path.join(__dirname, 'node_modules/reveal.js'),
                 from: 'lib',
@@ -169,9 +169,9 @@ module.exports = {
         font: path.join(__dirname, 'public/css/google-font.css'),
         "font-pack": path.join(__dirname, 'public/css/font.css'),
         common: [
-            "expose?jQuery!expose?$!jquery",
+            "expose-loader?jQuery!expose-loader?$!jquery",
             "velocity-animate",
-            "imports?$=jquery!jquery-mousewheel",
+            "imports-loader?$=jquery!jquery-mousewheel",
             "bootstrap"
         ],
         cover: [
@@ -188,28 +188,28 @@ module.exports = {
         "cover-pack": [
             "babel-polyfill",
             "bootstrap-validator",
-            "script!listPagnation",
-            "expose?select2!select2",
-            "expose?moment!moment",
-            "script!js-url",
+            "script-loader!listPagnation",
+            "expose-loader?select2!select2",
+            "expose-loader?moment!moment",
+            "script-loader!js-url",
             path.join(__dirname, 'public/js/cover.js')
         ],
         index: [
             "babel-polyfill",
-            "script!jquery-ui-resizable",
-            "script!js-url",
-            "expose?filterXSS!xss",
-            "script!Idle.Js",
-            "expose?LZString!lz-string",
-            "script!codemirror",
-            "script!inlineAttachment",
-            "script!jqueryTextcomplete",
-            "script!codemirrorSpellChecker",
-            "script!codemirrorInlineAttachment",
-            "script!ot",
+            "script-loader!jquery-ui-resizable",
+            "script-loader!js-url",
+            "expose-loader?filterXSS!xss",
+            "script-loader!Idle.Js",
+            "expose-loader?LZString!lz-string",
+            "script-loader!codemirror",
+            "script-loader!inlineAttachment",
+            "script-loader!jqueryTextcomplete",
+            "script-loader!codemirrorSpellChecker",
+            "script-loader!codemirrorInlineAttachment",
+            "script-loader!ot",
             "flowchart.js",
             "js-sequence-diagrams",
-            "expose?RevealMarkdown!reveal-markdown",
+            "expose-loader?RevealMarkdown!reveal-markdown",
             path.join(__dirname, 'public/js/google-drive-upload.js'),
             path.join(__dirname, 'public/js/google-drive-picker.js'),
             path.join(__dirname, 'public/js/index.js')
@@ -242,41 +242,41 @@ module.exports = {
         ],
         "index-pack": [
             "babel-polyfill",
-            "expose?Spinner!spin.js",
-            "script!jquery-ui-resizable",
+            "expose-loader?Spinner!spin.js",
+            "script-loader!jquery-ui-resizable",
             "bootstrap-validator",
-            "expose?jsyaml!js-yaml",
-            "script!mermaid",
-            "expose?moment!moment",
-            "script!js-url",
-            "script!handlebars",
-            "expose?hljs!highlight.js",
-            "expose?emojify!emojify.js",
-            "expose?filterXSS!xss",
-            "script!Idle.Js",
-            "script!gist-embed",
-            "expose?LZString!lz-string",
-            "script!codemirror",
-            "script!inlineAttachment",
-            "script!jqueryTextcomplete",
-            "script!codemirrorSpellChecker",
-            "script!codemirrorInlineAttachment",
-            "script!ot",
+            "expose-loader?jsyaml!js-yaml",
+            "script-loader!mermaid",
+            "expose-loader?moment!moment",
+            "script-loader!js-url",
+            "script-loader!handlebars",
+            "expose-loader?hljs!highlight.js",
+            "expose-loader?emojify!emojify.js",
+            "expose-loader?filterXSS!xss",
+            "script-loader!Idle.Js",
+            "script-loader!gist-embed",
+            "expose-loader?LZString!lz-string",
+            "script-loader!codemirror",
+            "script-loader!inlineAttachment",
+            "script-loader!jqueryTextcomplete",
+            "script-loader!codemirrorSpellChecker",
+            "script-loader!codemirrorInlineAttachment",
+            "script-loader!ot",
             "flowchart.js",
             "js-sequence-diagrams",
-            "expose?Viz!viz.js",
-            "expose?io!socket.io-client",
-            "expose?RevealMarkdown!reveal-markdown",
+            "expose-loader?Viz!viz.js",
+            "expose-loader?io!socket.io-client",
+            "expose-loader?RevealMarkdown!reveal-markdown",
             path.join(__dirname, 'public/js/google-drive-upload.js'),
             path.join(__dirname, 'public/js/google-drive-picker.js'),
             path.join(__dirname, 'public/js/index.js')
         ],
         pretty: [
             "babel-polyfill",
-            "expose?filterXSS!xss",
+            "expose-loader?filterXSS!xss",
             "flowchart.js",
             "js-sequence-diagrams",
-            "expose?RevealMarkdown!reveal-markdown",
+            "expose-loader?RevealMarkdown!reveal-markdown",
             path.join(__dirname, 'public/js/pretty.js')
         ],
         "pretty-styles": [
@@ -293,27 +293,27 @@ module.exports = {
         ],
         "pretty-pack": [
             "babel-polyfill",
-            "expose?jsyaml!js-yaml",
-            "script!mermaid",
-            "expose?moment!moment",
-            "script!handlebars",
-            "expose?hljs!highlight.js",
-            "expose?emojify!emojify.js",
-            "expose?filterXSS!xss",
-            "script!gist-embed",
+            "expose-loader?jsyaml!js-yaml",
+            "script-loader!mermaid",
+            "expose-loader?moment!moment",
+            "script-loader!handlebars",
+            "expose-loader?hljs!highlight.js",
+            "expose-loader?emojify!emojify.js",
+            "expose-loader?filterXSS!xss",
+            "script-loader!gist-embed",
             "flowchart.js",
             "js-sequence-diagrams",
-            "expose?Viz!viz.js",
-            "expose?RevealMarkdown!reveal-markdown",
+            "expose-loader?Viz!viz.js",
+            "expose-loader?RevealMarkdown!reveal-markdown",
             path.join(__dirname, 'public/js/pretty.js')
         ],
         slide: [
             "babel-polyfill",
             "bootstrap-tooltip",
-            "expose?filterXSS!xss",
+            "expose-loader?filterXSS!xss",
             "flowchart.js",
             "js-sequence-diagrams",
-            "expose?RevealMarkdown!reveal-markdown",
+            "expose-loader?RevealMarkdown!reveal-markdown",
             path.join(__dirname, 'public/js/slide.js')
         ],
         "slide-styles": [
@@ -329,24 +329,24 @@ module.exports = {
         ],
         "slide-pack": [
             "babel-polyfill",
-            "expose?jQuery!expose?$!jquery",
+            "expose-loader?jQuery!expose-loader?$!jquery",
             "velocity-animate",
-            "imports?$=jquery!jquery-mousewheel",
+            "imports-loader?$=jquery!jquery-mousewheel",
             "bootstrap-tooltip",
-            "expose?jsyaml!js-yaml",
-            "script!mermaid",
-            "expose?moment!moment",
-            "script!handlebars",
-            "expose?hljs!highlight.js",
-            "expose?emojify!emojify.js",
-            "expose?filterXSS!xss",
-            "script!gist-embed",
+            "expose-loader?jsyaml!js-yaml",
+            "script-loader!mermaid",
+            "expose-loader?moment!moment",
+            "script-loader!handlebars",
+            "expose-loader?hljs!highlight.js",
+            "expose-loader?emojify!emojify.js",
+            "expose-loader?filterXSS!xss",
+            "script-loader!gist-embed",
             "flowchart.js",
             "js-sequence-diagrams",
-            "expose?Viz!viz.js",
+            "expose-loader?Viz!viz.js",
             "headjs",
-            "expose?Reveal!reveal.js",
-            "expose?RevealMarkdown!reveal-markdown",
+            "expose-loader?Reveal!reveal.js",
+            "expose-loader?RevealMarkdown!reveal-markdown",
             path.join(__dirname, 'public/js/slide.js')
         ]
     },
@@ -354,16 +354,15 @@ module.exports = {
     output: {
         path: path.join(__dirname, 'public/build'),
         publicPath: '/build/',
-        filename: '[name].js',
-        baseUrl: '<%- url %>'
+        filename: '[name].js'
     },
 
     resolve: {
-        modulesDirectories: [
+        modules: [
             path.resolve(__dirname, 'src'),
             path.resolve(__dirname, 'node_modules')
         ],
-        extensions: ["", ".js"],
+        extensions: [".js"],
         alias: {
             codemirror: path.join(__dirname, 'node_modules/codemirror/codemirror.min.js'),
             inlineAttachment: path.join(__dirname, 'public/vendor/inlineAttachment/inline-attachment.js'),
@@ -394,43 +393,43 @@ module.exports = {
     },
 
     module: {
-        loaders: [{
+        rules: [{
             test: /\.json$/,
             loader: 'json-loader'
         }, {
             test: /\.js$/,
-            loader: 'babel',
+            loader: 'babel-loader',
             exclude: [/node_modules/, /public\/vendor/]
         }, {
             test: /\.css$/,
-            loader: ExtractTextPlugin.extract('style-loader', 'css-loader')
+            loader: ExtractTextPlugin.extract({ fallback: 'style-loader', use: 'css-loader' })
         }, {
             test: /\.scss$/,
-            loader: ExtractTextPlugin.extract('style-loader', 'sass-loader')
+            loader: ExtractTextPlugin.extract({ fallback: 'style-loader', use: 'sass-loader' })
         }, {
             test: /\.less$/,
-            loader: ExtractTextPlugin.extract('style-loader', 'less-loader')
+            loader: ExtractTextPlugin.extract({ fallback: 'style-loader', use: 'less-loader' })
         }, {
             test: require.resolve("js-sequence-diagrams"),
-            loader: "imports?Raphael=raphael"
+            loader: "imports-loader?Raphael=raphael"
         }, {
             test: /\.eot(\?v=\d+\.\d+\.\d+)?$/,
-            loader: "file"
+            loader: "file-loader"
         }, {
             test: /\.(woff|woff2)(\?v=\d+\.\d+\.\d+)?$/,
-            loader: "url?prefix=font/&limit=5000"
+            loader: "url-loader?prefix=font/&limit=5000"
         }, {
             test: /\.ttf(\?v=\d+\.\d+\.\d+)?$/,
-            loader: "url?limit=10000&mimetype=application/octet-stream"
+            loader: "url-loader?limit=10000&mimetype=application/octet-stream"
         }, {
             test: /\.svg(\?v=\d+\.\d+\.\d+)?$/,
-            loader: "url?limit=10000&mimetype=image/svg+xml"
+            loader: "url-loader?limit=10000&mimetype=image/svg+xml"
         }, {
             test: /\.png(\?v=\d+\.\d+\.\d+)?$/,
-            loader: "url?limit=10000&mimetype=image/png"
+            loader: "url-loader?limit=10000&mimetype=image/png"
         }, {
             test: /\.gif(\?v=\d+\.\d+\.\d+)?$/,
-            loader: "url?limit=10000&mimetype=image/gif"
+            loader: "url-loader?limit=10000&mimetype=image/gif"
         }]
     },