diff --git a/platform/chromium/other/manifest.json b/platform/chromium/other/manifest.json
index 99eb73b9792b3..a1b3cb3e92401 100644
--- a/platform/chromium/other/manifest.json
+++ b/platform/chromium/other/manifest.json
@@ -2,7 +2,7 @@
     "manifest_version": 2,
 
     "name": "Nano Adblocker",
-    "version": "1.0.0.17",
+    "version": "1.0.0.19",
 
     "commands": {
         "launch-element-zapper": {
diff --git a/scripts/build-firefox-core-only.bat b/scripts/build-firefox-core-only.bat
new file mode 100644
index 0000000000000..bf9c3d2f3d92d
--- /dev/null
+++ b/scripts/build-firefox-core-only.bat
@@ -0,0 +1,5 @@
+@ECHO OFF
+
+NODE build.node.js --firefox
+
+PAUSE
diff --git a/scripts/build-firefox.bat b/scripts/build-firefox.bat
new file mode 100644
index 0000000000000..10d37a7472ebe
--- /dev/null
+++ b/scripts/build-firefox.bat
@@ -0,0 +1,9 @@
+@ECHO OFF
+
+NODE build.node.js --firefox
+NODE pack-filters.node.js --firefox
+NODE pack-locale.node.js --firefox
+
+NODE build-firefox.node.js --firefox
+
+PAUSE
diff --git a/scripts/build-firefox.node.js b/scripts/build-firefox.node.js
index 6d317fd42cce7..b3fb86a1d6060 100644
--- a/scripts/build-firefox.node.js
+++ b/scripts/build-firefox.node.js
@@ -14,21 +14,27 @@
 
     let manifest = await fs.readFile(basePath + "/manifest.json", "utf8");
     manifest = JSON.parse(manifest);
+
+    manifest["incognito"] = "spanning";
+    delete manifest["options_page"];
+    delete manifest["storage"];
     delete manifest["minimum_chrome_version"];
     manifest["applications"] = {
         "gecko": {
             "strict_min_version": "52.0",
         },
     };
+
     await fs.writeFile(basePath + "/manifest.json", JSON.stringify(manifest, null, 2), "utf8");
 
     const files = await fs.readdir("platform/webext");
     let tasks = [];
     for (let file of files) {
-        if (file.endsWith(".js"));
-        tasks.push(fs.copyFile("platform/webext/" + file, basePath + "/js/" + file));
+        if (file.endsWith(".js")) {
+            tasks.push(fs.copyFile("platform/webext/" + file, basePath + "/js/" + file));
+        }
     }
     await Promise.all(tasks);
 
-    console.log("[Nano] Apply Firefox Patch :: Started");
+    console.log("[Nano] Apply Firefox Patch :: Done");
 })();