diff --git a/tools/v2.ts b/tools/v2.ts
index 35a0af8..dd42ddb 100644
--- a/tools/v2.ts
+++ b/tools/v2.ts
@@ -10,8 +10,12 @@ manifest.background.scripts.push(manifest.background.service_worker)
 delete manifest.background.type
 delete manifest.background.service_worker
 manifest.background.persistent = true
-manifest.permissions += manifest.host_permissions
-manifest.permissions += manifest.optional_host_permissions
+if (manifest.host_permissions) {
+    manifest.permissions.push(manifest.host_permissions)
+}
+if (manifest.optional_host_permissions) {
+    manifest.permissions.push(manifest.optional_host_permissions)
+}
 delete manifest.host_permissions
 delete manifest.optional_host_permissions
 
@@ -19,10 +23,10 @@ let newContentSecurityPolicy = ""
 
 try {
     for (const policy of manifest.content_security_policy) {
-        newContentSecurityPolicy += policy + " "
+        newContentSecurityPolicy += policy.key + "'" + policy.value + "'" + " "
     }
 } catch (e) {
-    newContentSecurityPolicy = ""
+    newContentSecurityPolicy = "default-src 'self'"
 }
 
 manifest.content_security_policy = newContentSecurityPolicy
@@ -33,4 +37,9 @@ try {
     manifest.web_accessible_resources = []
 }
 
+if (manifest.action) {
+    manifest.browser_action = manifest.action
+}
+delete manifest.action
+
 fs.writeFileSync('./dist/manifest.json', JSON.stringify(manifest, null, 2));
\ No newline at end of file