diff --git a/README.md b/README.md
index 833ba8c..051bed6 100644
--- a/README.md
+++ b/README.md
@@ -70,9 +70,6 @@ In addition:
 - \+ using a bookmarklet, hence browser-agnostic
 - \+ capable of on the fly HTML to org-mode markup conversion
 
-# Requirements
-No third party dependencies! Just `python3`.
-
 # Potential improvements
 * see [todos](./TODO.org)
 
@@ -96,13 +93,11 @@ You need `npm` for building the extension.
 After that you can find the extension in `dist` directory and 'Load unpacked** if necessary. There is also Flow and Eslint set up.
 
 ## testing and linting
-Check [CI config](./.circleci/config.yml) to figure out all the checks I'm doing.
-
-The only test(s) that don't run on CI at the moment (e.g. due to lack of X server) are marked with `@skip_if_ci`. You can run them manually though.
+Check [CI config](./.github/workflows/main.yml) to figure out all the checks I'm doing.
 
-Extra tests (not integrated in CI yet):
+There are some end2end tests which check both web extension and the browser, but require GUI, so they can't run on github actions. You can run them manually though.
 
-- `scripts/test_with_browser.py`
+- `pytest -s --pyargs tests.test_end2end`
 
 ## publishing
 
diff --git a/extension/babel.config.js b/extension/babel.config.cjs
similarity index 100%
rename from extension/babel.config.js
rename to extension/babel.config.cjs
diff --git a/extension/eslint.config.js b/extension/eslint.config.js
index 8c32353..3d1219e 100644
--- a/extension/eslint.config.js
+++ b/extension/eslint.config.js
@@ -1,11 +1,10 @@
 // @ts-check
+import globals from 'globals'
+import eslint from '@eslint/js'
+import tseslint from 'typescript-eslint'
 
-const globals = require('globals')
-const eslint = require('@eslint/js')
-const tseslint = require('typescript-eslint')
 
