diff --git a/bucket/1password-cli.json b/bucket/1password-cli.json
index 56eff05fba..7d30e352b0 100644
--- a/bucket/1password-cli.json
+++ b/bucket/1password-cli.json
@@ -1,7 +1,7 @@
 {
     "version": "1.8.0",
-    "homepage": "https://support.1password.com/command-line/",
     "description": "The 1Password command-line tool makes your 1Password account accessible entirely from the command line.",
+    "homepage": "https://support.1password.com/command-line/",
     "license": {
         "identifier": "Shareware",
         "url": "https://1password.com/legal/terms-of-service/"
@@ -19,7 +19,7 @@
     "bin": "op.exe",
     "checkver": {
         "url": "https://app-updates.agilebits.com/product_history/CLI",
-        "regex": "/op_windows_amd64_v([\\d.]+).zip"
+        "regex": "/op_windows_amd64_v([\\d.]+)\\.zip"
     },
     "autoupdate": {
         "architecture": {
diff --git a/bucket/7zip.json b/bucket/7zip.json
index b2b8e2c237..e851c083b0 100644
--- a/bucket/7zip.json
+++ b/bucket/7zip.json
@@ -1,11 +1,11 @@
 {
-    "homepage": "https://www.7-zip.org/",
+    "version": "19.00",
     "description": "A multi-format file archiver with high compression ratios",
+    "homepage": "https://www.7-zip.org/",
     "license": {
         "identifier": "Freeware,LGPL-2.0-only,BSD-3-Clause",
         "url": "https://www.7-zip.org/license.txt"
     },
-    "version": "19.00",
     "architecture": {
         "64bit": {
             "url": "https://7-zip.org/a/7z1900-x64.msi",
@@ -16,8 +16,14 @@
             "hash": "b49d55a52bc0eab14947c8982c413d9be141c337da1368a24aa0484cbb5e89cd"
         }
     },
-    "extract_dir": "Files/7-Zip",
+    "extract_dir": "Files\\7-Zip",
     "bin": "7z.exe",
+    "shortcuts": [
+        [
+            "7zFM.exe",
+            "7-Zip"
+        ]
+    ],
     "checkver": {
         "url": "https://www.7-zip.org/download.html",
         "regex": "Download 7-Zip ([\\d.]+)"
@@ -31,11 +37,5 @@
                 "url": "https://7-zip.org/a/7z$cleanVersion.msi"
             }
         }
-    },
-    "shortcuts": [
-        [
-            "7zFM.exe",
-            "7-Zip"
-        ]
-    ]
+    }
 }
diff --git a/bucket/cloudflared.json b/bucket/cloudflared.json
index 82ce87a7ba..bab4312d0b 100644
--- a/bucket/cloudflared.json
+++ b/bucket/cloudflared.json
@@ -1,5 +1,5 @@
 {
-    "version": "2021.1.3",
+    "version": "2021.1.4",
     "description": "Command-line client to interact with Cloudflare's Argo Tunnel, Cloudflare Access, start up a DNS over HTTPS resolver and more.",
     "homepage": "https://github.com/cloudflare/cloudflared",
     "license": {
@@ -8,12 +8,12 @@
     },
     "architecture": {
         "64bit": {
-            "url": "https://github.com/cloudflare/cloudflared/releases/download/2021.1.3/cloudflared-windows-amd64.exe#/cloudflared.exe",
-            "hash": "6c1782f9371fb1fa8aa58236aad05c605e19927bddf243b6dccee2151e92880e"
+            "url": "https://github.com/cloudflare/cloudflared/releases/download/2021.1.4/cloudflared-windows-amd64.exe#/cloudflared.exe",
+            "hash": "e9a71710270b36014946fd0d88a23aa01cfcb2f878e0e46194a39e89e04faffa"
         },
         "32bit": {
-            "url": "https://github.com/cloudflare/cloudflared/releases/download/2021.1.3/cloudflared-windows-386.exe#/cloudflared.exe",
-            "hash": "e563d6ce0eff011b0a7087c53bda963743d4e52b57e932b359c741e317356e64"
+            "url": "https://github.com/cloudflare/cloudflared/releases/download/2021.1.4/cloudflared-windows-386.exe#/cloudflared.exe",
+            "hash": "b4a005511c9f81ba24ee85e0a0951fa534159a747565a24ec5a0e62642486190"
         }
     },
     "bin": "cloudflared.exe",
diff --git a/bucket/docker-nightly.json b/bucket/docker-nightly.json
index ca7c98a370..ea08e114be 100644
--- a/bucket/docker-nightly.json
+++ b/bucket/docker-nightly.json
@@ -30,6 +30,10 @@
         "",
         "For help, see https://docs.microsoft.com/en-us/virtualization/windowscontainers/manage-docker/configure-docker-daemon"
     ],
+    "depends": [
+        "sudo",
+        "lcow"
+    ],
     "suggest": {
         "Linux container support on Windows": "lcow",
         "Docker Compose": "docker-compose",
@@ -38,10 +42,6 @@
         "Kubernetes Client": "kubectl",
         "compose.yml to kubernetes.yml": "kompose"
     },
-    "depends": [
-        "sudo",
-        "lcow"
-    ],
     "url": "https://master.dockerproject.org/windows/x86_64/docker.zip",
     "extract_dir": "docker",
     "bin": [
diff --git a/bucket/qemu.json b/bucket/qemu.json
index ba0e8621ea..1f260899d6 100644
--- a/bucket/qemu.json
+++ b/bucket/qemu.json
@@ -1,8 +1,8 @@
 {
-    "homepage": "https://qemu.weilnetz.de/",
-    "description": "A generic and open source machine emulator and virtualizer.",
-    "license": "GPL-2.0-only",
     "version": "5.2.0-rc2",
+    "description": "A generic and open source machine emulator and virtualizer.",
+    "homepage": "https://qemu.weilnetz.de/",
+    "license": "GPL-2.0-only",
     "architecture": {
         "64bit": {
             "url": "https://qemu.weilnetz.de/w64/2020/qemu-w64-setup-20201124.exe#/dl.7z",
@@ -79,9 +79,7 @@
         "qemu-system-xtensaebw.exe",
         "qemu-system-xtensaw.exe"
     ],
-    "checkver": {
-        "re": "<strong>(?<year>\\d{4})-(?<month>\\d{2})-(?<day>\\d{2})</strong>: New QEMU installers \\((?<version>[\\d.a-z\\-]+)\\)"
-    },
+    "checkver": "<strong>(?<year>\\d{4})-(?<month>\\d{2})-(?<day>\\d{2})</strong>: New QEMU installers \\((?<version>[\\d.a-z\\-]+)\\)",
     "autoupdate": {
         "architecture": {
             "64bit": {
diff --git a/bucket/wp-cli.json b/bucket/wp-cli.json
index 37da1680cd..9f8ad0a298 100644
--- a/bucket/wp-cli.json
+++ b/bucket/wp-cli.json
@@ -3,13 +3,13 @@
     "description": "Command-line interface for WordPress",
     "homepage": "https://wp-cli.org",
     "license": "MIT",
+    "notes": "'wp cli update' is aliased to 'scoop update wp-cli'",
     "suggest": {
         "PHP": [
             "php",
             "php-nts"
         ]
     },
-    "notes": "'wp cli update' is aliased to 'scoop update wp-cli'",
     "url": "https://github.com/wp-cli/wp-cli/releases/download/v2.4.0/wp-cli-2.4.0.phar#/wp-cli.phar",
     "hash": "sha512:4049c7e45e14276a70a41c3b0864be7a6a8cfa8ea65ebac8b184a4f503a91baa1a0d29260d03248bc74aef70729824330fb6b396336172a624332e16f64e37ef",
     "pre_install": [