diff --git a/v2/.gitignore b/v2/.gitignore
index 09cb68f..8983a41 100644
--- a/v2/.gitignore
+++ b/v2/.gitignore
@@ -1,2 +1,4 @@
+manifest.json
 background/out
 node_modules
+crx.zip
diff --git a/v2/Makefile b/v2/Makefile
index 2b3a257..c5a680a 100644
--- a/v2/Makefile
+++ b/v2/Makefile
@@ -1,10 +1,16 @@
 ENV=--prod
-FAKE=dev
+FAKE=dev prod
 
-all: background ui
+prod: background ui
+	jq 'del(.key)' manifest_base.json > manifest.json
 
 dev: ENV=
-dev: all
+dev: prod
+	cp manifest_base.json manifest.json
+
+crx.zip: prod
+	rm -f crx.zip
+	zip -r crx.zip background/out ui/dist icons manifest.json
 
 background: FORCE node_modules/@types/chrome
 	cd background && tsc --project src/tsconfig.json
@@ -21,4 +27,4 @@ ui: FORCE ui/node_modules
 FORCE:
 
 clean:
-	rm -rf ui/node_modules node_modules background/out ui/dist
+	rm -rf ui/node_modules node_modules background/out ui/dist manifest.json crx.zip
diff --git a/v2/icons/128.png b/v2/icons/128.png
new file mode 100644
index 0000000..b4c6c95
Binary files /dev/null and b/v2/icons/128.png differ
diff --git a/v2/icons/16.png b/v2/icons/16.png
new file mode 100644
index 0000000..5f92b77
Binary files /dev/null and b/v2/icons/16.png differ
diff --git a/v2/icons/48.png b/v2/icons/48.png
new file mode 100644
index 0000000..fcc76db
Binary files /dev/null and b/v2/icons/48.png differ
diff --git a/v2/manifest.json b/v2/manifest_base.json
similarity index 52%
rename from v2/manifest.json
rename to v2/manifest_base.json
index 62507a5..f60fc23 100644
--- a/v2/manifest.json
+++ b/v2/manifest_base.json
@@ -1,14 +1,27 @@
 {
-  "name": "Tamper Chrome 2",
-  "description" : "Tamper Chrome 2",
-  "version": "0.1.0",
   "manifest_version": 2,
-  "permissions": ["debugger", "<all_urls>", "activeTab", "debugger"],
+  "name": "Tamper Chrome",
+  "version": "2.0.0",
+  "description" : "Tamper Chrome is a Chrome extension that allows you to edit HTTP requests as they happen.",
+  "icons": {"16": "icons/16.png","48": "icons/48.png","128": "icons/128.png"},
+  "browser_action": {
+    "default_title": "Tamper Chrome",
+    "default_icon": {"16": "icons/16.png","48": "icons/48.png","128": "icons/128.png"}
+  },
   "background": {
     "page": "background/background.html",
     "persistent": true
   },
-  "browser_action": {"default_title": "TC2"},
+  "commands": {
+    "_execute_browser_action": {
+      "suggested_key": {
+        "default": "Alt+Shift+C"
+      },
+      "description": "Open tamper chrome for the current tab"
+    }
+  },
+  "minimum_chrome_version": "87",
+  "permissions": ["debugger", "<all_urls>", "activeTab", "debugger"],
   "content_security_policy": "script-src 'self' 'unsafe-eval'; object-src 'self'",
   "key": "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAgXuoF2D68sbW53PO/5gK6ar52c/oANFtGFuxE1SdKKLDdF4RbDZefwK48Bc4Zc2pW81qmHC+H+gMHLh+oiH0TP2l0THjQRRf57f5Wuhk42Tdp0qlyS2qQMky5WOVZU8vQdhnRCktMPLyNWx2PeiUXkQDQ3XkcY0cttPhRAlZgx+qNfguHkmsC7HNZ/Y00TY5uUrlGl9MDt2d6fj1uUyV7pimLMA4cnTIjkf+tWhFSXTEbINdpr/YqnU/lq2I9VonBTjoNkt9hAE3y/tDgmkMh3edqqQh96m7Ker+8ZFnaQr6PrPT0vzfQdwWCnl9ItiyJNuFlCkoOzYlrp1+OIzNaQIDAQAB"
 }