diff --git a/webpack.common.js b/webpack.common.js
index 823a9b16c5..c4f0d9dc5b 100644
--- a/webpack.common.js
+++ b/webpack.common.js
@@ -98,7 +98,6 @@ module.exports = {
             { from: './src/images', to: 'images' },
             { from: './src/lib', to: 'lib' },
             { from: './src/models', to: 'models' },
-            { from: './src/scripts', to: 'scripts' },
             { from: './src/content/autofill.css', to: 'content' }
         ])
     ],
diff --git a/webpack.prod.js b/webpack.prod.js
index 9ee986bf4c..7d4c259ab6 100644
--- a/webpack.prod.js
+++ b/webpack.prod.js
@@ -1,6 +1,13 @@
 const merge = require('webpack-merge');
 const ExtractTextPlugin = require('extract-text-webpack-plugin');
 const common = require('./webpack.common.js');
+const webpack = require('webpack');
+
+const extractLess = new ExtractTextPlugin({
+    filename: 'popup/css/[name].css',
+    disable: false,
+    allChunks: true
+});
 
 module.exports = merge(common, {
     module: {
@@ -23,12 +30,8 @@ module.exports = merge(common, {
     plugins: [
         new webpack.SourceMapDevToolPlugin({
             filename: '[name].js.map',
-            exclude: ['vendor.js', 'popup/vendor.js']
+            include: ['background.js', 'popup/app.js']
         }),
-        new ExtractTextPlugin({
-            filename: 'popup/css/[name].css',
-            disable: false,
-            allChunks: true
-        })
+        extractLess
     ]
 });