diff --git a/bucket/glow.json b/bucket/glow.json
index e7ab98e7bc..3d586f0dee 100644
--- a/bucket/glow.json
+++ b/bucket/glow.json
@@ -23,6 +23,9 @@
             "32bit": {
                 "url": "https://github.com/charmbracelet/glow/releases/download/v$version/glow_$version_Windows_i386.zip"
             }
+        },
+        "hash": {
+            "url": "$baseurl/checksums.txt"
         }
     }
 }
diff --git a/bucket/k3d.json b/bucket/k3d.json
index 8f7451a2f0..abb6a0c63d 100644
--- a/bucket/k3d.json
+++ b/bucket/k3d.json
@@ -1,5 +1,5 @@
 {
-    "version": "3.1.3",
+    "version": "3.1.4",
     "description": "Creates multi-node k3s cluster on a single machine using docker",
     "homepage": "https://github.com/rancher/k3d",
     "license": "MIT",
@@ -12,8 +12,8 @@
     },
     "architecture": {
         "64bit": {
-            "url": "https://github.com/rancher/k3d/releases/download/v3.1.3/k3d-windows-amd64.exe#/k3d.exe",
-            "hash": "aca25c60be732356d290d57a216d6f8dc0cc22c893d12b653cc64bd630f450ae"
+            "url": "https://github.com/rancher/k3d/releases/download/v3.1.4/k3d-windows-amd64.exe#/k3d.exe",
+            "hash": "196c571eb5ae257eb4d832bd9723c4d124a8c7ec1d515e35b9062d85063631a3"
         }
     },
     "bin": "k3d.exe",
