diff --git a/src/manifest.json b/src/manifest.json
index 9a2f219..8e4c7f2 100644
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -6,21 +6,31 @@
     "128": "icons/Gitako-128.png",
     "256": "icons/Gitako-256.png"
   },
-  "permissions": [
-    "storage",
-    "contextMenus",
-    "activeTab",
+  "permissions": ["storage", "contextMenus", "activeTab"],
+  "host_permissions": [
     "*://*.github.com/*",
-    "*://gitako.now.sh/*",
-    "*://*.sentry.io/*"
+    "*://gitako.enix.one/*",
+    "*://*.sentry.io/*",
+    "https://*/*",
+    "http://*/*"
+  ],
+  "web_accessible_resources": [
+    {
+      "resources": ["icons/vscode/*"],
+      "matches": ["http://*/*", "https://*/*"]
+    },
+    {
+      "resources": ["content.css"],
+      "matches": ["http://*/*", "https://*/*"]
+    }
   ],
-  "optional_permissions": ["http://*/*", "https://*/*"],
-  "web_accessible_resources": ["icons/vscode/*", "content.css"],
   "background": {
     "scripts": ["background.js"]
   },
-  "browser_action": {
-    "default_icon": "icons/Gitako.png"
+  "action": {
+    "browser": {
+      "default_icon": "icons/Gitako.png"
+    }
   },
   "content_scripts": [
     {
diff --git a/webpack.config.js b/webpack.config.js
index c34aae7..337ac2d 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -43,8 +43,12 @@ const plugins = [
         }
 
         if (!IN_PRODUCTION_MODE) {
+          // enable source mapping while developing
           Object.assign(manifest, {
-            web_accessible_resources: manifest.web_accessible_resources.concat('*.map'), // enable source mapping while developing
+            web_accessible_resources: manifest.web_accessible_resources.concat({
+              resources: ['*.map'],
+              matches: ['*://*/*']
+            }),
           })
         }
         return JSON.stringify(manifest)