diff --git a/Twitch Notes.crx b/Twitch Notes.crx
deleted file mode 100644
index e7ebbe3..0000000
Binary files a/Twitch Notes.crx and /dev/null differ
diff --git a/Twitch Notes.pem b/Twitch Notes.pem
deleted file mode 100644
index 3ec3965..0000000
--- a/Twitch Notes.pem	
+++ /dev/null
@@ -1,28 +0,0 @@
------BEGIN PRIVATE KEY-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDR5glpjy1tBIDk
-TUMR35FgLEDmDpt4LQDxJLtQldK78PGNSMlipFk2TCgLxjuNzxbrBA0AcRTEwdNN
-v9UMiWYjTUlbjM7Uv5FZ7jledYXrmfO5xv1qw7x/qDPJgo5oc0RLy98DYoBKRZYD
-q98jmI04FRvqLMqF1SnxESlI6Ae63NtaQZR9MIDjuosCT8bHwLoFmzl7QX9Ssg1e
-uzD5I63MKBDRiFlHPKo3Tg12via2uRg6BPNOKgTrEEQkCnXp+0JimYwC6WNSMRZt
-J0UCwhY1JwvJFo/CybCEhy54V3nfzSkiiJxN9N+Hu3VhwO6KJ0A0Qx65lqXtG1h7
-wxOwGHipAgMBAAECggEADE2Xms/JDxqO492RKJn052ZN+zN7J+u6t30acKezhY94
-LSVJeUYeXOPRC22ivdYYEbhNUHZltqm7dRN2jV38C2Yt6QHuJANtkDqkiLWf9FZ0
-C4fkgJlOsiHdv+Tuls8+KdOI89Br1M6oM3i5Iy4/hXxxRC7nbmRMqXltdNKgP12J
-pynhzD+Y6WbJJYeAhVROv1OzkJrK5ltAiD7emUSwNdbpT837Z6tXBTUoRLvM9pL7
-MvmhZIGzyBTsG5La3XMgT5kE+dWaqoDY38GCk51VDGeTJo0X2LbzEI8Za4GxOZ5Q
-MGGog4javTAvQz1RJXHoTz4/LOQtS+p1c5Ix8X5r3QKBgQD2DvrU4PswQ4N5/V5Y
-Y8yZ2Fg6JDZ+ij6CQxHGFhQCyFwuxWEvYE00B3YQYVZ/2VwNwjwD4wxBlt+eB7cl
-1/jIAwvLhqdwhZmyDpXLsGo7uucl+Xff+7v2n+p8NxHTgSmbo2ypyGTk1MH9CXsY
-rGqyVJYPg6mmZMpNvQAWwrCpxQKBgQDaYQygx490UBCZhSnlW5iN6o5wGxSFfxAP
-SvNtqmbgTILwT6cnCZnJQ6FPdHcYF6a05CraNLxNTbCgvwjZklAcGq3oR8s5vPI+
-l9f/eZcf8RHcas1K/RjnRSj1Ax2EEp6zYAfjtt6jORXt9kgKzpPTEOHDFzPXxMyp
-KC3/X/6VlQKBgHqFQP7pPApvQ7NlpynKH+HnKR9iUsQ1oCSKsvn4mmQ8UjJz1A2c
-HTUwFejYHxMwLzcmpW2mC79JGfX9j4PHg7hMU/43AX7093AC9THkmTE+wsRU8QzV
-s2V9gWvym+y+HvLBsGTmRN7w1dticin6CHLdzY7SF5KkE1wcJUQwE3mlAoGBAKBR
-2UR73Swlz1n1cgGI0iF1zmYs607qLm8btkSPcgE/Cm3D/FHjcXxZYyaCuR/91Qw9
-6dvSFV+nJoGMXcHk8V0AlSXO9zqHJUygixlqOXFguJ0Z52cjElJO6redNuEMDmhf
-msspKJ+pvBi70r3kVJACd8uS0COavil9bu9pmOxVAoGAZxWosuE6RGoPFtyvsTYF
-avp6Si3EDtOs9LAH1rEB7O37D1VrWBphDmCHnlEp6RgTR21NXCaALjneSrehug9g
-OQT57SldKt+Zzil6UEnhqX6SZXcYit0r9SMUSOkiF52sjK6k05Al4DtaUlYbRk9M
-mcvGRcKcUNi8/zfaxxyso1E=
------END PRIVATE KEY-----
diff --git a/Twitch Notes/manifest.json b/Twitch Notes/manifest.json
index 12c55a3..3a8cccb 100644
--- a/Twitch Notes/manifest.json	
+++ b/Twitch Notes/manifest.json	
@@ -1,9 +1,6 @@
 {
   "background": {
-    "scripts": ["background.js"]
-  },
-  "browser_action": {
-    "default_popup": "settings.html"
+    "service_worker": "background.js"
   },
   "content_scripts": [
     {
@@ -14,21 +11,36 @@
         "*://*.twitch.tv/*.htm",
         "*://*.twitch.tv/*.htm?*"
       ],
-      "js": ["run.js"],
-      "matches": ["*://*.twitch.tv/*"]
+      "js": [
+        "run.js"
+      ],
+      "matches": [
+        "*://*.twitch.tv/*"
+      ]
     }
   ],
   "description": "Add notes to twitch users (only visible to you)",
   "externally_connectable": {
-    "matches": ["*://*.twitch.tv/*"]
+    "matches": [
+      "*://*.twitch.tv/*"
+    ]
   },
   "homepage_url": "https://rdarius.lt/projects/chrome-extensions/twitch-notes",
   "icons": {
     "128": "icon.png"
   },
-  "manifest_version": 2,
+  "manifest_version": 3,
   "name": "Twitch Notes",
-  "permissions": ["*://*.twitch.tv/*"],
   "version": "0.0.0.1",
-  "web_accessible_resources": ["twitch-notes.js", "twitch-notes.css"]
+  "web_accessible_resources": [
+    {
+      "resources": [
+        "twitch-notes.js",
+        "twitch-notes.css"
+      ],
+      "matches": [
+        "*://*.twitch.tv/*"
+      ]
+    }
+  ]
 }
diff --git a/Twitch Notes/twitch-notes.js b/Twitch Notes/twitch-notes.js
index 51074eb..a3b2119 100644
--- a/Twitch Notes/twitch-notes.js	
+++ b/Twitch Notes/twitch-notes.js	
@@ -161,7 +161,7 @@
     )[0];
   } while (!buttonContainer || giveUpAt < Date.now());
 
-  // createSettingsButton(buttonContainer);
+  createSettingsButton(buttonContainer);
 
   // Options for the observer (which mutations to observe)
   const config = { attributes: true, childList: true, subtree: true };
@@ -183,10 +183,10 @@
 
             const username = n.attributes["data-a-user"].value;
             if (username) {
-              let noteButton = usernameContainer.querySelector(".twitchnote");
+              let noteButton = usernameContainer.querySelector(".twitch-note");
               if (!noteButton) {
                 const twitchNote = document.createElement("span");
-                twitchNote.classList.add("twitchnote");
+                twitchNote.classList.add("twitch-note");
                 twitchNote.style.cursor = "pointer";
                 twitchNote.addEventListener("click", () => {
                   openTwitchNote(username);