diff --git a/src/manifest.json b/src/manifest.json
index 8e4c7f2..f2ced38 100644
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -6,14 +6,9 @@
     "128": "icons/Gitako-128.png",
     "256": "icons/Gitako-256.png"
   },
-  "permissions": ["storage", "contextMenus", "activeTab"],
-  "host_permissions": [
-    "*://*.github.com/*",
-    "*://gitako.enix.one/*",
-    "*://*.sentry.io/*",
-    "https://*/*",
-    "http://*/*"
-  ],
+  "permissions": ["scripting", "storage", "contextMenus", "activeTab"],
+  "host_permissions": ["*://*.github.com/*", "*://gitako.enix.one/*", "*://*.sentry.io/*"],
+  "optional_host_permissions": ["*://*/*"],
   "web_accessible_resources": [
     {
       "resources": ["icons/vscode/*"],
@@ -25,12 +20,10 @@
     }
   ],
   "background": {
-    "scripts": ["background.js"]
+    "service_worker": "background.js"
   },
   "action": {
-    "browser": {
-      "default_icon": "icons/Gitako.png"
-    }
+    "default_icon": "icons/Gitako.png"
   },
   "content_scripts": [
     {
diff --git a/webpack.config.js b/webpack.config.js
index 3efacc4..ca388b8 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -120,7 +120,8 @@ module.exports = {
         test: /\.js$/,
         loader: 'babel-loader',
         // Transpile as least files under node_modules
-        include: /node_modules\/(webext-content-scripts|webext-detect-page)\/.*\.js$/,
+        include:
+          /node_modules\/(webext-content-scripts|webext-detect-page|webext-dynamic-content-scripts)\/.*\.js$/,
         options: {
           cacheDirectory: true,
         },