diff --git a/public/views/foot.ejs b/public/views/foot.ejs
index 0ad10546..7df96b58 100644
--- a/public/views/foot.ejs
+++ b/public/views/foot.ejs
@@ -31,7 +31,7 @@
 <script src="<%- url %>/vendor/codemirror-spell-checker/spell-checker.min.js" defer></script>
 <script src="<%- url %>/vendor/ot/ot.min.js" defer></script>
 <script src="<%- url %>/vendor/xss.min.js" defer></script>
-<script src="<%- url %>/build/js/app.js" defer></script>
+<script src="<%- url %>/build/app.js" defer></script>
 <script src="<%- url %>/js/google-drive-upload.js" defer></script>
 <script src="<%- url %>/js/google-drive-picker.js" defer></script>
 <script src="<%- url %>/js/reveal-markdown.js" defer></script>
diff --git a/public/views/head.ejs b/public/views/head.ejs
index 6890ddf3..2aa85689 100644
--- a/public/views/head.ejs
+++ b/public/views/head.ejs
@@ -36,6 +36,7 @@
 <link rel="stylesheet" href="<%- url %>/vendor/showup/showup.css">
 <link rel="stylesheet" href="<%- url %>/css/mermaid.css">
 <link rel="stylesheet" href="<%- url %>/css/markdown.css">
+<link rel="stylesheet" href="<%- url %>/build/app.css">
 <link rel="stylesheet" href="<%- url %>/css/index.css">
 <link rel="stylesheet" href="<%- url %>/css/extra.css">
 <link rel="stylesheet" href="<%- url %>/css/slide-preview.css">
diff --git a/webpack.config.js b/webpack.config.js
index cad356fb..8fce2653 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -20,7 +20,8 @@ module.exports = {
         }),
         new webpack.DefinePlugin({
             "require.specified": "require.resolve"
-        })
+        }),
+        new ExtractTextPlugin("[name].css")
     ],
 
     entry: {
@@ -28,7 +29,7 @@ module.exports = {
     },
 
     output: {
-        path: path.join(__dirname, 'public/build/js'),
+        path: path.join(__dirname, 'public/build'),
         filename: '[name].js'
     },
 
@@ -49,10 +50,10 @@ module.exports = {
             loader: 'json-loader'
         }, {
             test: /\.css$/,
-            loader: 'style-loader!css-loader'
+            loader: ExtractTextPlugin.extract('style-loader', 'css-loader')
         }, , {
             test: /\.scss$/,
-            loaders: ['style', 'css', 'sass']
+            loader: ExtractTextPlugin.extract('style-loader', 'sass-loader')
         }, {
             test: require.resolve("js-sequence-diagrams"),
             loader: "imports?Raphael=raphael"