diff --git a/bucket/x264.json b/bucket/x264.json
index 10e3ee4434..5804dd4f31 100644
--- a/bucket/x264.json
+++ b/bucket/x264.json
@@ -1,8 +1,8 @@
 {
+    "version": "3018",
     "description": "H.264/MPEG-4 AVC video encoder",
     "homepage": "https://www.videolan.org/developers/x264.html",
     "license": "GPL-2.0-or-later",
-    "version": "3018",
     "architecture": {
         "64bit": {
             "url": "https://artifacts.videolan.org/x264/release-win64/x264-r3018-db0d417.exe#/x264.exe",
@@ -16,7 +16,7 @@
     "bin": "x264.exe",
     "checkver": {
         "url": "https://artifacts.videolan.org/x264/release-win64/",
-        "regex": "x264-r([\\d]+)-(?<commit>[a-fA-F0-9]{7}).exe"
+        "regex": "x264-r([\\d]+)-(?<commit>[a-fA-F\\d]{7})\\.exe"
     },
     "autoupdate": {
         "architecture": {
diff --git a/bucket/xdelta.json b/bucket/xdelta.json
index 609ff4390f..8406d5c243 100644
--- a/bucket/xdelta.json
+++ b/bucket/xdelta.json
@@ -1,13 +1,8 @@
 {
-    "homepage": "http://xdelta.org/",
-    "description": "Open-source binary diff, delta/differential compression tools, VCDIFF/RFC 3284 delta compression.",
     "version": "3.1.0",
+    "description": "Open-source binary diff, delta/differential compression tools, VCDIFF/RFC 3284 delta compression.",
+    "homepage": "http://xdelta.org/",
     "license": "GPL-2.0-only",
-    "bin": "xdelta.exe",
-    "pre_install": "Get-ChildItem \"$dir\\xdelta3-*.exe\" | Rename-Item -NewName \"$dir\\xdelta.exe\"",
-    "checkver": {
-        "github": "https://github.com/jmacd/xdelta-gpl"
-    },
     "architecture": {
         "64bit": {
             "url": "https://github.com/jmacd/xdelta-gpl/releases/download/v3.1.0/xdelta3-3.1.0-x86_64.exe.zip",
@@ -17,5 +12,7 @@
             "url": "https://github.com/jmacd/xdelta-gpl/releases/download/v3.1.0/xdelta3-3.1.0-i686.exe.zip",
             "hash": "1e72f920dbae1b4edc7be0feba841d78fb06ad38b67630e99d5ff655d8c5d62f"
         }
-    }
+    },
+    "pre_install": "Get-ChildItem \"$dir\\xdelta3-*.exe\" | Rename-Item -NewName 'xdelta.exe'",
+    "bin": "xdelta.exe"
 }
diff --git a/bucket/xidel.json b/bucket/xidel.json
index 07a80c49d4..9e7dd77d9b 100644
--- a/bucket/xidel.json
+++ b/bucket/xidel.json
@@ -1,14 +1,14 @@
 {
-    "homepage": "http://www.videlibri.de/xidel.html",
-    "description": "command line tool to download and extract data from HTML/XML pages as well as JSON APIs.",
     "version": "0.9.8",
+    "description": "command line tool to download and extract data from HTML/XML pages as well as JSON APIs.",
+    "homepage": "http://www.videlibri.de/xidel.html",
     "license": "GPL-3.0-or-later",
     "url": "https://github.com/benibela/xidel/releases/download/Xidel_0.9.8/xidel-0.9.8.win32.zip",
     "hash": "96854c2be1e3755f56fabb8f00d1fe567108461b9fab139039219a1b7c17e382",
     "bin": "xidel.exe",
     "checkver": {
         "github": "https://github.com/benibela/xidel",
-        "regex": "xidel-([0-9.]+).win32"
+        "regex": "xidel-([\\d.]+)\\.win32"
     },
     "autoupdate": {
         "url": "https://github.com/benibela/xidel/releases/download/Xidel_$version/xidel-$version.win32.zip"
diff --git a/bucket/xming.json b/bucket/xming.json
index 47fbc05c23..8040f032c8 100644
--- a/bucket/xming.json
+++ b/bucket/xming.json
@@ -1,7 +1,7 @@
 {
-    "homepage": "http://www.straightrunning.com/XmingNotes/",
     "version": "6.9.0.31",
     "description": "Run X GUI applications on bash subsystem or linux VM, and have them rendered on Windows Desktop.",
+    "homepage": "http://www.straightrunning.com/XmingNotes/",
     "license": {
         "identifier": "Public Domain,...",
         "url": "http://www.straightrunning.com/XmingNotes/terms.php"
diff --git a/bucket/xmlstarlet.json b/bucket/xmlstarlet.json
index 805895838f..9dad85bcc3 100644
--- a/bucket/xmlstarlet.json
+++ b/bucket/xmlstarlet.json
@@ -9,7 +9,7 @@
     "bin": "xml.exe",
     "checkver": {
         "url": "https://sourceforge.net/projects/xmlstar/files/",
-        "regex": "xmlstarlet-([\\d\\.]+)-win"
+        "regex": "xmlstarlet-([\\d.]+)-win"
     },
     "autoupdate": {
         "url": "https://downloads.sourceforge.net/project/xmlstar/xmlstarlet/$version/xmlstarlet-$version-win32.zip",
diff --git a/bucket/xpdf-tools.json b/bucket/xpdf-tools.json
index 9232d402fc..0865b77894 100644
--- a/bucket/xpdf-tools.json
+++ b/bucket/xpdf-tools.json
@@ -1,34 +1,19 @@
 {
-    "homepage": "https://www.xpdfreader.com",
-    "description": "Several command-line utilities to read and extract data from PDF files",
     "version": "4.02",
-    "url": "https://xpdfreader-dl.s3.amazonaws.com/xpdf-tools-win-4.02.zip",
-    "hash": "b39a8e3f5f8f981328c926c6bcb3f3b11cc007c826719f6e10e3eb628e0a6355",
+    "description": "Several command-line utilities to read and extract data from PDF files",
+    "homepage": "https://www.xpdfreader.com",
     "license": {
         "identifier": "GPL-2.0-only|GPL-3.0-only",
         "url": "https://www.xpdfreader.com/opensource.html"
     },
+    "url": "https://xpdfreader-dl.s3.amazonaws.com/xpdf-tools-win-4.02.zip",
+    "hash": "b39a8e3f5f8f981328c926c6bcb3f3b11cc007c826719f6e10e3eb628e0a6355",
     "architecture": {
-        "32bit": {
-            "extract_dir": "xpdf-tools-win-4.02/bin32"
-        },
         "64bit": {
-            "extract_dir": "xpdf-tools-win-4.02/bin64"
-        }
-    },
-    "checkver": {
-        "url": "https://www.xpdfreader.com/download.html",
-        "re": "Current version:\\s*([^\\s<]+)"
-    },
-    "autoupdate": {
-        "url": "https://xpdfreader-dl.s3.amazonaws.com/xpdf-tools-win-$version.zip",
-        "architecture": {
-            "32bit": {
-                "extract_dir": "xpdf-tools-win-$version/bin32"
-            },
-            "64bit": {
-                "extract_dir": "xpdf-tools-win-$version/bin64"
-            }
+            "extract_dir": "xpdf-tools-win-4.02\\bin64"
+        },
+        "32bit": {
+            "extract_dir": "xpdf-tools-win-4.02\\bin32"
         }
     },
     "bin": [
@@ -41,5 +26,20 @@
         "pdftotext.exe",
         "pdfinfo.exe",
         "pdftops.exe"
-    ]
+    ],
+    "checkver": {
+        "url": "https://www.xpdfreader.com/download.html",
+        "regex": "Current version:\\s*([^\\s<]+)"
+    },
+    "autoupdate": {
+        "url": "https://xpdfreader-dl.s3.amazonaws.com/xpdf-tools-win-$version.zip",
+        "architecture": {
+            "64bit": {
+                "extract_dir": "xpdf-tools-win-$version\\bin64"
+            },
+            "32bit": {
+                "extract_dir": "xpdf-tools-win-$version\\bin32"
+            }
+        }
+    }
 }
diff --git a/bucket/xsv.json b/bucket/xsv.json
index 6ffd176236..2a854fc96e 100644
--- a/bucket/xsv.json
+++ b/bucket/xsv.json
@@ -1,8 +1,8 @@
 {
-    "homepage": "https://github.com/BurntSushi/xsv",
-    "description": "A fast CSV command line toolkit written in Rust",
-    "license": "Unlicense",
     "version": "0.13.0",
+    "description": "A fast CSV command line toolkit written in Rust",
+    "homepage": "https://github.com/BurntSushi/xsv",
+    "license": "Unlicense",
     "architecture": {
         "64bit": {
             "url": "https://github.com/BurntSushi/xsv/releases/download/0.13.0/xsv-0.13.0-x86_64-pc-windows-msvc.zip",
@@ -14,9 +14,7 @@
         }
     },
     "bin": "xsv.exe",
-    "checkver": {
-        "github": "https://github.com/BurntSushi/xsv"
-    },
+    "checkver": "github",
     "autoupdate": {
         "architecture": {
             "64bit": {
diff --git a/bucket/xxcopy.json b/bucket/xxcopy.json
index 71bb405ed2..0f82e1ab4b 100644
--- a/bucket/xxcopy.json
+++ b/bucket/xxcopy.json
@@ -1,11 +1,11 @@
 {
-    "homepage": "http://www.xxcopy.com",
     "version": "3.33.3",
+    "description": "A versatile file management tool for Microsoft Windows®.",
+    "homepage": "http://www.xxcopy.com",
     "license": {
         "identifier": "Shareware",
         "url": "http://www.xxcopy.com/xxtb_092.htm"
     },
-    "description": "A versatile file management tool for Microsoft Windows®.",
     "url": "http://www.xxcopy.com/download/xxfw3333.zip",
     "hash": "d5fd9d2446a0d54b564c864310b481c9e160ee487f305af67f584eff5b6bd767",
     "architecture": {
diff --git a/bucket/xz.json b/bucket/xz.json
index e21b54a068..bebdc7aab8 100644
--- a/bucket/xz.json
+++ b/bucket/xz.json
@@ -1,11 +1,11 @@
 {
+    "version": "5.2.5",
     "description": "XZ Utils is free general-purpose data compression software with a high compression ratio.",
     "homepage": "https://tukaani.org/xz/",
     "license": {
         "identifier": "LGPL-2.1-or-later,GPL-2.0-or-later,GPL-3.0-or-later,Public Domain",
         "url": "https://git.tukaani.org/?p=xz.git;a=blob;f=COPYING"
     },
-    "version": "5.2.5",
     "url": "https://tukaani.org/xz/xz-5.2.5-windows.zip",
     "hash": "d83b82ca75dfab39a13dda364367b34970c781a9df4d41264db922ac3a8f622d",
     "architecture": {
diff --git a/bucket/y-cruncher.json b/bucket/y-cruncher.json
index 61950dc4fc..555cef14c3 100644
--- a/bucket/y-cruncher.json
+++ b/bucket/y-cruncher.json
@@ -1,7 +1,7 @@
 {
-    "homepage": "http://www.numberworld.org/y-cruncher/",
-    "description": "Scalable multi-threaded benchmark calculating multiple mathematical constants to trillions of digits.",
     "version": "0.7.8.9507",
+    "description": "Scalable multi-threaded benchmark calculating multiple mathematical constants to trillions of digits.",
+    "homepage": "http://www.numberworld.org/y-cruncher/",
     "license": {
         "identifier": "Freeware",
         "url": "http://www.numberworld.org/y-cruncher/license.html"
@@ -10,7 +10,7 @@
     "hash": "89844061b7f61f047e412d648262687e05b3101968c0dbca8f2b57ed11f555ca",
     "extract_dir": "y-cruncher v0.7.8.9507",
     "bin": "y-cruncher.exe",
-    "checkver": "y-cruncher v([\\d.]+).zip",
+    "checkver": "y-cruncher v([\\d.]+)\\.zip",
     "autoupdate": {
         "url": "http://www.numberworld.org/y-cruncher/y-cruncher%20v$version.zip",
         "extract_dir": "y-cruncher v$version"
diff --git a/bucket/yasm.json b/bucket/yasm.json
index 79b310588f..2c8a92fcc2 100644
--- a/bucket/yasm.json
+++ b/bucket/yasm.json
@@ -1,8 +1,8 @@
 {
+    "version": "1.3.0",
     "description": "Modular assembler based on NASM",
     "homepage": "http://yasm.tortall.net/",
     "license": "BSD-3-Clause",
-    "version": "1.3.0",
     "architecture": {
         "64bit": {
             "hash": "d160b1d97266f3f28a71b4420a0ad2cd088a7977c2dd3b25af155652d8d8d91f",
@@ -16,7 +16,7 @@
     "bin": "yasm.exe",
     "checkver": {
         "url": "http://yasm.tortall.net/Download.html",
-        "re": "Latest Release: ([\\d.]+)"
+        "regex": "Latest Release: ([\\d.]+)"
     },
     "autoupdate": {
         "architecture": {
diff --git a/bucket/yubikey-personalization.json b/bucket/yubikey-personalization.json
index 2f80dde573..e62ebb7ab5 100644
--- a/bucket/yubikey-personalization.json
+++ b/bucket/yubikey-personalization.json
@@ -1,7 +1,7 @@
 {
-    "homepage": "https://developers.yubico.com/yubikey-personalization/",
-    "description": "A command line tool to personalize (i.e., set a AES key) YubiKeys.",
     "version": "1.19.0",
+    "description": "A command line tool to personalize (i.e., set a AES key) YubiKeys.",
+    "homepage": "https://developers.yubico.com/yubikey-personalization/",
     "license": "BSD-2-Clause",
     "architecture": {
         "64bit": {
@@ -23,7 +23,7 @@
     ],
     "checkver": {
         "url": "https://www.yubico.com/support/knowledge-base/categories/articles/yubikey-personalization-tools/",
-        "re": "ykpers-([\\d.]+)-win64\\.zip"
+        "regex": "ykpers-([\\d.]+)-win64\\.zip"
     },
     "autoupdate": {
         "architecture": {
diff --git a/bucket/zenhan.json b/bucket/zenhan.json
index 6399a74a4e..dad481b39f 100644
--- a/bucket/zenhan.json
+++ b/bucket/zenhan.json
@@ -1,7 +1,7 @@
 {
     "version": "0.0.1",
-    "homepage": "https://github.com/iuchim/zenhan",
     "description": "Editor input method switcher",
+    "homepage": "https://github.com/iuchim/zenhan",
     "license": "Unknown",
     "notes": "You can use zenhan from autoSwitchIM function of VSCodeVim (see https://github.com/VSCodeVim/Vim#input-method)",
     "url": "https://github.com/iuchim/zenhan/releases/download/v0.0.1/zenhan.zip",
diff --git a/bucket/ziglang.json b/bucket/ziglang.json
index 641351a8a0..2caafdd99d 100644
--- a/bucket/ziglang.json
+++ b/bucket/ziglang.json
@@ -26,7 +26,7 @@
         },
         "hash": {
             "url": "https://ziglang.org/download/",
-            "regex": "$basename[\\S\\s]+?$sha256"
+            "regex": "(?sm)$basename.*?$sha256"
         }
     }
 }
diff --git a/bucket/zip.json b/bucket/zip.json
index c85916be7f..ffad2646be 100644
--- a/bucket/zip.json
+++ b/bucket/zip.json
@@ -1,25 +1,25 @@
 {
+    "version": "3.0",
+    "description": "Zip compression utilities",
     "homepage": "http://www.info-zip.org/",
     "license": {
         "identifier": "Freeware",
         "url": "http://infozip.sourceforge.net/doc/LICENSE"
     },
-    "description": "Zip compression utilities",
-    "version": "3.0",
+    "architecture": {
+        "64bit": {
+            "url": "https://raw.githubusercontent.com/ScoopInstaller/Binary/master/zip/x64/zip300xn-x64.zip",
+            "hash": "63f32f1f797680d9c68379d36cff4373674d405527d7fa2b4bbd34edcc3370d2"
+        },
+        "32bit": {
+            "url": "https://raw.githubusercontent.com/ScoopInstaller/Binary/master/zip/zip300xn.zip",
+            "hash": "f8bbc1821d50400245107ce8cfa4a6c7b524387b58bbd6cbe9c20094e82c3bb5"
+        }
+    },
     "bin": [
         "zip.exe",
         "zipcloak.exe",
         "zipnote.exe",
         "zipsplit.exe"
-    ],
-    "architecture": {
-        "32bit": {
-            "hash": "f8bbc1821d50400245107ce8cfa4a6c7b524387b58bbd6cbe9c20094e82c3bb5",
-            "url": "https://raw.githubusercontent.com/ScoopInstaller/Binary/master/zip/zip300xn.zip"
-        },
-        "64bit": {
-            "hash": "63f32f1f797680d9c68379d36cff4373674d405527d7fa2b4bbd34edcc3370d2",
-            "url": "https://raw.githubusercontent.com/ScoopInstaller/Binary/master/zip/x64/zip300xn-x64.zip"
-        }
-    }
+    ]
 }
diff --git a/bucket/zookeeper.json b/bucket/zookeeper.json
index e1ebb45c0b..4eb589faf3 100644
--- a/bucket/zookeeper.json
+++ b/bucket/zookeeper.json
@@ -1,29 +1,29 @@
 {
-    "homepage": "https://zookeeper.apache.org/",
-    "description": "High-performance coordination service for distributed applications",
     "version": "3.6.2",
+    "description": "High-performance coordination service for distributed applications",
+    "homepage": "https://zookeeper.apache.org/",
     "license": "Apache-2.0",
-    "url": "https://www.apache.org/dist/zookeeper/zookeeper-3.6.2/apache-zookeeper-3.6.2-bin.tar.gz",
-    "hash": "sha512:caff5111bb6876b7124760bc006e6fa2523efa54b99321a3c9cd8192ea0d5596abc7d70a054b1aac9b20a411407dae7611c7aba870c23bff28eb1643ba499199",
-    "extract_dir": "apache-zookeeper-3.6.2-bin",
-    "bin": [
-        "bin\\zkServer.cmd",
-        "bin\\zkCli.cmd"
-    ],
-    "persist": "data",
     "suggest": {
         "JDK": [
             "java/oraclejdk",
             "java/openjdk"
         ]
     },
+    "url": "https://www.apache.org/dist/zookeeper/zookeeper-3.6.2/apache-zookeeper-3.6.2-bin.tar.gz",
+    "hash": "sha512:caff5111bb6876b7124760bc006e6fa2523efa54b99321a3c9cd8192ea0d5596abc7d70a054b1aac9b20a411407dae7611c7aba870c23bff28eb1643ba499199",
+    "extract_dir": "apache-zookeeper-3.6.2-bin",
     "post_install": [
         "$dataDirPath = (\"$dir\\data\").replace('\\', '\\\\')",
         "(Get-Content \"$dir\\conf\\zoo_sample.cfg\") -Replace '^dataDir=(.+)$', \"dataDir=$dataDirPath\" | Set-Content \"$dir\\conf\\zoo.cfg\" -Encoding Ascii"
     ],
+    "bin": [
+        "bin\\zkServer.cmd",
+        "bin\\zkCli.cmd"
+    ],
+    "persist": "data",
     "checkver": {
         "url": "https://www.apache.org/dist/zookeeper/",
-        "re": "zookeeper-([\\d.]+)/",
+        "regex": "zookeeper-([\\d.]+)/",
         "reverse": true
     },
     "autoupdate": {
diff --git a/bucket/zoxide.json b/bucket/zoxide.json
index 006effbda1..8b7b264b8c 100644
--- a/bucket/zoxide.json
+++ b/bucket/zoxide.json
@@ -1,8 +1,8 @@
 {
-    "version":  "0.4.3",
+    "version": "0.4.3",
     "description": "A faster way to navigate your filesystem",
-    "homepage":  "https://github.com/ajeetdsouza/zoxide",
-    "license":  "MIT",
+    "homepage": "https://github.com/ajeetdsouza/zoxide",
+    "license": "MIT",
     "notes": "See https://github.com/ajeetdsouza/zoxide#powershell for zoxide autoload",
     "architecture": {
         "64bit": {
diff --git a/bucket/zstd.json b/bucket/zstd.json
index 8e32df02bb..8317bfd03d 100644
--- a/bucket/zstd.json
+++ b/bucket/zstd.json
@@ -1,8 +1,8 @@
 {
+    "version": "1.4.5",
+    "description": "High compression ratios compression algorithm",
     "homepage": "https://facebook.github.io/zstd/",
     "license": "BSD-3-Clause",
-    "description": "High compression ratios compression algorithm",
-    "version": "1.4.5",
     "architecture": {
         "64bit": {
             "url": "https://github.com/facebook/zstd/releases/download/v1.4.5/zstd-v1.4.5-win64.zip",