-
-module.exports = tseslint.config(
+export default tseslint.config(
   eslint.configs.recommended,
   ...tseslint.configs.recommended, // TODO recommendedTypeChecked??
   {
diff --git a/extension/generate_manifest.js b/extension/generate_manifest.js
new file mode 100644
index 0000000..ae2d0ea
--- /dev/null
+++ b/extension/generate_manifest.js
@@ -0,0 +1,180 @@
+import assert from 'assert'
+
+import pkg from './package.json' with { type: "json" }
+
+const T = {
+    CHROME : 'chrome',
+    FIREFOX: 'firefox',
+}
+
+
+// ugh. declarative formats are shit.
+export function generateManifest({
+    target,  // str
+    version, // str
+    release,     // bool
+    ext_id   // str
+} = {}) {
+    assert(target)
+    assert(version)
+    assert(release !== null)
+    assert(ext_id)
+
+    const v3 = version == '3'
+
+    // Firefox wouldn't let you rebind its default shortcuts most of which use Shift
+    // On the other hand, Chrome wouldn't let you use Alt
+    const modifier = target === T.CHROME ? 'Shift' : 'Alt'
+
+    const action_name = v3 ? 'action' : 'browser_action'
+
+    const commands = {
+        "capture-simple": {
+            "description": "Quick capture: url, title and selection",
+            "suggested_key": {
+                "default": `Ctrl+${modifier}+H`,
+                "mac":  `Command+${modifier}+H`,
+            },
+        },
+    }
+
+    commands[`_execute_${action_name}`] = {
+        "description": "Capture page, with extra information",
+        "suggested_key": {
+            "default": `Ctrl+${modifier}+Y`,
+            "mac":  `Command+${modifier}+Y`,
+        },
+    }
+
+
+    const action = {
+        "default_icon": "img/unicorn.png",
+        "default_popup": "popup.html",
+        "default_title": "Capture page, with extra information",
+    }
+
+
+    const endpoints = (domain) => [
+        "http://"  + domain + "/capture",
+        "https://" + domain + "/capture",
+    ]
+
+
+    // prepare for manifest v3
+    const host_permissions = endpoints('localhost')
+    const optional_host_permissions = endpoints('*')
+
+
+    // TODO make permissions literate
+    const permissions = [
+        // for keeping extension settings
+        "storage",
+
+        // for showing notification about successful capture or errors
+        "notifications",
+
+        // need to query active tab and get its url/title
+        "activeTab",
+    ]
+
+
+    const optional_permissions = []
+
+    if (target === T.FIREFOX || v3) {
+        // chrome v2 doesn't support scripting api
+        // code has a fallback just for that
+        // (needed to get selected text)
+        permissions.push("scripting")
+    }
+
+
+    const content_security_policy = [
+        "script-src 'self'",  // this must be specified when overriding, otherwise it complains
+        /// also this works, but it seems that default-src somehow shadows style-src???
+        // "default-src 'self'",
+        // "style-src 'unsafe-inline'", // FFS, otherwise <style> directives on extension's pages not working??
+        ///
+
+        // also need to override it to eclude 'upgrade-insecure-requests' in manifest v3?
+        // https://developer.mozilla.org/en-US/docs/Mozilla/Add-ons/WebExtensions/Content_Security_Policy#upgrade_insecure_network_requests_in_manifest_v3
+        // NOTE: could be connect-src http: https: to allow all?
+        // but we're specifically allowing endpoints that have /capture in them
+        "connect-src " + endpoints('*:*').join(' '),
+    ].join('; ')
+
+
+    const background = {}
+    if (v3) {
+        if (target === T.CHROME) {
+            // webext lint will warn about this since it's not supported in firefox yet
+            background['service_worker'] = 'background.js'
+
+            // this isn't supported in chrome manifest v3 (chrome warns about unsupported field)
+            // but without it webext lint fails
+            background['scripts'] = ['background.js']
+        } else {
+            background['scripts'] = ['background.js']
+        }
+    } else {
+        background['scripts'] = ['background.js']
+        background['persistent'] = false
+    }
+    background['type'] = 'module'  // hmm seems like it works in firefox v2 too now??
+
+    const manifest = {
+        name: pkg.name + (release ? '' : ' [dev]'),
+        version: pkg.version,
+        description: pkg.description,
+        permissions: permissions,
+        commands: commands,
+        optional_permissions: optional_permissions,
+        manifest_version: v3 ? 3 : 2,
+        background: background,
+        icons: {
+            '128': 'img/unicorn.png'
+        },
+        options_ui: {
+            page: 'options.html',
+            open_in_tab: true,
+        },
+    }
+    manifest[action_name] = action
+
+    if (target === T.FIREFOX) {
+        // NOTE: chrome v3 works without content_security_policy??
+        // but in firefox it refuses to make a request even when we allow hostname permission??
+        manifest.content_security_policy = (v3 ? {extension_pages: content_security_policy} : content_security_policy)
+    }
+
+    manifest.content_scripts = [
+        {
+            "matches": ["<all_urls>"],
+            "js": ["detect_dark_mode.js"],
+        },
+    ]
+
+    if (v3) {
+        if (target === T.FIREFOX) {
+            // firefox doesn't support optional host permissions
+            // note that these will still have to be granted by user (unlike in chrome)
+            manifest['host_permissions'] = [...host_permissions, ...optional_host_permissions]
+        } else {
+            manifest['host_permissions'] = host_permissions
+            manifest['optional_host_permissions'] = optional_host_permissions
+        }
+    } else {
+        manifest.permissions.push(...host_permissions)
+        manifest.optional_permissions.push(...optional_host_permissions)
+    }
+
+    if (v3) {
+        // this isn't really required in chrome, but without it, webext lint fails for chrome addon
+        const gecko_id = target === T.FIREFOX ? ext_id : '{00000000-0000-0000-0000-000000000000}'
+        manifest['browser_specific_settings'] = {
+            'gecko': {
+                'id': gecko_id,
+            },
+        }
+    }
+    return manifest
+}
diff --git a/extension/jest.config.js b/extension/jest.config.cjs
similarity index 100%
rename from extension/jest.config.js
rename to extension/jest.config.cjs
diff --git a/extension/package.json b/extension/package.json
index 6763788..6a906a2 100644
--- a/extension/package.json
+++ b/extension/package.json
@@ -6,9 +6,7 @@
   "main": "dist/background.js",
   "scripts": {
     "test": "jest",
-    "build": "webpack --progress --profile",
-    "watch": "webpack --watch --progress",
-    "dev": "npm run watch",
+    "build": "rollup --config",
     "eslint": "eslint src",
     "web-ext": "web-ext",
     "release:cws": "chrome-webstore-upload",
@@ -33,27 +31,24 @@
     "@babel/preset-env": "^7.24.5",
     "@babel/preset-typescript": "^7.24.1",
     "@eslint/js": "^9.3.0",
+    "@rollup/plugin-commonjs": "^25.0.8",
+    "@rollup/plugin-node-resolve": "^15.2.3",
+    "@rollup/plugin-typescript": "^11.1.6",
     "@types/webextension-polyfill": "^0.10.7",
-    "babel-loader": "^9.1.3",
     "chrome-webstore-upload-cli": "^3.1.0",
-    "clean-webpack-plugin": "^4.0.0",
-    "copy-webpack-plugin": "^12.0.2",
-    "css-loader": "^7.1.2",
     "eslint": "^8.57.0",
     "globals": "^15.3.0",
     "jest": "^29.5.0",
     "jest-environment-jsdom": "^29.5.0",
     "jest-fetch-mock": "^3.0.3",
     "node-fetch": "^3.3.2",
-    "style-loader": "^4.0.0",
-    "ts-loader": "^9.5.1",
+    "rollup": "^4.18.0",
+    "rollup-plugin-copy": "^3.5.0",
+    "tslib": "^2.6.2",
     "typescript": "^5.4.5",
     "typescript-eslint": "^7.10.0",
     "web-ext": "^7.11.0",
-    "webextension-polyfill": "^0.12.0",
-    "webpack": "^5.91.0",
-    "webpack-cli": "^5.1.4",
-    "webpack-dev-server": "^5.0.4",
-    "webpack-extension-manifest-plugin": "^0.8.0"
-  }
+    "webextension-polyfill": "^0.12.0"
+  },
+  "type": "module"
 }
diff --git a/extension/rollup.config.js b/extension/rollup.config.js
new file mode 100644
index 0000000..c5a8a0f
--- /dev/null
+++ b/extension/rollup.config.js
@@ -0,0 +1,113 @@
+import assert from 'assert'
+import fs from 'fs'
+const { globSync } = import('node:fs')
+import path from 'path'
+import { fileURLToPath } from 'url'
+
+import typescript from '@rollup/plugin-typescript'
+import { nodeResolve } from '@rollup/plugin-node-resolve'
+import commonjs from '@rollup/plugin-commonjs'
+import copy from 'rollup-plugin-copy'
+
+import {generateManifest} from './generate_manifest.js'
+
+
+const env = {
+    RELEASE: process.env.RELEASE,
+    PUBLISH: process.env.PUBLISH,
+    MANIFEST: process.env.MANIFEST,
+}
+
+const target = process.env.TARGET; assert(target)
+const manifest_version = process.env.MANIFEST; assert(manifest_version)
+const ext_id = process.env.EXT_ID; assert(ext_id)
+const release = env.RELEASE === 'YES' // TODO use --environment=production for rollup?
+const publish = env.PUBLISH === 'YES'
+
+
+const thisDir = path.dirname(fileURLToPath(import.meta.url)); assert(path.isAbsolute(thisDir))
+const srcDir = path.join(thisDir, 'src')
+const buildDir = path.join(thisDir, 'dist', target)
+
+
+// kinda annoying it's not a builtin..
+function cleanOutputDir() {
+    return {
+        name: 'clean-output-dir',
+        buildStart(options) {
+            const outDir = buildDir
+            // we don't just want to rm -rf outputDir to respect if it's a symlink or something like that
+            if (!fs.existsSync(outDir)) {
+                return
+            }
+            fs.readdirSync(outDir).forEach(f => {
+                // console.debug("removing %s", f)
+                fs.rmSync(path.join(outDir, f), {recursive: true})
+            })
+        },
+    }
+}
+
+
+function generateManifestPlugin() {
+    return {
+        name: 'generate-manifest',
+        generateBundle(outputOptions, bundle) {
+            const manifest = generateManifest({
+                target: target,
+                version: manifest_version,
+                releas: release,
+                ext_id: ext_id,
+            })
+            const mjs = JSON.stringify(manifest, null, 2)
+            const outputPath = path.join(outputOptions.dir, 'manifest.json')
+            fs.mkdirSync(outputOptions.dir, { recursive: true })
+            fs.writeFileSync(outputPath, mjs, 'utf8')
+        }
+    }
+}
+
+
+const compile = inputs => { return {
+    input: inputs,
+    output: {
+        dir: buildDir,
+        // format: 'esm', //  default??
+        // format: 'iife',  // inlines? e.g. could use for bg page if we disable splitting..
+
+        // huh! so if I build all files in one go, it figures out the shared files properly it seems
+        // however it still inlines webextension stuff into one of the files? e.g. common
+        manualChunks: id => {  // ugh, seems a bit shit?
+            if (id.includes('webextension-polyfill')) {
+                return 'webextension-polyfill' // move it in a separate chunk
+            }
+        },
+   },
+   plugins: [
+       cleanOutputDir(),
+       copy({
+         targets: [
+           {src: 'src/**/*.html', dest: buildDir},
+           {src: 'src/**/*.png' , dest: buildDir},
+         ],
+         flatten: false,
+       }),
+       typescript({
+           outDir: buildDir,
+           noEmitOnError: true,  // fail on errors
+       }),
+       commonjs(),  // needed for webext polyfill
+       nodeResolve(),
+       generateManifestPlugin(),
+   ],
+}}
+
+
+export default [
+    compile([
+        path.join(srcDir, 'background.ts'),
+        path.join(srcDir, 'options_page.ts'),
+        path.join(srcDir, 'popup.ts'),
+        path.join(srcDir, 'detect_dark_mode.ts'),
+    ]),
+]
diff --git a/extension/src/background.ts b/extension/src/background.ts
index 15b9a6c..896fbe0 100644
--- a/extension/src/background.ts
+++ b/extension/src/background.ts
@@ -30,10 +30,10 @@
 import browser from "webextension-polyfill"
 
 
-import {COMMAND_CAPTURE_SIMPLE, METHOD_CAPTURE_WITH_EXTRAS, showNotification} from './common'
-import {getOptions} from './options'
-import type {Options} from './options'
-import { hasPermissions } from './permissions'
+import {COMMAND_CAPTURE_SIMPLE, METHOD_CAPTURE_WITH_EXTRAS, showNotification} from './common.js'
+import {getOptions} from './options.js'
+import type {Options} from './options.js'
+import { hasPermissions } from './permissions.js'
 
 
 type Params = {
diff --git a/extension/src/manifest.json b/extension/src/manifest.json
deleted file mode 100644
index af2e8b7..0000000
--- a/extension/src/manifest.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "name": "<webpack managed>",
-  "version": "<webpack managed>",
-  "options_ui": {
-    "page": "options.html",
-    "open_in_tab": true
-  },
-  "icons": {
-      "128": "img/unicorn.png"
-  }
-}
diff --git a/extension/src/options.html b/extension/src/options.html
index d669a1a..3b46a07 100644
--- a/extension/src/options.html
+++ b/extension/src/options.html
@@ -2,7 +2,7 @@
 <html lang="en">
 <head>
   <meta charset="UTF-8">
-  <script type="text/javascript" src="options_page.js"/></script>
+  <script type="module" src="options_page.js"/></script>
   <style>
    input:invalid {
        background-color: red;
diff --git a/extension/src/options_page.ts b/extension/src/options_page.ts
index 0c86383..101e3de 100644
--- a/extension/src/options_page.ts
+++ b/extension/src/options_page.ts
@@ -1,5 +1,5 @@
-import {getOptions, setOptions} from './options'
-import {ensurePermissions, hasPermissions} from './permissions'
+import {getOptions, setOptions} from './options.js'
+import {ensurePermissions, hasPermissions} from './permissions.js'
 
 
 const ENDPOINT_ID       = 'endpoint_id'
diff --git a/extension/src/popup.html b/extension/src/popup.html
index 20b3d15..b9b5e8b 100644
--- a/extension/src/popup.html
+++ b/extension/src/popup.html
@@ -2,7 +2,7 @@
 <html lang="en">
 <head>
   <meta charset="UTF-8">
-  <script type="text/javascript" src="popup.js"></script>
+  <script type="module" src="popup.js"></script>
 </head>
 <body>
     <!-- TODO ugh didn't work -->
diff --git a/extension/src/popup.ts b/extension/src/popup.ts
index 84a98af..d96beb9 100644
--- a/extension/src/popup.ts
+++ b/extension/src/popup.ts
@@ -1,7 +1,7 @@
 import browser from "webextension-polyfill"
 
-import {METHOD_CAPTURE_WITH_EXTRAS} from './common'
-import {getOptions} from './options'
+import {METHOD_CAPTURE_WITH_EXTRAS} from './common.js'
+import {getOptions} from './options.js'
 
 // TODO template it in html too?
 const BUTTON_ID = 'button_id'
diff --git a/extension/tsconfig.json b/extension/tsconfig.json
index 31c42eb..d2de688 100644
--- a/extension/tsconfig.json
+++ b/extension/tsconfig.json
@@ -1,6 +1,5 @@
 {
   "compilerOptions": {
-    "outDir": "./dist/",
     "baseUrl": "src/",
     "noImplicitAny": true,
     "module": "nodenext",
diff --git a/extension/webpack.config.js b/extension/webpack.config.js
deleted file mode 100644
index de6e69d..0000000
--- a/extension/webpack.config.js
+++ /dev/null
@@ -1,292 +0,0 @@
-const webpack = require('webpack'),
-      path = require('path'),
-      {CleanWebpackPlugin} = require('clean-webpack-plugin'),
-      CopyWebpackPlugin = require('copy-webpack-plugin'),
-      WebpackExtensionManifestPlugin = require('webpack-extension-manifest-plugin');
-
-const T = {
-    CHROME  : 'chrome',
-    FIREFOX: 'firefox',
-};
-
-
-const env = {
-  TARGET : process.env.TARGET,
-  RELEASE: process.env.RELEASE,
-  PUBLISH: process.env.PUBLISH,
-  MANIFEST: process.env.MANIFEST,
-}
-
-// TODO will be conditional on T.CHROME at some point
-const v3 = process.env.MANIFEST === '3'
-
-const ext_id = process.env.EXT_ID
-
-const pkg = require('./package.json');
-const baseManifest = require('./src/manifest.json');
-
-const release = env.RELEASE == 'YES' ? true : false;
-const publish = env.PUBLISH == 'YES' ? true : false;
-const dev = !release; // meh. maybe make up my mind?
-const target = env.TARGET;
-
-const name = "grasp" + (dev ? ' [dev]' : '');
-
-
-// ugh. declarative formats are shit.
-
-// Firefox wouldn't let you rebind its default shortcuts most of which use Shift
-// On the other hand, Chrome wouldn't let you use Alt
-const modifier = target === T.CHROME ? 'Shift' : 'Alt'
-
-const action_name = v3 ? 'action' : 'browser_action'
-
-const commands = {
-    "capture-simple": {
-        "description": "Quick capture: url, title and selection",
-        "suggested_key": {
-            "default": `Ctrl+${modifier}+H`,
-            "mac":  `Command+${modifier}+H`,
-        },
-    }
-}
-
-commands[`_execute_${action_name}`] = {
-        "description": "Capture page, with extra information",
-        "suggested_key": {
-            "default": `Ctrl+${modifier}+Y`,
-            "mac":  `Command+${modifier}+Y`,
-        },
-}
-
-
-const action = {
-    "default_icon": "img/unicorn.png",
-    "default_popup": "popup.html",
-    "default_title": "Capture page, with extra information",
-}
-
-
-const endpoints = (domain) => [
-  "http://"  + domain + "/capture",
-  "https://" + domain + "/capture",
-]
-
-    
-// prepare for manifest v3
-const host_permissions = endpoints('localhost')
-const optional_host_permissions = endpoints('*')
-
-
-// TODO make permissions literate
-const permissions = [
-    "storage",
-    "notifications",
-
-    // need to query active tab and get its url/title
-    "activeTab",  
-]
-
-
-const optional_permissions = []
-
-if (target === T.FIREFOX || v3) {
-  // chrome v2 doesn't support scripting api
-  // code has a fallback just for that
-  // (needed to get selected text)
-  permissions.push("scripting")
-}
-
-
-const content_security_policy = [
-  "script-src 'self'",  // this must be specified when overriding, otherwise it complains
-  /// also this works, but it seems that default-src somehow shadows style-src???
-  // "default-src 'self'",
-  // "style-src 'unsafe-inline'", // FFS, otherwise <style> directives on extension's pages not working??
-  ///
-
-  // also need to override it to eclude 'upgrade-insecure-requests' in manifest v3?
-  // https://developer.mozilla.org/en-US/docs/Mozilla/Add-ons/WebExtensions/Content_Security_Policy#upgrade_insecure_network_requests_in_manifest_v3
-  // NOTE: could be connect-src http: https: to allow all?
-  // but we're specifically allowing endpoints that have /capture in them
-  "connect-src " + endpoints('*:*').join(' '),
-].join('; ')
-
-
-const background = {}
-
-if (v3) {
-  if (target === T.CHROME) {
-    background['service_worker'] = 'background.js'
-    background['scripts'] = [
-      'background.js',
-    ]
-    // see header of background.js, this was for some experiments
-    // NOTE: not working in firefox? just fails to load the manifest
-    // background['type'] = 'module'
-  } else {
-    background['scripts'] = [
-      'background.js',
-    ]
-  }
-} else {
-  background['scripts'] = [
-    'background.js',
-  ]
-  background['persistent'] = false
-}
-
-
-const manifestExtra = {
-    name: name,
-    version: pkg.version,
-    description: pkg.description,
-    permissions: permissions,
-    commands: commands,
-    optional_permissions: optional_permissions,
-    manifest_version: v3 ? 3 : 2,
-    background: background,
-}
-
-if (target === T.FIREFOX) {
-    // NOTE: chrome v3 works without content_security_policy??
-    // but in firefox it refuses to make a request even when we allow hostname permission??
-  manifestExtra.content_security_policy = (v3 ? {extension_pages: content_security_policy} : content_security_policy)
-}
-
-
-manifestExtra[action_name] = action
-manifestExtra.content_scripts = [
-  {
-    "matches": ["<all_urls>"],
-    "js": ["detect_dark_mode.js"],
-  },
-]
-
-if (v3) {
-  if (target === T.FIREFOX) {
-    // firefox doesn't support optional host permissions
-    // note that these will still have to be granted by user (unlike in chrome)
-    manifestExtra['host_permissions'] = [...host_permissions, ...optional_host_permissions]
-  } else {
-    manifestExtra['host_permissions'] = host_permissions
-    manifestExtra['optional_host_permissions'] = optional_host_permissions
-  }
-} else {
-  manifestExtra.permissions.push(...host_permissions)
-  manifestExtra.optional_permissions.push(...optional_host_permissions)
-}
-
-if (v3) {
-  // this isn't really required in chrome, but without it, webext lint fails for chrome addon
-  const gecko_id = target === T.FIREFOX ? ext_id : "{00000000-0000-0000-0000-000000000000}"
-  manifestExtra['browser_specific_settings'] = {
-    "gecko": {
-      "id": gecko_id,
-    },
-  }
-}
-
-
-const buildPath = path.join(__dirname, 'dist', target);
-
-
-const splitChunks = {
-  // seems necessary, otherwise doesn't split out polyfill??
-  chunks: 'all',
-  cacheGroups: {
-    vendor: {
-      test: /[\\/]node_modules[\\/]/,
-      name(module) {
-        const packageName = module.context.match(/[\\/]node_modules[\\/](.*?)([\\/]|$)/)[1];
-        return packageName
-      },
-      // create chunk regardless size etc
-      enforce: true,
-    },
-  },
-}
-
-
-const options = {
-  mode: dev ? 'development' : 'production', // TODO map directly from MODE env var?
-  node: {
-    // no idea what does it mean... https://github.com/webpack/webpack/issues/5627#issuecomment-394290231
-    // but it does get rid of some Function() which webpacka apparently generates
-    global: false,
-  },
-  entry: {
-    background  : path.join(__dirname, "src", "background.ts"),
-    popup       : path.join(__dirname, "src", "popup.ts"),
-    options_page: path.join(__dirname, "src", "options_page.ts"),
-    detect_dark_mode: path.join(__dirname, "src", "detect_dark_mode.ts"),
-  },
-  output: {
-      path: buildPath,
-  },
-  optimization: {
-    // https://webpack.js.org/configuration/optimization
-    // don't think minimize worth it for such a tiny extension
-    minimize: false,
-
-    // ugh. for some reason with chunks it's not working
-    // splitChunks: (v3 && target === T.CHROME) ? false : splitChunks,
-    splitChunks: false,
-    // split chunks is so vendors split out into separate js files
-    // to prevent bloating individual source files
-    // seems that at the moment we need to manually load the chunks in the corresponding
-    // html files or manifest
-    // split chunks doc recommend using webpack html plugin??
-  },
-  module: {
-    rules: [
-      {
-        test: /\.js$/,
-        loader: 'babel-loader',
-        exclude: /node_modules/,
-      },
-      {
-        test: /\.tsx?$/,
-        use: 'ts-loader',
-        exclude: /node_modules/,
-      },
-      // not sure if I really need css/html loader it since I'm not using any special features.. but whatever
-      {
-        test: /\.css$/,
-        use: 'style-loader!css-loader',
-        exclude: /node_modules/,
-      },
-      {
-        test: /\.html$/,
-        loader: 'html-loader',
-        exclude: /node_modules/
-      }
-    ]
-  },
-  resolve: {
-    // this is necessary to import .ts files
-    extensions: ['.tsx', '.ts', '.js'],
-  },
-  plugins: [
-    new CleanWebpackPlugin(), // ok, respects symlinks
-
-    // without copy pluging, webpack only bundles js/json files
-    new CopyWebpackPlugin({
-      patterns: [
-        { context: 'src', from: '**/*.html' },
-        { context: 'src', from: '**/*.png'  },
-      ]
-    }),
-    new WebpackExtensionManifestPlugin({
-        config: {
-            base: baseManifest,
-            extend: manifestExtra,
-        }
-    }),
-  ],
-  // docs claim it's the slowest but pretty fast anyway
-  devtool: 'source-map',
-}
-
-
-module.exports = options;
diff --git a/tests/addon.py b/tests/addon.py
index 3b29bab..24d15d3 100644
--- a/tests/addon.py
+++ b/tests/addon.py
@@ -70,17 +70,11 @@ class Popup:
 
     def open(self) -> None:
         self.addon.activate()
-        # time.sleep(2)  # TODO not sure if can do better?
 
     def enter_data(self, *, comment: str, tags: str) -> None:
         helper = self.addon.helper
 
-        if helper.driver.name == 'firefox':
-            # for some reason in firefox under geckodriver it woudn't focus comment input field??
-            # tried both regular and dev edition firefox with latest geckodriver
-            # works fine when extension is loaded in firefox manually or in chrome with chromedriver..
-            # TODO file a bug??
-            helper.gui_hotkey('tab')  # give focus to the input
+        helper.gui_hotkey('tab')  # give focus to the input
 
         helper.gui_write(comment)
 
diff --git a/tests/addon_helper.py b/tests/addon_helper.py
index 676e6ee..3215e6a 100644
--- a/tests/addon_helper.py
+++ b/tests/addon_helper.py
@@ -7,10 +7,9 @@
 from typing import Any
 
 from loguru import logger
-import psutil
 from selenium import webdriver
 
-from .webdriver_utils import is_headless
+from .webdriver_utils import is_headless, get_browser_process
 
 
 @dataclass
@@ -85,7 +84,7 @@ def gui_write(self, *args, **kwargs) -> None:
         import pyautogui
 
         focus_browser_window(self.driver)
-        pyautogui.write(*args, **kwargs)  # select first item
+        pyautogui.write(*args, **kwargs)
 
 
 # NOTE looks like it used to be posssible in webdriver api?
@@ -146,11 +145,7 @@ def get_window_id(driver: webdriver.Remote) -> str:
         pid = str(driver.capabilities['moz:processID'])
     elif driver.name == 'chrome':
         # ugh no pid in capabilities...
-        driver_pid = driver.service.process.pid  # type: ignore[attr-defined]
-        process = psutil.Process(driver_pid)
-        [chrome_process] = process.children()
-        cmdline = chrome_process.cmdline()
-        assert '--enable-automation' in cmdline, cmdline
+        chrome_process = get_browser_process(driver)
         pid = str(chrome_process.pid)
     else:
         raise RuntimeError(driver.name)
diff --git a/tests/webdriver_utils.py b/tests/webdriver_utils.py
index 3015f3f..de4f8d6 100644
--- a/tests/webdriver_utils.py
+++ b/tests/webdriver_utils.py
@@ -3,6 +3,7 @@
 from time import sleep
 from typing import Dict, Iterator, Optional
 
+import psutil
 from selenium import webdriver
 from selenium.common.exceptions import NoAlertPresentException
 from selenium.webdriver import Remote as Driver
@@ -53,8 +54,10 @@ def is_headless(driver: Driver) -> bool:
     if driver.name == 'firefox':
         return driver.capabilities.get('moz:headless', False)
     elif driver.name == 'chrome':
+        return any('--headless' in c for c in get_browser_process(driver).cmdline())
+        # ugh.. looks like this stopped working?
         # https://antoinevastel.com/bot%20detection/2018/01/17/detect-chrome-headless-v2.html
-        return driver.execute_script("return navigator.webdriver") is True
+        # return driver.execute_script("return navigator.webdriver") is True
     else:
         raise RuntimeError(driver.name)
 
@@ -147,3 +150,17 @@ def get_webdriver(
     version_string = ' '.join(f'{k}={v}' for k, v in version_data.items())
     logger.info(f'webdriver version: {version_string}')
     return driver
+
+
+def get_browser_process(driver: webdriver.Remote) -> psutil.Process:
+    driver_pid = driver.service.process.pid  # type: ignore[attr-defined]
+    dprocess = psutil.Process(driver_pid)
+    [process] = dprocess.children()
+    cmdline = process.cmdline()
+    if driver.name == 'firefox':
+        assert '--marionette' in cmdline, cmdline
+    elif driver.name == 'chrome':
+        assert '--enable-automation' in cmdline, cmdline
+    else:
+        raise AssertionError
+    return process