diff --git a/server/test_with_browser.py b/server/test_with_browser.py
index 65ea2b2..c060bca 100755
--- a/server/test_with_browser.py
+++ b/server/test_with_browser.py
@@ -31,6 +31,7 @@ def get_webdriver():
             driver.install_addon(str(addon_path), temporary=True)
             yield driver
         finally:
+            # confirm('ready to continue?')
             driver.close()
 
 
diff --git a/src/background.html b/src/background.html
deleted file mode 100644
index 384a69f..0000000
--- a/src/background.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <meta charset="UTF-8">
-  <title></title>
-</head>
-<body>
-</body>
-</html>
diff --git a/src/js/options_page.js b/src/js/options_page.js
index 85ee071..8938ac6 100644
--- a/src/js/options_page.js
+++ b/src/js/options_page.js
@@ -47,6 +47,7 @@ function refreshPermissionValidation(endpoint: string) {
 }
 
 function restoreOptions() {
+    getSaveButton().addEventListener('click', saveOptions);
     get_options(opts => {
         const ep = opts.endpoint;
         getEndpoint().value = ep;
@@ -74,4 +75,3 @@ function saveOptions() {
 
 
 document.addEventListener('DOMContentLoaded', restoreOptions);
-getSaveButton().addEventListener('click', saveOptions);
diff --git a/src/manifest.json b/src/manifest.json
index e01685d..331c235 100644
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -1,14 +1,13 @@
 {
-  "icons": {
-      "128": "unicorn.png"
+  "name": "<webpack managed>",
+  "version": "<webpack managed>",
+  "background": {
+      "scripts": ["background.js"],
+      "persistent": false
   },
   "options_ui": {
       "page": "options.html"
   },
-
-  "background": {
-    "page": "background.html"
-  },
   "browser_action": {
       "default_icon": "unicorn.png",
       "default_popup": "popup.html",
@@ -22,5 +21,8 @@
       "description": "Capture page, with extra information"
     }
   },
+  "icons": {
+      "128": "unicorn.png"
+  },
   "manifest_version": 2
 }
diff --git a/src/options.html b/src/options.html
index 8b12c4b..d669a1a 100644
--- a/src/options.html
+++ b/src/options.html
@@ -2,7 +2,7 @@
 <html lang="en">
 <head>
   <meta charset="UTF-8">
-  <title></title>
+  <script type="text/javascript" src="options_page.js"/></script>
   <style>
    input:invalid {
        background-color: red;
diff --git a/src/popup.html b/src/popup.html
index 67926e8..20b3d15 100644
--- a/src/popup.html
+++ b/src/popup.html
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
   <meta charset="UTF-8">
+  <script type="text/javascript" src="popup.js"></script>
 </head>
 <body>
     <!-- TODO ugh didn't work -->
diff --git a/webpack.config.js b/webpack.config.js
index 0826fbd..8d25036 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -2,8 +2,7 @@ const webpack = require('webpack'),
       path = require('path'),
       CleanWebpackPlugin = require('clean-webpack-plugin'),
       CopyWebpackPlugin = require('copy-webpack-plugin'),
-      WebpackExtensionManifestPlugin = require('webpack-extension-manifest-plugin'),
-      HtmlWebpackPlugin = require('html-webpack-plugin');
+      WebpackExtensionManifestPlugin = require('webpack-extension-manifest-plugin');
 // TODO remove plugins from package.json
 
 const T = {
@@ -79,26 +78,23 @@ if (target === T.FIREFOX) {
     manifestExtra.browser_action = {browser_style: true};
 }
 
-var fileExtensions = ["jpg", "jpeg", "png", "gif", "eot", "otf", "svg", "ttf", "woff", "woff2"];
-
 const build_path = path.join(__dirname, "dist"); // TODO target??
 
-var options = {
-  mode: 'production', // TODO eh??
+const options = {
+  mode: dev ? 'development' : 'production', // TODO map directly from MODE env var?
   optimization: {
     // https://webpack.js.org/configuration/optimization
     // don't think minimize worth it for such a tiny extension
     minimize: false
   },
   entry: {
-    popup     : path.join(__dirname, "src", "js", "popup.js"),
-    options   : path.join(__dirname, "src", "js", "options_page.js"),
-    background: path.join(__dirname, "src", "js", "background.js")
+    background  : path.join(__dirname, "src", "js", "background"),
+    popup       : path.join(__dirname, "src", "js", "popup"),
+    options_page: path.join(__dirname, "src", "js", "options_page"),
   },
   output: {
       path: build_path,
-      // TODO why bundle???
-      filename: "[name].bundle.js",
+      filename: "[name].js",
   },
   module: {
     rules: [
@@ -111,12 +107,7 @@ var options = {
       },
       {
         test: /\.css$/,
-        loader: "style-loader!css-loader",
-        exclude: /node_modules/
-      },
-      {
-        test: new RegExp('\.(' + fileExtensions.join('|') + ')$'),
-        loader: "file-loader?name=[name].[ext]",
+        loader: "style-loader!css-loader", // TODO different from promnesia??
         exclude: /node_modules/
       },
       {
@@ -130,32 +121,14 @@ var options = {
     new CleanWebpackPlugin([build_path + "/*"]),
     new CopyWebpackPlugin([
         { from: 'src/img/*.png', flatten: true },
+        { from: 'src/*.html'   , flatten: true },
     ]),
-    // expose and write the allowed env vars on the compiled bundle
-    new webpack.DefinePlugin({
-      "process.env.NODE_ENV": JSON.stringify(env.NODE_ENV)
-    }),
     new WebpackExtensionManifestPlugin({
         config: {
             base: baseManifest,
             extend: manifestExtra,
         }
     }),
-    new HtmlWebpackPlugin({
-      template: path.join(__dirname, "src", "popup.html"),
-      filename: "popup.html",
-        chunks: ["popup"],
-    }),
-    new HtmlWebpackPlugin({
-      template: path.join(__dirname, "src", "options.html"),
-      filename: "options.html",
-      chunks: ["options"]
-    }),
-    new HtmlWebpackPlugin({
-      template: path.join(__dirname, "src", "background.html"),
-      filename: "background.html",
-      chunks: ["background"]
-    }),
   ]
 };
 
