diff --git a/bucket/tor-browser.json b/bucket/tor-browser.json
index 8f89dd4f682cdd..6adb155958f0dd 100644
--- a/bucket/tor-browser.json
+++ b/bucket/tor-browser.json
@@ -1,4 +1,5 @@
 {
+    "$schema": "https://raw.githubusercontent.com/ScoopInstaller/Scoop/master/schema.json",
     "##": "Multiple components under various open source licenses. Included HTTPS Everywhere extension is the strictest.",
     "version": "14.0.6",
     "description": "Web browser that connects to the internet via the Tor anonymity network",
@@ -6,22 +7,25 @@
     "license": "GPL-3.0-or-later",
     "architecture": {
         "64bit": {
-            "url": "https://archive.torproject.org/tor-package-archive/torbrowser/14.0.6/tor-browser-windows-x86_64-portable-14.0.6.exe#/dl.7z",
+            "url": "https://archive.torproject.org/tor-package-archive/torbrowser/14.0.6/tor-browser-windows-x86_64-portable-14.0.6.exe",
             "hash": "8396d2cd3859189ac38629ac7d71128f6596b5cc71e089ce490f86f14b4ffb94"
         },
         "32bit": {
-            "url": "https://archive.torproject.org/tor-package-archive/torbrowser/14.0.6/tor-browser-windows-i686-portable-14.0.6.exe#/dl.7z",
+            "url": "https://archive.torproject.org/tor-package-archive/torbrowser/14.0.6/tor-browser-windows-i686-portable-14.0.6.exe",
             "hash": "8f98e916153c45744ce027fe17c0aff731cc8896a327e988e47c5e7a4d8dee82"
         }
     },
-    "extract_dir": "Browser",
     "pre_install": [
+        "# Rename downloaded file",
+        "Rename-Item -Path \"$dir\\tor-browser-*.exe\" -NewName \"installer.exe\"",
+        "# Extract as 7-Zip archive",
+        "Expand-7zipArchive -Path \"$dir\\installer.exe\" -DestinationPath \"$dir\\_temp\"",
+        "# Move content to $dir",
+        "movedir -from \"$dir\\_temp\\Browser\" -to \"$dir\"",
         "# Update extensions in persisted profile",
-        "movedir \"$dir\\TorBrowser\\Data\\Browser\\profile.default\" \"$persist_dir\\TorBrowser\\Data\\Browser\\profile.default\" | Out-Null"
-    ],
-    "persist": [
-        "TorBrowser\\Data\\Browser\\profile.default",
-        "TorBrowser\\Data\\Tor"
+        "movedir -from \"$dir\\TorBrowser\\Data\\Browser\\profile.default\" -to \"$persist_dir\\TorBrowser\\Data\\Browser\\profile.default\"",
+        "# Delete _temp",
+        "Remove-Item -Force -Recurse -Path \"$dir\\_temp\""
     ],
     "bin": [
         [
@@ -35,6 +39,10 @@
             "Tor Browser"
         ]
     ],
+    "persist": [
+        "TorBrowser\\Data\\Browser\\profile.default",
+        "TorBrowser\\Data\\Tor"
+    ],
     "checkver": {
         "url": "https://www.torproject.org/download/",
         "regex": "torbrowser/([\\d.]+)/tor-browser-windows-x86_64-portable"
@@ -42,10 +50,10 @@
     "autoupdate": {
         "architecture": {
             "64bit": {
-                "url": "https://archive.torproject.org/tor-package-archive/torbrowser/$version/tor-browser-windows-x86_64-portable-$version.exe#/dl.7z"
+                "url": "https://archive.torproject.org/tor-package-archive/torbrowser/$version/tor-browser-windows-x86_64-portable-$version.exe"
             },
             "32bit": {
-                "url": "https://archive.torproject.org/tor-package-archive/torbrowser/$version/tor-browser-windows-i686-portable-$version.exe#/dl.7z"
+                "url": "https://archive.torproject.org/tor-package-archive/torbrowser/$version/tor-browser-windows-i686-portable-$version.exe"
             }
         },
         "hash": {