diff --git a/.vscode/settings.json b/.vscode/settings.json
index 160691c4..fec4c2ae 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -26,16 +26,29 @@
         "visualboyadvance",
         "yuzu"
     ],
-    "sortJSON.orderOverride": ["identifier",
-        "homepage",
-        "description",
+    "sortJSON.orderOverride": [
         "version",
+        "description",
+        "homepage",
         "license",
         "notes",
+        "depends",
+        "suggest",
         "url",
         "hash",
-        "pre-install",
-        "post-install"
+        "extract_dir",
+        "extract_to",
+        "pre_install",
+        "installer",
+        "post_install",
+        "env_add_path",
+        "env_set",
+        "bin",
+        "shortcuts",
+        "persist",
+        "uninstaller",
+        "checkver",
+        "autoupdate"
     ],
     "editor.codeActionsOnSave": {
         "source.fixAll": true,
@@ -43,15 +56,28 @@
       },
 
     "sort-json.settings.orderOverride": [
-        "homepage",
-        "description",
         "version",
+        "description",
+        "homepage",
         "license",
         "notes",
+        "depends",
+        "suggest",
         "url",
         "hash",
-        "pre-install",
-        "post-install"
+        "extract_dir",
+        "extract_to",
+        "pre_install",
+        "installer",
+        "post_install",
+        "env_add_path",
+        "env_set",
+        "bin",
+        "shortcuts",
+        "persist",
+        "uninstaller",
+        "checkver",
+        "autoupdate"
     ],
     "[json]": {
         "editor.defaultFormatter": "vscode.json-language-features"
diff --git a/bucket/0ad.json b/bucket/0ad.json
index d42c80e0..4f0be530 100644
--- a/bucket/0ad.json
+++ b/bucket/0ad.json
@@ -1,28 +1,28 @@
 {
-    "homepage": "https://play0ad.com/",
-    "description": "Free and open source strategy game of ancient warfare",
     "version": "0.0.25b",
+    "description": "Free and open source strategy game of ancient warfare",
+    "homepage": "https://play0ad.com/",
     "license": {
-        "identifier": "Freeware",
-        "url": "https://github.com/0ad/0ad/blob/master/LICENSE.txt"
+        "url": "https://github.com/0ad/0ad/blob/master/LICENSE.txt",
+        "identifier": "Freeware"
     },
     "url": "https://releases.wildfiregames.com/0ad-0.0.25b-alpha-win32.exe#/setup.exe",
     "hash": "sha1:48b0266f6047c06242822dccdd6d957db14983e1",
+    "installer": {
+        "script": "Start-Process -FilePath \"$dir\\setup.exe\" -ArgumentList \"/S\", \"/D=$dir\" -Wait"
+    },
+    "bin": "binaries\\system\\pyrogenesis.exe",
+    "uninstaller": {
+        "script": "Start-Process -FilePath \"$dir\\Uninstall.exe\" -ArgumentList /S -Wait"
+    },
+    "checkver": {
+        "url": "https://play0ad.com/download/win/",
+        "regex": "0ad-([\\w.]+)-alpha-win32.exe"
+    },
     "autoupdate": {
         "url": "https://releases.wildfiregames.com/0ad-$version-alpha-win32.exe#/setup.exe",
         "hash": {
             "url": "$url.sha1sum"
         }
-    },
-    "bin": "binaries\\system\\pyrogenesis.exe",
-    "checkver": {
-        "url": "https://play0ad.com/download/win/",
-        "regex": "0ad-([\\w.]+)-alpha-win32.exe"
-    },
-    "installer": {
-        "script": "Start-Process -FilePath \"$dir\\setup.exe\" -ArgumentList \"/S\", \"/D=$dir\" -Wait"
-    },
-    "uninstaller": {
-        "script": "Start-Process -FilePath \"$dir\\Uninstall.exe\" -ArgumentList /S -Wait"
     }
 }
diff --git a/bucket/actools.json b/bucket/actools.json
index 79d32551..8ad6f755 100644
--- a/bucket/actools.json
+++ b/bucket/actools.json
@@ -1,18 +1,18 @@
 {
-    "homepage": "https://github.com/gro-ove/actools",
-    "description": "Alternative launcher for Assetto Corsa named Content Manager, and some utils as well",
     "version": "0.8.2393.39063",
+    "description": "Alternative launcher for Assetto Corsa named Content Manager, and some utils as well",
+    "homepage": "https://github.com/gro-ove/actools",
     "license": "MS-PL",
     "url": "https://github.com/gro-ove/actools/releases/download/v0.8.2393.39063/Content.Manager.zip",
     "hash": "4e34870fb86f46b9657c89026f965e6ca52c181c518aa7c0f10b531d6308aed6",
-    "autoupdate": {
-        "url": "https://github.com/gro-ove/actools/releases/download/v$version/Content.Manager.zip"
-    },
-    "checkver": "github",
     "shortcuts": [
         [
             "Content Manager.exe",
             "Assetto Corsa Content Manager"
         ]
-    ]
+    ],
+    "checkver": "github",
+    "autoupdate": {
+        "url": "https://github.com/gro-ove/actools/releases/download/v$version/Content.Manager.zip"
+    }
 }
diff --git a/bucket/adom.json b/bucket/adom.json
index af471f71..db1e4a8f 100644
--- a/bucket/adom.json
+++ b/bucket/adom.json
@@ -1,23 +1,23 @@
 {
-    "homepage": "https://www.adom.de/home",
-    "description": "A roguelike with a mix of story, RPG, exploration, and strategic and flexible combat.",
     "version": "3.3.3",
+    "description": "A roguelike with a mix of story, RPG, exploration, and strategic and flexible combat.",
+    "homepage": "https://www.adom.de/home",
     "license": "Custom",
     "url": "https://www.adom.de/home/download/current/adom_windows_3.3.3.zip",
     "hash": "679182edf2df02cabbacf11a3b432ed087ccedda4323491e170be14a93114549",
-    "autoupdate": {
-        "url": "https://www.adom.de/home/download/current/adom_windows_$version.zip"
-    },
-    "bin": "adom.exe",
-    "checkver": {
-        "url": "https://www.adom.de/home/downloads.html",
-        "re": "Version ([\\d.]+)"
-    },
     "extract_dir": "adom",
+    "bin": "adom.exe",
     "shortcuts": [
         [
             "adom.exe",
             "Ancient Domains of Mystery (ASCII)"
         ]
-    ]
+    ],
+    "checkver": {
+        "url": "https://www.adom.de/home/downloads.html",
+        "re": "Version ([\\d.]+)"
+    },
+    "autoupdate": {
+        "url": "https://www.adom.de/home/download/current/adom_windows_$version.zip"
+    }
 }
diff --git a/bucket/amidst.json b/bucket/amidst.json
index 3d04dc02..d9c0dfd8 100644
--- a/bucket/amidst.json
+++ b/bucket/amidst.json
@@ -1,8 +1,11 @@
 {
-    "homepage": "https://github.com/toolbox4minecraft/amidst",
-    "description": "Minecraft interface and data/structure tracking tool",
     "version": "4.7",
+    "description": "Minecraft interface and data/structure tracking tool",
+    "homepage": "https://github.com/toolbox4minecraft/amidst",
     "license": "GPL-3.0-only",
+    "suggest": {
+        "Java Runtime Environment": "java/adoptopenjdk-hotspot-jre"
+    },
     "url": [
         "https://github.com/toolbox4minecraft/amidst/releases/download/v4.7/amidst-v4-7.jar#/amidst.jar",
         "https://raw.githubusercontent.com/toolbox4minecraft/amidst/master/src/main/resources/amidst/icon/amidst.ico"
@@ -11,12 +14,8 @@
         "a1e7118c3ec952ebc5ca6f0dfe1484e5c6c0150a234bacb13aec69c164655bd3",
         "72a590ca98fc21d315b090b2ae82a46b99a56934c1d17e3c7ea0bba6f45a5d61"
     ],
-    "autoupdate": {
-        "url": "https://github.com/toolbox4minecraft/amidst/releases/download/v$version/amidst-v$dashVersion.jar#/amidst.jar"
-    },
-    "bin": "amidst.bat",
-    "checkver": "github",
     "pre_install": "Set-Content -Path \"$dir\\amidst.bat\" -Value \"@echo off`njava -jar `\"$dir\\amidst.jar`\" %*\"",
+    "bin": "amidst.bat",
     "shortcuts": [
         [
             "amidst.bat",
@@ -25,7 +24,8 @@
             "amidst.ico"
         ]
     ],
-    "suggest": {
-        "Java Runtime Environment": "java/adoptopenjdk-hotspot-jre"
+    "checkver": "github",
+    "autoupdate": {
+        "url": "https://github.com/toolbox4minecraft/amidst/releases/download/v$version/amidst-v$dashVersion.jar#/amidst.jar"
     }
 }
diff --git a/bucket/amulet-map-editor.json b/bucket/amulet-map-editor.json
index ab5f6bc9..93c5ead2 100644
--- a/bucket/amulet-map-editor.json
+++ b/bucket/amulet-map-editor.json
@@ -1,29 +1,29 @@
 {
-    "homepage": "https://www.amulet-editor.com",
-    "description": "Minecraft world editor and converter that supports all versions since Java 1.12 and Bedrock 1.7",
     "version": "0.8.20",
+    "description": "Minecraft world editor and converter that supports all versions since Java 1.12 and Bedrock 1.7",
+    "homepage": "https://www.amulet-editor.com",
     "license": "Unknown",
+    "shortcuts": [
+        [
+            "amulet_app.exe",
+            "Amulet Map Editor"
+        ]
+    ],
+    "persist": [
+        "config",
+        "logs"
+    ],
+    "checkver": {
+        "github": "https://github.com/Amulet-Team/Amulet-Map-Editor"
+    },
+    "autoupdate": {
+        "url": "https://github.com/Amulet-Team/Amulet-Map-Editor/releases/download/$version/Amulet-v$version-windows-x64.zip"
+    },
     "architecture": {
         "64bit": {
             "url": "https://github.com/Amulet-Team/Amulet-Map-Editor/releases/download/0.8.20/Amulet-v0.8.20-windows-x64.zip",
             "hash": "1b3ca6ed3806f89dc943b93bec216d440aec0d1f857d6c681f0143dc0659fdc5",
             "extract_dir": "Amulet"
         }
-    },
-    "autoupdate": {
-        "url": "https://github.com/Amulet-Team/Amulet-Map-Editor/releases/download/$version/Amulet-v$version-windows-x64.zip"
-    },
-    "checkver": {
-        "github": "https://github.com/Amulet-Team/Amulet-Map-Editor"
-    },
-    "persist": [
-        "config",
-        "logs"
-    ],
-    "shortcuts": [
-        [
-            "amulet_app.exe",
-            "Amulet Map Editor"
-        ]
-    ]
+    }
 }
diff --git a/bucket/angband-dev.json b/bucket/angband-dev.json
index 860a19e0..53f0a23b 100644
--- a/bucket/angband-dev.json
+++ b/bucket/angband-dev.json
@@ -1,22 +1,12 @@
 {
-    "homepage": "https://rephial.org/",
-    "description": "A free single-player dungeon exploration Roguelike (Pre-release)",
     "version": "4.2.4-1-g5611fed01",
+    "description": "A free single-player dungeon exploration Roguelike (Pre-release)",
+    "homepage": "https://rephial.org/",
     "license": "GPL-2.0",
     "notes": "Configuration files cannot be persisted, but will be retained during the update",
     "url": "https://github.com/angband/angband/releases/download/4.2.4-1-g5611fed01/Angband-4.2.4-1-g5611fed01-win.zip",
     "hash": "a8ae08cd0531f7dc9b7153ddd7a0854a3ab47d80f5b615f6d99375a7aed94b5f",
-    "autoupdate": {
-        "url": "https://github.com/angband/angband/releases/download/$version/Angband-$version-win.zip",
-        "extract_dir": "angband-$version"
-    },
-    "checkver": {
-        "url": "https://github.com/angband/angband/releases",
-        "regex": "Angband-(?<major>[\\d]+)\\.(?<minor>[\\d]+)\\.(?<patch>[\\d]+)-(?<build>[\\d]+)-g(?<commit>[\\da-z]+)-win\\.zip",
-        "replace": "${major}.${minor}.${patch}-${build}-g${commit}"
-    },
     "extract_dir": "angband-4.2.4-1-g5611fed01",
-    "persist": "lib\\user",
     "post_install": [
         "'angband.INI' | ForEach-Object {",
         "    if (!(Test-Path \"$persist_dir\\$_.bak\")) {",
@@ -36,11 +26,21 @@
             "Angband\\Angband Manual (Pre-release)"
         ]
     ],
+    "persist": "lib\\user",
     "uninstaller": {
         "script": [
             "'angband.INI' | ForEach-Object {",
             "    Copy-Item \"$dir\\$_\" \"$persist_dir\\$_.bak\" -Force",
             "}"
         ]
+    },
+    "checkver": {
+        "url": "https://github.com/angband/angband/releases",
+        "regex": "Angband-(?<major>[\\d]+)\\.(?<minor>[\\d]+)\\.(?<patch>[\\d]+)-(?<build>[\\d]+)-g(?<commit>[\\da-z]+)-win\\.zip",
+        "replace": "${major}.${minor}.${patch}-${build}-g${commit}"
+    },
+    "autoupdate": {
+        "url": "https://github.com/angband/angband/releases/download/$version/Angband-$version-win.zip",
+        "extract_dir": "angband-$version"
     }
 }
diff --git a/bucket/angband.json b/bucket/angband.json
index 7f49d333..94996533 100644
--- a/bucket/angband.json
+++ b/bucket/angband.json
@@ -1,20 +1,12 @@
 {
-    "homepage": "https://rephial.org/",
-    "description": "A free single-player dungeon exploration Roguelike",
     "version": "4.2.4",
+    "description": "A free single-player dungeon exploration Roguelike",
+    "homepage": "https://rephial.org/",
     "license": "GPL-2.0",
     "notes": "Configuration files cannot be persisted, but will be retained during package updates.",
     "url": "https://github.com/angband/angband/releases/download/4.2.4/angband-4.2.4-win.zip",
     "hash": "efd1932ca0d266fd0d785b7c41a60979be20709f8cd0571387976eae74379ed7",
-    "autoupdate": {
-        "url": "https://github.com/angband/angband/releases/download/$version/angband-$version-win.zip",
-        "extract_dir": "angband-$version"
-    },
-    "checkver": {
-        "github": "https://github.com/angband/angband/"
-    },
     "extract_dir": "angband-4.2.4",
-    "persist": "lib\\user",
     "post_install": [
         "'angband.INI' | ForEach-Object {",
         "    if (!(Test-Path \"$persist_dir\\$_.bak\")) {",
@@ -34,11 +26,19 @@
             "Angband\\Angband Manual"
         ]
     ],
+    "persist": "lib\\user",
     "uninstaller": {
         "script": [
             "'angband.INI' | ForEach-Object {",
             "    Copy-Item \"$dir\\$_\" \"$persist_dir\\$_.bak\" -Force",
             "}"
         ]
+    },
+    "checkver": {
+        "github": "https://github.com/angband/angband/"
+    },
+    "autoupdate": {
+        "url": "https://github.com/angband/angband/releases/download/$version/angband-$version-win.zip",
+        "extract_dir": "angband-$version"
     }
 }
diff --git a/bucket/ares.json b/bucket/ares.json
index ae172212..a677ecab 100644
--- a/bucket/ares.json
+++ b/bucket/ares.json
@@ -1,34 +1,10 @@
 {
-    "homepage": "https://ares-emulator.github.io/",
-    "description": "Multi-system emulator focused on accuracy and preservation",
     "version": "127",
+    "description": "Multi-system emulator focused on accuracy and preservation",
+    "homepage": "https://ares-emulator.github.io/",
     "license": "ISC",
     "notes": "Configuration file cannot be persisted, but will be retained during the update",
-    "architecture": {
-        "64bit": {
-            "url": "https://github.com/ares-emulator/ares/releases/download/v127/ares-windows.zip",
-            "hash": "95ee28a1f527a498c35eb156ed60fb9ed43173eb9d8179e7fc80d433ecb859b9"
-        }
-    },
-    "autoupdate": {
-        "architecture": {
-            "64bit": {
-                "url": "https://github.com/ares-emulator/ares/releases/download/v$cleanVersion/ares-windows.zip",
-                "extract_dir": "ares-v$cleanVersion"
-            }
-        }
-    },
-    "bin": "ares.exe",
-    "checkver": {
-        "github": "https://github.com/ares-emulator/ares/"
-    },
     "extract_dir": "ares-v127",
-    "persist": [
-        "Systems",
-        "Saves",
-        "Screenshots",
-        "Debugging"
-    ],
     "post_install": [
         "if (!(Test-Path \"$persist_dir\\settings.bml.bak\")) {",
         "   New-Item -ItemType File \"$dir\\settings.bml\" | Out-Null",
@@ -40,17 +16,41 @@
         "   Copy-Item \"$persist_dir\\settings.bml.bak\" \"$dir\\settings.bml\" -Force",
         "}"
     ],
+    "bin": "ares.exe",
     "shortcuts": [
         [
             "ares.exe",
             "ares"
         ]
     ],
+    "persist": [
+        "Systems",
+        "Saves",
+        "Screenshots",
+        "Debugging"
+    ],
     "uninstaller": {
         "script": [
             "'settings.bml' | ForEach-Object {",
             "    Copy-Item \"$dir\\$_\" \"$persist_dir\\$_.bak\" -Force",
             "}"
         ]
+    },
+    "checkver": {
+        "github": "https://github.com/ares-emulator/ares/"
+    },
+    "autoupdate": {
+        "architecture": {
+            "64bit": {
+                "url": "https://github.com/ares-emulator/ares/releases/download/v$cleanVersion/ares-windows.zip",
+                "extract_dir": "ares-v$cleanVersion"
+            }
+        }
+    },
+    "architecture": {
+        "64bit": {
+            "url": "https://github.com/ares-emulator/ares/releases/download/v127/ares-windows.zip",
+            "hash": "95ee28a1f527a498c35eb156ed60fb9ed43173eb9d8179e7fc80d433ecb859b9"
+        }
     }
 }
diff --git a/bucket/ark-smart-breeding.json b/bucket/ark-smart-breeding.json
index cc6a5dc5..cf680f5f 100644
--- a/bucket/ark-smart-breeding.json
+++ b/bucket/ark-smart-breeding.json
@@ -1,22 +1,22 @@
 {
-    "homepage": "https://github.com/cadon/ARKStatsExtractor",
-    "description": "For the game ARK Survival Evolved. Extracts possible levelups of creatures to get the values for breeding. Save your creatures in a library, sort and compare their stats, view their pedigree, use the breeding-plan to get the best possible creatures and keep track of the growing babies with timers.",
     "version": "0.49.2.0",
+    "description": "For the game ARK Survival Evolved. Extracts possible levelups of creatures to get the values for breeding. Save your creatures in a library, sort and compare their stats, view their pedigree, use the breeding-plan to get the best possible creatures and keep track of the growing babies with timers.",
+    "homepage": "https://github.com/cadon/ARKStatsExtractor",
     "license": "MIT",
     "url": "https://github.com/cadon/ARKStatsExtractor/releases/download/v0.49.2/ARK.Smart.Breeding_0.49.2.0.zip",
     "hash": "ab00ad40cad29d858cff72fe1a838b07ae267a9f09499adb70b72484d38d2ff9",
-    "autoupdate": {
-        "url": "https://github.com/cadon/ARKStatsExtractor/releases/download/v$matchTag/ARK.Smart.Breeding_$version.zip"
-    },
     "bin": "ARK Smart Breeding.exe",
-    "checkver": {
-        "github": "https://github.com/cadon/ARKStatsExtractor",
-        "regex": "download/v(?<tag>[\\d.]+)/ARK.Smart.Breeding_(?<version>[\\d.]+).zip"
-    },
     "shortcuts": [
         [
             "ARK Smart Breeding.exe",
             "ARK Smart Breeding"
         ]
-    ]
+    ],
+    "checkver": {
+        "github": "https://github.com/cadon/ARKStatsExtractor",
+        "regex": "download/v(?<tag>[\\d.]+)/ARK.Smart.Breeding_(?<version>[\\d.]+).zip"
+    },
+    "autoupdate": {
+        "url": "https://github.com/cadon/ARKStatsExtractor/releases/download/v$matchTag/ARK.Smart.Breeding_$version.zip"
+    }
 }
diff --git a/bucket/armagetronad.json b/bucket/armagetronad.json
index 79ff90b0..5d97b3e1 100644
--- a/bucket/armagetronad.json
+++ b/bucket/armagetronad.json
@@ -1,7 +1,7 @@
 {
-    "homepage": "http://www.armagetronad.org/",
-    "description": "3D multiplayer game with Tron-style lightcycles",
     "version": "0.2.8.3.5",
+    "description": "3D multiplayer game with Tron-style lightcycles",
+    "homepage": "http://www.armagetronad.org/",
     "license": "GPL-2.0-or-later",
     "url": "https://launchpad.net/armagetronad/0.2.8/0.2.8.3.5/+download/armagetronad-0.2.8.3.5.win32.exe#/dl.7z",
     "hash": "305a2c6d3da2fadf29a34ee329a5b4ffa2d793f6ce488a4f61878de3965b5f56",
diff --git a/bucket/ascii-sector.json b/bucket/ascii-sector.json
index 3d8ffcd9..f05392be 100644
--- a/bucket/ascii-sector.json
+++ b/bucket/ascii-sector.json
@@ -1,16 +1,9 @@
 {
-    "homepage": "http://www.asciisector.net",
     "version": "0.7.2",
+    "homepage": "http://www.asciisector.net",
     "license": "Freeware",
     "url": "https://s3.amazonaws.com/asciisector/asciisec0.7.2-win.zip",
     "hash": "5325c2658021074b63781d14fb882dd71ebc9fa24659213c5c496e5c22c20d70",
-    "autoupdate": {
-        "url": "https://s3.amazonaws.com/asciisector/asciisec$version-win.zip"
-    },
-    "checkver": {
-        "url": "http://www.asciisector.net/",
-        "re": "Latest version: ([\\d\\.]+)"
-    },
     "extract_dir": "asciisec",
     "shortcuts": [
         [
@@ -21,5 +14,12 @@
             "manual.pdf",
             "Ascii Sector Manual"
         ]
-    ]
+    ],
+    "checkver": {
+        "url": "http://www.asciisector.net/",
+        "re": "Latest version: ([\\d\\.]+)"
+    },
+    "autoupdate": {
+        "url": "https://s3.amazonaws.com/asciisector/asciisec$version-win.zip"
+    }
 }
diff --git a/bucket/assaultcube.json b/bucket/assaultcube.json
index d5c1a7de..83e1e73e 100644
--- a/bucket/assaultcube.json
+++ b/bucket/assaultcube.json
@@ -1,16 +1,10 @@
 {
-    "homepage": "https://assault.cubers.net/",
-    "description": "Semi-realistic first-person shooter based on the Cube engine",
     "version": "1.3.0.1",
+    "description": "Semi-realistic first-person shooter based on the Cube engine",
+    "homepage": "https://assault.cubers.net/",
     "license": "https://assault.cubers.net/docs/license.html",
     "url": "https://github.com/assaultcube/AC/releases/download/v1.3.0.1/AssaultCube_v1.3.0.1_LockdownEdition_RC2.exe#/dl.7z",
     "hash": "2073161155fc781d85d35a58286452c88260765deb9f8be0cda08c559e36feb8",
-    "autoupdate": {
-        "url": "https://github.com/assaultcube/AC/releases/download/v$version/AssaultCube_v$version_LockdownEdition_RC2.exe"
-    },
-    "checkver": {
-        "github": "https://github.com/assaultcube/AC"
-    },
     "post_install": "Move-Item \"$dir\\bin_win32\\openal32_RemoveThisPartToUseOpenAL-Soft.dll\" \"$dir\\bin_win32\\openal32.dll\"",
     "shortcuts": [
         [
@@ -19,5 +13,11 @@
             "",
             "docs/images/favicon.ico"
         ]
-    ]
+    ],
+    "checkver": {
+        "github": "https://github.com/assaultcube/AC"
+    },
+    "autoupdate": {
+        "url": "https://github.com/assaultcube/AC/releases/download/v$version/AssaultCube_v$version_LockdownEdition_RC2.exe"
+    }
 }
diff --git a/bucket/assetstudio.json b/bucket/assetstudio.json
index 879a016e..1ace6e0c 100644
--- a/bucket/assetstudio.json
+++ b/bucket/assetstudio.json
@@ -1,21 +1,21 @@
 {
-    "homepage": "https://github.com/Perfare/AssetStudio",
-    "description": "Tool for exploring, extracting and exporting Unity assets and assetbundles.",
     "version": "0.16.21",
+    "description": "Tool for exploring, extracting and exporting Unity assets and assetbundles.",
+    "homepage": "https://github.com/Perfare/AssetStudio",
     "license": "MIT",
     "url": "https://github.com/Perfare/AssetStudio/releases/download/v0.16.21/AssetStudio.net6.v0.16.21.zip",
     "hash": "aac44b2657b0e7006dc90faf67f2d6f88ffd6dbd139d7f38373014b8f1f866d0",
-    "autoupdate": {
-        "url": "https://github.com/Perfare/AssetStudio/releases/download/v$version/AssetStudio.net6.v$version.zip"
-    },
     "bin": "AssetStudioGUI.exe",
-    "checkver": {
-        "github": "https://github.com/Perfare/AssetStudio"
-    },
     "shortcuts": [
         [
             "AssetStudioGUI.exe",
             "AssetStudio"
         ]
-    ]
+    ],
+    "checkver": {
+        "github": "https://github.com/Perfare/AssetStudio"
+    },
+    "autoupdate": {
+        "url": "https://github.com/Perfare/AssetStudio/releases/download/v$version/AssetStudio.net6.v$version.zip"
+    }
 }
diff --git a/bucket/augmentinel.json b/bucket/augmentinel.json
index bab4a862..16ec0d3a 100644
--- a/bucket/augmentinel.json
+++ b/bucket/augmentinel.json
@@ -1,22 +1,22 @@
 {
-    "homepage": "https://simonowen.com/spectrum/augmentinel/",
-    "description": "A re-skinned version of the Geoff Crammond classic: The Sentinel.",
     "version": "1.5",
+    "description": "A re-skinned version of the Geoff Crammond classic: The Sentinel.",
+    "homepage": "https://simonowen.com/spectrum/augmentinel/",
     "license": "Freeware",
     "notes": "If you get an error about missing XAudio DLLs, try installing the DirectX End-User Runtime: https://www.microsoft.com/en-us/download/confirmation.aspx?id=8109",
     "url": "https://simonowen.com/spectrum/augmentinel/Augmentinel-15.zip",
     "hash": "5ff6173f7c1813dbd8618b824eb4120a115ce447622126445cec94cd8dd2dd2f",
-    "autoupdate": {
-        "url": "https://simonowen.com/spectrum/augmentinel/Augmentinel-$cleanVersion.zip"
-    },
-    "checkver": {
-        "url": "https://simonowen.com/spectrum/augmentinel/",
-        "regex": "<p>Version ([\\d.-]+)\\,"
-    },
     "shortcuts": [
         [
             "Augmentinel.exe",
             "Augmentinel"
         ]
-    ]
+    ],
+    "checkver": {
+        "url": "https://simonowen.com/spectrum/augmentinel/",
+        "regex": "<p>Version ([\\d.-]+)\\,"
+    },
+    "autoupdate": {
+        "url": "https://simonowen.com/spectrum/augmentinel/Augmentinel-$cleanVersion.zip"
+    }
 }
diff --git a/bucket/betterjoy.json b/bucket/betterjoy.json
index cc5417ca..b62607c2 100644
--- a/bucket/betterjoy.json
+++ b/bucket/betterjoy.json
@@ -1,20 +1,35 @@
 {
-    "homepage": "https://github.com/Davidobot/BetterJoy",
-    "description": "A remapping program for Nintendo Switch controllers",
     "version": "v7.1",
+    "description": "A remapping program for Nintendo Switch controllers",
+    "homepage": "https://github.com/Davidobot/BetterJoy",
     "license": {
-        "identifier": "MIT",
-        "url": "https://github.com/Davidobot/BetterJoy/blob/master/LICENSE"
+        "url": "https://github.com/Davidobot/BetterJoy/blob/master/LICENSE",
+        "identifier": "MIT"
     },
     "notes": [
         "BetterJoy needs vigembus installed to function.",
         "Run the ViGEm_Bus_Setup at $dir\\Drivers if you have never installed ViGEm before."
     ],
-    "architecture": {
-        "64bit": {
-            "url": "https://github.com/Davidobot/BetterJoy/releases/download/v7.1/BetterJoy_v7.1.zip",
-            "hash": "a9ffe5bb14b05e775f34f9eeff41fca89a350d49252eedae1e330e88952e7f36"
-        }
+    "pre_install": [
+        "if (!(Test-Path \"$persist_dir\")) {",
+        "   New-Item -Path \"$dir\" -Name \"settings\" -ItemType \"File\" | Out-Null",
+        "}"
+    ],
+    "bin": "BetterJoyForCemu.exe",
+    "shortcuts": [
+        [
+            "BetterJoyForCemu.exe",
+            "BetterJoy"
+        ]
+    ],
+    "persist": [
+        "BetterJoyForCemu.exe.config",
+        "settings"
+    ],
+    "checkver": {
+        "github": "https://github.com/Davidobot/BetterJoy",
+        "regex": "download/(?<build>v[\\d\\.]+[a-z]?)",
+        "replace": "${1}"
     },
     "autoupdate": {
         "architecture": {
@@ -23,25 +38,10 @@
             }
         }
     },
-    "bin": "BetterJoyForCemu.exe",
-    "checkver": {
-        "github": "https://github.com/Davidobot/BetterJoy",
-        "regex": "download/(?<build>v[\\d\\.]+[a-z]?)",
-        "replace": "${1}"
-    },
-    "persist": [
-        "BetterJoyForCemu.exe.config",
-        "settings"
-    ],
-    "pre_install": [
-        "if (!(Test-Path \"$persist_dir\")) {",
-        "   New-Item -Path \"$dir\" -Name \"settings\" -ItemType \"File\" | Out-Null",
-        "}"
-    ],
-    "shortcuts": [
-        [
-            "BetterJoyForCemu.exe",
-            "BetterJoy"
-        ]
-    ]
+    "architecture": {
+        "64bit": {
+            "url": "https://github.com/Davidobot/BetterJoy/releases/download/v7.1/BetterJoy_v7.1.zip",
+            "hash": "a9ffe5bb14b05e775f34f9eeff41fca89a350d49252eedae1e330e88952e7f36"
+        }
+    }
 }
diff --git a/bucket/bgb.json b/bucket/bgb.json
index 3e8eff7b..07e3dde6 100644
--- a/bucket/bgb.json
+++ b/bucket/bgb.json
@@ -1,8 +1,23 @@
 {
-    "homepage": "http://bgb.bircd.org/",
-    "description": "GameBoy emulator/debugger",
     "version": "1.5.9",
+    "description": "GameBoy emulator/debugger",
+    "homepage": "http://bgb.bircd.org/",
     "license": "Freeware",
+    "persist": "bgb.ini",
+    "checkver": {
+        "url": "http://bgb.bircd.org/",
+        "regex": "\\(current version: BGB ([\\d]+[\\.][\\d]+[\\.][\\d]+)\\)<\\/title>"
+    },
+    "autoupdate": {
+        "architecture": {
+            "32bit": {
+                "url": "http://bgb.bircd.org/bgb.zip"
+            },
+            "64bit": {
+                "url": "http://bgb.bircd.org/bgbw64.zip"
+            }
+        }
+    },
     "architecture": {
         "32bit": {
             "url": "http://bgb.bircd.org/bgb.zip",
@@ -26,20 +41,5 @@
                 ]
             ]
         }
-    },
-    "autoupdate": {
-        "architecture": {
-            "32bit": {
-                "url": "http://bgb.bircd.org/bgb.zip"
-            },
-            "64bit": {
-                "url": "http://bgb.bircd.org/bgbw64.zip"
-            }
-        }
-    },
-    "checkver": {
-        "url": "http://bgb.bircd.org/",
-        "regex": "\\(current version: BGB ([\\d]+[\\.][\\d]+[\\.][\\d]+)\\)<\\/title>"
-    },
-    "persist": "bgb.ini"
+    }
 }
diff --git a/bucket/blade-of-agony.json b/bucket/blade-of-agony.json
index 20d55e4a..f4fcec38 100644
--- a/bucket/blade-of-agony.json
+++ b/bucket/blade-of-agony.json
@@ -1,9 +1,16 @@
 {
-    "homepage": "https://boa.realm667.com/",
-    "description": "World War II-themed singleplayer FPS running on the GZDoom engine",
     "version": "3.1",
+    "description": "World War II-themed singleplayer FPS running on the GZDoom engine",
+    "homepage": "https://boa.realm667.com/",
     "license": "GPL-3.0-or-later",
     "url": "https://www.moddb.com/downloads/start/213227#/dl.html",
+    "pre_install": [
+        "'boa-launcher.ini' | ForEach-Object {",
+        "   if (!(Test-Path \"$persist_dir\\$_\")) {",
+        "       New-Item -ItemType File \"$dir\\$_\" | Out-Null",
+        "   }",
+        "}"
+    ],
     "installer": {
         "script": [
             "(Get-Content \"$dir\\dl.html\").foreach{ if ($_ -match \"/downloads/mirror/213227/[\\d]{3}/[\\da-f]{32}\") {  $fileUrl = $matches[0]  } }",
@@ -18,21 +25,14 @@
             "Remove-Item -Force \"$dir\\dl.html\""
         ]
     },
-    "persist": [
-        "boa-launcher.ini",
-        "Save"
-    ],
-    "pre_install": [
-        "'boa-launcher.ini' | ForEach-Object {",
-        "   if (!(Test-Path \"$persist_dir\\$_\")) {",
-        "       New-Item -ItemType File \"$dir\\$_\" | Out-Null",
-        "   }",
-        "}"
-    ],
     "shortcuts": [
         [
             "Blade of Agony - Launcher.exe",
             "Blade of Agony"
         ]
+    ],
+    "persist": [
+        "boa-launcher.ini",
+        "Save"
     ]
 }
diff --git a/bucket/blockbench.json b/bucket/blockbench.json
index c25ab3a7..e6ecd093 100644
--- a/bucket/blockbench.json
+++ b/bucket/blockbench.json
@@ -1,10 +1,26 @@
 {
-    "homepage": "https://blockbench.net/",
-    "description": "Modern model editor for boxy models and pixel art textures.",
     "version": "4.1.5",
+    "description": "Modern model editor for boxy models and pixel art textures.",
+    "homepage": "https://blockbench.net/",
     "license": "GPL-3.0-or-later",
     "url": "https://github.com/JannisX11/blockbench/releases/download/v4.1.5/Blockbench_4.1.5.exe#/dl.7z",
     "hash": "sha512:e69f4ef373e411e79c9deff89ef84dccafeab918c871f6293a58f1a6fa174c111862bf00da4ad15a0b250d3fffaa79cb7fca198705c20f8c2750bcc837052445",
+    "shortcuts": [
+        [
+            "Blockbench.exe",
+            "Blockbench"
+        ]
+    ],
+    "checkver": {
+        "github": "https://github.com/JannisX11/blockbench/"
+    },
+    "autoupdate": {
+        "url": "https://github.com/JannisX11/blockbench/releases/download/v$version/Blockbench_$version.exe#/dl.7z",
+        "hash": {
+            "url": "$baseurl/latest.yml",
+            "find": "sha512:\\s+(.*)"
+        }
+    },
     "architecture": {
         "32bit": {
             "installer": {
@@ -22,21 +38,5 @@
                 ]
             }
         }
-    },
-    "autoupdate": {
-        "url": "https://github.com/JannisX11/blockbench/releases/download/v$version/Blockbench_$version.exe#/dl.7z",
-        "hash": {
-            "url": "$baseurl/latest.yml",
-            "find": "sha512:\\s+(.*)"
-        }
-    },
-    "checkver": {
-        "github": "https://github.com/JannisX11/blockbench/"
-    },
-    "shortcuts": [
-        [
-            "Blockbench.exe",
-            "Blockbench"
-        ]
-    ]
+    }
 }
diff --git a/bucket/bombermaaan.json b/bucket/bombermaaan.json
index 53f6455d..12475db6 100644
--- a/bucket/bombermaaan.json
+++ b/bucket/bombermaaan.json
@@ -1,22 +1,14 @@
 {
-    "homepage": "http://bombermaaan.sourceforge.net/",
-    "description": "Classic bomberman game",
     "version": "1.4.0.627",
+    "description": "Classic bomberman game",
+    "homepage": "http://bombermaaan.sourceforge.net/",
     "license": "GPL-3.0-or-later",
     "url": "https://downloads.sourceforge.net/project/bombermaaan/1%20-%20Bombermaaan%20Stable/1.4/Bombermaaan_1.4.0.627_setup.exe",
     "hash": "4e8bdc5362623e6f7712c7fb2442339de3ea494ff51562f8ed86af2239ec4745",
-    "autoupdate": {
-        "url": "https://downloads.sourceforge.net/project/bombermaaan/1%20-%20Bombermaaan%20Stable/$majorVersion.$minorVersion/Bombermaaan_$version_setup.exe"
-    },
     "bin": [
         "Bombermaaan_32.exe",
         "Bombermaaan_16.exe"
     ],
-    "checkver": {
-        "url": "http://bombermaaan.sourceforge.net/download.php",
-        "regex": "Bombermaaan_([\\d.]+)_setup.exe"
-    },
-    "innosetup": true,
     "shortcuts": [
         [
             "Bombermaaan_32.exe",
@@ -26,5 +18,13 @@
             "Bombermaaan_16.exe",
             "Bombermaaan (smaller)"
         ]
-    ]
+    ],
+    "checkver": {
+        "url": "http://bombermaaan.sourceforge.net/download.php",
+        "regex": "Bombermaaan_([\\d.]+)_setup.exe"
+    },
+    "autoupdate": {
+        "url": "https://downloads.sourceforge.net/project/bombermaaan/1%20-%20Bombermaaan%20Stable/$majorVersion.$minorVersion/Bombermaaan_$version_setup.exe"
+    },
+    "innosetup": true
 }
diff --git a/bucket/bsnes.json b/bucket/bsnes.json
index 2109f53d..82c5a000 100644
--- a/bucket/bsnes.json
+++ b/bucket/bsnes.json
@@ -1,23 +1,31 @@
 {
-    "homepage": "https://github.com/bsnes-emu/bsnes",
-    "description": "Super Nintendo Entertainment System (SNES) emulator",
     "version": "115",
+    "description": "Super Nintendo Entertainment System (SNES) emulator",
+    "homepage": "https://github.com/bsnes-emu/bsnes",
     "license": {
-        "identifier": "GPL-2.0",
-        "url": "https://github.com/bsnes-emu/bsnes/blob/master/LICENSE.txt"
+        "url": "https://github.com/bsnes-emu/bsnes/blob/master/LICENSE.txt",
+        "identifier": "GPL-2.0"
     },
     "url": "https://github.com/bsnes-emu/bsnes/releases/download/v115/bsnes_v115-windows.zip",
     "hash": "be2b3d17523f011359d1a88e05a54a0e70c846ee98a6b520d1a60e7422b2f7ef",
-    "autoupdate": {
-        "url": "https://github.com/bsnes-emu/bsnes/releases/download/v$version/bsnes_v$version-windows.zip",
-        "extract_dir": "bsnes_v$version-windows"
-    },
+    "extract_dir": "bsnes_v115-windows",
     "bin": "bsnes.exe",
+    "shortcuts": [
+        [
+            "bsnes.exe",
+            "bsnes"
+        ]
+    ],
+    "persist": [
+        "Firmware",
+        "settings.bml"
+    ],
     "checkver": {
         "github": "https://github.com/bsnes-emu/bsnes",
         "regex": ".*bsnes_v(?<version>[\\d\\w.]+)-windows.zip"
     },
-    "extract_dir": "bsnes_v115-windows",
-    "persist": ["Firmware", "settings.bml"],
-    "shortcuts": [["bsnes.exe", "bsnes"]]
+    "autoupdate": {
+        "url": "https://github.com/bsnes-emu/bsnes/releases/download/v$version/bsnes_v$version-windows.zip",
+        "extract_dir": "bsnes_v$version-windows"
+    }
 }
diff --git a/bucket/bzflag.json b/bucket/bzflag.json
index 6f05f39d..f3c2209c 100644
--- a/bucket/bzflag.json
+++ b/bucket/bzflag.json
@@ -1,22 +1,22 @@
 {
-    "homepage": "https://www.bzflag.org/",
-    "description": "3D multiplayer tank battle game",
     "version": "2.4.22",
+    "description": "3D multiplayer tank battle game",
+    "homepage": "https://www.bzflag.org/",
     "license": "MPL-2.0",
+    "depends": "extras/vcredist2017",
     "url": "https://download.bzflag.org/bzflag/windows/2.4.22/bzflag-2.4.22.exe#/dl.7z",
     "hash": "17df61347cfc2cb08da4ed5974189df40ce26ebb94605ef928cd40f43b935ae7",
-    "autoupdate": {
-        "url": "https://download.bzflag.org/bzflag/windows/$version/bzflag-$version.exe#/dl.7z"
-    },
     "bin": "bzflag.exe",
-    "checkver": {
-        "github": "https://github.com/BZFlag-Dev/bzflag"
-    },
-    "depends": "extras/vcredist2017",
     "shortcuts": [
         [
             "bzflag.exe",
             "BZFlag"
         ]
-    ]
+    ],
+    "checkver": {
+        "github": "https://github.com/BZFlag-Dev/bzflag"
+    },
+    "autoupdate": {
+        "url": "https://download.bzflag.org/bzflag/windows/$version/bzflag-$version.exe#/dl.7z"
+    }
 }
diff --git a/bucket/cataclysm-dda-tiles-experimental.json b/bucket/cataclysm-dda-tiles-experimental.json
index 68990b3a..a9570562 100644
--- a/bucket/cataclysm-dda-tiles-experimental.json
+++ b/bucket/cataclysm-dda-tiles-experimental.json
@@ -1,17 +1,23 @@
 {
-    "homepage": "https://cataclysmdda.org",
-    "description": "Roguelike in a post-apocalyptic world (with sprite-based graphics, experimental build)",
     "version": "2022-03-01-1530",
+    "description": "Roguelike in a post-apocalyptic world (with sprite-based graphics, experimental build)",
+    "homepage": "https://cataclysmdda.org",
     "license": "CC-BY-SA-3.0",
-    "architecture": {
-        "32bit": {
-            "url": "https://github.com/CleverRaven/Cataclysm-DDA/releases/download/cdda-experimental-2022-03-01-1530/cdda-windows-tiles-x32-2022-03-01-1530.zip",
-            "hash": "9b6787a09ee06d701e3db78bf6cf34590b357be5f7a1135ef7f839153055b765"
-        },
-        "64bit": {
-            "url": "https://github.com/CleverRaven/Cataclysm-DDA/releases/download/cdda-experimental-2022-03-01-1530/cdda-windows-tiles-x64-2022-03-01-1530.zip",
-            "hash": "7483d8253a101ec25a3191c3c63bc132c61901841ecd61bdda47a126a0a5206a"
-        }
+    "shortcuts": [
+        [
+            "cataclysm-tiles.exe",
+            "Cataclysm DDA\\Cataclysm DDA Tiles (Experimental)"
+        ]
+    ],
+    "persist": [
+        "config",
+        "save",
+        "sound",
+        "templates"
+    ],
+    "checkver": {
+        "url": "https://github.com/CleverRaven/Cataclysm-DDA/releases/",
+        "re": "Cataclysm-DDA experimental build ([\\d.-]+)(<)"
     },
     "autoupdate": {
         "architecture": {
@@ -23,20 +29,14 @@
             }
         }
     },
-    "checkver": {
-        "url": "https://github.com/CleverRaven/Cataclysm-DDA/releases/",
-        "re": "Cataclysm-DDA experimental build ([\\d.-]+)(<)"
-    },
-    "persist": [
-        "config",
-        "save",
-        "sound",
-        "templates"
-    ],
-    "shortcuts": [
-        [
-            "cataclysm-tiles.exe",
-            "Cataclysm DDA\\Cataclysm DDA Tiles (Experimental)"
-        ]
-    ]
+    "architecture": {
+        "32bit": {
+            "url": "https://github.com/CleverRaven/Cataclysm-DDA/releases/download/cdda-experimental-2022-03-01-1530/cdda-windows-tiles-x32-2022-03-01-1530.zip",
+            "hash": "9b6787a09ee06d701e3db78bf6cf34590b357be5f7a1135ef7f839153055b765"
+        },
+        "64bit": {
+            "url": "https://github.com/CleverRaven/Cataclysm-DDA/releases/download/cdda-experimental-2022-03-01-1530/cdda-windows-tiles-x64-2022-03-01-1530.zip",
+            "hash": "7483d8253a101ec25a3191c3c63bc132c61901841ecd61bdda47a126a0a5206a"
+        }
+    }
 }
diff --git a/bucket/cataclysm-dda-tiles.json b/bucket/cataclysm-dda-tiles.json
index 730d6082..8075f4e6 100644
--- a/bucket/cataclysm-dda-tiles.json
+++ b/bucket/cataclysm-dda-tiles.json
@@ -1,8 +1,14 @@
 {
-    "homepage": "https://cataclysmdda.org",
-    "description": "Turn-based survival game set in a post-apocalyptic world (with graphical tiles)",
     "version": "0.F",
+    "description": "Turn-based survival game set in a post-apocalyptic world (with graphical tiles)",
+    "homepage": "https://cataclysmdda.org",
     "license": "CC-BY-SA-3.0",
+    "shortcuts": [
+        [
+            "cataclysm-tiles.exe",
+            "Cataclysm DDA Tiles"
+        ]
+    ],
     "architecture": {
         "32bit": {
             "url": "https://github.com/CleverRaven/Cataclysm-DDA/releases/download/0.F/cdda-windows-tiles-x32-2021-07-03-0512.zip",
@@ -12,11 +18,5 @@
             "url": "https://github.com/CleverRaven/Cataclysm-DDA/releases/download/0.F/cdda-windows-tiles-x64-2021-07-03-0512.zip",
             "hash": "54ff7a666879308d40a3b5867998e0fad64331e29bf9c436bda230f527054b4c"
         }
-    },
-    "shortcuts": [
-        [
-            "cataclysm-tiles.exe",
-            "Cataclysm DDA Tiles"
-        ]
-    ]
+    }
 }
diff --git a/bucket/cataclysm-dda.json b/bucket/cataclysm-dda.json
index 45172bb9..1ea59119 100644
--- a/bucket/cataclysm-dda.json
+++ b/bucket/cataclysm-dda.json
@@ -1,8 +1,20 @@
 {
-    "homepage": "https://cataclysmdda.org",
-    "description": "Roguelike in a post-apocalyptic world (with text-based graphics)",
     "version": "0.D",
+    "description": "Roguelike in a post-apocalyptic world (with text-based graphics)",
+    "homepage": "https://cataclysmdda.org",
     "license": "CC-BY-SA-3.0",
+    "shortcuts": [
+        [
+            "cataclysm.exe",
+            "Cataclysm DDA\\Cataclysm DDA Curses"
+        ]
+    ],
+    "persist": [
+        "config",
+        "save",
+        "sound",
+        "templates"
+    ],
     "architecture": {
         "32bit": {
             "url": "https://github.com/CleverRaven/Cataclysm-DDA/releases/download/0.D/cataclysmdda-0.D-8574-Win-Curses.zip",
@@ -12,17 +24,5 @@
             "url": "https://github.com/CleverRaven/Cataclysm-DDA/releases/download/0.D/cataclysmdda-0.D-8574-Win64-Curses.zip",
             "hash": "806b0664f03e8c2756c0b5f21465e7be874b0290c74251842563e7a37da81ea1"
         }
-    },
-    "persist": [
-        "config",
-        "save",
-        "sound",
-        "templates"
-    ],
-    "shortcuts": [
-        [
-            "cataclysm.exe",
-            "Cataclysm DDA\\Cataclysm DDA Curses"
-        ]
-    ]
+    }
 }
diff --git a/bucket/cdogs-sdl.json b/bucket/cdogs-sdl.json
index ccd27c9c..716edebe 100644
--- a/bucket/cdogs-sdl.json
+++ b/bucket/cdogs-sdl.json
@@ -1,17 +1,10 @@
 {
-    "homepage": "https://cxong.github.io/cdogs-sdl/",
-    "description": "Classic overhead run-and-gun game",
     "version": "1.2.0",
+    "description": "Classic overhead run-and-gun game",
+    "homepage": "https://cxong.github.io/cdogs-sdl/",
     "license": "GPL-2.0-or-later",
     "url": "https://github.com/cxong/cdogs-sdl/releases/download/1.2.0/C-Dogs.SDL-1.2.0-win32.zip",
     "hash": "3a8e3ebb1eedfe2a5c42398b439a32f088803bf22271219d576032eb2766682a",
-    "autoupdate": {
-        "url": "https://github.com/cxong/cdogs-sdl/releases/download/$version/C-Dogs.SDL-$version-win32.zip",
-        "extract_dir": "C-Dogs.SDL-$version-win32"
-    },
-    "checkver": {
-        "github": "https://github.com/cxong/cdogs-sdl"
-    },
     "extract_dir": "C-Dogs.SDL-1.2.0-win32",
     "shortcuts": [
         [
@@ -22,5 +15,12 @@
             "bin\\cdogs-sdl-editor.exe",
             "C-Dogs SDL Editor"
         ]
-    ]
+    ],
+    "checkver": {
+        "github": "https://github.com/cxong/cdogs-sdl"
+    },
+    "autoupdate": {
+        "url": "https://github.com/cxong/cdogs-sdl/releases/download/$version/C-Dogs.SDL-$version-win32.zip",
+        "extract_dir": "C-Dogs.SDL-$version-win32"
+    }
 }
diff --git a/bucket/cemu.json b/bucket/cemu.json
index 6ef34b72..b03a2885 100644
--- a/bucket/cemu.json
+++ b/bucket/cemu.json
@@ -1,28 +1,14 @@
 {
-    "homepage": "https://cemu.info/",
-    "description": "Experimental software to emulate Wii U applications on PC",
     "version": "1.26.2f",
+    "description": "Experimental software to emulate Wii U applications on PC",
+    "homepage": "https://cemu.info/",
     "license": {
-        "identifier": "Freeware",
-        "url": "https://cemu.info"
+        "url": "https://cemu.info",
+        "identifier": "Freeware"
     },
-    "architecture": {
-        "64bit": {
-            "url": "https://cemu.info/releases/cemu_1.26.2.zip",
-            "hash": "b0e3abf5048f78e352b42c3e1660a2c6e85d6905cd9f60d06ca2f2318fa3152c"
-        }
-    },
-    "autoupdate": {
-        "architecture": {
-            "64bit": {
-                "url": "https://cemu.info/releases/cemu_$matchVersion.zip"
-            }
-        },
-        "extract_dir": "cemu_$matchVersion"
-    },
-    "bin": "Cemu.exe",
-    "checkver": {
-        "regex": "Download latest version \\(v((?<version>[\\d.]+)[\\w]*?),"
+    "suggest": {
+        "cemuhook": "cemuhook",
+        "vcredist": "extras/vcredist2015"
     },
     "extract_dir": "cemu_1.26.2",
     "installer": {
@@ -37,6 +23,13 @@
             "}"
         ]
     },
+    "bin": "Cemu.exe",
+    "shortcuts": [
+        [
+            "cemu.exe",
+            "Cemu"
+        ]
+    ],
     "persist": [
         "settings.xml",
         "controllerProfiles",
@@ -46,14 +39,21 @@
         "sharedFonts",
         "shaderCache\\transferable"
     ],
-    "shortcuts": [
-        [
-            "cemu.exe",
-            "Cemu"
-        ]
-    ],
-    "suggest": {
-        "cemuhook": "cemuhook",
-        "vcredist": "extras/vcredist2015"
+    "checkver": {
+        "regex": "Download latest version \\(v((?<version>[\\d.]+)[\\w]*?),"
+    },
+    "autoupdate": {
+        "extract_dir": "cemu_$matchVersion",
+        "architecture": {
+            "64bit": {
+                "url": "https://cemu.info/releases/cemu_$matchVersion.zip"
+            }
+        }
+    },
+    "architecture": {
+        "64bit": {
+            "url": "https://cemu.info/releases/cemu_1.26.2.zip",
+            "hash": "b0e3abf5048f78e352b42c3e1660a2c6e85d6905cd9f60d06ca2f2318fa3152c"
+        }
     }
 }
diff --git a/bucket/cemuhook.json b/bucket/cemuhook.json
index 06b7286c..ac7380b7 100644
--- a/bucket/cemuhook.json
+++ b/bucket/cemuhook.json
@@ -1,26 +1,10 @@
 {
-    "homepage": "https://cemuhook.sshnuke.net/",
-    "description": "Plugin for the Cemu emulator enabling H.264 decoding, gamepad input source overrides and game code/data patching at load-time",
     "version": "0.5.7.7",
+    "description": "Plugin for the Cemu emulator enabling H.264 decoding, gamepad input source overrides and game code/data patching at load-time",
+    "homepage": "https://cemuhook.sshnuke.net/",
     "license": {
-        "identifier": "Freeware",
-        "url": "https://cemuhook.sshnuke.net"
-    },
-    "architecture": {
-        "64bit": {
-            "url": "https://files.sshnuke.net/cemuhook_1262d_0577.zip",
-            "hash": "62c47873eaa2f1f07f80e207ebbbf122648623ed2639ca137c6c1be1ac3172b7"
-        }
-    },
-    "autoupdate": {
-        "architecture": {
-            "64bit": {
-                "url": "https://files.sshnuke.net/cemuhook_$matchCemu.zip"
-            }
-        }
-    },
-    "checkver": {
-        "regex": "cemuhook_(?<cemu>[\\d_a-z]+).zip\">Cemu hook ([\\d.]+) for"
+        "url": "https://cemuhook.sshnuke.net",
+        "identifier": "Freeware"
     },
     "depends": "cemu",
     "installer": {
@@ -37,5 +21,21 @@
             "   }",
             "}"
         ]
+    },
+    "checkver": {
+        "regex": "cemuhook_(?<cemu>[\\d_a-z]+).zip\">Cemu hook ([\\d.]+) for"
+    },
+    "autoupdate": {
+        "architecture": {
+            "64bit": {
+                "url": "https://files.sshnuke.net/cemuhook_$matchCemu.zip"
+            }
+        }
+    },
+    "architecture": {
+        "64bit": {
+            "url": "https://files.sshnuke.net/cemuhook_1262d_0577.zip",
+            "hash": "62c47873eaa2f1f07f80e207ebbbf122648623ed2639ca137c6c1be1ac3172b7"
+        }
     }
 }
diff --git a/bucket/citra-canary.json b/bucket/citra-canary.json
index 9fa182a9..b33c4b01 100644
--- a/bucket/citra-canary.json
+++ b/bucket/citra-canary.json
@@ -1,28 +1,14 @@
 {
-    "homepage": "https://citra-emu.org/",
-    "description": "Emulator for Nintendo 3DS, capable of playing many of your favorite games",
     "version": "2072-20220306",
+    "description": "Emulator for Nintendo 3DS, capable of playing many of your favorite games",
+    "homepage": "https://citra-emu.org/",
     "license": {
-        "identifier": "GPL-2.0",
-        "url": "https://github.com/citra-emu/citra-canary/blob/master/license.txt"
+        "url": "https://github.com/citra-emu/citra-canary/blob/master/license.txt",
+        "identifier": "GPL-2.0"
     },
     "url": "https://github.com/citra-emu/citra-canary/releases/download/canary-2072/citra-windows-mingw-20220306-8aa6f20.7z",
     "hash": "169d9561ac29b72bb8b67dcb2bfa263d47fa417be3665099397f6eab220eb097",
-    "autoupdate": {
-        "url": "https://github.com/citra-emu/citra-canary/releases/download/canary-$matchBuild/citra-windows-mingw-$matchDate-$matchRandom.7z"
-    },
-    "bin": [
-        "citra.exe",
-        "citra-qt.exe",
-        "citra-room.exe"
-    ],
-    "checkver": {
-        "github": "https://github.com/citra-emu/citra-canary",
-        "regex": "download/canary-(?<build>[\\d]+)/citra-windows-mingw-(?<date>[\\d]+)-(?<random>[a-fA-F\\d]+).7z",
-        "replace": "${1}-${2}"
-    },
     "extract_dir": "canary-mingw",
-    "persist": "user",
     "pre_install": [
         "if (!(Test-Path \"$persist_dir\\user\")) {",
         "   New-Item -Path \"$persist_dir\" -Name \"user\" -ItemType \"directory\" | Out-Null",
@@ -33,10 +19,24 @@
         "   }",
         "}"
     ],
+    "bin": [
+        "citra.exe",
+        "citra-qt.exe",
+        "citra-room.exe"
+    ],
     "shortcuts": [
         [
             "citra-qt.exe",
             "Citra (Canary)"
         ]
-    ]
+    ],
+    "persist": "user",
+    "checkver": {
+        "github": "https://github.com/citra-emu/citra-canary",
+        "regex": "download/canary-(?<build>[\\d]+)/citra-windows-mingw-(?<date>[\\d]+)-(?<random>[a-fA-F\\d]+).7z",
+        "replace": "${1}-${2}"
+    },
+    "autoupdate": {
+        "url": "https://github.com/citra-emu/citra-canary/releases/download/canary-$matchBuild/citra-windows-mingw-$matchDate-$matchRandom.7z"
+    }
 }
diff --git a/bucket/citra.json b/bucket/citra.json
index 3cdae24b..9ea5a213 100644
--- a/bucket/citra.json
+++ b/bucket/citra.json
@@ -1,28 +1,14 @@
 {
-    "homepage": "https://citra-emu.org/",
-    "description": "Emulator for Nintendo 3DS, capable of playing many of your favorite games",
     "version": "1757-20220305",
+    "description": "Emulator for Nintendo 3DS, capable of playing many of your favorite games",
+    "homepage": "https://citra-emu.org/",
     "license": {
-        "identifier": "GPL-2.0",
-        "url": "https://github.com/citra-emu/citra-nightly/blob/master/license.txt"
+        "url": "https://github.com/citra-emu/citra-nightly/blob/master/license.txt",
+        "identifier": "GPL-2.0"
     },
     "url": "https://github.com/citra-emu/citra-nightly/releases/download/nightly-1757/citra-windows-mingw-20220305-ac98458.7z",
     "hash": "0e6979f48bd735fbc07f237f15d3cdcbd56278e5927d291345741eaaca02214b",
-    "autoupdate": {
-        "url": "https://github.com/citra-emu/citra-nightly/releases/download/nightly-$matchBuild/citra-windows-mingw-$matchDate-$matchRandom.7z"
-    },
-    "bin": [
-        "citra.exe",
-        "citra-qt.exe",
-        "citra-room.exe"
-    ],
-    "checkver": {
-        "github": "https://github.com/citra-emu/citra-nightly",
-        "regex": "download/nightly-(?<build>[\\d]+)/citra-windows-mingw-(?<date>[\\d]+)-(?<random>[a-fA-F\\d]+).7z",
-        "replace": "${1}-${2}"
-    },
     "extract_dir": "nightly-mingw",
-    "persist": "user",
     "pre_install": [
         "if (!(Test-Path \"$persist_dir\\user\")) {",
         "   New-Item -Path \"$persist_dir\" -Name \"user\" -ItemType \"directory\" | Out-Null",
@@ -33,10 +19,24 @@
         "   }",
         "}"
     ],
+    "bin": [
+        "citra.exe",
+        "citra-qt.exe",
+        "citra-room.exe"
+    ],
     "shortcuts": [
         [
             "citra-qt.exe",
             "Citra"
         ]
-    ]
+    ],
+    "persist": "user",
+    "checkver": {
+        "github": "https://github.com/citra-emu/citra-nightly",
+        "regex": "download/nightly-(?<build>[\\d]+)/citra-windows-mingw-(?<date>[\\d]+)-(?<random>[a-fA-F\\d]+).7z",
+        "replace": "${1}-${2}"
+    },
+    "autoupdate": {
+        "url": "https://github.com/citra-emu/citra-nightly/releases/download/nightly-$matchBuild/citra-windows-mingw-$matchDate-$matchRandom.7z"
+    }
 }
diff --git a/bucket/corporateclash.json b/bucket/corporateclash.json
index bd1ade55..0a17a3f0 100644
--- a/bucket/corporateclash.json
+++ b/bucket/corporateclash.json
@@ -1,26 +1,26 @@
 {
-    "homepage": "https://corporateclash.net",
-    "description": "Toontown: Corporate Clash is a completely free to play massively multiplayer online game designed to be the new experience of a game many of us loved. This is a game designed for players of all ages. ANYONE can have fun joining in the battle against the evil robot cogs. So, grab a seltzer and a few pies and dive right into the never ending battle to save Toontown from the cogs! What are you waiting for?",
     "version": "1.2.1",
+    "description": "Toontown: Corporate Clash is a completely free to play massively multiplayer online game designed to be the new experience of a game many of us loved. This is a game designed for players of all ages. ANYONE can have fun joining in the battle against the evil robot cogs. So, grab a seltzer and a few pies and dive right into the never ending battle to save Toontown from the cogs! What are you waiting for?",
+    "homepage": "https://corporateclash.net",
     "license": "Proprietary",
     "notes": "This is only the launcher, an account is required to play.",
     "url": "https://github.com/CorporateClash/pyside2-releases/releases/download/v1.2.1/installer.exe#/dl.7z",
     "hash": "96e88c047415d959de275217ad3efef3069cdf522d383f76242ab68ac2c27d64",
-    "autoupdate": {
-        "url": "https://github.com/CorporateClash/pyside2-releases/releases/download/v$version/installer.exe#/dl.7z"
-    },
-    "bin": "CorporateClash.exe",
-    "checkver": {
-        "github": "https://github.com/CorporateClash/pyside2-releases"
-    },
     "pre_install": [
         "Remove-Item $dir -Recurse -Force  -Include * -Exclude new_launcher.exe",
         "Rename-Item -Path $dir/new_launcher.exe -NewName $dir/CorporateClash.exe"
     ],
+    "bin": "CorporateClash.exe",
     "shortcuts": [
         [
             "CorporateClash.exe",
             "Corproate Clash"
         ]
-    ]
+    ],
+    "checkver": {
+        "github": "https://github.com/CorporateClash/pyside2-releases"
+    },
+    "autoupdate": {
+        "url": "https://github.com/CorporateClash/pyside2-releases/releases/download/v$version/installer.exe#/dl.7z"
+    }
 }
diff --git a/bucket/crispy-doom.json b/bucket/crispy-doom.json
index 6e17cc6f..7af936fc 100644
--- a/bucket/crispy-doom.json
+++ b/bucket/crispy-doom.json
@@ -1,7 +1,7 @@
 {
-    "homepage": "https://www.chocolate-doom.org/wiki/index.php/Crispy_Doom",
-    "description": "Faithful enhanced-resolution source port for Doom",
     "version": "5.11.1",
+    "description": "Faithful enhanced-resolution source port for Doom",
+    "homepage": "https://www.chocolate-doom.org/wiki/index.php/Crispy_Doom",
     "license": "GPL-2.0-or-later",
     "notes": [
         "Place WAD files (game data) in:",
@@ -10,17 +10,10 @@
     ],
     "url": "https://github.com/fabiangreffrath/crispy-doom/releases/download/crispy-doom-5.11.1/crispy-doom-5.11.1-win32.zip",
     "hash": "7e071eb376ba8388a67a81a208a4964b1b60a48847f9388766ab60e832f17cfa",
-    "autoupdate": {
-        "url": "https://github.com/fabiangreffrath/crispy-doom/releases/download/crispy-doom-$version/crispy-doom-$version-win32.zip"
-    },
-    "checkver": {
-        "github": "https://github.com/fabiangreffrath/crispy-doom",
-        "regex": "/releases/tag/crispy-doom-([\\d.]+)"
-    },
+    "pre_install": "New-Item -ItemType Directory -Force -Path $persist_dir\\..\\_doom | Out-Null",
     "env_set": {
         "DOOMWADDIR": "$persist_dir\\..\\_doom"
     },
-    "pre_install": "New-Item -ItemType Directory -Force -Path $persist_dir\\..\\_doom | Out-Null",
     "shortcuts": [
         [
             "crispy-doom.exe",
@@ -61,5 +54,12 @@
             "crispy-doom-setup.exe",
             "Setup Crispy Doom"
         ]
-    ]
+    ],
+    "checkver": {
+        "github": "https://github.com/fabiangreffrath/crispy-doom",
+        "regex": "/releases/tag/crispy-doom-([\\d.]+)"
+    },
+    "autoupdate": {
+        "url": "https://github.com/fabiangreffrath/crispy-doom/releases/download/crispy-doom-$version/crispy-doom-$version-win32.zip"
+    }
 }
diff --git a/bucket/cxbx-reloaded.json b/bucket/cxbx-reloaded.json
index 0d53b63c..e13b6e52 100644
--- a/bucket/cxbx-reloaded.json
+++ b/bucket/cxbx-reloaded.json
@@ -1,30 +1,30 @@
 {
-    "homepage": "https://cxbx-reloaded.co.uk/",
-    "description": "Microsoft Xbox emulator",
     "version": "1e300d6",
+    "description": "Microsoft Xbox emulator",
+    "homepage": "https://cxbx-reloaded.co.uk/",
     "license": {
-        "identifier": "GPL-2.0",
-        "url": "https://github.com/Cxbx-Reloaded/Cxbx-Reloaded/blob/master/COPYING"
+        "url": "https://github.com/Cxbx-Reloaded/Cxbx-Reloaded/blob/master/COPYING",
+        "identifier": "GPL-2.0"
     },
     "url": "https://github.com/Cxbx-Reloaded/Cxbx-Reloaded/releases/download/CI-1e300d6/CxbxReloaded-Release-VS2019.zip",
     "hash": "b07bb6db061ca9de6a3bb6c33f42227ef3fc4c50f6c8f1a8342255db31f17864",
-    "autoupdate": {
-        "url": "https://github.com/Cxbx-Reloaded/Cxbx-Reloaded/releases/download/CI-$version/CxbxReloaded-Release-VS2019.zip"
-    },
-    "bin": "cxbx.exe",
-    "checkver": {
-        "url": "https://github.com/Cxbx-Reloaded/Cxbx-Reloaded/releases.atom",
-        "regex": "CI-([a-f\\d]+)"
-    },
-    "persist": [
-        "EmuDisk",
-        "settings.ini"
-    ],
     "pre_install": "if (!(Test-Path \"$persist_dir\\settings.ini\")) { $null = New-Item \"$dir\\settings.ini\" }",
+    "bin": "cxbx.exe",
     "shortcuts": [
         [
             "cxbx.exe",
             "Cxbx-Reloaded"
         ]
-    ]
+    ],
+    "persist": [
+        "EmuDisk",
+        "settings.ini"
+    ],
+    "checkver": {
+        "url": "https://github.com/Cxbx-Reloaded/Cxbx-Reloaded/releases.atom",
+        "regex": "CI-([a-f\\d]+)"
+    },
+    "autoupdate": {
+        "url": "https://github.com/Cxbx-Reloaded/Cxbx-Reloaded/releases/download/CI-$version/CxbxReloaded-Release-VS2019.zip"
+    }
 }
diff --git a/bucket/darkplaces.json b/bucket/darkplaces.json
index 721dce40..31b34deb 100644
--- a/bucket/darkplaces.json
+++ b/bucket/darkplaces.json
@@ -1,7 +1,7 @@
 {
-    "homepage": "https://icculus.org/twilight/darkplaces/",
-    "description": "Modern Quake source port with advanced graphics capabilities",
     "version": "nightly",
+    "description": "Modern Quake source port with advanced graphics capabilities",
+    "homepage": "https://icculus.org/twilight/darkplaces/",
     "license": "GPL-2.0-or-later",
     "notes": [
         "Place game data files (such as pak0.pak and pak1.pak) in:",
@@ -18,20 +18,6 @@
         "- Quake Mission Pack 3 - Abyss of Pandemonium:",
         "    $persist_dir\\abyss\\"
     ],
-    "architecture": {
-        "32bit": {
-            "url": "https://icculus.org/twilight/darkplaces/files/darkplacesenginewindowsonlyautobuild.zip"
-        },
-        "64bit": {
-            "url": "https://icculus.org/twilight/darkplaces/files/darkplacesenginewindows64onlyautobuild.zip"
-        }
-    },
-    "persist": [
-        "id1",
-        "hipnotic",
-        "rogue",
-        "abyss"
-    ],
     "shortcuts": [
         [
             "darkplaces-sdl.exe",
@@ -53,5 +39,19 @@
             "DarkPlaces (Quake - Abyss of Pandemonium)",
             "-game abyss"
         ]
-    ]
+    ],
+    "persist": [
+        "id1",
+        "hipnotic",
+        "rogue",
+        "abyss"
+    ],
+    "architecture": {
+        "32bit": {
+            "url": "https://icculus.org/twilight/darkplaces/files/darkplacesenginewindowsonlyautobuild.zip"
+        },
+        "64bit": {
+            "url": "https://icculus.org/twilight/darkplaces/files/darkplacesenginewindows64onlyautobuild.zip"
+        }
+    }
 }
diff --git a/bucket/demul.json b/bucket/demul.json
index 26e4107a..6a6bc303 100644
--- a/bucket/demul.json
+++ b/bucket/demul.json
@@ -1,18 +1,27 @@
 {
-    "homepage": "http://demul.emulation64.com/",
-    "description": "Dreamcast, Naomi, Atomiswave, Hikaru, other SuperH or PowerVR 2-based systems emulator",
     "version": "07_280418",
+    "description": "Dreamcast, Naomi, Atomiswave, Hikaru, other SuperH or PowerVR 2-based systems emulator",
+    "homepage": "http://demul.emulation64.com/",
     "license": "Freeware",
+    "suggest": {
+        "gdidrop": "gdidrop"
+    },
     "url": "http://demul.emulation64.com/files/demul07_280418.7z",
     "hash": "ae3f11ed5d36c4f327b3428b8947181284a7f9ae302d811852d4d7a4e9af9148",
-    "autoupdate": {
-        "url": "http://demul.emulation64.com/files/demul$version.7z"
-    },
+    "pre_install": [
+        "'Demul.ini' | ForEach-Object {",
+        "   if (!(Test-Path \"$dir\\$_\")) {",
+        "       New-Item -ItemType File \"$dir\\$_\" | Out-Null",
+        "   }",
+        "}"
+    ],
     "bin": "demul.exe",
-    "checkver": {
-        "url": "http://demul.emulation64.com/downloads/",
-        "regex": "demul([\\d\\._]+)\\.7z"
-    },
+    "shortcuts": [
+        [
+            "demul.exe",
+            "DEmul"
+        ]
+    ],
     "persist": [
         "Demul.ini",
         "gdrCHD.ini",
@@ -27,20 +36,11 @@
         "snap",
         "sstates"
     ],
-    "pre_install": [
-        "'Demul.ini' | ForEach-Object {",
-        "   if (!(Test-Path \"$dir\\$_\")) {",
-        "       New-Item -ItemType File \"$dir\\$_\" | Out-Null",
-        "   }",
-        "}"
-    ],
-    "shortcuts": [
-        [
-            "demul.exe",
-            "DEmul"
-        ]
-    ],
-    "suggest": {
-        "gdidrop": "gdidrop"
+    "checkver": {
+        "url": "http://demul.emulation64.com/downloads/",
+        "regex": "demul([\\d\\._]+)\\.7z"
+    },
+    "autoupdate": {
+        "url": "http://demul.emulation64.com/files/demul$version.7z"
     }
 }
diff --git a/bucket/demulshooter.json b/bucket/demulshooter.json
index 86871f0b..2de379ed 100644
--- a/bucket/demulshooter.json
+++ b/bucket/demulshooter.json
@@ -1,7 +1,7 @@
 {
-    "homepage": "https://github.com/argonlefou/DemulShooter",
-    "description": "Hook into (mostly) emulators to allow playing rail shooter games with up to 4 lightguns or HID devices",
     "version": "10.4.4",
+    "description": "Hook into (mostly) emulators to allow playing rail shooter games with up to 4 lightguns or HID devices",
+    "homepage": "https://github.com/argonlefou/DemulShooter",
     "license": "Unknown",
     "notes": [
         "",
@@ -10,16 +10,16 @@
     ],
     "url": "https://github.com/argonlefou/DemulShooter/releases/download/v10.4.4/DemulShooter_v10.4.4.zip",
     "hash": "5a8d818e939e50327edd3f8ec5d0182e6631e3058cdf326f5e2ed49dd405896b",
-    "autoupdate": {
-        "url": "https://github.com/argonlefou/DemulShooter/releases/download/v$version/DemulShooter_v$version.zip"
-    },
-    "checkver": "github",
-    "persist": "config.ini",
     "pre_install": "if (!(Test-Path \"$persist_dir\\config.ini\")) { New-Item -ItemType File \"$dir\\config.ini\" | Out-Null }",
     "shortcuts": [
         [
             "DemulShooter_GUI.exe",
             "DemulShooter"
         ]
-    ]
+    ],
+    "persist": "config.ini",
+    "checkver": "github",
+    "autoupdate": {
+        "url": "https://github.com/argonlefou/DemulShooter/releases/download/v$version/DemulShooter_v$version.zip"
+    }
 }
diff --git a/bucket/dgvoodoo2.json b/bucket/dgvoodoo2.json
index c4caf56c..befc92fc 100644
--- a/bucket/dgvoodoo2.json
+++ b/bucket/dgvoodoo2.json
@@ -1,7 +1,7 @@
 {
-    "homepage": "https://github.com/dege-diosg/dgVoodoo2",
-    "description": "Glide/DirectX implementation on D3D11/12. Play your old Glide and DirectX games even on the latest, modern versions of Windows.",
     "version": "2.78",
+    "description": "Glide/DirectX implementation on D3D11/12. Play your old Glide and DirectX games even on the latest, modern versions of Windows.",
+    "homepage": "https://github.com/dege-diosg/dgVoodoo2",
     "license": "http://dege.freeweb.hu/dgVoodoo2/ReadmeGeneral/#redistributionrights",
     "notes": [
         "",
@@ -18,8 +18,8 @@
     ],
     "url": "https://github.com/dege-diosg/dgVoodoo2/releases/download/v2.78/dgVoodoo2_78.zip",
     "hash": "952bcae953b02979229f2366f286775238d5132a562a2cc385bb1328546dd5fd",
+    "checkver": "github",
     "autoupdate": {
         "url": "https://github.com/dege-diosg/dgVoodoo2/releases/download/v$version/dgVoodoo$underscoreVersion.zip"
-    },
-    "checkver": "github"
+    }
 }
diff --git a/bucket/dolphin-beta.json b/bucket/dolphin-beta.json
index 5500ab9b..8228c77a 100644
--- a/bucket/dolphin-beta.json
+++ b/bucket/dolphin-beta.json
@@ -1,30 +1,14 @@
 {
-    "homepage": "https://dolphin-emu.org/",
-    "description": "A Nintendo GameCube and Wii emulator, with enhancements and Netplay. (development version)",
     "version": "5.0-16101",
+    "description": "A Nintendo GameCube and Wii emulator, with enhancements and Netplay. (development version)",
+    "homepage": "https://dolphin-emu.org/",
     "license": {
-        "identifier": "GPL-2.0-or-later",
-        "url": "https://github.com/dolphin-emu/dolphin/blob/master/COPYING"
+        "url": "https://github.com/dolphin-emu/dolphin/blob/master/COPYING",
+        "identifier": "GPL-2.0-or-later"
     },
     "url": "https://dl.dolphin-emu.org/builds/c0/39/dolphin-master-5.0-16101-x64.7z",
     "hash": "03294446b652791b7a368d2796d995452a36a464369ee0dd62cc82cf7b07b86c",
-    "autoupdate": {
-        "url": "https://dl.dolphin-emu.org/builds/$matchRand1/$matchRand2/dolphin-master-$matchMajor-$matchBuild-x64.7z"
-    },
-    "bin": [
-        [
-            "Dolphin.exe",
-            "dolphin-beta"
-        ]
-    ],
-    "checkver": {
-        "url": "https://dolphin-emu.org/download/",
-        "regex": "\\/(?<rand1>.{2})\\/(?<rand2>.{2})\\/dolphin-master-(?<major>[\\d\\.]+)-(?<build>[\\d]+)",
-        "replace": "${major}-${build}"
-    },
     "extract_dir": "Dolphin-x64",
-    "persist": "User",
-    "post_install": "Set-Content -Value $null -Path \"$dir\\portable.txt\"",
     "pre_install": [
         "if (!(Test-Path \"$persist_dir\")) {",
         "   New-item \"$persist_dir\" -ItemType Directory | Out-Null",
@@ -36,10 +20,26 @@
         "   }",
         "}"
     ],
+    "post_install": "Set-Content -Value $null -Path \"$dir\\portable.txt\"",
+    "bin": [
+        [
+            "Dolphin.exe",
+            "dolphin-beta"
+        ]
+    ],
     "shortcuts": [
         [
             "Dolphin.exe",
             "Dolphin (Beta)"
         ]
-    ]
+    ],
+    "persist": "User",
+    "checkver": {
+        "url": "https://dolphin-emu.org/download/",
+        "regex": "\\/(?<rand1>.{2})\\/(?<rand2>.{2})\\/dolphin-master-(?<major>[\\d\\.]+)-(?<build>[\\d]+)",
+        "replace": "${major}-${build}"
+    },
+    "autoupdate": {
+        "url": "https://dl.dolphin-emu.org/builds/$matchRand1/$matchRand2/dolphin-master-$matchMajor-$matchBuild-x64.7z"
+    }
 }
diff --git a/bucket/dolphin-dev.json b/bucket/dolphin-dev.json
index 05a094a8..0d752e2a 100644
--- a/bucket/dolphin-dev.json
+++ b/bucket/dolphin-dev.json
@@ -1,30 +1,17 @@
 {
-    "homepage": "https://dolphin-emu.org/",
-    "description": "A Nintendo GameCube and Wii emulator, with enhancements and Netplay. (development version)",
     "version": "5.0-16118",
+    "description": "A Nintendo GameCube and Wii emulator, with enhancements and Netplay. (development version)",
+    "homepage": "https://dolphin-emu.org/",
     "license": {
-        "identifier": "GPL-2.0-or-later",
-        "url": "https://github.com/dolphin-emu/dolphin/blob/master/COPYING"
+        "url": "https://github.com/dolphin-emu/dolphin/blob/master/COPYING",
+        "identifier": "GPL-2.0-or-later"
+    },
+    "suggest": {
+        "Microsoft Visual C++ Runtime 2019": "extras/vcredist2019"
     },
     "url": "https://dl.dolphin-emu.org/builds/c3/e6/dolphin-master-5.0-16118-x64.7z",
     "hash": "668ea698e69705a74ef31c3d944994879f6708179f9471b5e861be8203f0877d",
-    "autoupdate": {
-        "url": "https://dl.dolphin-emu.org/builds/$matchRand1/$matchRand2/dolphin-master-$matchMajor-$matchBuild-x64.7z"
-    },
-    "bin": [
-        [
-            "Dolphin.exe",
-            "dolphin-dev"
-        ]
-    ],
-    "checkver": {
-        "url": "https://dolphin-emu.org/download/list/master/1/",
-        "regex": "\\/(?<rand1>.{2})\\/(?<rand2>.{2})\\/dolphin-master-(?<major>[\\d\\.]+)-(?<build>[\\d]+)",
-        "replace": "${major}-${build}"
-    },
     "extract_dir": "Dolphin-x64",
-    "persist": "User",
-    "post_install": "Set-Content -Value $null -Path \"$dir\\portable.txt\"",
     "pre_install": [
         "if (!(Test-Path \"$persist_dir\")) {",
         "   New-item \"$persist_dir\" -ItemType Directory | Out-Null",
@@ -36,13 +23,26 @@
         "   }",
         "}"
     ],
+    "post_install": "Set-Content -Value $null -Path \"$dir\\portable.txt\"",
+    "bin": [
+        [
+            "Dolphin.exe",
+            "dolphin-dev"
+        ]
+    ],
     "shortcuts": [
         [
             "Dolphin.exe",
             "Dolphin (Development)"
         ]
     ],
-    "suggest": {
-        "Microsoft Visual C++ Runtime 2019": "extras/vcredist2019"
+    "persist": "User",
+    "checkver": {
+        "url": "https://dolphin-emu.org/download/list/master/1/",
+        "regex": "\\/(?<rand1>.{2})\\/(?<rand2>.{2})\\/dolphin-master-(?<major>[\\d\\.]+)-(?<build>[\\d]+)",
+        "replace": "${major}-${build}"
+    },
+    "autoupdate": {
+        "url": "https://dl.dolphin-emu.org/builds/$matchRand1/$matchRand2/dolphin-master-$matchMajor-$matchBuild-x64.7z"
     }
 }
diff --git a/bucket/dolphin.json b/bucket/dolphin.json
index 7fac8220..6c7c9cbd 100644
--- a/bucket/dolphin.json
+++ b/bucket/dolphin.json
@@ -1,23 +1,16 @@
 {
-    "homepage": "https://dolphin-emu.org/",
-    "description": "A Nintendo GameCube and Wii emulator, with enhancements and Netplay.",
     "version": "5.0",
+    "description": "A Nintendo GameCube and Wii emulator, with enhancements and Netplay.",
+    "homepage": "https://dolphin-emu.org/",
     "license": {
-        "identifier": "GPL-2.0-or-later",
-        "url": "https://github.com/dolphin-emu/dolphin/blob/master/COPYING"
+        "url": "https://github.com/dolphin-emu/dolphin/blob/master/COPYING",
+        "identifier": "GPL-2.0-or-later"
+    },
+    "suggest": {
+        "Microsoft Visual C++ Runtime 2019": "extras/vcredist2019"
     },
     "url": "https://dl-mirror.dolphin-emu.org/5.0/dolphin-x64-5.0.exe#/dolphin.lzma",
     "hash": "e1b3ae8fc890c6588e5656f77ef2747ae7ddfc90b6530b240c0c5b9d0ab3ce8c",
-    "autoupdate": {
-        "url": "https://dl-mirror.dolphin-emu.org/$version/dolphin-x64-$version.exe#/dolphin.lzma"
-    },
-    "bin": "Dolphin.exe",
-    "checkver": {
-        "url": "https://dolphin-emu.org/download/",
-        "regex": "https://dl-mirror.dolphin-emu.org/([\\d.]+)/dolphin-x64"
-    },
-    "persist": "User",
-    "post_install": "Set-Content -Value $null -Path \"$dir\\portable.txt\"",
     "pre_install": [
         "if (!(Test-Path \"$persist_dir\")) {",
         "   New-item \"$persist_dir\" -ItemType Directory | Out-Null",
@@ -29,13 +22,20 @@
         "   }",
         "}"
     ],
+    "post_install": "Set-Content -Value $null -Path \"$dir\\portable.txt\"",
+    "bin": "Dolphin.exe",
     "shortcuts": [
         [
             "Dolphin.exe",
             "Dolphin"
         ]
     ],
-    "suggest": {
-        "Microsoft Visual C++ Runtime 2019": "extras/vcredist2019"
+    "persist": "User",
+    "checkver": {
+        "url": "https://dolphin-emu.org/download/",
+        "regex": "https://dl-mirror.dolphin-emu.org/([\\d.]+)/dolphin-x64"
+    },
+    "autoupdate": {
+        "url": "https://dl-mirror.dolphin-emu.org/$version/dolphin-x64-$version.exe#/dolphin.lzma"
     }
 }
diff --git a/bucket/doom-retro.json b/bucket/doom-retro.json
index 68e7a737..a7c7ec0d 100644
--- a/bucket/doom-retro.json
+++ b/bucket/doom-retro.json
@@ -1,7 +1,7 @@
 {
-    "homepage": "https://www.doomretro.com/",
-    "description": "A classic redefined DOOM source port",
     "version": "4.4.8",
+    "description": "A classic redefined DOOM source port",
+    "homepage": "https://www.doomretro.com/",
     "license": "GPL-3.0-or-later",
     "notes": [
         "",
@@ -20,15 +20,28 @@
         "See the corresponding wiki section here for reference: https://github.com/bradharding/doomretro/wiki/CONSOLE-COMMANDS#ACTIONS",
         ""
     ],
-    "architecture": {
-        "32bit": {
-            "url": "https://github.com/bradharding/doomretro/releases/download/v4.4.8/doomretro-4.4.8-win32.zip",
-            "hash": "3509c45b5f594e431e77ff0358ab63d2bb738b1a30de3863f15212d02856d980"
-        },
-        "64bit": {
-            "url": "https://github.com/bradharding/doomretro/releases/download/v4.4.8/doomretro-4.4.8-win64.zip",
-            "hash": "80525f7610a1cfce0be42ede54404f5e65820d4935d441f717804c935177b43f"
-        }
+    "pre_install": [
+        "if (!(Test-Path \"$persist_dir\\doomretro.cfg\")) {",
+        "   New-Item -ItemType File \"$dir\\doomretro.cfg\" | Out-Null",
+        "}",
+        "if (!(Test-Path \"$scoopdir\\persist\\_doom\")) {",
+        "   New-item \"$scoopdir\\persist\\_doom\" -ItemType Directory | Out-Null",
+        "}"
+    ],
+    "bin": "doomretro.exe",
+    "shortcuts": [
+        [
+            "doomretro.exe",
+            "DOOM Retro"
+        ]
+    ],
+    "persist": [
+        "savegames",
+        "screenshots",
+        "doomretro.cfg"
+    ],
+    "checkver": {
+        "github": "https://github.com/bradharding/doomretro/"
     },
     "autoupdate": {
         "architecture": {
@@ -40,27 +53,14 @@
             }
         }
     },
-    "bin": "doomretro.exe",
-    "checkver": {
-        "github": "https://github.com/bradharding/doomretro/"
-    },
-    "persist": [
-        "savegames",
-        "screenshots",
-        "doomretro.cfg"
-    ],
-    "pre_install": [
-        "if (!(Test-Path \"$persist_dir\\doomretro.cfg\")) {",
-        "   New-Item -ItemType File \"$dir\\doomretro.cfg\" | Out-Null",
-        "}",
-        "if (!(Test-Path \"$scoopdir\\persist\\_doom\")) {",
-        "   New-item \"$scoopdir\\persist\\_doom\" -ItemType Directory | Out-Null",
-        "}"
-    ],
-    "shortcuts": [
-        [
-            "doomretro.exe",
-            "DOOM Retro"
-        ]
-    ]
+    "architecture": {
+        "32bit": {
+            "url": "https://github.com/bradharding/doomretro/releases/download/v4.4.8/doomretro-4.4.8-win32.zip",
+            "hash": "3509c45b5f594e431e77ff0358ab63d2bb738b1a30de3863f15212d02856d980"
+        },
+        "64bit": {
+            "url": "https://github.com/bradharding/doomretro/releases/download/v4.4.8/doomretro-4.4.8-win64.zip",
+            "hash": "80525f7610a1cfce0be42ede54404f5e65820d4935d441f717804c935177b43f"
+        }
+    }
 }
diff --git a/bucket/doomsday.json b/bucket/doomsday.json
index b189d3ba..3004ee35 100644
--- a/bucket/doomsday.json
+++ b/bucket/doomsday.json
@@ -1,24 +1,24 @@
 {
-    "homepage": "http://dengine.net/",
-    "description": "Modern source port for Doom, Heretic, Hexen and more",
     "version": "2.3.1",
+    "description": "Modern source port for Doom, Heretic, Hexen and more",
+    "homepage": "http://dengine.net/",
     "license": "GPL-3.0-or-later",
     "notes": [
         "Place WAD files (game data) in:",
         "",
         "    $persist_dir\\data"
     ],
-    "architecture": {
-        "32bit": {
-            "url": "https://files.dengine.net/archive/doomsday_2.3.1_x86.zip",
-            "hash": "0921e44b898cea7457dc3f16f82b794b86d500301c2460c8e8f91ec917da429b",
-            "extract_dir": "doomsday_2.3.1_x86"
-        },
-        "64bit": {
-            "url": "https://files.dengine.net/archive/doomsday_2.3.1_x64.zip",
-            "hash": "5b033905086ab4cb570d140a6122d48f5e1525339cd475ed0e8d392b1842e8eb",
-            "extract_dir": "doomsday_2.3.1_x64"
-        }
+    "bin": "bin\\Doomsday.exe",
+    "shortcuts": [
+        [
+            "bin\\Doomsday.exe",
+            "Doomsday Engine"
+        ]
+    ],
+    "persist": "data",
+    "checkver": {
+        "url": "https://dengine.net/windows",
+        "regex": "doomsday_([\\d.-]+)_x[\\d]{2}\\.zip"
     },
     "autoupdate": {
         "architecture": {
@@ -32,16 +32,16 @@
             }
         }
     },
-    "bin": "bin\\Doomsday.exe",
-    "checkver": {
-        "url": "https://dengine.net/windows",
-        "regex": "doomsday_([\\d.-]+)_x[\\d]{2}\\.zip"
-    },
-    "persist": "data",
-    "shortcuts": [
-        [
-            "bin\\Doomsday.exe",
-            "Doomsday Engine"
-        ]
-    ]
+    "architecture": {
+        "32bit": {
+            "url": "https://files.dengine.net/archive/doomsday_2.3.1_x86.zip",
+            "hash": "0921e44b898cea7457dc3f16f82b794b86d500301c2460c8e8f91ec917da429b",
+            "extract_dir": "doomsday_2.3.1_x86"
+        },
+        "64bit": {
+            "url": "https://files.dengine.net/archive/doomsday_2.3.1_x64.zip",
+            "hash": "5b033905086ab4cb570d140a6122d48f5e1525339cd475ed0e8d392b1842e8eb",
+            "extract_dir": "doomsday_2.3.1_x64"
+        }
+    }
 }
diff --git a/bucket/duckstation.json b/bucket/duckstation.json
index fc1740be..92a6f1f6 100644
--- a/bucket/duckstation.json
+++ b/bucket/duckstation.json
@@ -1,41 +1,16 @@
 {
-    "homepage": "https://github.com/stenzek/duckstation/",
-    "description": "A fast PlayStation 1 emulator for PC and Android",
     "version": "20220118-g50db81a",
+    "description": "A fast PlayStation 1 emulator for PC and Android",
+    "homepage": "https://github.com/stenzek/duckstation/",
     "license": {
-        "identifier": "GPL-3.0-only",
-        "url": "https://github.com/stenzek/duckstation/blob/master/LICENSE"
+        "url": "https://github.com/stenzek/duckstation/blob/master/LICENSE",
+        "identifier": "GPL-3.0-only"
     },
     "notes": [
         "ATTENTION: Duckstation requires a PSX BIOS to function.",
         "Place the BIOS file in $persist_dir\\bios",
         "Learn more at: https://www.duckstation.org/wiki/BIOS"
     ],
-    "architecture": {
-        "64bit": {
-            "url": "https://github.com/stenzek/duckstation/releases/download/latest/duckstation-windows-x64-release.zip",
-            "hash": "d95c867805d3c1bb21778cc2618b67e2e286892849bd2a1c37061b408f40821b"
-        }
-    },
-    "autoupdate": {
-        "architecture": {
-            "64bit": {
-                "url": "https://github.com/stenzek/duckstation/releases/download/latest/duckstation-windows-x64-release.zip"
-            }
-        }
-    },
-    "bin": [
-        [
-            "duckstation-nogui-x64-ReleaseLTCG.exe",
-            "duckstation"
-        ],
-        "duckstation-qt-x64-ReleaseLTCG.exe"
-    ],
-    "checkver": {
-        "url": "https://github.com/stenzek/duckstation/releases/tag/latest",
-        "regex": " datetime=\"(?<year>[0-9]{4})-(?<month>[0-9]{2})-(?<day>[0-9]{2})[\\s\\S]*?.*duckstation/commit/(?<commit>[0-9a-f]{7})",
-        "replace": "${year}${month}${day}-g${commit}"
-    },
     "installer": {
         "script": [
             "if (!(Test-Path \"$persist_dir\")) {",
@@ -44,6 +19,19 @@
             "}"
         ]
     },
+    "bin": [
+        [
+            "duckstation-nogui-x64-ReleaseLTCG.exe",
+            "duckstation"
+        ],
+        "duckstation-qt-x64-ReleaseLTCG.exe"
+    ],
+    "shortcuts": [
+        [
+            "duckstation-qt-x64-ReleaseLTCG.exe",
+            "Duckstation"
+        ]
+    ],
     "persist": [
         "bios",
         "cache",
@@ -62,10 +50,22 @@
         "portable.txt",
         "settings.ini"
     ],
-    "shortcuts": [
-        [
-            "duckstation-qt-x64-ReleaseLTCG.exe",
-            "Duckstation"
-        ]
-    ]
+    "checkver": {
+        "url": "https://github.com/stenzek/duckstation/releases/tag/latest",
+        "regex": " datetime=\"(?<year>[0-9]{4})-(?<month>[0-9]{2})-(?<day>[0-9]{2})[\\s\\S]*?.*duckstation/commit/(?<commit>[0-9a-f]{7})",
+        "replace": "${year}${month}${day}-g${commit}"
+    },
+    "autoupdate": {
+        "architecture": {
+            "64bit": {
+                "url": "https://github.com/stenzek/duckstation/releases/download/latest/duckstation-windows-x64-release.zip"
+            }
+        }
+    },
+    "architecture": {
+        "64bit": {
+            "url": "https://github.com/stenzek/duckstation/releases/download/latest/duckstation-windows-x64-release.zip",
+            "hash": "d95c867805d3c1bb21778cc2618b67e2e286892849bd2a1c37061b408f40821b"
+        }
+    }
 }
diff --git a/bucket/dwarf-fortress-lnp.json b/bucket/dwarf-fortress-lnp.json
index 43c6b0fa..dafc2a61 100644
--- a/bucket/dwarf-fortress-lnp.json
+++ b/bucket/dwarf-fortress-lnp.json
@@ -1,31 +1,31 @@
 {
-    "homepage": "http://dffd.bay12games.com/file.php?id=7622",
-    "description": "Peridexis Errant's Lazy Newb Pack for Dwarf Fortress",
     "version": "0.47.05-r06",
+    "description": "Peridexis Errant's Lazy Newb Pack for Dwarf Fortress",
+    "homepage": "http://dffd.bay12games.com/file.php?id=7622",
     "license": "Custom",
     "url": "http://dffd.bay12games.com/download.php?id=7622&f=PeridexisErrant%27s+Starter+Pack+0.47.05-r06.zip#/dl.7z",
     "hash": "74c6dfdca808a0222457e06cf122c1691498229234f6d9769d4a6a601b65ba04",
-    "autoupdate": {
-        "url": "http://dffd.bay12games.com/download.php?id=7622&f=PeridexisErrant%27s+Starter+Pack+$version.zip#/dl.7z",
-        "hash": {
-            "url": "http://dffd.bay12games.com/file.php?id=7622",
-            "find": "SHA-256:[^>]+>(.*)<"
-        }
-    },
     "bin": [
         [
             "Starter Pack Launcher (PyLNP).exe",
             "dwarf-fortress-lnp"
         ]
     ],
-    "checkver": {
-        "url": "http://dffd.bay12games.com/file.php?id=7622",
-        "re": "File version:.*\\n[^>]+>(.*)<"
-    },
     "shortcuts": [
         [
             "Starter Pack Launcher (PyLNP).exe",
             "Dwarf Fortress LNP"
         ]
-    ]
+    ],
+    "checkver": {
+        "url": "http://dffd.bay12games.com/file.php?id=7622",
+        "re": "File version:.*\\n[^>]+>(.*)<"
+    },
+    "autoupdate": {
+        "url": "http://dffd.bay12games.com/download.php?id=7622&f=PeridexisErrant%27s+Starter+Pack+$version.zip#/dl.7z",
+        "hash": {
+            "url": "http://dffd.bay12games.com/file.php?id=7622",
+            "find": "SHA-256:[^>]+>(.*)<"
+        }
+    }
 }
diff --git a/bucket/dwarf-fortress.json b/bucket/dwarf-fortress.json
index b44f27d7..6548b2a1 100644
--- a/bucket/dwarf-fortress.json
+++ b/bucket/dwarf-fortress.json
@@ -1,22 +1,22 @@
 {
-    "homepage": "http://www.bay12games.com/dwarves",
-    "description": "Indie construction and management game",
     "version": "0.47.05",
+    "description": "Indie construction and management game",
+    "homepage": "http://www.bay12games.com/dwarves",
     "license": "Custom",
     "url": "http://www.bay12games.com/dwarves/df_47_05_win.zip",
     "hash": "3ad9cbc4d93e2ebb9c54caf57c696bc34905f25a6be95561b25c40d2863c732d",
-    "autoupdate": {
-        "url": "http://www.bay12games.com/dwarves/df_$minorVersion_$patchVersion_win.zip"
-    },
-    "checkver": {
-        "url": "http://www.bay12games.com/dwarves",
-        "re": "DWARF FORTRESS CLASSIC ([\\d\\.]+)"
-    },
-    "persist": "data",
     "shortcuts": [
         [
             "Dwarf Fortress.exe",
             "Dwarf Fortress"
         ]
-    ]
+    ],
+    "persist": "data",
+    "checkver": {
+        "url": "http://www.bay12games.com/dwarves",
+        "re": "DWARF FORTRESS CLASSIC ([\\d\\.]+)"
+    },
+    "autoupdate": {
+        "url": "http://www.bay12games.com/dwarves/df_$minorVersion_$patchVersion_win.zip"
+    }
 }
diff --git a/bucket/dxvk.json b/bucket/dxvk.json
index a42cc447..f70d19c5 100644
--- a/bucket/dxvk.json
+++ b/bucket/dxvk.json
@@ -1,7 +1,7 @@
 {
-    "homepage": "https://github.com/doitsujin/dxvk",
-    "description": "A Vulkan-based translation layer for Direct3D 9/10/11",
     "version": "1.10",
+    "description": "A Vulkan-based translation layer for Direct3D 9/10/11",
+    "homepage": "https://github.com/doitsujin/dxvk",
     "license": "Zlib",
     "notes": [
         "",
@@ -16,8 +16,8 @@
     ],
     "url": "https://github.com/doitsujin/dxvk/releases/download/v1.10/dxvk-1.10.tar.gz",
     "hash": "a15bc7c1df66158a205c498883b0b216390d58f4a128657990af357431b9ce77",
+    "checkver": "github",
     "autoupdate": {
         "url": "https://github.com/doitsujin/dxvk/releases/download/v$version/dxvk-$version.tar.gz"
-    },
-    "checkver": "github"
+    }
 }
diff --git a/bucket/dxwrapper.json b/bucket/dxwrapper.json
index 7841352b..6527ad21 100644
--- a/bucket/dxwrapper.json
+++ b/bucket/dxwrapper.json
@@ -1,7 +1,7 @@
 {
-    "homepage": "https://github.com/elishacloud/dxwrapper",
-    "description": "Wrapper for legacy DirectX APIs to fix compatibility issues with old games",
     "version": "1.0.6542.21",
+    "description": "Wrapper for legacy DirectX APIs to fix compatibility issues with old games",
+    "homepage": "https://github.com/elishacloud/dxwrapper",
     "license": "Zlib",
     "notes": [
         "",
@@ -10,8 +10,8 @@
     ],
     "url": "https://github.com/elishacloud/dxwrapper/releases/download/v1.0.6542.21/dxwrapper.zip",
     "hash": "9c29693121b15b28c6e499a77af23911011fa2d741316674dc98a4bd33542c9d",
+    "checkver": "github",
     "autoupdate": {
         "url": "https://github.com/elishacloud/dxwrapper/releases/download/v$version/dxwrapper.zip"
-    },
-    "checkver": "github"
+    }
 }
diff --git a/bucket/ecwolf.json b/bucket/ecwolf.json
index 0c40186b..1c79e24b 100644
--- a/bucket/ecwolf.json
+++ b/bucket/ecwolf.json
@@ -1,22 +1,23 @@
 {
-    "homepage": "https://maniacsvault.net/ecwolf/",
-    "description": "Source port for Wolfenstein 3D",
     "version": "1.3.3",
+    "description": "Source port for Wolfenstein 3D",
+    "homepage": "https://maniacsvault.net/ecwolf/",
     "license": "GPL-2.0-or-later",
     "notes": [
         "Place WL6/SOD/SD1/SD2/SD3 files (game data) in:",
         "",
         "    %APPDATA%\\ECWolf"
     ],
-    "architecture": {
-        "32bit": {
-            "url": "http://maniacsvault.net/ecwolf/files/ecwolf/1.x/ecwolf-1.3.3_x86.zip",
-            "hash": "b541f23b53659a2d2117632f77e421f5bce77a98e8e2b252988983c0a48d1ed3"
-        },
-        "64bit": {
-            "url": "http://maniacsvault.net/ecwolf/files/ecwolf/1.x/ecwolf-1.3.3_x64.zip",
-            "hash": "f96e1119b1646aad30f05bb0adb079f57326a3093bef304c8124a2ec9fc8ea7d"
-        }
+    "bin": "ecwolf.exe",
+    "shortcuts": [
+        [
+            "ecwolf.exe",
+            "ECWolf"
+        ]
+    ],
+    "checkver": {
+        "url": "https://maniacsvault.net/ecwolf/download.php",
+        "regex": "\\/ecwolf-([\\d.-]+)_x[\\d]{2}\\.zip"
     },
     "autoupdate": {
         "architecture": {
@@ -28,15 +29,14 @@
             }
         }
     },
-    "bin": "ecwolf.exe",
-    "checkver": {
-        "url": "https://maniacsvault.net/ecwolf/download.php",
-        "regex": "\\/ecwolf-([\\d.-]+)_x[\\d]{2}\\.zip"
-    },
-    "shortcuts": [
-        [
-            "ecwolf.exe",
-            "ECWolf"
-        ]
-    ]
+    "architecture": {
+        "32bit": {
+            "url": "http://maniacsvault.net/ecwolf/files/ecwolf/1.x/ecwolf-1.3.3_x86.zip",
+            "hash": "b541f23b53659a2d2117632f77e421f5bce77a98e8e2b252988983c0a48d1ed3"
+        },
+        "64bit": {
+            "url": "http://maniacsvault.net/ecwolf/files/ecwolf/1.x/ecwolf-1.3.3_x64.zip",
+            "hash": "f96e1119b1646aad30f05bb0adb079f57326a3093bef304c8124a2ec9fc8ea7d"
+        }
+    }
 }
diff --git a/bucket/eduke32.json b/bucket/eduke32.json
index 22fd54fa..cf30c4bf 100644
--- a/bucket/eduke32.json
+++ b/bucket/eduke32.json
@@ -1,7 +1,7 @@
 {
-    "homepage": "https://www.eduke32.com/",
-    "description": "Modern source port for Duke Nukem 3D",
     "version": "20220224-9963-4900c3bd8",
+    "description": "Modern source port for Duke Nukem 3D",
+    "homepage": "https://www.eduke32.com/",
     "license": "http://www.eduke32.com/buildlic.txt",
     "notes": [
         "Place GRP and RTS files (game data) in:",
@@ -12,15 +12,33 @@
         "",
         "    $persist_dir\\autoload"
     ],
-    "architecture": {
-        "32bit": {
-            "url": "https://dukeworld.com/eduke32/synthesis/20220224-9963-4900c3bd8/eduke32_win32_20220224-9963-4900c3bd8.7z",
-            "hash": "a630a3db7bda37d812b61dacd6e3116a7580d0f5c196f3fc30f0230bd136d526"
-        },
-        "64bit": {
-            "url": "https://dukeworld.com/eduke32/synthesis/20220224-9963-4900c3bd8/eduke32_win64_20220224-9963-4900c3bd8.7z",
-            "hash": "cba2d431856abcd29cdf2ecbe13bb6236bbc1fb988bd1d99960ebc52e4b78e19"
-        }
+    "pre_install": [
+        "New-Item -Path $dir -Name eduke32.cfg -ItemType File -ErrorAction Ignore | Out-Null",
+        "New-Item -Path $dir -Name settings.cfg -ItemType File -ErrorAction Ignore | Out-Null"
+    ],
+    "bin": [
+        [
+            "eduke32.exe",
+            "eduke32",
+            "-j $persist_dir\\data"
+        ]
+    ],
+    "shortcuts": [
+        [
+            "eduke32.exe",
+            "EDuke32",
+            "-j data"
+        ]
+    ],
+    "persist": [
+        "autoload",
+        "data",
+        "eduke32.cfg",
+        "settings.cfg"
+    ],
+    "checkver": {
+        "url": "https://dukeworld.com/eduke32/synthesis/",
+        "regex": "<strong>(\\d{8}-\\d{4,}-[a-z0-9]{9})</strong>"
     },
     "autoupdate": {
         "architecture": {
@@ -32,32 +50,14 @@
             }
         }
     },
-    "bin": [
-        [
-            "eduke32.exe",
-            "eduke32",
-            "-j $persist_dir\\data"
-        ]
-    ],
-    "checkver": {
-        "url": "https://dukeworld.com/eduke32/synthesis/",
-        "regex": "<strong>(\\d{8}-\\d{4,}-[a-z0-9]{9})</strong>"
-    },
-    "persist": [
-        "autoload",
-        "data",
-        "eduke32.cfg",
-        "settings.cfg"
-    ],
-    "pre_install": [
-        "New-Item -Path $dir -Name eduke32.cfg -ItemType File -ErrorAction Ignore | Out-Null",
-        "New-Item -Path $dir -Name settings.cfg -ItemType File -ErrorAction Ignore | Out-Null"
-    ],
-    "shortcuts": [
-        [
-            "eduke32.exe",
-            "EDuke32",
-            "-j data"
-        ]
-    ]
+    "architecture": {
+        "32bit": {
+            "url": "https://dukeworld.com/eduke32/synthesis/20220224-9963-4900c3bd8/eduke32_win32_20220224-9963-4900c3bd8.7z",
+            "hash": "a630a3db7bda37d812b61dacd6e3116a7580d0f5c196f3fc30f0230bd136d526"
+        },
+        "64bit": {
+            "url": "https://dukeworld.com/eduke32/synthesis/20220224-9963-4900c3bd8/eduke32_win64_20220224-9963-4900c3bd8.7z",
+            "hash": "cba2d431856abcd29cdf2ecbe13bb6236bbc1fb988bd1d99960ebc52e4b78e19"
+        }
+    }
 }
diff --git a/bucket/endless-sky.json b/bucket/endless-sky.json
index 4d5cdd9b..6eacb791 100644
--- a/bucket/endless-sky.json
+++ b/bucket/endless-sky.json
@@ -1,18 +1,17 @@
 {
-    "homepage": "https://github.com/endless-sky/endless-sky",
-    "description": "2D space trading and combat game similar to the classic Escape Velocity series.",
     "version": "0.9.14",
+    "description": "2D space trading and combat game similar to the classic Escape Velocity series.",
+    "homepage": "https://github.com/endless-sky/endless-sky",
     "license": "GPL-3.0-or-later",
-    "architecture": {
-        "32bit": {
-            "url": "https://github.com/endless-sky/endless-sky/releases/download/v0.9.14/endless-sky-win32-0.9.14.zip",
-            "hash": "f92e8bb8228cb51b659fa8cf0d90844422a907cfe1e3dbf7a5e45315b8a69ddf"
-        },
-        "64bit": {
-            "url": "https://github.com/endless-sky/endless-sky/releases/download/v0.9.14/endless-sky-win64-0.9.14.zip",
-            "hash": "17d98e283dd0de5aa57c6190ab4c99a9abb1612ecef8ceb169cc01330f6affd9"
-        }
-    },
+    "bin": "EndlessSky.exe",
+    "shortcuts": [
+        [
+            "EndlessSky.exe",
+            "Endless Sky"
+        ]
+    ],
+    "persist": "data",
+    "checkver": "github",
     "autoupdate": {
         "architecture": {
             "32bit": {
@@ -23,13 +22,14 @@
             }
         }
     },
-    "bin": "EndlessSky.exe",
-    "checkver": "github",
-    "persist": "data",
-    "shortcuts": [
-        [
-            "EndlessSky.exe",
-            "Endless Sky"
-        ]
-    ]
+    "architecture": {
+        "32bit": {
+            "url": "https://github.com/endless-sky/endless-sky/releases/download/v0.9.14/endless-sky-win32-0.9.14.zip",
+            "hash": "f92e8bb8228cb51b659fa8cf0d90844422a907cfe1e3dbf7a5e45315b8a69ddf"
+        },
+        "64bit": {
+            "url": "https://github.com/endless-sky/endless-sky/releases/download/v0.9.14/endless-sky-win64-0.9.14.zip",
+            "hash": "17d98e283dd0de5aa57c6190ab4c99a9abb1612ecef8ceb169cc01330f6affd9"
+        }
+    }
 }
diff --git a/bucket/enigma.json b/bucket/enigma.json
index 5642ee18..b29c4a3e 100644
--- a/bucket/enigma.json
+++ b/bucket/enigma.json
@@ -1,10 +1,22 @@
 {
-    "homepage": "https://www.nongnu.org/enigma/index.html",
-    "description": "A puzzle game inspired by Oxyd on the Atari ST and Rock'n'Roll on the Amiga",
     "version": "1.21",
+    "description": "A puzzle game inspired by Oxyd on the Atari ST and Rock'n'Roll on the Amiga",
+    "homepage": "https://www.nongnu.org/enigma/index.html",
     "license": "GPL-2.0-or-later | LGPL-2.1-or-later",
     "url": "https://downloads.sourceforge.net/project/enigma-game/Release%201.21/Enigma-w32-1.21.zip",
     "hash": "b2709110cd1e4a26af1997112b9374a5cde2b7f02d8c7b249ac9d6a1fde46a98",
+    "extract_dir": "Enigma-1.21",
+    "bin": "enigma.exe",
+    "shortcuts": [
+        [
+            "enigma.exe",
+            "Enigma"
+        ]
+    ],
+    "checkver": {
+        "url": "https://www.nongnu.org/enigma/download.html",
+        "regex": "(?sm)<b>Windows</b>.+?\\.zip file \\(([\\d.]+)\\)"
+    },
     "autoupdate": {
         "url": "https://downloads.sourceforge.net/project/enigma-game/Release%20$version/Enigma-w32-$version.zip",
         "hash": {
@@ -12,17 +24,5 @@
             "regex": "(?sm)<b>Windows</b>.+?\\.zip file.+?<li>sha256 - $sha256</li>"
         },
         "extract_dir": "Enigma-$version"
-    },
-    "bin": "enigma.exe",
-    "checkver": {
-        "url": "https://www.nongnu.org/enigma/download.html",
-        "regex": "(?sm)<b>Windows</b>.+?\\.zip file \\(([\\d.]+)\\)"
-    },
-    "extract_dir": "Enigma-1.21",
-    "shortcuts": [
-        [
-            "enigma.exe",
-            "Enigma"
-        ]
-    ]
+    }
 }
diff --git a/bucket/ericw-tools.json b/bucket/ericw-tools.json
index b4ae0850..947e2bda 100644
--- a/bucket/ericw-tools.json
+++ b/bucket/ericw-tools.json
@@ -1,19 +1,18 @@
 {
-    "homepage": "https://ericwa.github.io/ericw-tools/",
-    "description": "Command-line tools for compiling and analyzing Quake maps",
     "version": "0.18.1",
+    "description": "Command-line tools for compiling and analyzing Quake maps",
+    "homepage": "https://ericwa.github.io/ericw-tools/",
     "license": "GPL-3.0-or-later",
-    "architecture": {
-        "32bit": {
-            "url": "https://github.com/ericwa/ericw-tools/releases/download/v0.18.1/ericw-tools-v0.18.1-win32.zip",
-            "hash": "562aae414b914ffa8d3a208ca74d16ac4ca2b61031773227c7d4bdc8384b13ef",
-            "extract_dir": "ericw-tools-v0.18.1-win32"
-        },
-        "64bit": {
-            "url": "https://github.com/ericwa/ericw-tools/releases/download/v0.18.1/ericw-tools-v0.18.1-win64.zip",
-            "hash": "a0f39c6faeb29cd08b267880cdcebb310f9938fef4cbbff07d1f6843c36e9cd3",
-            "extract_dir": "ericw-tools-v0.18.1-win64"
-        }
+    "depends": "extras/vcredist2013",
+    "bin": [
+        "bin\\bspinfo.exe",
+        "bin\\bsputil.exe",
+        "bin\\light.exe",
+        "bin\\qbsp.exe",
+        "bin\\vis.exe"
+    ],
+    "checkver": {
+        "github": "https://github.com/ericwa/ericw-tools"
     },
     "autoupdate": {
         "architecture": {
@@ -27,15 +26,16 @@
             }
         }
     },
-    "bin": [
-        "bin\\bspinfo.exe",
-        "bin\\bsputil.exe",
-        "bin\\light.exe",
-        "bin\\qbsp.exe",
-        "bin\\vis.exe"
-    ],
-    "checkver": {
-        "github": "https://github.com/ericwa/ericw-tools"
-    },
-    "depends": "extras/vcredist2013"
+    "architecture": {
+        "32bit": {
+            "url": "https://github.com/ericwa/ericw-tools/releases/download/v0.18.1/ericw-tools-v0.18.1-win32.zip",
+            "hash": "562aae414b914ffa8d3a208ca74d16ac4ca2b61031773227c7d4bdc8384b13ef",
+            "extract_dir": "ericw-tools-v0.18.1-win32"
+        },
+        "64bit": {
+            "url": "https://github.com/ericwa/ericw-tools/releases/download/v0.18.1/ericw-tools-v0.18.1-win64.zip",
+            "hash": "a0f39c6faeb29cd08b267880cdcebb310f9938fef4cbbff07d1f6843c36e9cd3",
+            "extract_dir": "ericw-tools-v0.18.1-win64"
+        }
+    }
 }
diff --git a/bucket/extremetuxracer.json b/bucket/extremetuxracer.json
index b754d62c..efa30c9d 100644
--- a/bucket/extremetuxracer.json
+++ b/bucket/extremetuxracer.json
@@ -1,13 +1,18 @@
 {
-    "homepage": "https://sourceforge.net/projects/extremetuxracer/",
-    "description": "High-speed arctic racing game based on Tux Racer",
     "version": "0.8.0",
+    "description": "High-speed arctic racing game based on Tux Racer",
+    "homepage": "https://sourceforge.net/projects/extremetuxracer/",
     "license": "GPL-2.0-or-later",
-    "architecture": {
-        "64bit": {
-            "url": "https://downloads.sourceforge.net/project/extremetuxracer/releases/0.8.0/ExtremeTuxRacer_0.8.0_x64.msi",
-            "hash": "722fbfd0aaeff3394de5067a32d17b330dd312d67ebb3e492422af475ff3cd28"
-        }
+    "depends": "extras/vcredist2015",
+    "extract_dir": "PFiles\\Extreme TuxRacer",
+    "shortcuts": [
+        [
+            "ExtremeTuxRacer.exe",
+            "Extreme Tux Racer"
+        ]
+    ],
+    "checkver": {
+        "regex": "ExtremeTuxRacer_([\\d.-]+)_x[\\d]{2}\\.msi"
     },
     "autoupdate": {
         "architecture": {
@@ -16,15 +21,10 @@
             }
         }
     },
-    "checkver": {
-        "regex": "ExtremeTuxRacer_([\\d.-]+)_x[\\d]{2}\\.msi"
-    },
-    "depends": "extras/vcredist2015",
-    "extract_dir": "PFiles\\Extreme TuxRacer",
-    "shortcuts": [
-        [
-            "ExtremeTuxRacer.exe",
-            "Extreme Tux Racer"
-        ]
-    ]
+    "architecture": {
+        "64bit": {
+            "url": "https://downloads.sourceforge.net/project/extremetuxracer/releases/0.8.0/ExtremeTuxRacer_0.8.0_x64.msi",
+            "hash": "722fbfd0aaeff3394de5067a32d17b330dd312d67ebb3e492422af475ff3cd28"
+        }
+    }
 }
diff --git a/bucket/fbneo-nightly.json b/bucket/fbneo-nightly.json
index d9f1acfa..b76b090d 100644
--- a/bucket/fbneo-nightly.json
+++ b/bucket/fbneo-nightly.json
@@ -3,6 +3,16 @@
     "description": "Emulator for arcade games and select consoles",
     "homepage": "https://github.com/finalburnneo/FBNeo",
     "license": "https://github.com/finalburnneo/FBNeo/blob/master/src/license.txt",
+    "persist": [
+        "avi",
+        "config",
+        "neocdiso",
+        "recordings",
+        "roms",
+        "savestates",
+        "screenshots",
+        "support"
+    ],
     "architecture": {
         "32bit": {
             "url": "https://github.com/finalburnneo/FBNeo/releases/download/latest/Windows.x32.zip",
@@ -34,15 +44,5 @@
                 ]
             ]
         }
-    },
-    "persist": [
-        "avi",
-        "config",
-        "neocdiso",
-        "recordings",
-        "roms",
-        "savestates",
-        "screenshots",
-        "support"
-    ]
+    }
 }
diff --git a/bucket/fillets.json b/bucket/fillets.json
index fcc5f637..d4762595 100644
--- a/bucket/fillets.json
+++ b/bucket/fillets.json
@@ -1,24 +1,24 @@
 {
-    "homepage": "http://fillets.sourceforge.net/",
-    "description": "Port of the puzzle game Fish Fillets from ALTAR interactive",
     "version": "1.0.1",
+    "description": "Port of the puzzle game Fish Fillets from ALTAR interactive",
+    "homepage": "http://fillets.sourceforge.net/",
     "license": "GPL-2.0-or-later",
     "url": "https://downloads.sourceforge.net/project/fillets/Fish%20Fillets%20-%20Next%20Generation/1.0.1/fillets-ng-all-win32-1.0.1.zip",
     "hash": "65440c2d4148aebf2d6aed8ed7103e52ce9d82051bd362fc49adfe7694436930",
-    "autoupdate": {
-        "url": "https://downloads.sourceforge.net/project/fillets/Fish%20Fillets%20-%20Next%20Generation/$version/fillets-ng-all-win32-$version.zip",
-        "extract_dir": "fillets-ng-all-win32-$version"
-    },
-    "bin": "fillets.exe",
-    "checkver": {
-        "url": "http://fillets.sourceforge.net/index.php#news",
-        "regex": "Fish Fillets NG - ([\\d.]+)"
-    },
     "extract_dir": "fillets-ng-all-win32-1.0.1",
+    "bin": "fillets.exe",
     "shortcuts": [
         [
             "fillets.exe",
             "Fish Fillets NG"
         ]
-    ]
+    ],
+    "checkver": {
+        "url": "http://fillets.sourceforge.net/index.php#news",
+        "regex": "Fish Fillets NG - ([\\d.]+)"
+    },
+    "autoupdate": {
+        "url": "https://downloads.sourceforge.net/project/fillets/Fish%20Fillets%20-%20Next%20Generation/$version/fillets-ng-all-win32-$version.zip",
+        "extract_dir": "fillets-ng-all-win32-$version"
+    }
 }
diff --git a/bucket/flycast.json b/bucket/flycast.json
index ede0c6be..44ef1cff 100644
--- a/bucket/flycast.json
+++ b/bucket/flycast.json
@@ -1,17 +1,25 @@
 {
-    "homepage": "https://github.com/flyinghead/flycast",
-    "description": "Flycast is a multi-platform Sega Dreamcast, Naomi and Atomiswave emulator derived from reicast",
     "version": "1.2",
+    "description": "Flycast is a multi-platform Sega Dreamcast, Naomi and Atomiswave emulator derived from reicast",
+    "homepage": "https://github.com/flyinghead/flycast",
     "license": {
-        "identifier": "GPL-2.0",
-        "url": "https://github.com/flyinghead/flycast/blob/master/LICENSE"
-    },
-    "architecture": {
-        "64bit": {
-            "url": "https://github.com/flyinghead/flycast/releases/download/v1.2/flycast-win64-1.2.zip",
-            "hash": "ca4876e5519ef2dbdc6383432072660dd4ff865af9532da76a01c397d3f5a2f3"
-        }
+        "url": "https://github.com/flyinghead/flycast/blob/master/LICENSE",
+        "identifier": "GPL-2.0"
     },
+    "pre_install": "if (!(Test-Path \"$persist_dir\\emu.cfg\")) { New-Item -ItemType File \"$dir\\emu.cfg\" | Out-Null }",
+    "bin": "flycast.exe",
+    "shortcuts": [
+        [
+            "flycast.exe",
+            "Flycast"
+        ]
+    ],
+    "persist": [
+        "emu.cfg",
+        "data",
+        "mappings"
+    ],
+    "checkver": "github",
     "autoupdate": {
         "architecture": {
             "64bit": {
@@ -19,18 +27,10 @@
             }
         }
     },
-    "bin": "flycast.exe",
-    "checkver": "github",
-    "persist": [
-        "emu.cfg",
-        "data",
-        "mappings"
-    ],
-    "pre_install": "if (!(Test-Path \"$persist_dir\\emu.cfg\")) { New-Item -ItemType File \"$dir\\emu.cfg\" | Out-Null }",
-    "shortcuts": [
-        [
-            "flycast.exe",
-            "Flycast"
-        ]
-    ]
+    "architecture": {
+        "64bit": {
+            "url": "https://github.com/flyinghead/flycast/releases/download/v1.2/flycast-win64-1.2.zip",
+            "hash": "ca4876e5519ef2dbdc6383432072660dd4ff865af9532da76a01c397d3f5a2f3"
+        }
+    }
 }
diff --git a/bucket/freeciv.json b/bucket/freeciv.json
index 7189004f..f717af88 100644
--- a/bucket/freeciv.json
+++ b/bucket/freeciv.json
@@ -1,22 +1,15 @@
 {
-    "homepage": "http://www.freeciv.org/",
-    "description": "Empire-building strategy game",
     "version": "3.0.0",
+    "description": "Empire-building strategy game",
+    "homepage": "http://www.freeciv.org/",
     "license": "GPL-2.0-or-later",
     "url": "http://prdownloads.sourceforge.net/freeciv/Freeciv-3.0.0-msys2-win64-gtk3.22-setup.exe?download#/setup.7z",
     "hash": "efac553e3a70a81c6c6d2be784915ea30f6d064ce7dd4051916edad109df58af",
-    "autoupdate": {
-        "url": "http://prdownloads.sourceforge.net/freeciv/Freeciv-$version-msys2-win64-gtk3.22-setup.exe?download#/setup.7z"
-    },
     "bin": [
         "freeciv-gtk3.22.exe",
         "freeciv-mp-gtk3.exe",
         "freeciv-server.exe"
     ],
-    "checkver": {
-        "url": "http://www.freeciv.org/download.html",
-        "regex": "stable release, (\\d{1,2}\\.\\d{1,2}\\.\\d{1,2})"
-    },
     "shortcuts": [
         [
             "freeciv-gtk3.22.exe",
@@ -30,5 +23,12 @@
             "freeciv-server.exe",
             "Freeciv Server"
         ]
-    ]
+    ],
+    "checkver": {
+        "url": "http://www.freeciv.org/download.html",
+        "regex": "stable release, (\\d{1,2}\\.\\d{1,2}\\.\\d{1,2})"
+    },
+    "autoupdate": {
+        "url": "http://prdownloads.sourceforge.net/freeciv/Freeciv-$version-msys2-win64-gtk3.22-setup.exe?download#/setup.7z"
+    }
 }
diff --git a/bucket/freedoom.json b/bucket/freedoom.json
index f6f2f047..8ceaa392 100644
--- a/bucket/freedoom.json
+++ b/bucket/freedoom.json
@@ -1,18 +1,22 @@
 {
-    "homepage": "https://freedoom.github.io/",
-    "description": "Free content replacements for Doom and Doom II single-player game",
     "version": "0.12.1",
+    "description": "Free content replacements for Doom and Doom II single-player game",
+    "homepage": "https://freedoom.github.io/",
     "license": "BSD-3-Clause",
     "notes": "GZDoom is a recommended Doom source port by the Freedoom project",
+    "suggest": {
+        "Doom source port": [
+            "gzdoom",
+            "crispy-doom",
+            "prboom-plus",
+            "zandronum",
+            "doomsday",
+            "odamex",
+            "qzdoom"
+        ]
+    },
     "url": "https://github.com/freedoom/freedoom/releases/download/v0.12.1/freedoom-0.12.1.zip",
     "hash": "f42c6810fc89b0282de1466c2c9c7c9818031a8d556256a6db1b69f6a77b5806",
-    "autoupdate": {
-        "url": "https://github.com/freedoom/freedoom/releases/download/v$version/freedoom-$version.zip",
-        "extract_dir": "freedoom-$version"
-    },
-    "checkver": {
-        "github": "https://github.com/freedoom/freedoom"
-    },
     "extract_dir": "freedoom-0.12.1",
     "installer": {
         "script": [
@@ -39,22 +43,18 @@
             "Freedoom Manual"
         ]
     ],
-    "suggest": {
-        "Doom source port": [
-            "gzdoom",
-            "crispy-doom",
-            "prboom-plus",
-            "zandronum",
-            "doomsday",
-            "odamex",
-            "qzdoom"
-        ]
-    },
     "uninstaller": {
         "script": [
             "Remove-Item \"$persist_dir\\..\\_doom\\freedoom1.wad\"",
             "Remove-Item \"$persist_dir\\..\\_doom\\freedoom2.wad\"",
             "Remove-Item \"$persist_dir\\..\\_doom\\freedm.wad\""
         ]
+    },
+    "checkver": {
+        "github": "https://github.com/freedoom/freedoom"
+    },
+    "autoupdate": {
+        "url": "https://github.com/freedoom/freedoom/releases/download/v$version/freedoom-$version.zip",
+        "extract_dir": "freedoom-$version"
     }
 }
diff --git a/bucket/freedroidrpg.json b/bucket/freedroidrpg.json
index 21ca3f2d..2dd61b0d 100644
--- a/bucket/freedroidrpg.json
+++ b/bucket/freedroidrpg.json
@@ -1,21 +1,21 @@
 {
-    "homepage": "http://www.freedroid.org/",
-    "description": "Isometric RPG influenced by Paradroid",
     "version": "1.0rc2",
+    "description": "Isometric RPG influenced by Paradroid",
+    "homepage": "http://www.freedroid.org/",
     "license": "GPL-2.0-or-later",
     "url": "https://ftp.osuosl.org/pub/freedroid/freedroidRPG-1.0/freedroidRPG-1.0rc2-win32.exe#dl.zip",
     "hash": "edb47413bb54573d90b70327b0d0f40ad0667dccf56eadf1a38ab750d4e41af9",
-    "autoupdate": {
-        "url": "https://ftp.osuosl.org/pub/freedroid/freedroidRPG-$matchHead/freedroidRPG-$version-win32.exe#dl.zip"
-    },
     "bin": "freedroidRPG.exe",
-    "checkver": {
-        "regex": ">freedroidRPG-(.*?)(<)"
-    },
     "shortcuts": [
         [
             "freedroidRPG.exe",
             "FreedroidRPG"
         ]
-    ]
+    ],
+    "checkver": {
+        "regex": ">freedroidRPG-(.*?)(<)"
+    },
+    "autoupdate": {
+        "url": "https://ftp.osuosl.org/pub/freedroid/freedroidRPG-$matchHead/freedroidRPG-$version-win32.exe#dl.zip"
+    }
 }
diff --git a/bucket/freeorion-test.json b/bucket/freeorion-test.json
index 495fe001..f682d71d 100644
--- a/bucket/freeorion-test.json
+++ b/bucket/freeorion-test.json
@@ -1,28 +1,28 @@
 {
-    "homepage": "https://freeorion.org/",
-    "description": "Turn-based space empire and galactic conquest (4X) game (Test Build)",
     "version": "2022-02-28.7f6c2e1",
+    "description": "Turn-based space empire and galactic conquest (4X) game (Test Build)",
+    "homepage": "https://freeorion.org/",
     "license": "GPL-2.0",
     "url": "https://sourceforge.net/projects/freeorion/files/FreeOrion/Test/FreeOrion_2022-02-28.7f6c2e1_Test_Win32_Setup.exe/download#/dl.zip",
     "hash": "cd09107d16f68d48512edc763428ef1d02256fd353c41428c1f564fb1e605f47",
-    "autoupdate": {
-        "url": "https://sourceforge.net/projects/freeorion/files/FreeOrion/Test/FreeOrion_$version_Test_Win32_Setup.exe/download#/dl.zip"
-    },
     "bin": [
         [
             "FreeOrion.exe",
             "freeorion-test"
         ]
     ],
+    "shortcuts": [
+        [
+            "FreeOrion.exe",
+            "FreeOrion (Test Build)"
+        ]
+    ],
     "checkver": {
         "url": "https://sourceforge.net/projects/freeorion/files/FreeOrion/Test/",
         "regex": "FreeOrion_(?<year>[\\d]{4})-(?<month>[\\d]{2})-(?<day>[\\d]{2})\\.(?<commit>[a-z\\d]{7})_Test_Win32_Setup",
         "replace": "${year}-${month}-${day}.${commit}"
     },
-    "shortcuts": [
-        [
-            "FreeOrion.exe",
-            "FreeOrion (Test Build)"
-        ]
-    ]
+    "autoupdate": {
+        "url": "https://sourceforge.net/projects/freeorion/files/FreeOrion/Test/FreeOrion_$version_Test_Win32_Setup.exe/download#/dl.zip"
+    }
 }
diff --git a/bucket/freeorion.json b/bucket/freeorion.json
index db7ee9c0..287b7205 100644
--- a/bucket/freeorion.json
+++ b/bucket/freeorion.json
@@ -1,17 +1,10 @@
 {
-    "homepage": "https://freeorion.org/",
-    "description": "Turn-based space empire and galactic conquest (4X) game",
     "version": "0.4.10.2",
+    "description": "Turn-based space empire and galactic conquest (4X) game",
+    "homepage": "https://freeorion.org/",
     "license": "GPL-2.0",
     "url": "https://sourceforge.net/projects/freeorion/files/FreeOrion/FreeOrion%20Version%200.4.10/FreeOrion_v0.4.10.2_2021-08-01.f663dad_Win32_Setup.exe#/dl.zip",
     "hash": "sha1:427bee2806be31138c8ddbb379e911f554f53479",
-    "autoupdate": {
-        "url": "https://sourceforge.net/projects/freeorion/files/FreeOrion/FreeOrion%20Version%20$majorVersion.$minorVersion.$patchVersion/FreeOrion_v$version_$matchFile_Win32_Setup.exe#/dl.zip"
-    },
-    "checkver": {
-        "url": "https://github.com/freeorion/freeorion/releases/latest",
-        "regex": "FreeOrion_v([\\d.]+)_(?<file>[\\d\\-.a-z]+)_Win32_Setup.exe"
-    },
     "shortcuts": [
         [
             "FreeOrion.exe",
@@ -22,5 +15,12 @@
             "FreeOrion Fullscreen",
             "-f"
         ]
-    ]
+    ],
+    "checkver": {
+        "url": "https://github.com/freeorion/freeorion/releases/latest",
+        "regex": "FreeOrion_v([\\d.]+)_(?<file>[\\d\\-.a-z]+)_Win32_Setup.exe"
+    },
+    "autoupdate": {
+        "url": "https://sourceforge.net/projects/freeorion/files/FreeOrion/FreeOrion%20Version%20$majorVersion.$minorVersion.$patchVersion/FreeOrion_v$version_$matchFile_Win32_Setup.exe#/dl.zip"
+    }
 }
diff --git a/bucket/fteqw.json b/bucket/fteqw.json
index e2245a94..afb7e3a0 100644
--- a/bucket/fteqw.json
+++ b/bucket/fteqw.json
@@ -1,7 +1,7 @@
 {
-    "homepage": "http://fte.triptohell.info/",
-    "description": "Modern QuakeWorld source port with advanced graphics capabilities",
     "version": "nightly",
+    "description": "Modern QuakeWorld source port with advanced graphics capabilities",
+    "homepage": "http://fte.triptohell.info/",
     "license": "GPL-2.0-or-later",
     "notes": [
         "Place game data files (such as pak0.pak and pak1.pak) in:",
@@ -18,6 +18,12 @@
         "- Quake Mission Pack 3 - Abyss of Pandemonium:",
         "    $persist_dir\\abyss\\"
     ],
+    "persist": [
+        "id1",
+        "hipnotic",
+        "rogue",
+        "abyss"
+    ],
     "architecture": {
         "32bit": {
             "url": "http://triptohell.info/moodles/win32/fteqw.exe",
@@ -69,11 +75,5 @@
                 ]
             ]
         }
-    },
-    "persist": [
-        "id1",
-        "hipnotic",
-        "rogue",
-        "abyss"
-    ]
+    }
 }
diff --git a/bucket/gdidrop.json b/bucket/gdidrop.json
index 4aa4217f..56a4eb2f 100644
--- a/bucket/gdidrop.json
+++ b/bucket/gdidrop.json
@@ -1,18 +1,18 @@
 {
-    "homepage": "https://github.com/feyris-tan/gdidrop",
-    "description": "Tool to convert bin/cue files of Redump Dreamcast Images to gdi/bin/raw in order to run on Demul",
     "version": "1",
+    "description": "Tool to convert bin/cue files of Redump Dreamcast Images to gdi/bin/raw in order to run on Demul",
+    "homepage": "https://github.com/feyris-tan/gdidrop",
     "license": "BSD-2-Clause",
     "url": "https://github.com/feyris-tan/gdidrop/releases/download/1/gdidrop.zip",
     "hash": "a05635e2aad563f0225ad30e0dd285fbf1bec19fe087fdc87b0819cbc590de45",
-    "autoupdate": {
-        "url": "https://github.com/feyris-tan/gdidrop/releases/download/$version/gdidrop.zip"
-    },
-    "checkver": "github",
     "shortcuts": [
         [
             "gdidrop.exe",
             "gdidrop"
         ]
-    ]
+    ],
+    "checkver": "github",
+    "autoupdate": {
+        "url": "https://github.com/feyris-tan/gdidrop/releases/download/$version/gdidrop.zip"
+    }
 }
diff --git a/bucket/golly.json b/bucket/golly.json
index 6cd66f8d..16fc05e8 100644
--- a/bucket/golly.json
+++ b/bucket/golly.json
@@ -1,8 +1,26 @@
 {
-    "homepage": "http://golly.sourceforge.net/",
-    "description": "Program for exploring cellular automata such as the Game of Life",
     "version": "4.1",
+    "description": "Program for exploring cellular automata such as the Game of Life",
+    "homepage": "http://golly.sourceforge.net/",
     "license": "GPL-2.0-or-later",
+    "bin": "Golly.exe",
+    "shortcuts": [
+        [
+            "Golly.exe",
+            "Golly"
+        ]
+    ],
+    "checkver": {
+        "url": "https://sourceforge.net/projects/golly/",
+        "regex": "golly-([\\d.-]+)-win-64bit\\.zip"
+    },
+    "autoupdate": {
+        "architecture": {
+            "64bit": {
+                "url": "http://downloads.sourceforge.net/project/golly/golly/golly-$version/golly-$version-win-64bit.zip"
+            }
+        }
+    },
     "architecture": {
         "64bit": {
             "url": "http://downloads.sourceforge.net/project/golly/golly/golly-4.1/golly-4.1-win-64bit.zip",
@@ -12,23 +30,5 @@
                 "Remove-Item $dir/$app-$version-win-64bit"
             ]
         }
-    },
-    "autoupdate": {
-        "architecture": {
-            "64bit": {
-                "url": "http://downloads.sourceforge.net/project/golly/golly/golly-$version/golly-$version-win-64bit.zip"
-            }
-        }
-    },
-    "bin": "Golly.exe",
-    "checkver": {
-        "url": "https://sourceforge.net/projects/golly/",
-        "regex": "golly-([\\d.-]+)-win-64bit\\.zip"
-    },
-    "shortcuts": [
-        [
-            "Golly.exe",
-            "Golly"
-        ]
-    ]
+    }
 }
diff --git a/bucket/gzdoom.json b/bucket/gzdoom.json
index 82c2fa8f..cb91b2bd 100644
--- a/bucket/gzdoom.json
+++ b/bucket/gzdoom.json
@@ -1,18 +1,31 @@
 {
-    "homepage": "https://zdoom.org/",
-    "description": "Modern source port for Doom, Heretic, Hexen and more",
     "version": "4.7.1",
+    "description": "Modern source port for Doom, Heretic, Hexen and more",
+    "homepage": "https://zdoom.org/",
     "license": "GPL-3.0-or-later",
     "notes": [
         "Place WAD files (game data) in:",
         "",
         "    $persist_dir\\..\\_doom"
     ],
-    "architecture": {
-        "64bit": {
-            "url": "https://github.com/coelckers/gzdoom/releases/download/g4.7.1/gzdoom-4-7-1-Windows-64bit.zip",
-            "hash": "ca63e508d0444068dbfc1317fa02c565c15e72649e78849b0fea0772fc66dc12"
-        }
+    "pre_install": [
+        "New-Item -ItemType Directory -Force -Path $persist_dir\\..\\_doom | Out-Null",
+        "New-Item -Path $dir -Name gzdoom_portable.ini -ItemType File -ErrorAction Ignore | Out-Null"
+    ],
+    "env_set": {
+        "DOOMWADDIR": "$persist_dir\\..\\_doom"
+    },
+    "bin": "gzdoom.exe",
+    "shortcuts": [
+        [
+            "gzdoom.exe",
+            "GZDoom"
+        ]
+    ],
+    "persist": "gzdoom_portable.ini",
+    "checkver": {
+        "github": "https://github.com/coelckers/gzdoom",
+        "regex": "/releases/tag/(?:g)?([\\w.]+)"
     },
     "autoupdate": {
         "architecture": {
@@ -21,23 +34,10 @@
             }
         }
     },
-    "bin": "gzdoom.exe",
-    "checkver": {
-        "github": "https://github.com/coelckers/gzdoom",
-        "regex": "/releases/tag/(?:g)?([\\w.]+)"
-    },
-    "env_set": {
-        "DOOMWADDIR": "$persist_dir\\..\\_doom"
-    },
-    "persist": "gzdoom_portable.ini",
-    "pre_install": [
-        "New-Item -ItemType Directory -Force -Path $persist_dir\\..\\_doom | Out-Null",
-        "New-Item -Path $dir -Name gzdoom_portable.ini -ItemType File -ErrorAction Ignore | Out-Null"
-    ],
-    "shortcuts": [
-        [
-            "gzdoom.exe",
-            "GZDoom"
-        ]
-    ]
+    "architecture": {
+        "64bit": {
+            "url": "https://github.com/coelckers/gzdoom/releases/download/g4.7.1/gzdoom-4-7-1-Windows-64bit.zip",
+            "hash": "ca63e508d0444068dbfc1317fa02c565c15e72649e78849b0fea0772fc66dc12"
+        }
+    }
 }
diff --git a/bucket/hedgewars.json b/bucket/hedgewars.json
index a303e967..5d096992 100644
--- a/bucket/hedgewars.json
+++ b/bucket/hedgewars.json
@@ -1,26 +1,26 @@
 {
-    "homepage": "https://www.hedgewars.org/",
-    "description": "2D turn-based artillery game featuring fighting hedgehogs",
     "version": "1.0.0",
+    "description": "2D turn-based artillery game featuring fighting hedgehogs",
+    "homepage": "https://www.hedgewars.org/",
     "license": "GPL-2.0-only",
     "url": "https://www.hedgewars.org/download/releases/Hedgewars-1.0.0.exe#/dl.7z",
     "hash": "cbbdbfcc560313234d08c8d445a8e81137e958dc7b4a67802671aa6407b5ba83",
-    "autoupdate": {
-        "url": "https://www.hedgewars.org/download/releases/Hedgewars-$version.exe#/dl.7z"
-    },
     "bin": [
         "hedgewars.exe",
         "hedgewars-server.exe",
         "hwengine.exe"
     ],
-    "checkver": {
-        "url": "https://www.hedgewars.org/download.html",
-        "regex": "releases\\/Hedgewars-([\\d.-]+)\\.exe"
-    },
     "shortcuts": [
         [
             "hedgewars.exe",
             "Hedgewars"
         ]
-    ]
+    ],
+    "checkver": {
+        "url": "https://www.hedgewars.org/download.html",
+        "regex": "releases\\/Hedgewars-([\\d.-]+)\\.exe"
+    },
+    "autoupdate": {
+        "url": "https://www.hedgewars.org/download/releases/Hedgewars-$version.exe#/dl.7z"
+    }
 }
diff --git a/bucket/infraarcana.json b/bucket/infraarcana.json
index b66e8efa..4114ff73 100644
--- a/bucket/infraarcana.json
+++ b/bucket/infraarcana.json
@@ -1,32 +1,12 @@
 {
-    "homepage": "https://sites.google.com/site/infraarcana/home",
-    "description": "A roguelike game set in the early 20th century",
     "version": "20220227-62efad2a",
+    "description": "A roguelike game set in the early 20th century",
+    "homepage": "https://sites.google.com/site/infraarcana/home",
     "license": {
-        "identifier": "AGPL-3.0-or-later",
-        "url": "https://gitlab.com/martin-tornqvist/ia/-/blob/develop/installed_files/LICENSE.txt"
+        "url": "https://gitlab.com/martin-tornqvist/ia/-/blob/develop/installed_files/LICENSE.txt",
+        "identifier": "AGPL-3.0-or-later"
     },
     "notes": "User data are stored in C:\\Users\\[USERNAME]\\AppData\\Roaming\\infra_arcana",
-    "architecture": {
-        "64bit": {
-            "url": "https://gitlab.com/martin-tornqvist/ia/-/jobs/2141759851/artifacts/download#/dl.zip",
-            "hash": "9c63e7521db1728ee949ba543c5807172fd2a19fa491476448a279b8ba550985",
-            "extract_dir": "ia windows x64 62efad2a 2022-02-27"
-        }
-    },
-    "autoupdate": {
-        "architecture": {
-            "64bit": {
-                "url": "https://gitlab.com/martin-tornqvist/ia/-/jobs/$matchJob/artifacts/download#/dl.zip",
-                "extract_dir": "ia windows x64 $matchCommit $matchYear-$matchMonth-$matchDay"
-            }
-        }
-    },
-    "checkver": {
-        "url": "https://gitlab.com/martin-tornqvist/ia/-/jobs",
-        "regex": "passed(?:.*\\n){4}.*(?<job>[0-9]{10})\">build-windows(?:.*\\n){13}.*\\/commit\\/[0-9a-f]{40}\">(?<commit>[0-9a-f]{8})<\\/a>(?:.*\\n){20}.*datetime=\"(?<year>[0-9]{4})-(?<month>[0-9]{2})-(?<day>[0-9]{2})",
-        "replace": "${year}${month}${day}-${commit}"
-    },
     "shortcuts": [
         [
             "ia.exe",
@@ -36,5 +16,25 @@
             "manual.txt",
             "Infra Arcana\\Infra Arcana Manual"
         ]
-    ]
+    ],
+    "checkver": {
+        "url": "https://gitlab.com/martin-tornqvist/ia/-/jobs",
+        "regex": "passed(?:.*\\n){4}.*(?<job>[0-9]{10})\">build-windows(?:.*\\n){13}.*\\/commit\\/[0-9a-f]{40}\">(?<commit>[0-9a-f]{8})<\\/a>(?:.*\\n){20}.*datetime=\"(?<year>[0-9]{4})-(?<month>[0-9]{2})-(?<day>[0-9]{2})",
+        "replace": "${year}${month}${day}-${commit}"
+    },
+    "autoupdate": {
+        "architecture": {
+            "64bit": {
+                "url": "https://gitlab.com/martin-tornqvist/ia/-/jobs/$matchJob/artifacts/download#/dl.zip",
+                "extract_dir": "ia windows x64 $matchCommit $matchYear-$matchMonth-$matchDay"
+            }
+        }
+    },
+    "architecture": {
+        "64bit": {
+            "url": "https://gitlab.com/martin-tornqvist/ia/-/jobs/2141759851/artifacts/download#/dl.zip",
+            "hash": "9c63e7521db1728ee949ba543c5807172fd2a19fa491476448a279b8ba550985",
+            "extract_dir": "ia windows x64 62efad2a 2022-02-27"
+        }
+    }
 }
diff --git a/bucket/iortcw.json b/bucket/iortcw.json
index f5294ba3..0d44d42b 100644
--- a/bucket/iortcw.json
+++ b/bucket/iortcw.json
@@ -1,17 +1,35 @@
 {
-    "homepage": "https://github.com/iortcw/iortcw",
-    "description": "Source port for Return to Castle Wolfenstein",
     "version": "1.51c",
+    "description": "Source port for Return to Castle Wolfenstein",
+    "homepage": "https://github.com/iortcw/iortcw",
     "license": "https://github.com/iortcw/iortcw/blob/master/SP/COPYING.txt",
     "notes": [
         "Place game data files (such as pak0.pk3, sp_pak1.pk3-sp_pak4.pk3, mp_*.pk3) in:",
         "",
         "    $persist_dir\\Main\\"
     ],
+    "persist": "Main",
+    "checkver": {
+        "github": "https://github.com/iortcw/iortcw",
+        "regex": "/releases/tag/(?:v|V)?([\\w.]+)"
+    },
+    "autoupdate": {
+        "architecture": {
+            "32bit": {
+                "url": "https://github.com/iortcw/iortcw/releases/download/$version/iortcw-$version-win-x86.zip",
+                "extract_dir": "iortcw-$version-win-x86"
+            },
+            "64bit": {
+                "url": "https://github.com/iortcw/iortcw/releases/download/$version/iortcw-$version-win-x64.zip",
+                "extract_dir": "iortcw-$version-win-x64"
+            }
+        }
+    },
     "architecture": {
         "32bit": {
             "url": "https://github.com/iortcw/iortcw/releases/download/1.51c/iortcw-1.51c-win-x86.zip",
             "hash": "776e914433ee0e4b76ed3a9957740cea7e9b263c1c01086cc4d270e1ee5ca9f4",
+            "extract_dir": "iortcw-1.51c-win-x86",
             "bin": [
                 [
                     "ioWolfSP.x86.exe",
@@ -26,7 +44,6 @@
                     "iowolfded"
                 ]
             ],
-            "extract_dir": "iortcw-1.51c-win-x86",
             "shortcuts": [
                 [
                     "ioWolfSP.x86.exe",
@@ -41,6 +58,7 @@
         "64bit": {
             "url": "https://github.com/iortcw/iortcw/releases/download/1.51c/iortcw-1.51c-win-x64.zip",
             "hash": "17315ee0ee69ed48874c5af17b31f6dc7fd7a040814b43dbc485686d261405d1",
+            "extract_dir": "iortcw-1.51c-win-x64",
             "bin": [
                 [
                     "ioWolfSP.x64.exe",
@@ -55,7 +73,6 @@
                     "iowolfded"
                 ]
             ],
-            "extract_dir": "iortcw-1.51c-win-x64",
             "shortcuts": [
                 [
                     "ioWolfSP.x64.exe",
@@ -67,22 +84,5 @@
                 ]
             ]
         }
-    },
-    "autoupdate": {
-        "architecture": {
-            "32bit": {
-                "url": "https://github.com/iortcw/iortcw/releases/download/$version/iortcw-$version-win-x86.zip",
-                "extract_dir": "iortcw-$version-win-x86"
-            },
-            "64bit": {
-                "url": "https://github.com/iortcw/iortcw/releases/download/$version/iortcw-$version-win-x64.zip",
-                "extract_dir": "iortcw-$version-win-x64"
-            }
-        }
-    },
-    "checkver": {
-        "github": "https://github.com/iortcw/iortcw",
-        "regex": "/releases/tag/(?:v|V)?([\\w.]+)"
-    },
-    "persist": "Main"
+    }
 }
diff --git a/bucket/ivan.json b/bucket/ivan.json
index 26c8e89a..d4d17453 100644
--- a/bucket/ivan.json
+++ b/bucket/ivan.json
@@ -1,20 +1,20 @@
 {
-    "homepage": "https://github.com/Attnam/ivan",
-    "description": "Iter Vehemens ad Necem - a continuation of the graphical roguelike by members of http://attnam.com",
     "version": "059",
+    "description": "Iter Vehemens ad Necem - a continuation of the graphical roguelike by members of http://attnam.com",
+    "homepage": "https://github.com/Attnam/ivan",
     "license": "GPL-2.0",
     "url": "https://github.com/Attnam/ivan/releases/download/v059/IVAN-v059-win.zip",
     "hash": "ebd59c7a7cc36cf910a0ef9c26fce8e6dba4557aea26307c8009646dcd6c1972",
-    "autoupdate": {
-        "url": "https://github.com/Attnam/ivan/releases/download/v$version/IVAN-v$version-win.zip",
-        "extract_dir": "IVAN-v$version-win"
-    },
-    "checkver": "github",
     "extract_dir": "IVAN-v059-win",
     "shortcuts": [
         [
             "ivan.exe",
             "IVAN"
         ]
-    ]
+    ],
+    "checkver": "github",
+    "autoupdate": {
+        "url": "https://github.com/Attnam/ivan/releases/download/v$version/IVAN-v$version-win.zip",
+        "extract_dir": "IVAN-v$version-win"
+    }
 }
diff --git a/bucket/jim.json b/bucket/jim.json
index e0e53484..6eeb9245 100644
--- a/bucket/jim.json
+++ b/bucket/jim.json
@@ -1,22 +1,22 @@
 {
-    "homepage": "http://www.jengerer.com/item_manager/",
-    "description": "TF2 Item Manager",
     "version": "0.9.9.9.9.9.9.5.3",
+    "description": "TF2 Item Manager",
+    "homepage": "http://www.jengerer.com/item_manager/",
     "license": "Proprietary",
+    "depends": "extras/vcredist2010",
     "url": "http://www.jengerer.com/item_manager/downloads/item_manager.zip",
     "hash": "019d698f251931a9c59fbaf5f2ce9771cb6364bea6cdb0260bb7f24fd1151d23",
-    "autoupdate": {
-        "url": "http://www.jengerer.com/item_manager/downloads/item_manager.zip"
-    },
     "bin": "item_manager.exe",
-    "checkver": {
-        "regex": "What's new in ([\\d.]+)"
-    },
-    "depends": "extras/vcredist2010",
     "shortcuts": [
         [
             "item_manager.exe",
             "Jengerer's Item Manager"
         ]
-    ]
+    ],
+    "checkver": {
+        "regex": "What's new in ([\\d.]+)"
+    },
+    "autoupdate": {
+        "url": "http://www.jengerer.com/item_manager/downloads/item_manager.zip"
+    }
 }
diff --git a/bucket/katrain.json b/bucket/katrain.json
index 0e21a700..370e58a8 100644
--- a/bucket/katrain.json
+++ b/bucket/katrain.json
@@ -1,7 +1,7 @@
 {
-    "homepage": "https://github.com/sanderland/katrain",
-    "description": "A tool for analyzing and playing go with AI feedback from KataGo",
     "version": "1.10.1",
+    "description": "A tool for analyzing and playing go with AI feedback from KataGo",
+    "homepage": "https://github.com/sanderland/katrain",
     "license": "MIT",
     "notes": [
         "KaTrain config is stored in C:\\Users\\[USERNAME]\\.katrain",
@@ -9,16 +9,16 @@
     ],
     "url": "https://github.com/sanderland/katrain/releases/download/1.10.1/KaTrain.zip",
     "hash": "70e878d87f28b8149506311570788bdc2456d5cc1865a263940388510f6cd129",
-    "autoupdate": {
-        "url": "https://github.com/sanderland/katrain/releases/download/$version/KaTrain.zip"
-    },
-    "checkver": "github",
     "extract_dir": "KaTrain",
-    "persist": "sgfout",
     "shortcuts": [
         [
             "KaTrain.exe",
             "KaTrain"
         ]
-    ]
+    ],
+    "persist": "sgfout",
+    "checkver": "github",
+    "autoupdate": {
+        "url": "https://github.com/sanderland/katrain/releases/download/$version/KaTrain.zip"
+    }
 }
diff --git a/bucket/kega-fusion.json b/bucket/kega-fusion.json
index 81017d8c..7880cedb 100644
--- a/bucket/kega-fusion.json
+++ b/bucket/kega-fusion.json
@@ -1,26 +1,26 @@
 {
-    "homepage": "https://www.carpeludum.com/kega-fusion/",
-    "description": "SEGA Genesis / Mega Drive emulator",
     "version": "3.64",
+    "description": "SEGA Genesis / Mega Drive emulator",
+    "homepage": "https://www.carpeludum.com/kega-fusion/",
     "license": "Freeware",
     "url": "https://www.carpeludum.com/download/Fusion364.zip",
     "hash": "6365101eb417c5c2a5e6609573f354b7b7ea86632cbfd968676a1eec070e0ca3",
-    "autoupdate": {
-        "url": "https://www.carpeludum.com/download/Fusion$cleanVersion.zip",
-        "extract_dir": "Fusion$cleanVersion"
-    },
-    "bin": "Fusion.exe",
-    "checkver": {
-        "url": "https://www.carpeludum.com/kega-fusion/",
-        "regex": "Kega Fusion ([\\d]+[\\.][\\d]+) Windows<\\/a>"
-    },
     "extract_dir": "Fusion364",
-    "persist": "Fusion.ini",
     "pre_install": "If(!(Test-Path(\"$persist_dir\\Fusion.ini\"))){New-Item -ItemType File \"$dir\\Fusion.ini\" | Out-Null }",
+    "bin": "Fusion.exe",
     "shortcuts": [
         [
             "Fusion.exe",
             "Kega Fusion"
         ]
-    ]
+    ],
+    "persist": "Fusion.ini",
+    "checkver": {
+        "url": "https://www.carpeludum.com/kega-fusion/",
+        "regex": "Kega Fusion ([\\d]+[\\.][\\d]+) Windows<\\/a>"
+    },
+    "autoupdate": {
+        "url": "https://www.carpeludum.com/download/Fusion$cleanVersion.zip",
+        "extract_dir": "Fusion$cleanVersion"
+    }
 }
diff --git a/bucket/lambdahack.json b/bucket/lambdahack.json
index 00b9fb3a..01907454 100644
--- a/bucket/lambdahack.json
+++ b/bucket/lambdahack.json
@@ -1,18 +1,16 @@
 {
-    "homepage": "https://github.com/LambdaHack/LambdaHack",
-    "description": "Haskell game engine library for roguelike dungeon crawlers",
     "version": "0.11.0.0",
+    "description": "Haskell game engine library for roguelike dungeon crawlers",
+    "homepage": "https://github.com/LambdaHack/LambdaHack",
     "license": "BSD-3",
-    "architecture": {
-        "32bit": {
-            "url": "https://github.com/LambdaHack/LambdaHack/releases/download/v0.11.0.0/LambdaHack_0.11.0.0_windows-i686.zip",
-            "hash": "250e0982874cc55d812e8d83806a14e77b68483669764c2a5ff3f5d6f50a9947"
-        },
-        "64bit": {
-            "url": "https://github.com/LambdaHack/LambdaHack/releases/download/v0.11.0.0/LambdaHack_0.11.0.0_windows-x86_64.zip",
-            "hash": "7588920ac3987e4fbea80980e14854aadc8983783bc5ce1e50edb6b16d25003c"
-        }
-    },
+    "extract_dir": "LambdaHackTheGame",
+    "shortcuts": [
+        [
+            "LambdaHack.exe",
+            "Lambda Hack"
+        ]
+    ],
+    "checkver": "github",
     "autoupdate": {
         "architecture": {
             "32bit": {
@@ -23,12 +21,14 @@
             }
         }
     },
-    "checkver": "github",
-    "extract_dir": "LambdaHackTheGame",
-    "shortcuts": [
-        [
-            "LambdaHack.exe",
-            "Lambda Hack"
-        ]
-    ]
+    "architecture": {
+        "32bit": {
+            "url": "https://github.com/LambdaHack/LambdaHack/releases/download/v0.11.0.0/LambdaHack_0.11.0.0_windows-i686.zip",
+            "hash": "250e0982874cc55d812e8d83806a14e77b68483669764c2a5ff3f5d6f50a9947"
+        },
+        "64bit": {
+            "url": "https://github.com/LambdaHack/LambdaHack/releases/download/v0.11.0.0/LambdaHack_0.11.0.0_windows-x86_64.zip",
+            "hash": "7588920ac3987e4fbea80980e14854aadc8983783bc5ce1e50edb6b16d25003c"
+        }
+    }
 }
diff --git a/bucket/legendary.json b/bucket/legendary.json
index d12c2b6d..6a1732bf 100644
--- a/bucket/legendary.json
+++ b/bucket/legendary.json
@@ -1,14 +1,14 @@
 {
-    "homepage": "https://github.com/derrod/legendary",
-    "description": "Alternative command-line game downloader and launcher for Epic Games Store",
     "version": "0.20.25",
+    "description": "Alternative command-line game downloader and launcher for Epic Games Store",
+    "homepage": "https://github.com/derrod/legendary",
     "license": "GPL-3.0-or-later",
     "notes": "See https://github.com/derrod/legendary/blob/master/README.md for instructions about how to run the program.",
     "url": "https://github.com/derrod/legendary/releases/download/0.20.25/legendary.exe",
     "hash": "4404becba3da394300291c736c3c56ab75438785e06a1f5e5d8a55fd876c73de",
+    "bin": "legendary.exe",
+    "checkver": "github",
     "autoupdate": {
         "url": "https://github.com/derrod/legendary/releases/download/$version/legendary.exe"
-    },
-    "bin": "legendary.exe",
-    "checkver": "github"
+    }
 }
diff --git a/bucket/lf2.json b/bucket/lf2.json
index 6d882518..93aaf4c4 100644
--- a/bucket/lf2.json
+++ b/bucket/lf2.json
@@ -1,23 +1,23 @@
 {
-    "homepage": "http://www.lf2.net/",
-    "description": "Little Fighter 2. A Fighting game.",
     "version": "2.0a",
+    "description": "Little Fighter 2. A Fighting game.",
+    "homepage": "http://www.lf2.net/",
     "license": "Freeware",
+    "suggest": {
+        "Visual C++ 2005 Redistributable": "extras/vcredist2005"
+    },
     "url": "http://201708.mediafire.com/file/j2ddn2qqc27u5x1/LittleFighter_2.0a_azo.exe/file#/dl.7z",
     "hash": "254c79d8fb0af8df72eef042aa2f0c3d9409a0da391f6ab40964450fb0ade034",
-    "bin": "lf2.ps1",
     "extract_dir": "LittleFighter",
     "pre_install": [
         "Set-Content \"$dir\\lf2.ps1\" -Value 'Start-Process \"$PSScriptRoot\\lf2.exe\" -WorkingDirectory $PSScriptRoot' -Encoding Ascii",
         "Remove-Item \"$dir\\*.url\""
     ],
+    "bin": "lf2.ps1",
     "shortcuts": [
         [
             "lf2.exe",
             "Little Fighter 2"
         ]
-    ],
-    "suggest": {
-        "Visual C++ 2005 Redistributable": "extras/vcredist2005"
-    }
+    ]
 }
diff --git a/bucket/loot.json b/bucket/loot.json
index 989f086c..adcd8ac1 100644
--- a/bucket/loot.json
+++ b/bucket/loot.json
@@ -1,27 +1,27 @@
 {
-    "homepage": "https://github.com/loot/loot",
-    "description": "Plugin load order optimisation tool for The Elder Scrolls and Fallout series",
     "version": "0.17.0",
+    "description": "Plugin load order optimisation tool for The Elder Scrolls and Fallout series",
+    "homepage": "https://github.com/loot/loot",
     "license": "GPL-3.0-or-later",
+    "suggest": {
+        "Visual C++ Redistributable 2019": "extras/vcredist2019"
+    },
     "url": "https://github.com/loot/loot/releases/download/0.17.0/loot_0.17.0-0-g36fedfe_0.17.0.7z",
     "hash": "4efb1ff3deeae463637d8e7a3150f267eae0600afa0714d766722a579cd2e67e",
-    "autoupdate": {
-        "url": "https://github.com/loot/loot/releases/download/$version/loot_$version-0-$matchCommit_$version.7z",
-        "extract_dir": "loot_$version-0-$matchCommit_$version"
-    },
-    "bin": "LOOT.exe",
-    "checkver": {
-        "github": "https://github.com/loot/loot",
-        "regex": "loot_([\\d.]+)-0-(?<commit>\\w+)_(?<version>[\\d\\.]+)\\.7z"
-    },
     "extract_dir": "loot_0.17.0-0-g36fedfe_0.17.0",
+    "bin": "LOOT.exe",
     "shortcuts": [
         [
             "LOOT.exe",
             "LOOT"
         ]
     ],
-    "suggest": {
-        "Visual C++ Redistributable 2019": "extras/vcredist2019"
+    "checkver": {
+        "github": "https://github.com/loot/loot",
+        "regex": "loot_([\\d.]+)-0-(?<commit>\\w+)_(?<version>[\\d\\.]+)\\.7z"
+    },
+    "autoupdate": {
+        "url": "https://github.com/loot/loot/releases/download/$version/loot_$version-0-$matchCommit_$version.7z",
+        "extract_dir": "loot_$version-0-$matchCommit_$version"
     }
 }
diff --git a/bucket/lzdoom.json b/bucket/lzdoom.json
index f21ed0ec..bce59b38 100644
--- a/bucket/lzdoom.json
+++ b/bucket/lzdoom.json
@@ -1,22 +1,26 @@
 {
-    "homepage": "https://zdoom.org/",
-    "description": "Legacy source port for Doom, Heretic, Hexen and more (based on GZDoom)",
     "version": "3.88",
+    "description": "Legacy source port for Doom, Heretic, Hexen and more (based on GZDoom)",
+    "homepage": "https://zdoom.org/",
     "license": "GPL-3.0-or-later",
     "notes": [
         "Place WAD files (game data) in:",
         "",
         "    $persist_dir\\..\\_doom"
     ],
-    "architecture": {
-        "32bit": {
-            "url": "https://github.com/drfrag666/gzdoom/releases/download/3.88/LZDoom_3.88_x86.zip",
-            "hash": "7bb5607a59f27a8095e59319b52fe9176911c19431b7267a0b1d119a039dab5f"
-        },
-        "64bit": {
-            "url": "https://github.com/drfrag666/gzdoom/releases/download/3.88/LZDoom_3.88_x64.zip",
-            "hash": "331210c7b2d85080333e3e00140bd0119da58256fe1d142591b079ef4fe74fda"
-        }
+    "pre_install": "New-Item -ItemType Directory -Force -Path $persist_dir\\..\\_doom | Out-Null",
+    "env_set": {
+        "DOOMWADDIR": "$persist_dir\\..\\_doom"
+    },
+    "bin": "lzdoom.exe",
+    "shortcuts": [
+        [
+            "lzdoom.exe",
+            "LZDoom"
+        ]
+    ],
+    "checkver": {
+        "github": "https://github.com/drfrag666/gzdoom"
     },
     "autoupdate": {
         "architecture": {
@@ -28,18 +32,14 @@
             }
         }
     },
-    "bin": "lzdoom.exe",
-    "checkver": {
-        "github": "https://github.com/drfrag666/gzdoom"
-    },
-    "env_set": {
-        "DOOMWADDIR": "$persist_dir\\..\\_doom"
-    },
-    "pre_install": "New-Item -ItemType Directory -Force -Path $persist_dir\\..\\_doom | Out-Null",
-    "shortcuts": [
-        [
-            "lzdoom.exe",
-            "LZDoom"
-        ]
-    ]
+    "architecture": {
+        "32bit": {
+            "url": "https://github.com/drfrag666/gzdoom/releases/download/3.88/LZDoom_3.88_x86.zip",
+            "hash": "7bb5607a59f27a8095e59319b52fe9176911c19431b7267a0b1d119a039dab5f"
+        },
+        "64bit": {
+            "url": "https://github.com/drfrag666/gzdoom/releases/download/3.88/LZDoom_3.88_x64.zip",
+            "hash": "331210c7b2d85080333e3e00140bd0119da58256fe1d142591b079ef4fe74fda"
+        }
+    }
 }
diff --git a/bucket/m64p.json b/bucket/m64p.json
index e6aa6a86..56136758 100644
--- a/bucket/m64p.json
+++ b/bucket/m64p.json
@@ -1,29 +1,15 @@
 {
-    "homepage": "https://m64p.github.io/",
-    "description": "Nintendo 64 emulator bundled with paraLLEl-RDP for graphics",
     "version": "2021.12.29",
+    "description": "Nintendo 64 emulator bundled with paraLLEl-RDP for graphics",
+    "homepage": "https://m64p.github.io/",
     "license": {
-        "identifier": "GPL-3.0",
-        "url": "https://github.com/m64p/m64p/blob/main/LICENSE"
+        "url": "https://github.com/m64p/m64p/blob/main/LICENSE",
+        "identifier": "GPL-3.0"
     },
     "notes": "Configuration files cannot be persisted, but will be retained during the update",
     "url": "https://github.com/loganmc10/m64p/releases/download/v2021.12.29/m64p-win64-7045d7a.zip",
     "hash": "d99f9bcc7219c55473ac991a1dc17ea783f0a2270ee1ec63b3e101fcb7645415",
-    "autoupdate": {
-        "url": "https://github.com/loganmc10/m64p/releases/download/v$version/m64p-win64-$matchCommit.zip"
-    },
-    "bin": [
-        [
-            "mupen64plus-gui.exe",
-            "m64p"
-        ]
-    ],
-    "checkver": {
-        "url": "https://github.com/loganmc10/m64p/releases",
-        "regex": "releases\\/download\\/v([\\d.]{10})\\/m64p-win64-(?<commit>[\\da-f]{7})\\.zip"
-    },
     "extract_dir": "mupen64plus",
-    "persist": "config",
     "post_install": [
         "if (!(Test-Path \"$persist_dir\\mupen64plus-gui.ini.bak\")) {",
         "   Set-Content \"$dir\\mupen64plus-gui.ini\" '[General]'",
@@ -33,17 +19,31 @@
         "   Copy-Item \"$persist_dir\\mupen64plus-gui.ini.bak\" \"$dir\\mupen64plus-gui.ini\" -Force",
         "}"
     ],
+    "bin": [
+        [
+            "mupen64plus-gui.exe",
+            "m64p"
+        ]
+    ],
     "shortcuts": [
         [
             "mupen64plus-gui.exe",
             "m64p"
         ]
     ],
+    "persist": "config",
     "uninstaller": {
         "script": [
             "'mupen64plus-gui.ini' | ForEach-Object {",
             "    Copy-Item \"$dir\\$_\" \"$persist_dir\\$_.bak\" -Force",
             "}"
         ]
+    },
+    "checkver": {
+        "url": "https://github.com/loganmc10/m64p/releases",
+        "regex": "releases\\/download\\/v([\\d.]{10})\\/m64p-win64-(?<commit>[\\da-f]{7})\\.zip"
+    },
+    "autoupdate": {
+        "url": "https://github.com/loganmc10/m64p/releases/download/v$version/m64p-win64-$matchCommit.zip"
     }
 }
diff --git a/bucket/mame.json b/bucket/mame.json
index a46a0c0e..4b9bf599 100644
--- a/bucket/mame.json
+++ b/bucket/mame.json
@@ -1,10 +1,32 @@
 {
-    "homepage": "http://mamedev.org",
-    "description": "Arcade machine emulator",
     "version": "0.241",
+    "description": "Arcade machine emulator",
+    "homepage": "http://mamedev.org",
     "license": {
-        "identifier": "GPL-2.0",
-        "url": "https://github.com/mamedev/mame/blob/master/COPYING"
+        "url": "https://github.com/mamedev/mame/blob/master/COPYING",
+        "identifier": "GPL-2.0"
+    },
+    "persist": [
+        "ctrlr",
+        "plugins",
+        "roms",
+        "mame.ini",
+        "ui.ini",
+        "plugin.ini"
+    ],
+    "checkver": {
+        "github": "https://github.com/mamedev/mame",
+        "regex": "MAME ([\\d.]+)"
+    },
+    "autoupdate": {
+        "architecture": {
+            "32bit": {
+                "url": "https://file-examples-com.github.io/uploads/2017/02/file_example_JSON_1kb.json"
+            },
+            "64bit": {
+                "url": "https://github.com/mamedev/mame/releases/download/mame$cleanVersion/mame$cleanVersionb_64bit.exe#/dl.7z"
+            }
+        }
     },
     "architecture": {
         "32bit": {
@@ -30,18 +52,18 @@
         "64bit": {
             "url": "https://github.com/mamedev/mame/releases/download/mame0241/mame0241b_64bit.exe#/dl.7z",
             "hash": "8b643ef1c9a5842133b98a99e96126ca530ee01d1a2bc335f8da96db61a3aea2",
-            "bin": [
-                [
-                    "mame.exe",
-                    "mame"
-                ]
-            ],
             "pre_install": [
                 "if(!(Test-Path \"$persist_dir\\mame.ini\")) {",
                 "   Start-Process \"$dir\\mame.exe\" -WorkingDirectory \"$dir\" -ArgumentList \"-createconfig\"",
                 "   Start-Sleep -Seconds 5",
                 "}"
             ],
+            "bin": [
+                [
+                    "mame.exe",
+                    "mame"
+                ]
+            ],
             "shortcuts": [
                 [
                     "mame.exe",
@@ -49,27 +71,5 @@
                 ]
             ]
         }
-    },
-    "autoupdate": {
-        "architecture": {
-            "32bit": {
-                "url": "https://file-examples-com.github.io/uploads/2017/02/file_example_JSON_1kb.json"
-            },
-            "64bit": {
-                "url": "https://github.com/mamedev/mame/releases/download/mame$cleanVersion/mame$cleanVersionb_64bit.exe#/dl.7z"
-            }
-        }
-    },
-    "checkver": {
-        "github": "https://github.com/mamedev/mame",
-        "regex": "MAME ([\\d.]+)"
-    },
-    "persist": [
-        "ctrlr",
-        "plugins",
-        "roms",
-        "mame.ini",
-        "ui.ini",
-        "plugin.ini"
-    ]
+    }
 }
diff --git a/bucket/mameui.json b/bucket/mameui.json
index 90fc990e..6fee86cc 100644
--- a/bucket/mameui.json
+++ b/bucket/mameui.json
@@ -1,32 +1,8 @@
 {
-    "homepage": "http://www.mameui.info/",
-    "description": "GUI frontend for MAME, the multi-purpose emulation framework",
     "version": "nightly",
+    "description": "GUI frontend for MAME, the multi-purpose emulation framework",
+    "homepage": "http://www.mameui.info/",
     "license": "GPL-2.0-or-later",
-    "architecture": {
-        "64bit": {
-            "url": "http://www.mameui.info/MAMEUI.7z",
-            "bin": "mameui.exe",
-            "extract_dir": "MAMEUI",
-            "shortcuts": [
-                [
-                    "MAMEUI.exe",
-                    "MAMEUI"
-                ]
-            ]
-        }
-    },
-    "autoupdate": {
-        "architecture": {
-            "64bit": {
-                "url": "http://www.mameui.info/MAMEUI.7z"
-            }
-        }
-    },
-    "checkver": {
-        "regex": "MAMEUI v\\.([\\d]+) Download",
-        "replace": "0.${1}"
-    },
     "persist": [
         "cfg",
         "diff",
@@ -36,5 +12,29 @@
         "nvram",
         "snap",
         "sta"
-    ]
+    ],
+    "checkver": {
+        "regex": "MAMEUI v\\.([\\d]+) Download",
+        "replace": "0.${1}"
+    },
+    "autoupdate": {
+        "architecture": {
+            "64bit": {
+                "url": "http://www.mameui.info/MAMEUI.7z"
+            }
+        }
+    },
+    "architecture": {
+        "64bit": {
+            "url": "http://www.mameui.info/MAMEUI.7z",
+            "extract_dir": "MAMEUI",
+            "bin": "mameui.exe",
+            "shortcuts": [
+                [
+                    "MAMEUI.exe",
+                    "MAMEUI"
+                ]
+            ]
+        }
+    }
 }
diff --git a/bucket/mcedit2.json b/bucket/mcedit2.json
index f98525bb..7a311de7 100644
--- a/bucket/mcedit2.json
+++ b/bucket/mcedit2.json
@@ -1,19 +1,18 @@
 {
-    "homepage": "http://www.mcedit.net/",
-    "description": "World editor for Minecraft",
     "version": "2.0.0-beta14",
+    "description": "World editor for Minecraft",
+    "homepage": "http://www.mcedit.net/",
     "license": "BSD-3-Clause",
-    "architecture": {
-        "32bit": {
-            "url": "https://github.com/mcedit/mcedit2/releases/download/2.0.0-beta14/mcedit2-win32-2.0.0-beta14.exe#/mcedit2.7z",
-            "hash": "d98471a303215de878c97fd86e263912825fa56eb3fc4347e5afc78e191953a4",
-            "extract_dir": "mcedit2-win32-2.0.0-beta14"
-        },
-        "64bit": {
-            "url": "https://github.com/mcedit/mcedit2/releases/download/2.0.0-beta14/mcedit2-win64-2.0.0-beta14.exe#/mcedit2.7z",
-            "hash": "7b481550cb6ceae28deacb4072eafb5201bb111c65a7389c4aa66495fa670b55",
-            "extract_dir": "mcedit2-win64-2.0.0-beta14"
-        }
+    "bin": "mcedit2.exe",
+    "shortcuts": [
+        [
+            "mcedit2.exe",
+            "MCEdit2"
+        ]
+    ],
+    "checkver": {
+        "url": "https://github.com/mcedit/mcedit2/releases",
+        "regex": "tree/([\\wd.-]+)"
     },
     "autoupdate": {
         "architecture": {
@@ -27,15 +26,16 @@
             }
         }
     },
-    "bin": "mcedit2.exe",
-    "checkver": {
-        "url": "https://github.com/mcedit/mcedit2/releases",
-        "regex": "tree/([\\wd.-]+)"
-    },
-    "shortcuts": [
-        [
-            "mcedit2.exe",
-            "MCEdit2"
-        ]
-    ]
+    "architecture": {
+        "32bit": {
+            "url": "https://github.com/mcedit/mcedit2/releases/download/2.0.0-beta14/mcedit2-win32-2.0.0-beta14.exe#/mcedit2.7z",
+            "hash": "d98471a303215de878c97fd86e263912825fa56eb3fc4347e5afc78e191953a4",
+            "extract_dir": "mcedit2-win32-2.0.0-beta14"
+        },
+        "64bit": {
+            "url": "https://github.com/mcedit/mcedit2/releases/download/2.0.0-beta14/mcedit2-win64-2.0.0-beta14.exe#/mcedit2.7z",
+            "hash": "7b481550cb6ceae28deacb4072eafb5201bb111c65a7389c4aa66495fa670b55",
+            "extract_dir": "mcedit2-win64-2.0.0-beta14"
+        }
+    }
 }
diff --git a/bucket/mcrcon.json b/bucket/mcrcon.json
index d3c71131..313e7c3f 100644
--- a/bucket/mcrcon.json
+++ b/bucket/mcrcon.json
@@ -1,10 +1,19 @@
 {
-    "homepage": "https://github.com/Tiiffi/mcrcon",
-    "description": "RCON client for Minecraft",
     "version": "0.7.2",
+    "description": "RCON client for Minecraft",
+    "homepage": "https://github.com/Tiiffi/mcrcon",
     "license": "Zlib",
     "url": "https://github.com/Tiiffi/mcrcon/releases/download/v0.7.2/mcrcon-0.7.2-windows-x86-32.zip",
     "hash": "9bc513cd039c4738764a6354df45e776ea4db58eafefaa19f92e845a9147f85e",
+    "extract_dir": "mcrcon-0.7.2-windows-x86-32",
+    "bin": "mcrcon.exe",
+    "shortcuts": [
+        [
+            "mcrcon.exe",
+            "mcrcon"
+        ]
+    ],
+    "checkver": "github",
     "autoupdate": {
         "url": "https://github.com/Tiiffi/mcrcon/releases/download/v$version/mcrcon-$version-windows-x86-32.zip",
         "hash": {
@@ -12,14 +21,5 @@
             "regex": "windows.*\\s<td>$sha256</td>"
         },
         "extract_dir": "mcrcon-$version-windows-x86-32"
-    },
-    "bin": "mcrcon.exe",
-    "checkver": "github",
-    "extract_dir": "mcrcon-0.7.2-windows-x86-32",
-    "shortcuts": [
-        [
-            "mcrcon.exe",
-            "mcrcon"
-        ]
-    ]
+    }
 }
diff --git a/bucket/mednafen-dev.json b/bucket/mednafen-dev.json
index abb263ea..1ec348ef 100644
--- a/bucket/mednafen-dev.json
+++ b/bucket/mednafen-dev.json
@@ -1,45 +1,18 @@
 {
-    "homepage": "https://mednafen.github.io/",
-    "description": "Multi-system emulator (development version)",
     "version": "1.29.0",
+    "description": "Multi-system emulator (development version)",
+    "homepage": "https://mednafen.github.io/",
     "license": {
-        "identifier": "GPL-2.0-only",
-        "url": "http://www.gnu.org/licenses/gpl-2.0.html"
+        "url": "http://www.gnu.org/licenses/gpl-2.0.html",
+        "identifier": "GPL-2.0-only"
     },
     "notes": [
         "ATTENTION: Mednafen requires BIOS/firmware files for Playstation 1, PC Engine, and PC FX emulation.",
         "It is recommended to place these in $persist_dir\\firmware.",
         "See https://mednafen.github.io/documentation/#Section_firmware_bios for more information."
     ],
-    "architecture": {
-        "32bit": {
-            "url": "https://mednafen.github.io/releases/files/mednafen-1.29.0-win32.zip",
-            "hash": "f1c78dd0190129efaeeaa8e96553fb4d83d0120041caaaa6d4e7f440a573d811"
-        },
-        "64bit": {
-            "url": "https://mednafen.github.io/releases/files/mednafen-1.29.0-win64.zip",
-            "hash": "26c6676354d44e7d2c31b002f0abb097940e0846e449ed080fb79e6b64db0be2"
-        }
-    },
-    "autoupdate": {
-        "architecture": {
-            "32bit": {
-                "url": "https://mednafen.github.io/releases/files/mednafen-$matchVersion$matchDev-win32.zip"
-            },
-            "64bit": {
-                "url": "https://mednafen.github.io/releases/files/mednafen-$matchVersion$matchDev-win64.zip"
-            }
-        }
-    },
-    "bin": [
-        [
-            "mednafen.exe",
-            "mednafen-dev"
-        ]
-    ],
-    "checkver": {
-        "regex": "mednafen-(?<version>[\\d.]+)(?<dev>-UNSTABLE)?.tar.xz",
-        "replace": "${1}"
+    "suggest": {
+        "Mednaffe": "mednaffe"
     },
     "installer": {
         "script": [
@@ -48,6 +21,18 @@
             "}"
         ]
     },
+    "bin": [
+        [
+            "mednafen.exe",
+            "mednafen-dev"
+        ]
+    ],
+    "shortcuts": [
+        [
+            "mednafen.exe",
+            "mednafen (dev)"
+        ]
+    ],
     "persist": [
         "cheats",
         "firmware",
@@ -59,13 +44,28 @@
         "snaps",
         "mednafen.cfg"
     ],
-    "shortcuts": [
-        [
-            "mednafen.exe",
-            "mednafen (dev)"
-        ]
-    ],
-    "suggest": {
-        "Mednaffe": "mednaffe"
+    "checkver": {
+        "regex": "mednafen-(?<version>[\\d.]+)(?<dev>-UNSTABLE)?.tar.xz",
+        "replace": "${1}"
+    },
+    "autoupdate": {
+        "architecture": {
+            "32bit": {
+                "url": "https://mednafen.github.io/releases/files/mednafen-$matchVersion$matchDev-win32.zip"
+            },
+            "64bit": {
+                "url": "https://mednafen.github.io/releases/files/mednafen-$matchVersion$matchDev-win64.zip"
+            }
+        }
+    },
+    "architecture": {
+        "32bit": {
+            "url": "https://mednafen.github.io/releases/files/mednafen-1.29.0-win32.zip",
+            "hash": "f1c78dd0190129efaeeaa8e96553fb4d83d0120041caaaa6d4e7f440a573d811"
+        },
+        "64bit": {
+            "url": "https://mednafen.github.io/releases/files/mednafen-1.29.0-win64.zip",
+            "hash": "26c6676354d44e7d2c31b002f0abb097940e0846e449ed080fb79e6b64db0be2"
+        }
     }
 }
diff --git a/bucket/mednafen.json b/bucket/mednafen.json
index 0b531a2d..80b0795e 100644
--- a/bucket/mednafen.json
+++ b/bucket/mednafen.json
@@ -1,40 +1,18 @@
 {
-    "homepage": "https://mednafen.github.io/",
-    "description": "Multi-system emulator",
     "version": "1.29.0",
+    "description": "Multi-system emulator",
+    "homepage": "https://mednafen.github.io/",
     "license": {
-        "identifier": "GPL-2.0",
-        "url": "http://www.gnu.org/licenses/gpl-2.0.html"
+        "url": "http://www.gnu.org/licenses/gpl-2.0.html",
+        "identifier": "GPL-2.0"
     },
     "notes": [
         "ATTENTION: Mednafen requires BIOS/firmware files for Playstation 1, PC Engine, and PC FX emulation.",
         "It is recommended to place these in $persist_dir\\firmware.",
         "See https://mednafen.github.io/documentation/#Section_firmware_bios for more information."
     ],
-    "architecture": {
-        "32bit": {
-            "url": "https://mednafen.github.io/releases/files/mednafen-1.29.0-win32.zip",
-            "hash": "f1c78dd0190129efaeeaa8e96553fb4d83d0120041caaaa6d4e7f440a573d811"
-        },
-        "64bit": {
-            "url": "https://mednafen.github.io/releases/files/mednafen-1.29.0-win64.zip",
-            "hash": "26c6676354d44e7d2c31b002f0abb097940e0846e449ed080fb79e6b64db0be2"
-        }
-    },
-    "autoupdate": {
-        "architecture": {
-            "32bit": {
-                "url": "https://mednafen.github.io/releases/files/mednafen-$matchVersion-win32.zip"
-            },
-            "64bit": {
-                "url": "https://mednafen.github.io/releases/files/mednafen-$matchVersion-win64.zip"
-            }
-        }
-    },
-    "bin": "mednafen.exe",
-    "checkver": {
-        "regex": "mednafen-(?<version>[\\d.]+).tar.xz",
-        "replace": "${1}"
+    "suggest": {
+        "Mednaffe": "mednaffe"
     },
     "installer": {
         "script": [
@@ -43,6 +21,13 @@
             "}"
         ]
     },
+    "bin": "mednafen.exe",
+    "shortcuts": [
+        [
+            "mednafen.exe",
+            "mednafen"
+        ]
+    ],
     "persist": [
         "cheats",
         "firmware",
@@ -54,13 +39,28 @@
         "snaps",
         "mednafen.cfg"
     ],
-    "shortcuts": [
-        [
-            "mednafen.exe",
-            "mednafen"
-        ]
-    ],
-    "suggest": {
-        "Mednaffe": "mednaffe"
+    "checkver": {
+        "regex": "mednafen-(?<version>[\\d.]+).tar.xz",
+        "replace": "${1}"
+    },
+    "autoupdate": {
+        "architecture": {
+            "32bit": {
+                "url": "https://mednafen.github.io/releases/files/mednafen-$matchVersion-win32.zip"
+            },
+            "64bit": {
+                "url": "https://mednafen.github.io/releases/files/mednafen-$matchVersion-win64.zip"
+            }
+        }
+    },
+    "architecture": {
+        "32bit": {
+            "url": "https://mednafen.github.io/releases/files/mednafen-1.29.0-win32.zip",
+            "hash": "f1c78dd0190129efaeeaa8e96553fb4d83d0120041caaaa6d4e7f440a573d811"
+        },
+        "64bit": {
+            "url": "https://mednafen.github.io/releases/files/mednafen-1.29.0-win64.zip",
+            "hash": "26c6676354d44e7d2c31b002f0abb097940e0846e449ed080fb79e6b64db0be2"
+        }
     }
 }
diff --git a/bucket/mednaffe.json b/bucket/mednaffe.json
index f7fcfdd2..580ebf73 100644
--- a/bucket/mednaffe.json
+++ b/bucket/mednaffe.json
@@ -1,31 +1,14 @@
 {
-    "homepage": "https://github.com/AmatCoder/mednaffe/",
-    "description": "Front-end for Mednafen",
     "version": "0.9.2",
+    "description": "Front-end for Mednafen",
+    "homepage": "https://github.com/AmatCoder/mednaffe/",
     "license": {
-        "identifier": "GPL-3.0",
-        "url": "https://github.com/AmatCoder/mednaffe/blob/master/COPYING"
+        "url": "https://github.com/AmatCoder/mednaffe/blob/master/COPYING",
+        "identifier": "GPL-3.0"
     },
+    "depends": "sudo",
     "url": "https://github.com/AmatCoder/mednaffe/releases/download/0.9.2/mednaffe-0.9.2-win.zip",
     "hash": "e172f24c656dbc0d07bbeb67de03481b119be155997749697d12f9f33b60af00",
-    "autoupdate": {
-        "url": "https://github.com/AmatCoder/mednaffe/releases/download/$version/mednaffe-$version-win.zip"
-    },
-    "bin": "mednaffe.exe",
-    "checkver": "github",
-    "depends": "sudo",
-    "installer": {
-        "script": [
-            "if (!(Test-Path \"$persist_dir\\mednafen.cfg\")) {",
-            "   New-Item \"$persist_dir\" -ItemType Directory | Out-Null",
-            "   switch ($medinst) {",
-            "       1 {sudo New-Item -ItemType HardLink -Path \"$persist_dir\\mednafen.cfg\" -Target \"$scoopdir\\persist\\mednafen\\mednafen.cfg\" | Out-Null}",
-            "       2 {sudo New-Item -ItemType HardLink -Path \"$persist_dir\\mednafen.cfg\" -Target \"$scoopdir\\persist\\mednafen-dev\\mednafen.cfg\" | Out-Null}",
-            "   }",
-            "}"
-        ]
-    },
-    "persist": "mednafen.cfg",
     "pre_install": [
         "$medinst = 0",
         "if (Test-Path \"$scoopdir\\apps\\mednafen\\current\\mednafen.exe\") {",
@@ -53,10 +36,27 @@
         "   }",
         "}"
     ],
+    "installer": {
+        "script": [
+            "if (!(Test-Path \"$persist_dir\\mednafen.cfg\")) {",
+            "   New-Item \"$persist_dir\" -ItemType Directory | Out-Null",
+            "   switch ($medinst) {",
+            "       1 {sudo New-Item -ItemType HardLink -Path \"$persist_dir\\mednafen.cfg\" -Target \"$scoopdir\\persist\\mednafen\\mednafen.cfg\" | Out-Null}",
+            "       2 {sudo New-Item -ItemType HardLink -Path \"$persist_dir\\mednafen.cfg\" -Target \"$scoopdir\\persist\\mednafen-dev\\mednafen.cfg\" | Out-Null}",
+            "   }",
+            "}"
+        ]
+    },
+    "bin": "mednaffe.exe",
     "shortcuts": [
         [
             "mednaffe.exe",
             "Mednaffe"
         ]
-    ]
+    ],
+    "persist": "mednafen.cfg",
+    "checkver": "github",
+    "autoupdate": {
+        "url": "https://github.com/AmatCoder/mednaffe/releases/download/$version/mednaffe-$version-win.zip"
+    }
 }
diff --git a/bucket/megaglest.json b/bucket/megaglest.json
index dc621fcc..523b8b14 100644
--- a/bucket/megaglest.json
+++ b/bucket/megaglest.json
@@ -1,8 +1,21 @@
 {
-    "homepage": "https://megaglest.org/",
-    "description": "Real-time 3D strategy game",
     "version": "3.13.0",
+    "description": "Real-time 3D strategy game",
+    "homepage": "https://megaglest.org/",
     "license": "GPL-3.0-or-later",
+    "checkver": {
+        "github": "https://github.com/MegaGlest/megaglest-source"
+    },
+    "autoupdate": {
+        "architecture": {
+            "32bit": {
+                "url": "https://github.com/MegaGlest/megaglest-source/releases/download/$version/MegaGlest-Installer-$version_windows_32bit.exe#/dl.7z"
+            },
+            "64bit": {
+                "url": "https://github.com/MegaGlest/megaglest-source/releases/download/$version/MegaGlest-Installer-$version_windows_64bit.exe#/dl.7z"
+            }
+        }
+    },
     "architecture": {
         "32bit": {
             "url": "https://github.com/MegaGlest/megaglest-source/releases/download/3.13.0/MegaGlest-Installer-3.13.0_windows_32bit.exe#/dl.7z",
@@ -51,18 +64,5 @@
                 ]
             ]
         }
-    },
-    "autoupdate": {
-        "architecture": {
-            "32bit": {
-                "url": "https://github.com/MegaGlest/megaglest-source/releases/download/$version/MegaGlest-Installer-$version_windows_32bit.exe#/dl.7z"
-            },
-            "64bit": {
-                "url": "https://github.com/MegaGlest/megaglest-source/releases/download/$version/MegaGlest-Installer-$version_windows_64bit.exe#/dl.7z"
-            }
-        }
-    },
-    "checkver": {
-        "github": "https://github.com/MegaGlest/megaglest-source"
     }
 }
diff --git a/bucket/melonds.json b/bucket/melonds.json
index 4f10df1c..31da25a7 100644
--- a/bucket/melonds.json
+++ b/bucket/melonds.json
@@ -1,10 +1,10 @@
 {
-    "homepage": "http://melonds.kuribo64.net/",
-    "description": "A Nintendo DS emulator aiming for fast and accurate emulation",
     "version": "0.9.3",
+    "description": "A Nintendo DS emulator aiming for fast and accurate emulation",
+    "homepage": "http://melonds.kuribo64.net/",
     "license": {
-        "identifier": "GPL-3.0",
-        "url": "https://github.com/Arisotura/melonDS/blob/master/LICENSE"
+        "url": "https://github.com/Arisotura/melonDS/blob/master/LICENSE",
+        "identifier": "GPL-3.0"
     },
     "notes": [
         "ATTENTION: MelonDS requires BIOS and firmware files dumped from a Nintendo DS to function.",
@@ -12,13 +12,6 @@
     ],
     "url": "https://github.com/Arisotura/melonDS/releases/download/0.9.3/melonDS_0.9.3_win_x64.7z",
     "hash": "108693998ce58175b4acb02788177f80e9e277658fa2cc9c62a2c7ae34181b10",
-    "autoupdate": {
-        "url": "https://github.com/Arisotura/melonDS/releases/download/$version/melonDS_$version_win_64.7z"
-    },
-    "bin": "melonDS.exe",
-    "checkver": {
-        "github": "https://github.com/Arisotura/melonDS"
-    },
     "installer": {
         "script": [
             "$FILE = 'melonDS.ini'",
@@ -27,11 +20,18 @@
             "}"
         ]
     },
-    "persist": "melonDS.ini",
+    "bin": "melonDS.exe",
     "shortcuts": [
         [
             "melonDS.exe",
             "melonDS"
         ]
-    ]
+    ],
+    "persist": "melonDS.ini",
+    "checkver": {
+        "github": "https://github.com/Arisotura/melonDS"
+    },
+    "autoupdate": {
+        "url": "https://github.com/Arisotura/melonDS/releases/download/$version/melonDS_$version_win_64.7z"
+    }
 }
diff --git a/bucket/mesen-s.json b/bucket/mesen-s.json
index 756413cf..a34ec507 100644
--- a/bucket/mesen-s.json
+++ b/bucket/mesen-s.json
@@ -1,21 +1,22 @@
 {
-    "homepage": "https://www.mesen.ca",
-    "description": "A high-accuracy SNES and Super GameBoy emulator",
     "version": "0.4.0",
+    "description": "A high-accuracy SNES and Super GameBoy emulator",
+    "homepage": "https://www.mesen.ca",
     "license": {
-        "identifier": "GPL-3.0",
-        "url": "https://github.com/SourMesen/Mesen-S/blob/master/LICENSE"
+        "url": "https://github.com/SourMesen/Mesen-S/blob/master/LICENSE",
+        "identifier": "GPL-3.0"
     },
     "notes": "Configuration files cannot be persisted, but will be retained during the update",
     "url": "https://github.com/SourMesen/Mesen-S/releases/download/0.4.0/Mesen-S.0.4.0.zip",
     "hash": "ce4ee543dd3aaa4a10e8597d5aa4735fbe9252c8d679e5772dbee827cfaa2d96",
-    "autoupdate": {
-        "url": "https://github.com/SourMesen/Mesen-S/releases/download/$version/Mesen-S.$version.zip"
-    },
+    "pre_install": "if (!(Test-Path \"$persist_dir\\settings.xml\")) { New-Item -ItemType File \"$dir\\settings.xml\" | Out-Null }",
     "bin": "Mesen-S.exe",
-    "checkver": {
-        "github": "https://github.com/SourMesen/Mesen-S/"
-    },
+    "shortcuts": [
+        [
+            "Mesen-S.exe",
+            "Mesen-S"
+        ]
+    ],
     "persist": [
         "settings.xml",
         "Avi",
@@ -28,11 +29,10 @@
         "Screenshots",
         "Wave"
     ],
-    "pre_install": "if (!(Test-Path \"$persist_dir\\settings.xml\")) { New-Item -ItemType File \"$dir\\settings.xml\" | Out-Null }",
-    "shortcuts": [
-        [
-            "Mesen-S.exe",
-            "Mesen-S"
-        ]
-    ]
+    "checkver": {
+        "github": "https://github.com/SourMesen/Mesen-S/"
+    },
+    "autoupdate": {
+        "url": "https://github.com/SourMesen/Mesen-S/releases/download/$version/Mesen-S.$version.zip"
+    }
 }
diff --git a/bucket/mesen.json b/bucket/mesen.json
index dbd3457f..23d82c38 100644
--- a/bucket/mesen.json
+++ b/bucket/mesen.json
@@ -1,20 +1,24 @@
 {
-    "homepage": "https://www.mesen.ca",
-    "description": "A high-accuracy NES and Famicom emulator and NSF player.",
     "version": "0.9.9",
+    "description": "A high-accuracy NES and Famicom emulator and NSF player.",
+    "homepage": "https://www.mesen.ca",
     "license": {
-        "identifier": "GPL-3.0",
-        "url": "https://github.com/SourMesen/Mesen/blob/master/LICENSE"
+        "url": "https://github.com/SourMesen/Mesen/blob/master/LICENSE",
+        "identifier": "GPL-3.0"
     },
     "url": "https://github.com/SourMesen/Mesen/releases/download/0.9.9/Mesen.0.9.9.zip",
     "hash": "91bd2b1ba007c9349864a96e490dbdaada78033d51e0be1aabbf442a4b9a7cda",
-    "autoupdate": {
-        "url": "https://github.com/SourMesen/Mesen/releases/download/$version/Mesen.$version.zip"
-    },
+    "pre_install": [
+        "if(!(Test-Path(\"$persist_dir\\FdsBios.bin\"))) { New-Item \"$dir\\FdsBios.bin\" | Out-Null }",
+        "if (!(Test-Path \"$persist_dir\\settings.xml\")) { New-Item -ItemType File \"$dir\\settings.xml\" | Out-Null }"
+    ],
     "bin": "Mesen.exe",
-    "checkver": {
-        "github": "https://github.com/SourMesen/Mesen/"
-    },
+    "shortcuts": [
+        [
+            "Mesen.exe",
+            "Mesen"
+        ]
+    ],
     "persist": [
         "settings.xml",
         "FdsBios.bin",
@@ -28,14 +32,10 @@
         "Screenshots",
         "Wave"
     ],
-    "pre_install": [
-        "if(!(Test-Path(\"$persist_dir\\FdsBios.bin\"))) { New-Item \"$dir\\FdsBios.bin\" | Out-Null }",
-        "if (!(Test-Path \"$persist_dir\\settings.xml\")) { New-Item -ItemType File \"$dir\\settings.xml\" | Out-Null }"
-    ],
-    "shortcuts": [
-        [
-            "Mesen.exe",
-            "Mesen"
-        ]
-    ]
+    "checkver": {
+        "github": "https://github.com/SourMesen/Mesen/"
+    },
+    "autoupdate": {
+        "url": "https://github.com/SourMesen/Mesen/releases/download/$version/Mesen.$version.zip"
+    }
 }
diff --git a/bucket/mgba-dev.json b/bucket/mgba-dev.json
index f5dddce5..2a138cb2 100644
--- a/bucket/mgba-dev.json
+++ b/bucket/mgba-dev.json
@@ -1,41 +1,10 @@
 {
-    "homepage": "https://mgba.io/",
-    "description": "A fast, accurate, and portable GBA emulator (development version)",
     "version": "7293-20220301",
+    "description": "A fast, accurate, and portable GBA emulator (development version)",
+    "homepage": "https://mgba.io/",
     "license": {
-        "identifier": "MPL-2.0",
-        "url": "https://github.com/mgba-emu/mgba/blob/master/LICENSE"
-    },
-    "architecture": {
-        "32bit": {
-            "url": "https://s3.amazonaws.com/mgba/build/mGBA-build-2022-03-01-win32-7293-245a20b442d577c90221fdbfd16ea573d0046523.7z",
-            "hash": "a8b0ac02983690dbaab0e98c38c60f5189b688557d0011047bfaee16c6e2c0a9"
-        },
-        "64bit": {
-            "url": "https://s3.amazonaws.com/mgba/build/mGBA-build-2022-03-01-win64-7293-245a20b442d577c90221fdbfd16ea573d0046523.7z",
-            "hash": "dab858a96ef342ac498f7a3cb368272879c1eb81c33e4eda3b65d35bef978fd5"
-        }
-    },
-    "autoupdate": {
-        "architecture": {
-            "32bit": {
-                "url": "https://s3.amazonaws.com/mgba/build/mGBA-build-$matchYear-$matchMonth-$matchDay-win32-$matchVer-$matchGit.7z"
-            },
-            "64bit": {
-                "url": "https://s3.amazonaws.com/mgba/build/mGBA-build-$matchYear-$matchMonth-$matchDay-win64-$matchVer-$matchGit.7z"
-            }
-        }
-    },
-    "bin": [
-        [
-            "mGBA.exe",
-            "mgba-sdl.exe"
-        ]
-    ],
-    "checkver": {
-        "url": "https://mgba.io/builds/1/",
-        "regex": "build-(?<year>20\\d{2})-(?<month>\\d{2})-(?<day>\\d{2})-win32-(?<ver>[\\d]+)-(?<git>\\w{40})\\.7z",
-        "replace": "$4-$1$2$3"
+        "url": "https://github.com/mgba-emu/mgba/blob/master/LICENSE",
+        "identifier": "MPL-2.0"
     },
     "installer": {
         "script": [
@@ -52,6 +21,18 @@
             "}"
         ]
     },
+    "bin": [
+        [
+            "mGBA.exe",
+            "mgba-sdl.exe"
+        ]
+    ],
+    "shortcuts": [
+        [
+            "mGBA.exe",
+            "mGBA (Development)"
+        ]
+    ],
     "persist": [
         "cheats",
         "patch",
@@ -62,10 +43,29 @@
         "qt.ini",
         "config.ini"
     ],
-    "shortcuts": [
-        [
-            "mGBA.exe",
-            "mGBA (Development)"
-        ]
-    ]
+    "checkver": {
+        "url": "https://mgba.io/builds/1/",
+        "regex": "build-(?<year>20\\d{2})-(?<month>\\d{2})-(?<day>\\d{2})-win32-(?<ver>[\\d]+)-(?<git>\\w{40})\\.7z",
+        "replace": "$4-$1$2$3"
+    },
+    "autoupdate": {
+        "architecture": {
+            "32bit": {
+                "url": "https://s3.amazonaws.com/mgba/build/mGBA-build-$matchYear-$matchMonth-$matchDay-win32-$matchVer-$matchGit.7z"
+            },
+            "64bit": {
+                "url": "https://s3.amazonaws.com/mgba/build/mGBA-build-$matchYear-$matchMonth-$matchDay-win64-$matchVer-$matchGit.7z"
+            }
+        }
+    },
+    "architecture": {
+        "32bit": {
+            "url": "https://s3.amazonaws.com/mgba/build/mGBA-build-2022-03-01-win32-7293-245a20b442d577c90221fdbfd16ea573d0046523.7z",
+            "hash": "a8b0ac02983690dbaab0e98c38c60f5189b688557d0011047bfaee16c6e2c0a9"
+        },
+        "64bit": {
+            "url": "https://s3.amazonaws.com/mgba/build/mGBA-build-2022-03-01-win64-7293-245a20b442d577c90221fdbfd16ea573d0046523.7z",
+            "hash": "dab858a96ef342ac498f7a3cb368272879c1eb81c33e4eda3b65d35bef978fd5"
+        }
+    }
 }
diff --git a/bucket/mgba.json b/bucket/mgba.json
index 4cbd08f8..029986fa 100644
--- a/bucket/mgba.json
+++ b/bucket/mgba.json
@@ -1,43 +1,10 @@
 {
-    "homepage": "https://mgba.io/",
-    "description": "A fast, accurate, and portable GBA emulator",
     "version": "0.9.3",
+    "description": "A fast, accurate, and portable GBA emulator",
+    "homepage": "https://mgba.io/",
     "license": {
-        "identifier": "MPL-2.0",
-        "url": "https://github.com/mgba-emu/mgba/blob/master/LICENSE"
-    },
-    "architecture": {
-        "32bit": {
-            "url": "https://github.com/mgba-emu/mgba/releases/download/0.9.3/mGBA-0.9.3-win32.7z",
-            "hash": "54df53ba5bb463395da0b85db8692234259c2ab7210781d49426b78e5a259757",
-            "extract_dir": "mGBA-0.9.3-win32"
-        },
-        "64bit": {
-            "url": "https://github.com/mgba-emu/mgba/releases/download/0.9.3/mGBA-0.9.3-win64.7z",
-            "hash": "a84ba662a2808f2d47de6f00d437981359194b807447043860a33ce15b3f5468",
-            "extract_dir": "mGBA-0.9.3-win64"
-        }
-    },
-    "autoupdate": {
-        "architecture": {
-            "32bit": {
-                "url": "https://github.com/mgba-emu/mgba/releases/download/$version/mGBA-$version-win32.7z",
-                "extract_dir": "mGBA-$version-win32"
-            },
-            "64bit": {
-                "url": "https://github.com/mgba-emu/mgba/releases/download/$version/mGBA-$version-win64.7z",
-                "extract_dir": "mGBA-$version-win64"
-            }
-        }
-    },
-    "bin": [
-        [
-            "mGBA.exe",
-            "mgba-sdl.exe"
-        ]
-    ],
-    "checkver": {
-        "github": "https://github.com/mgba-emu/mgba"
+        "url": "https://github.com/mgba-emu/mgba/blob/master/LICENSE",
+        "identifier": "MPL-2.0"
     },
     "installer": {
         "script": [
@@ -51,6 +18,18 @@
             "}"
         ]
     },
+    "bin": [
+        [
+            "mGBA.exe",
+            "mgba-sdl.exe"
+        ]
+    ],
+    "shortcuts": [
+        [
+            "mGBA.exe",
+            "mGBA"
+        ]
+    ],
     "persist": [
         "cheats",
         "patch",
@@ -61,10 +40,31 @@
         "qt.ini",
         "config.ini"
     ],
-    "shortcuts": [
-        [
-            "mGBA.exe",
-            "mGBA"
-        ]
-    ]
+    "checkver": {
+        "github": "https://github.com/mgba-emu/mgba"
+    },
+    "autoupdate": {
+        "architecture": {
+            "32bit": {
+                "url": "https://github.com/mgba-emu/mgba/releases/download/$version/mGBA-$version-win32.7z",
+                "extract_dir": "mGBA-$version-win32"
+            },
+            "64bit": {
+                "url": "https://github.com/mgba-emu/mgba/releases/download/$version/mGBA-$version-win64.7z",
+                "extract_dir": "mGBA-$version-win64"
+            }
+        }
+    },
+    "architecture": {
+        "32bit": {
+            "url": "https://github.com/mgba-emu/mgba/releases/download/0.9.3/mGBA-0.9.3-win32.7z",
+            "hash": "54df53ba5bb463395da0b85db8692234259c2ab7210781d49426b78e5a259757",
+            "extract_dir": "mGBA-0.9.3-win32"
+        },
+        "64bit": {
+            "url": "https://github.com/mgba-emu/mgba/releases/download/0.9.3/mGBA-0.9.3-win64.7z",
+            "hash": "a84ba662a2808f2d47de6f00d437981359194b807447043860a33ce15b3f5468",
+            "extract_dir": "mGBA-0.9.3-win64"
+        }
+    }
 }
diff --git a/bucket/mindustry-server.json b/bucket/mindustry-server.json
index 87c34569..6748af88 100644
--- a/bucket/mindustry-server.json
+++ b/bucket/mindustry-server.json
@@ -1,27 +1,27 @@
 {
-    "homepage": "https://mindustrygame.github.io/",
-    "description": "Server-side program for Mindustry, a sandbox tower-defense game",
     "version": "135",
+    "description": "Server-side program for Mindustry, a sandbox tower-defense game",
+    "homepage": "https://mindustrygame.github.io/",
     "license": "GPL-3.0-only",
+    "suggest": {
+        "Java Runtime Environment": "java/adoptopenjdk-hotspot-jre",
+        "Mindustry": "games/mindustry"
+    },
     "url": "https://github.com/Anuken/Mindustry/releases/download/v135/server-release.jar#/Mindustry-Server.jar",
     "hash": "836e9befdad47af4c62e6764386cbd2bff2888e2e7e4e9f2acfa1c52e744f975",
-    "autoupdate": {
-        "url": "https://github.com/Anuken/Mindustry/releases/download/v$version/server-release.jar#/Mindustry-Server.jar"
-    },
-    "bin": "mindustry-server.bat",
-    "checkver": {
-        "url": "https://github.com/Anuken/Mindustry/releases",
-        "regex": "Anuken\\/Mindustry\\/tree\\/v(\\d+)"
-    },
     "pre_install": "Set-Content -Path \"$dir\\mindustry-server.bat\" -Value \"pushd $dir && java -jar Mindustry-Server.jar && popd\"",
+    "bin": "mindustry-server.bat",
     "shortcuts": [
         [
             "mindustry-server.bat",
             "Mindustry Server"
         ]
     ],
-    "suggest": {
-        "Java Runtime Environment": "java/adoptopenjdk-hotspot-jre",
-        "Mindustry": "games/mindustry"
+    "checkver": {
+        "url": "https://github.com/Anuken/Mindustry/releases",
+        "regex": "Anuken\\/Mindustry\\/tree\\/v(\\d+)"
+    },
+    "autoupdate": {
+        "url": "https://github.com/Anuken/Mindustry/releases/download/v$version/server-release.jar#/Mindustry-Server.jar"
     }
 }
diff --git a/bucket/mindustry.json b/bucket/mindustry.json
index 2628b970..edc3b9fc 100644
--- a/bucket/mindustry.json
+++ b/bucket/mindustry.json
@@ -1,26 +1,26 @@
 {
-    "homepage": "https://mindustrygame.github.io/",
-    "description": "A sandbox tower-defense game",
     "version": "135",
+    "description": "A sandbox tower-defense game",
+    "homepage": "https://mindustrygame.github.io/",
     "license": "GPL-3.0-only",
+    "suggest": {
+        "Java Runtime Environment": "java/adoptopenjdk-hotspot-jre"
+    },
     "url": "https://github.com/Anuken/Mindustry/releases/download/v135/Mindustry.jar",
     "hash": "62b3c1f99b4a86e81482e4c8148af44eaabe3b031b3315649414b208ad296ff0",
-    "autoupdate": {
-        "url": "https://github.com/Anuken/Mindustry/releases/download/v$version/Mindustry.jar"
-    },
-    "bin": "mindustry.bat",
-    "checkver": {
-        "url": "https://github.com/Anuken/Mindustry/releases",
-        "regex": "Anuken\\/Mindustry\\/tree\\/v(\\d+)"
-    },
     "pre_install": "Set-Content -Path \"$dir\\mindustry.bat\" -Value \"pushd $dir && javaw -jar Mindustry.jar && popd\"",
+    "bin": "mindustry.bat",
     "shortcuts": [
         [
             "mindustry.bat",
             "Mindustry"
         ]
     ],
-    "suggest": {
-        "Java Runtime Environment": "java/adoptopenjdk-hotspot-jre"
+    "checkver": {
+        "url": "https://github.com/Anuken/Mindustry/releases",
+        "regex": "Anuken\\/Mindustry\\/tree\\/v(\\d+)"
+    },
+    "autoupdate": {
+        "url": "https://github.com/Anuken/Mindustry/releases/download/v$version/Mindustry.jar"
     }
 }
diff --git a/bucket/minecraft.json b/bucket/minecraft.json
index f7c7e913..2343c97f 100644
--- a/bucket/minecraft.json
+++ b/bucket/minecraft.json
@@ -1,18 +1,18 @@
 {
-    "homepage": "https://www.minecraft.net/",
-    "description": "Official launcher for Minecraft, a sandbox voxel game",
     "version": "nightly",
+    "description": "Official launcher for Minecraft, a sandbox voxel game",
+    "homepage": "https://www.minecraft.net/",
     "license": {
-        "identifier": "Proprietary",
-        "url": "https://account.mojang.com/terms"
+        "url": "https://account.mojang.com/terms",
+        "identifier": "Proprietary"
     },
     "notes": "This is only the launcher; a premium account is required to play Minecraft.",
     "url": "https://launcher.mojang.com/download/Minecraft.exe",
-    "bin": "Minecraft.exe",
     "post_install": [
         "Copy-Item -ErrorAction Ignore -Recurse -Force \"$persist_dir\\game\" -Destination $dir",
         "Copy-Item -ErrorAction Ignore -Recurse -Force \"$persist_dir\\runtime\" -Destination $dir"
     ],
+    "bin": "Minecraft.exe",
     "shortcuts": [
         [
             "Minecraft.exe",
diff --git a/bucket/minetest.json b/bucket/minetest.json
index 5d52c6fe..b366b1f9 100644
--- a/bucket/minetest.json
+++ b/bucket/minetest.json
@@ -1,19 +1,28 @@
 {
-    "homepage": "https://www.minetest.net/",
-    "description": "Minecraft-like infinite-world multiplayer sandbox game",
     "version": "5.5.0",
+    "description": "Minecraft-like infinite-world multiplayer sandbox game",
+    "homepage": "https://www.minetest.net/",
     "license": "LGPL-2.1-or-later",
-    "architecture": {
-        "32bit": {
-            "url": "https://github.com/minetest/minetest/releases/download/5.5.0/minetest-5.5.0-win32.zip",
-            "hash": "bf1e5d221b84dcd8c6d77a3831740ed927a1b6f3eed223a713e7b4d833d7bb9a",
-            "extract_dir": "minetest-5.5.0-win32"
-        },
-        "64bit": {
-            "url": "https://github.com/minetest/minetest/releases/download/5.5.0/minetest-5.5.0-win64.zip",
-            "hash": "d6788a4d22060cc612134f94d21b52d57bac4d4cc78a70700e07e5be15223e83",
-            "extract_dir": "minetest-5.5.0-win64"
-        }
+    "post_install": [
+        "if(!(Test-Path \"$dir\\config\\minetest.conf\")) {",
+        "New-Item -ErrorAction Ignore -Type file \"$dir\\config\\minetest.conf\" | Out-Null",
+        "}"
+    ],
+    "shortcuts": [
+        [
+            "bin\\minetest.exe",
+            "Minetest",
+            "--config ..\\config\\minetest.conf"
+        ]
+    ],
+    "persist": [
+        "config",
+        "mods",
+        "screenshots",
+        "worlds"
+    ],
+    "checkver": {
+        "github": "https://github.com/minetest/minetest"
     },
     "autoupdate": {
         "architecture": {
@@ -27,25 +36,16 @@
             }
         }
     },
-    "checkver": {
-        "github": "https://github.com/minetest/minetest"
-    },
-    "persist": [
-        "config",
-        "mods",
-        "screenshots",
-        "worlds"
-    ],
-    "post_install": [
-        "if(!(Test-Path \"$dir\\config\\minetest.conf\")) {",
-        "New-Item -ErrorAction Ignore -Type file \"$dir\\config\\minetest.conf\" | Out-Null",
-        "}"
-    ],
-    "shortcuts": [
-        [
-            "bin\\minetest.exe",
-            "Minetest",
-            "--config ..\\config\\minetest.conf"
-        ]
-    ]
+    "architecture": {
+        "32bit": {
+            "url": "https://github.com/minetest/minetest/releases/download/5.5.0/minetest-5.5.0-win32.zip",
+            "hash": "bf1e5d221b84dcd8c6d77a3831740ed927a1b6f3eed223a713e7b4d833d7bb9a",
+            "extract_dir": "minetest-5.5.0-win32"
+        },
+        "64bit": {
+            "url": "https://github.com/minetest/minetest/releases/download/5.5.0/minetest-5.5.0-win64.zip",
+            "hash": "d6788a4d22060cc612134f94d21b52d57bac4d4cc78a70700e07e5be15223e83",
+            "extract_dir": "minetest-5.5.0-win64"
+        }
+    }
 }
diff --git a/bucket/minutor.json b/bucket/minutor.json
index d2144800..8438e8c8 100644
--- a/bucket/minutor.json
+++ b/bucket/minutor.json
@@ -1,21 +1,21 @@
 {
-    "homepage": "http://seancode.com/minutor/",
-    "description": "Map rendering tool for Minecraft",
     "version": "2.18.0",
+    "description": "Map rendering tool for Minecraft",
+    "homepage": "http://seancode.com/minutor/",
     "license": "BSD-2-Clause",
     "url": "https://github.com/mrkite/minutor/releases/download/2.18.0/Minutor.Windows.no.installer.zip",
     "hash": "06ed5c15a9cf74a083a1f243b72a9c53243e9bdc2ba5ebc01f177ececeb198ce",
-    "autoupdate": {
-        "url": "https://github.com/mrkite/minutor/releases/download/$version/Minutor.Windows.no.installer.zip"
-    },
     "bin": "minutor.exe",
-    "checkver": {
-        "github": "https://github.com/mrkite/minutor/"
-    },
     "shortcuts": [
         [
             "minutor.exe",
             "Minutor"
         ]
-    ]
+    ],
+    "checkver": {
+        "github": "https://github.com/mrkite/minutor/"
+    },
+    "autoupdate": {
+        "url": "https://github.com/mrkite/minutor/releases/download/$version/Minutor.Windows.no.installer.zip"
+    }
 }
diff --git a/bucket/mo2.json b/bucket/mo2.json
index 3f37ffd6..0972c315 100644
--- a/bucket/mo2.json
+++ b/bucket/mo2.json
@@ -1,21 +1,21 @@
 {
-    "homepage": "https://github.com/ModOrganizer2/modorganizer",
-    "description": "Mod manager for various PC games",
     "version": "2.4.4",
+    "description": "Mod manager for various PC games",
+    "homepage": "https://github.com/ModOrganizer2/modorganizer",
     "license": "GPL-3.0-or-later",
     "url": "https://github.com/ModOrganizer2/modorganizer/releases/download/v2.4.4/Mod.Organizer-2.4.4.7z",
     "hash": "03ebaee8eda760a46b7dd828e3e6494355fc842bac24c221d109a22c0b273df2",
-    "autoupdate": {
-        "url": "https://github.com/ModOrganizer2/modorganizer/releases/download/v$version/Mod.Organizer-$version.7z"
-    },
     "bin": "ModOrganizer.exe",
-    "checkver": {
-        "github": "https://github.com/ModOrganizer2/modorganizer"
-    },
     "shortcuts": [
         [
             "ModOrganizer.exe",
             "ModOrganizer"
         ]
-    ]
+    ],
+    "checkver": {
+        "github": "https://github.com/ModOrganizer2/modorganizer"
+    },
+    "autoupdate": {
+        "url": "https://github.com/ModOrganizer2/modorganizer/releases/download/v$version/Mod.Organizer-$version.7z"
+    }
 }
diff --git a/bucket/multimc.json b/bucket/multimc.json
index 812ccb14..f5ec2052 100644
--- a/bucket/multimc.json
+++ b/bucket/multimc.json
@@ -1,18 +1,23 @@
 {
-    "homepage": "https://multimc.org/",
-    "description": "Launcher for Minecraft that allows for multiple, cleanly separated instances of Minecraft.",
     "version": "0.6.14",
+    "description": "Launcher for Minecraft that allows for multiple, cleanly separated instances of Minecraft.",
+    "homepage": "https://multimc.org/",
     "license": "Apache-2.0",
     "url": "https://files.multimc.org/downloads/mmc-stable-win32.zip",
     "hash": "d82f57db7c6816151835dcb24a41018bf91565747ec0ab986f69328d1a0724e0",
-    "autoupdate": {
-        "url": "https://files.multimc.org/downloads/mmc-stable-win32.zip"
-    },
-    "bin": "MultiMC.exe",
-    "checkver": {
-        "github": "https://github.com/MultiMC/MultiMC5"
-    },
     "extract_dir": "MultiMC",
+    "pre_install": [
+        "if (-not (Test-Path \"$dir\\accounts.json\")) { New-Item \"$dir\\accounts.json\" -ItemType File | Out-Null }",
+        "if (-not (Test-Path \"$dir\\multimc.cfg\")) { New-Item \"$dir\\multimc.cfg\" -ItemType File -Value \"Analytics=false`r`nAutoUpdate=false`r`nIconTheme=pe_colored`r`nLaunchMaximized=true\" | Out-Null }",
+        "if (-not (Test-Path \"$dir\\notifications.json\")) { New-Item \"$dir\\notifications.json\" -ItemType File | Out-Null }"
+    ],
+    "bin": "MultiMC.exe",
+    "shortcuts": [
+        [
+            "MultiMC.exe",
+            "MultiMC"
+        ]
+    ],
     "persist": [
         "accounts",
         "assets",
@@ -25,15 +30,10 @@
         "multimc.cfg",
         "notifications.json"
     ],
-    "pre_install": [
-        "if (-not (Test-Path \"$dir\\accounts.json\")) { New-Item \"$dir\\accounts.json\" -ItemType File | Out-Null }",
-        "if (-not (Test-Path \"$dir\\multimc.cfg\")) { New-Item \"$dir\\multimc.cfg\" -ItemType File -Value \"Analytics=false`r`nAutoUpdate=false`r`nIconTheme=pe_colored`r`nLaunchMaximized=true\" | Out-Null }",
-        "if (-not (Test-Path \"$dir\\notifications.json\")) { New-Item \"$dir\\notifications.json\" -ItemType File | Out-Null }"
-    ],
-    "shortcuts": [
-        [
-            "MultiMC.exe",
-            "MultiMC"
-        ]
-    ]
+    "checkver": {
+        "github": "https://github.com/MultiMC/MultiMC5"
+    },
+    "autoupdate": {
+        "url": "https://files.multimc.org/downloads/mmc-stable-win32.zip"
+    }
 }
diff --git a/bucket/nanoboyadvance.json b/bucket/nanoboyadvance.json
index ec4a279c..23507d6c 100644
--- a/bucket/nanoboyadvance.json
+++ b/bucket/nanoboyadvance.json
@@ -1,14 +1,16 @@
 {
-    "homepage": "https://github.com/nba-emu/NanoBoyAdvance",
-    "description": "NanoBoyAdvance is a Game Boy Advance emulator focused on accuracy.",
     "version": "1.4",
+    "description": "NanoBoyAdvance is a Game Boy Advance emulator focused on accuracy.",
+    "homepage": "https://github.com/nba-emu/NanoBoyAdvance",
     "license": "GPL-3.0-only",
-    "architecture": {
-        "64bit": {
-            "url": "https://github.com/nba-emu/NanoBoyAdvance/releases/download/v1.4/NanoBoyAdvance-1.4-win64.zip",
-            "hash": "f4b678d7868b613588e01e25fb091a0677e10cd87906d3298e44ee71fd53b07c"
-        }
-    },
+    "shortcuts": [
+        [
+            "NanoBoyAdvance.exe",
+            "NanoBoyAdvance"
+        ]
+    ],
+    "persist": "config.toml",
+    "checkver": "github",
     "autoupdate": {
         "architecture": {
             "64bit": {
@@ -16,12 +18,10 @@
             }
         }
     },
-    "checkver": "github",
-    "persist": "config.toml",
-    "shortcuts": [
-        [
-            "NanoBoyAdvance.exe",
-            "NanoBoyAdvance"
-        ]
-    ]
+    "architecture": {
+        "64bit": {
+            "url": "https://github.com/nba-emu/NanoBoyAdvance/releases/download/v1.4/NanoBoyAdvance-1.4-win64.zip",
+            "hash": "f4b678d7868b613588e01e25fb091a0677e10cd87906d3298e44ee71fd53b07c"
+        }
+    }
 }
diff --git a/bucket/nbtexplorer.json b/bucket/nbtexplorer.json
index a67fb3a0..1f3dd467 100644
--- a/bucket/nbtexplorer.json
+++ b/bucket/nbtexplorer.json
@@ -1,19 +1,19 @@
 {
-    "homepage": "https://github.com/jaquadro/NBTExplorer",
-    "description": "Graphical NBT editor for all Minecraft NBT data sources.",
     "version": "2.8.0",
+    "description": "Graphical NBT editor for all Minecraft NBT data sources.",
+    "homepage": "https://github.com/jaquadro/NBTExplorer",
     "license": "MIT",
     "url": "https://github.com/jaquadro/NBTExplorer/releases/download/v2.8.0-win/NBTExplorer-2.8.0.zip",
     "hash": "1bf4c3e56a0e8fba911c6c73cc12fbf105c01367d92dcfb9d20b0f529a666e4b",
-    "autoupdate": {
-        "url": "https://github.com/jaquadro/NBTExplorer/releases/download/v$matchHead-win/NBTExplorer-$matchHead.zip"
-    },
     "bin": "NBTExplorer.exe",
-    "checkver": "github",
     "shortcuts": [
         [
             "NBTExplorer.exe",
             "NBTExplorer"
         ]
-    ]
+    ],
+    "checkver": "github",
+    "autoupdate": {
+        "url": "https://github.com/jaquadro/NBTExplorer/releases/download/v$matchHead-win/NBTExplorer-$matchHead.zip"
+    }
 }
diff --git a/bucket/nester.json b/bucket/nester.json
index ff806cea..1137dd03 100644
--- a/bucket/nester.json
+++ b/bucket/nester.json
@@ -1,12 +1,12 @@
 {
-    "homepage": "https://sourceforge.net/p/nester-emu/wiki/Home/",
-    "description": "NES (Nintendo Entertainment System) emulator",
     "version": "public_beta_4a",
+    "description": "NES (Nintendo Entertainment System) emulator",
+    "homepage": "https://sourceforge.net/p/nester-emu/wiki/Home/",
     "license": "GPL-2.0-or-later",
     "url": "https://nchc.dl.sourceforge.net/project/nester-emu/nester-emu/public%20beta%204a/nester_publicbeta4a.zip",
     "hash": "23e72f07dd327ec1eba836155bad9f8efc0a5d30d46a525df0ae061bced6380d",
-    "bin": "nester.exe",
     "extract_dir": "nester_publicbeta4a",
+    "bin": "nester.exe",
     "shortcuts": [
         [
             "nester.exe",
diff --git a/bucket/nethack.json b/bucket/nethack.json
index 5ae84ee8..05e3205e 100644
--- a/bucket/nethack.json
+++ b/bucket/nethack.json
@@ -1,19 +1,12 @@
 {
-    "homepage": "https://www.nethack.org",
-    "description": "Single player rogue-like videogame",
     "version": "3.6.6",
+    "description": "Single player rogue-like videogame",
+    "homepage": "https://www.nethack.org",
     "license": "NGPL",
     "url": "https://github.com/NetHack/NetHack/releases/download/NetHack-3.6.6_Released/NetHack-3.6.6_Released.x86.zip",
     "hash": "681799e42d7527621f27a30aee7efa5c2d61cd8ae97a9b7105460ea4c238b978",
-    "autoupdate": {
-        "url": "https://github.com/NetHack/NetHack/releases/download/NetHack-$version_Released/NetHack-$version_Released.x86.zip"
-    },
-    "bin": "NetHack.exe",
-    "checkver": {
-        "github": "https://github.com/NetHack/NetHack",
-        "regex": "Release build of NetHack ([\\d\\.]+)"
-    },
     "post_install": "nethack --showpaths",
+    "bin": "NetHack.exe",
     "shortcuts": [
         [
             "NetHackW.exe",
@@ -23,5 +16,12 @@
             "Guidebook.txt",
             "NetHack Guidebook"
         ]
-    ]
+    ],
+    "checkver": {
+        "github": "https://github.com/NetHack/NetHack",
+        "regex": "Release build of NetHack ([\\d\\.]+)"
+    },
+    "autoupdate": {
+        "url": "https://github.com/NetHack/NetHack/releases/download/NetHack-$version_Released/NetHack-$version_Released.x86.zip"
+    }
 }
diff --git a/bucket/neverball.json b/bucket/neverball.json
index 60bf8dcf..78252e67 100644
--- a/bucket/neverball.json
+++ b/bucket/neverball.json
@@ -1,22 +1,15 @@
 {
-    "homepage": "https://neverball.org/",
-    "description": "3D roll-the-ball puzzle game (includes Neverputt)",
     "version": "1.6.0",
+    "description": "3D roll-the-ball puzzle game (includes Neverputt)",
+    "homepage": "https://neverball.org/",
     "license": "GPL-2.0-or-later",
     "url": "https://neverball.org/neverball-1.6.0.zip",
     "hash": "865391cc041208e526401a8eb1f14fba44323f17d7e818c5e65e82393ff747fb",
-    "autoupdate": {
-        "url": "https://neverball.org/neverball-$version.zip"
-    },
+    "extract_dir": "neverball-1.6.0",
     "bin": [
         "neverball.exe",
         "neverputt.exe"
     ],
-    "checkver": {
-        "url": "https://neverball.org/download.php",
-        "regex": "neverball-([\\d.-]+)\\.zip"
-    },
-    "extract_dir": "neverball-1.6.0",
     "shortcuts": [
         [
             "neverball.exe",
@@ -26,5 +19,12 @@
             "neverputt.exe",
             "Neverputt"
         ]
-    ]
+    ],
+    "checkver": {
+        "url": "https://neverball.org/download.php",
+        "regex": "neverball-([\\d.-]+)\\.zip"
+    },
+    "autoupdate": {
+        "url": "https://neverball.org/neverball-$version.zip"
+    }
 }
diff --git a/bucket/newer-tanooki.json b/bucket/newer-tanooki.json
index 7439c384..630c0f00 100644
--- a/bucket/newer-tanooki.json
+++ b/bucket/newer-tanooki.json
@@ -2,9 +2,9 @@
     "version": "1.0",
     "description": "NewerSMBW save editor",
     "homepage": "https://github.com/RedStoneMatt/NewerTanooki",
+    "license": "GPL-3.0-only",
     "url": "https://github.com/RedStoneMatt/NewerTanooki/releases/download/v1.0/NewerTanooki.rar",
     "hash": "cbab72a7644bae3bf9f5ef901a85709f0f2e91b58fc6dea6f0a010073164877b",
-    "license": "GPL-3.0-only",
     "bin": "NewerTanooki.exe",
     "shortcuts": [
         [
diff --git a/bucket/nuncabola.json b/bucket/nuncabola.json
index 3931f9c3..9d5b1de2 100644
--- a/bucket/nuncabola.json
+++ b/bucket/nuncabola.json
@@ -1,17 +1,13 @@
 {
-    "homepage": "http://uppgarn.com/nuncabola/",
-    "description": "3D roll-the-ball puzzle game (reimplementation of Neverball in Java)",
     "version": "0.200",
+    "description": "3D roll-the-ball puzzle game (reimplementation of Neverball in Java)",
+    "homepage": "http://uppgarn.com/nuncabola/",
     "license": "GPL-2.0-or-later",
+    "suggest": {
+        "Java Runtime Environment": "java/adoptopenjdk-hotspot-jre"
+    },
     "url": "http://uppgarn.com/nuncabola/nuncabola-0.200.zip",
     "hash": "f0f2293b59939b618c07133ca3a7b70bb77a03a3ce7ccdf611c0d8f34594a598",
-    "autoupdate": {
-        "url": "http://uppgarn.com/nuncabola/nuncabola-$version.zip"
-    },
-    "checkver": {
-        "url": "http://uppgarn.com/nuncabola/",
-        "re": "Version ([0-9]\\.[0-9]+)"
-    },
     "extract_dir": "Nuncabola",
     "shortcuts": [
         [
@@ -19,7 +15,11 @@
             "Nuncabola"
         ]
     ],
-    "suggest": {
-        "Java Runtime Environment": "java/adoptopenjdk-hotspot-jre"
+    "checkver": {
+        "url": "http://uppgarn.com/nuncabola/",
+        "re": "Version ([0-9]\\.[0-9]+)"
+    },
+    "autoupdate": {
+        "url": "http://uppgarn.com/nuncabola/nuncabola-$version.zip"
     }
 }
diff --git a/bucket/odamex.json b/bucket/odamex.json
index 81e14c84..b46afe25 100644
--- a/bucket/odamex.json
+++ b/bucket/odamex.json
@@ -1,22 +1,29 @@
 {
-    "homepage": "https://odamex.net/",
-    "description": "Multiplayer-oriented source port for Doom",
     "version": "10.0.0",
+    "description": "Multiplayer-oriented source port for Doom",
+    "homepage": "https://odamex.net/",
     "license": "GPL-2.0-or-later",
     "notes": [
         "Place WAD files (game data) in:",
         "",
         "    $persist_dir\\..\\_doom"
     ],
-    "architecture": {
-        "32bit": {
-            "url": "https://downloads.sourceforge.net/project/odamex/Odamex/10.0.0/odamex-win32-10.0.0.zip",
-            "hash": "sha1:d540ec13351c20108a3fd9c93890f199b0a61b74"
-        },
-        "64bit": {
-            "url": "https://downloads.sourceforge.net/project/odamex/Odamex/10.0.0/odamex-win64-10.0.0.zip",
-            "hash": "sha1:65aa500bf3271ada4b380a9495a17b20bb618425"
-        }
+    "pre_install": "New-Item -ItemType Directory -Force -Path $persist_dir\\..\\_doom | Out-Null",
+    "env_set": {
+        "DOOMWADDIR": "$persist_dir\\..\\_doom"
+    },
+    "shortcuts": [
+        [
+            "odamex.exe",
+            "Odamex"
+        ],
+        [
+            "odalaunch.exe",
+            "Odalaunch"
+        ]
+    ],
+    "checkver": {
+        "regex": ">Version ([a-zA-Z\\d.\\-_]+):"
     },
     "autoupdate": {
         "architecture": {
@@ -28,21 +35,14 @@
             }
         }
     },
-    "checkver": {
-        "regex": ">Version ([a-zA-Z\\d.\\-_]+):"
-    },
-    "env_set": {
-        "DOOMWADDIR": "$persist_dir\\..\\_doom"
-    },
-    "pre_install": "New-Item -ItemType Directory -Force -Path $persist_dir\\..\\_doom | Out-Null",
-    "shortcuts": [
-        [
-            "odamex.exe",
-            "Odamex"
-        ],
-        [
-            "odalaunch.exe",
-            "Odalaunch"
-        ]
-    ]
+    "architecture": {
+        "32bit": {
+            "url": "https://downloads.sourceforge.net/project/odamex/Odamex/10.0.0/odamex-win32-10.0.0.zip",
+            "hash": "sha1:d540ec13351c20108a3fd9c93890f199b0a61b74"
+        },
+        "64bit": {
+            "url": "https://downloads.sourceforge.net/project/odamex/Odamex/10.0.0/odamex-win64-10.0.0.zip",
+            "hash": "sha1:65aa500bf3271ada4b380a9495a17b20bb618425"
+        }
+    }
 }
diff --git a/bucket/opdessertstorm.json b/bucket/opdessertstorm.json
index 5336aef1..03544b4d 100644
--- a/bucket/opdessertstorm.json
+++ b/bucket/opdessertstorm.json
@@ -1,12 +1,19 @@
 {
-    "homepage": "https://opdessertstorm.com/",
-    "description": "Third-party private server for the massively multiplayer online game Toontown",
     "version": "1.0.0",
+    "description": "Third-party private server for the massively multiplayer online game Toontown",
+    "homepage": "https://opdessertstorm.com/",
     "license": "Proprietary",
     "notes": "This is only the launcher, a free account is required to play.",
     "url": "https://github.com/ODSOperations/releases/raw/master/ods_setup.exe#/dl.7z",
     "hash": "9ebe3befca55c29e68cdf95f369e31ef4353d737d3483b3510c04f6685cd7995",
+    "pre_install": "Remove-Item $dir -Recurse -Force  -Include * -Exclude DessertStorm.exe",
     "bin": "DessertStorm.exe",
+    "shortcuts": [
+        [
+            "DessertStorm.exe",
+            "Operation: Dessert Storm"
+        ]
+    ],
     "persist": [
         "resources",
         "user",
@@ -19,12 +26,5 @@
         "ods.exe",
         "swresample-3.dll",
         "swscale-5.dll"
-    ],
-    "pre_install": "Remove-Item $dir -Recurse -Force  -Include * -Exclude DessertStorm.exe",
-    "shortcuts": [
-        [
-            "DessertStorm.exe",
-            "Operation: Dessert Storm"
-        ]
     ]
 }
diff --git a/bucket/openarena.json b/bucket/openarena.json
index ee39c2e9..aba266bd 100644
--- a/bucket/openarena.json
+++ b/bucket/openarena.json
@@ -1,12 +1,12 @@
 {
-    "homepage": "http://openarena.ws/",
-    "description": "Free fast-paced first-person shooter based on the Quake III Arena engine",
     "version": "0.8.8",
+    "description": "Free fast-paced first-person shooter based on the Quake III Arena engine",
+    "homepage": "http://openarena.ws/",
     "license": "GPL-2.0-or-later",
     "url": "http://download.tuxfamily.org/openarena/rel/088/openarena-0.8.8.zip",
     "hash": "5a8faf7f5b51f351b0a1618c06b6b98a5f1a6758f1d39818de2c87df2a0bac4a",
-    "bin": "openarena.exe",
     "extract_dir": "openarena-0.8.8",
+    "bin": "openarena.exe",
     "shortcuts": [
         [
             "openarena.exe",
diff --git a/bucket/openclonk.json b/bucket/openclonk.json
index ffc57547..ddd0c60b 100644
--- a/bucket/openclonk.json
+++ b/bucket/openclonk.json
@@ -1,8 +1,15 @@
 {
-    "homepage": "https://www.openclonk.org/",
-    "description": "2D multiplayer action game with mining, settling and fast-paced melees",
     "version": "8.1",
+    "description": "2D multiplayer action game with mining, settling and fast-paced melees",
+    "homepage": "https://www.openclonk.org/",
     "license": "ISC",
+    "bin": "openclonk.exe",
+    "shortcuts": [
+        [
+            "openclonk.exe",
+            "OpenClonk"
+        ]
+    ],
     "architecture": {
         "32bit": {
             "url": "https://www.openclonk.org/builds/release/8.1/openclonk-8.1.exe#/dl.7z",
@@ -12,12 +19,5 @@
             "url": "https://www.openclonk.org/builds/release/8.1/openclonk-8.1-x64.exe#/dl.7z",
             "hash": "cb595b8b7495b9c68cb21db01c852ff3c12f20de51d72dfc99009aa1093f0b01"
         }
-    },
-    "bin": "openclonk.exe",
-    "shortcuts": [
-        [
-            "openclonk.exe",
-            "OpenClonk"
-        ]
-    ]
+    }
 }
diff --git a/bucket/opendungeons.json b/bucket/opendungeons.json
index bc4f947d..e3411bce 100644
--- a/bucket/opendungeons.json
+++ b/bucket/opendungeons.json
@@ -1,18 +1,18 @@
 {
-    "homepage": "https://opendungeons.github.io/",
-    "description": "Real-time strategy game inspired by the Dungeon Keeper series",
     "version": "0.7.1",
+    "description": "Real-time strategy game inspired by the Dungeon Keeper series",
+    "homepage": "https://opendungeons.github.io/",
     "license": "GPL-3.0-or-later",
     "url": "ftp://download.tuxfamily.org/opendungeons/0.7/OpenDungeons-0.7.1-Win32-MSVS2013.zip",
     "hash": "7ed4889a4d7fea5deb02b3f730f26be1a16563b85781f513de065f82b8d0d535",
-    "checkver": {
-        "github": "https://github.com/OpenDungeons/OpenDungeons"
-    },
     "extract_dir": "OpenDungeons-0.7.1-Win32-MSVS2013",
     "shortcuts": [
         [
             "OpenDungeons.exe",
             "OpenDungeons"
         ]
-    ]
+    ],
+    "checkver": {
+        "github": "https://github.com/OpenDungeons/OpenDungeons"
+    }
 }
diff --git a/bucket/openhv.json b/bucket/openhv.json
index 11e89a79..732af0d9 100644
--- a/bucket/openhv.json
+++ b/bucket/openhv.json
@@ -1,17 +1,17 @@
 {
-    "homepage": "https://openhv.itch.io/openhv",
-    "description": "Open Hard Vacuum. 90s Pixelart Science-Fiction Real-time strategy game with multiplayer support, competent skirmish AI and an integrated map editor",
     "version": "20210321",
+    "description": "Open Hard Vacuum. 90s Pixelart Science-Fiction Real-time strategy game with multiplayer support, competent skirmish AI and an integrated map editor",
+    "homepage": "https://openhv.itch.io/openhv",
     "license": "GPL-3.0-or-later",
-    "architecture": {
-        "32bit": {
-            "url": "https://github.com/OpenHV/OpenHV/releases/download/20210321/OpenHV-20210321-x86-winportable.zip",
-            "hash": "7177b800ed36562e0ac6f7a559cddebac5f8c8e78e9c20d0582ce08f626a8a0d"
-        },
-        "64bit": {
-            "url": "https://github.com/OpenHV/OpenHV/releases/download/20210321/OpenHV-20210321-x64-winportable.zip",
-            "hash": "85f38f5b3905b54a93cf3bcb44ebadcd126fd88ef0f374e571573219afcda442"
-        }
+    "bin": "OpenHV.exe",
+    "shortcuts": [
+        [
+            "OpenHV.exe",
+            "Hard Vacuum (OpenHV)"
+        ]
+    ],
+    "checkver": {
+        "github": "https://github.com/OpenHV/OpenHV"
     },
     "autoupdate": {
         "architecture": {
@@ -23,14 +23,14 @@
             }
         }
     },
-    "bin": "OpenHV.exe",
-    "checkver": {
-        "github": "https://github.com/OpenHV/OpenHV"
-    },
-    "shortcuts": [
-        [
-            "OpenHV.exe",
-            "Hard Vacuum (OpenHV)"
-        ]
-    ]
+    "architecture": {
+        "32bit": {
+            "url": "https://github.com/OpenHV/OpenHV/releases/download/20210321/OpenHV-20210321-x86-winportable.zip",
+            "hash": "7177b800ed36562e0ac6f7a559cddebac5f8c8e78e9c20d0582ce08f626a8a0d"
+        },
+        "64bit": {
+            "url": "https://github.com/OpenHV/OpenHV/releases/download/20210321/OpenHV-20210321-x64-winportable.zip",
+            "hash": "85f38f5b3905b54a93cf3bcb44ebadcd126fd88ef0f374e571573219afcda442"
+        }
+    }
 }
diff --git a/bucket/openmsx-dev.json b/bucket/openmsx-dev.json
index 8152fb35..0bd0ad37 100644
--- a/bucket/openmsx-dev.json
+++ b/bucket/openmsx-dev.json
@@ -1,33 +1,15 @@
 {
-    "homepage": "https://openmsx.fixato.net/",
-    "description": "Cycle-accurate MSX emulator (Development builds)",
     "version": "17.0-315-gd21b03b18",
+    "description": "Cycle-accurate MSX emulator (Development builds)",
+    "homepage": "https://openmsx.fixato.net/",
     "license": "GPL-2.0",
     "notes": "User data are stored in C:\\Users\\[USERNAME]\\Documents\\openMSX",
-    "architecture": {
-        "64bit": {
-            "url": "https://openmsx.fixato.net/builds/windows/x64/openmsx-17.0-315-gd21b03b18-windows-vc-x64-bin.zip",
-            "hash": "c70f53b5f05fa4b8d5fa569c3cbf9abe49e7e5605c81ed07c6c1d081d2262473"
-        }
-    },
-    "autoupdate": {
-        "architecture": {
-            "64bit": {
-                "url": "https://openmsx.fixato.net/builds/windows/x64/openmsx-$version-windows-vc-x64-bin.zip"
-            }
-        }
-    },
     "bin": [
         [
             "openmsx.exe",
             "openmex-dev"
         ]
     ],
-    "checkver": {
-        "url": "https://openmsx.fixato.net/builds/windows/x64/",
-        "regex": "openmsx-(?<ver>[\\d.]+)-(?<build>[\\d]+)-g(?<commit>[\\da-f]{9})-windows-vc-x64-bin\\.zip",
-        "replace": "${ver}-${build}-g${commit}"
-    },
     "shortcuts": [
         [
             "openmsx.exe",
@@ -37,5 +19,23 @@
             "Catapult\\bin\\Catapult.exe",
             "openMSX\\Catapult (Development)"
         ]
-    ]
+    ],
+    "checkver": {
+        "url": "https://openmsx.fixato.net/builds/windows/x64/",
+        "regex": "openmsx-(?<ver>[\\d.]+)-(?<build>[\\d]+)-g(?<commit>[\\da-f]{9})-windows-vc-x64-bin\\.zip",
+        "replace": "${ver}-${build}-g${commit}"
+    },
+    "autoupdate": {
+        "architecture": {
+            "64bit": {
+                "url": "https://openmsx.fixato.net/builds/windows/x64/openmsx-$version-windows-vc-x64-bin.zip"
+            }
+        }
+    },
+    "architecture": {
+        "64bit": {
+            "url": "https://openmsx.fixato.net/builds/windows/x64/openmsx-17.0-315-gd21b03b18-windows-vc-x64-bin.zip",
+            "hash": "c70f53b5f05fa4b8d5fa569c3cbf9abe49e7e5605c81ed07c6c1d081d2262473"
+        }
+    }
 }
diff --git a/bucket/openmsx.json b/bucket/openmsx.json
index c86b60e4..abe4d6e0 100644
--- a/bucket/openmsx.json
+++ b/bucket/openmsx.json
@@ -1,26 +1,10 @@
 {
-    "homepage": "https://openmsx.org/",
-    "description": "Cycle-accurate MSX emulator",
     "version": "17.0",
+    "description": "Cycle-accurate MSX emulator",
+    "homepage": "https://openmsx.org/",
     "license": "GPL-2.0",
     "notes": "User data are stored in C:\\Users\\[USERNAME]\\Documents\\openMSX",
-    "architecture": {
-        "64bit": {
-            "url": "https://github.com/openMSX/openMSX/releases/download/RELEASE_17_0/openmsx-17.0-windows-vc-x64-bin.zip",
-            "hash": "b2b128824f8a0c239c3e986ce9b27efc77657ef965fc063095602b54fd841fb4"
-        }
-    },
-    "autoupdate": {
-        "architecture": {
-            "64bit": {
-                "url": "https://github.com/openMSX/openMSX/releases/download/RELEASE_$majorVersion_$minorVersion/openmsx-$version-windows-vc-x64-bin.zip"
-            }
-        }
-    },
     "bin": "openmsx.exe",
-    "checkver": {
-        "regex": "openmsx-([\\d.]+)-windows-vc-x64-bin\\.zip"
-    },
     "shortcuts": [
         [
             "openmsx.exe",
@@ -30,5 +14,21 @@
             "Catapult\\bin\\Catapult.exe",
             "openMSX\\Catapult"
         ]
-    ]
+    ],
+    "checkver": {
+        "regex": "openmsx-([\\d.]+)-windows-vc-x64-bin\\.zip"
+    },
+    "autoupdate": {
+        "architecture": {
+            "64bit": {
+                "url": "https://github.com/openMSX/openMSX/releases/download/RELEASE_$majorVersion_$minorVersion/openmsx-$version-windows-vc-x64-bin.zip"
+            }
+        }
+    },
+    "architecture": {
+        "64bit": {
+            "url": "https://github.com/openMSX/openMSX/releases/download/RELEASE_17_0/openmsx-17.0-windows-vc-x64-bin.zip",
+            "hash": "b2b128824f8a0c239c3e986ce9b27efc77657ef965fc063095602b54fd841fb4"
+        }
+    }
 }
diff --git a/bucket/openmw-nightly.json b/bucket/openmw-nightly.json
index 8696e82a..5a8bafb2 100644
--- a/bucket/openmw-nightly.json
+++ b/bucket/openmw-nightly.json
@@ -1,22 +1,11 @@
 {
-    "homepage": "http://openmw.org/",
-    "description": "An open-source open-world RPG game engine that supports playing Morrowind. (nightly version)",
     "version": "20220306-a59c56e3",
+    "description": "An open-source open-world RPG game engine that supports playing Morrowind. (nightly version)",
+    "homepage": "http://openmw.org/",
     "license": "GPL-3.0-or-later",
     "notes": "Please run the OpenMW Launcher in the start menu to configure the game data path. Otherwise, OpenMW won't start correctly.",
-    "architecture": {
-        "64bit": {
-            "url": "https://gitlab.com/OpenMW/openmw/-/jobs/2168538371/artifacts/download#/dl.7z",
-            "hash": "61da5ad4584e9eb44bbcc7a639d8b727cb0fe4c3210de9a4c46be7412f0dbd2f"
-        }
-    },
-    "autoupdate": {
-        "architecture": {
-            "64bit": {
-                "url": "https://gitlab.com/OpenMW/openmw/-/jobs/$matchJob/artifacts/download#/dl.7z"
-            }
-        }
-    },
+    "pre_install": "Expand-ZipArchive \"$dir\\OpenMW_MSVC2019_64_Engine_Release_*.zip\" \"$dir\"",
+    "post_install": "Remove-Item \"$dir\\MSVC2019_64_Ninja\", \"$dir\\chocolatey.log\", \"$dir\\OpenMW_MSVC2019_64_Engine_Release_*.zip\" -Force -Recurse",
     "bin": [
         "openmw.exe",
         "openmw-launcher.exe",
@@ -29,13 +18,6 @@
             "openmw-launcher-nightly"
         ]
     ],
-    "checkver": {
-        "url": "https://gitlab.com/OpenMW/openmw/-/jobs",
-        "regex": "\\/commit\\/[0-9a-f]{40}\">(?<commit>[0-9a-f]{8})<\\/a>(?:.*\\n){21}.*datetime=\"(?<year>[0-9]{4})-(?<month>[0-9]{2})-(?<day>[0-9]{2})(?:.*\\n){16}passed(?:.*\\n){4}.*(?<job>[0-9]{10})\">Windows_Ninja_Engine_Release",
-        "replace": "${year}${month}${day}-${commit}"
-    },
-    "post_install": "Remove-Item \"$dir\\MSVC2019_64_Ninja\", \"$dir\\chocolatey.log\", \"$dir\\OpenMW_MSVC2019_64_Engine_Release_*.zip\" -Force -Recurse",
-    "pre_install": "Expand-ZipArchive \"$dir\\OpenMW_MSVC2019_64_Engine_Release_*.zip\" \"$dir\"",
     "shortcuts": [
         [
             "openmw.exe",
@@ -45,5 +27,23 @@
             "openmw-launcher.exe",
             "OpenMW Launcher (nightly)"
         ]
-    ]
+    ],
+    "checkver": {
+        "url": "https://gitlab.com/OpenMW/openmw/-/jobs",
+        "regex": "\\/commit\\/[0-9a-f]{40}\">(?<commit>[0-9a-f]{8})<\\/a>(?:.*\\n){21}.*datetime=\"(?<year>[0-9]{4})-(?<month>[0-9]{2})-(?<day>[0-9]{2})(?:.*\\n){16}passed(?:.*\\n){4}.*(?<job>[0-9]{10})\">Windows_Ninja_Engine_Release",
+        "replace": "${year}${month}${day}-${commit}"
+    },
+    "autoupdate": {
+        "architecture": {
+            "64bit": {
+                "url": "https://gitlab.com/OpenMW/openmw/-/jobs/$matchJob/artifacts/download#/dl.7z"
+            }
+        }
+    },
+    "architecture": {
+        "64bit": {
+            "url": "https://gitlab.com/OpenMW/openmw/-/jobs/2168538371/artifacts/download#/dl.7z",
+            "hash": "61da5ad4584e9eb44bbcc7a639d8b727cb0fe4c3210de9a4c46be7412f0dbd2f"
+        }
+    }
 }
diff --git a/bucket/openmw.json b/bucket/openmw.json
index 0645bfd4..7afe25c1 100644
--- a/bucket/openmw.json
+++ b/bucket/openmw.json
@@ -1,32 +1,15 @@
 {
-    "homepage": "http://openmw.org/",
-    "description": "An open-source open-world RPG game engine that supports playing Morrowind.",
     "version": "0.47.0",
+    "description": "An open-source open-world RPG game engine that supports playing Morrowind.",
+    "homepage": "http://openmw.org/",
     "license": "GPL-3.0-or-later",
     "notes": "Please run the OpenMW Launcher in the start menu to configure the game data path. Otherwise, OpenMW won't start correctly.",
-    "architecture": {
-        "64bit": {
-            "url": "https://github.com/OpenMW/openmw/releases/download/openmw-0.47.0/OpenMW-0.47.0-win64.exe#/dl.7z",
-            "hash": "02702977ae32d73aa20e5710a20bc5452d7131dab63bc43d194e339cadaf1e61"
-        }
-    },
-    "autoupdate": {
-        "architecture": {
-            "64bit": {
-                "url": "https://github.com/OpenMW/openmw/releases/download/openmw-$version/OpenMW-$version-win64.exe#/dl.7z"
-            }
-        }
-    },
+    "post_install": "Remove-Item \"$dir\\`$PLUGINSDIR\", \"$dir\\Uninstall*\" -Force -Recurse",
     "bin": [
         "openmw.exe",
         "openmw-cs.exe",
         "openmw-launcher.exe"
     ],
-    "checkver": {
-        "url": "https://github.com/OpenMW/openmw/releases/latest",
-        "regex": "/releases/tag/openmw-(?:v|V)?([\\d.]+)"
-    },
-    "post_install": "Remove-Item \"$dir\\`$PLUGINSDIR\", \"$dir\\Uninstall*\" -Force -Recurse",
     "shortcuts": [
         [
             "openmw.exe",
@@ -40,5 +23,22 @@
             "openmw-launcher.exe",
             "OpenMW Launcher"
         ]
-    ]
+    ],
+    "checkver": {
+        "url": "https://github.com/OpenMW/openmw/releases/latest",
+        "regex": "/releases/tag/openmw-(?:v|V)?([\\d.]+)"
+    },
+    "autoupdate": {
+        "architecture": {
+            "64bit": {
+                "url": "https://github.com/OpenMW/openmw/releases/download/openmw-$version/OpenMW-$version-win64.exe#/dl.7z"
+            }
+        }
+    },
+    "architecture": {
+        "64bit": {
+            "url": "https://github.com/OpenMW/openmw/releases/download/openmw-0.47.0/OpenMW-0.47.0-win64.exe#/dl.7z",
+            "hash": "02702977ae32d73aa20e5710a20bc5452d7131dab63bc43d194e339cadaf1e61"
+        }
+    }
 }
diff --git a/bucket/openra.json b/bucket/openra.json
index 7fb600d9..57cf7676 100644
--- a/bucket/openra.json
+++ b/bucket/openra.json
@@ -1,38 +1,14 @@
 {
-    "homepage": "http://www.openra.net",
-    "description": "Real-time strategy game engine for early Westwood games such as Command & Conquer: Red Alert",
     "version": "20210321",
+    "description": "Real-time strategy game engine for early Westwood games such as Command & Conquer: Red Alert",
+    "homepage": "http://www.openra.net",
     "license": "GPL-3.0-or-later",
-    "architecture": {
-        "32bit": {
-            "url": "https://github.com/OpenRA/OpenRA/releases/download/release-20210321/OpenRA-release-20210321-x86.exe#/dl.7z",
-            "hash": "ca18821c1754fc003d72fdad104da4c8d6f11c6cd5406bcda4a2fed3da648ccd"
-        },
-        "64bit": {
-            "url": "https://github.com/OpenRA/OpenRA/releases/download/release-20210321/OpenRA-release-20210321-x64.exe#/dl.7z",
-            "hash": "2613a38dad1c8a564ca6c9dcc147d8273680ced06fa3f11d8195f757b14ec545"
-        }
-    },
-    "autoupdate": {
-        "architecture": {
-            "32bit": {
-                "url": "https://github.com/OpenRA/OpenRA/releases/download/release-$version/OpenRA-release-$version-x86.exe#/dl.7z"
-            },
-            "64bit": {
-                "url": "https://github.com/OpenRA/OpenRA/releases/download/release-$version/OpenRA-release-$version-x64.exe#/dl.7z"
-            }
-        }
-    },
+    "pre_install": "Remove-Item \"$dir\\`$PLUGINSDIR\", \"$dir\\uninstaller.exe\" -Force -Recurse",
     "bin": [
         "Dune2000.exe",
         "RedAlert.exe",
         "TiberianDawn.exe"
     ],
-    "checkver": {
-        "github": "https://github.com/OpenRA/OpenRA",
-        "regex": "release-(\\d{8})"
-    },
-    "pre_install": "Remove-Item \"$dir\\`$PLUGINSDIR\", \"$dir\\uninstaller.exe\" -Force -Recurse",
     "shortcuts": [
         [
             "Dune2000.exe",
@@ -46,5 +22,29 @@
             "TiberianDawn.exe",
             "OpenRA - Tiberian Dawn"
         ]
-    ]
+    ],
+    "checkver": {
+        "github": "https://github.com/OpenRA/OpenRA",
+        "regex": "release-(\\d{8})"
+    },
+    "autoupdate": {
+        "architecture": {
+            "32bit": {
+                "url": "https://github.com/OpenRA/OpenRA/releases/download/release-$version/OpenRA-release-$version-x86.exe#/dl.7z"
+            },
+            "64bit": {
+                "url": "https://github.com/OpenRA/OpenRA/releases/download/release-$version/OpenRA-release-$version-x64.exe#/dl.7z"
+            }
+        }
+    },
+    "architecture": {
+        "32bit": {
+            "url": "https://github.com/OpenRA/OpenRA/releases/download/release-20210321/OpenRA-release-20210321-x86.exe#/dl.7z",
+            "hash": "ca18821c1754fc003d72fdad104da4c8d6f11c6cd5406bcda4a2fed3da648ccd"
+        },
+        "64bit": {
+            "url": "https://github.com/OpenRA/OpenRA/releases/download/release-20210321/OpenRA-release-20210321-x64.exe#/dl.7z",
+            "hash": "2613a38dad1c8a564ca6c9dcc147d8273680ced06fa3f11d8195f757b14ec545"
+        }
+    }
 }
diff --git a/bucket/openrct2.json b/bucket/openrct2.json
index a8a7e157..5187572e 100644
--- a/bucket/openrct2.json
+++ b/bucket/openrct2.json
@@ -1,18 +1,16 @@
 {
-    "homepage": "https://github.com/OpenRCT2/OpenRCT2",
-    "description": "Open source re-implementation of RollerCoaster Tycoon 2",
     "version": "0.3.5.1",
+    "description": "Open source re-implementation of RollerCoaster Tycoon 2",
+    "homepage": "https://github.com/OpenRCT2/OpenRCT2",
     "license": "GPL-3.0-only",
-    "architecture": {
-        "32bit": {
-            "url": "https://github.com/OpenRCT2/OpenRCT2/releases/download/v0.3.5.1/OpenRCT2-0.3.5.1-windows-portable-win32.zip",
-            "hash": "89f1caebc948b18b545336086628672ffc0c986180d36a143dc69e2ab831768b"
-        },
-        "64bit": {
-            "url": "https://github.com/OpenRCT2/OpenRCT2/releases/download/v0.3.5.1/OpenRCT2-0.3.5.1-windows-portable-x64.zip",
-            "hash": "b004fe15f112be19b35a7462d5eba5672b07d4c9b7d79ec2388a1de360a8b97c"
-        }
-    },
+    "bin": "OpenRCT2.exe",
+    "shortcuts": [
+        [
+            "OpenRCT2.exe",
+            "OpenRCT2"
+        ]
+    ],
+    "checkver": "github",
     "autoupdate": {
         "architecture": {
             "32bit": {
@@ -23,12 +21,14 @@
             }
         }
     },
-    "bin": "OpenRCT2.exe",
-    "checkver": "github",
-    "shortcuts": [
-        [
-            "OpenRCT2.exe",
-            "OpenRCT2"
-        ]
-    ]
+    "architecture": {
+        "32bit": {
+            "url": "https://github.com/OpenRCT2/OpenRCT2/releases/download/v0.3.5.1/OpenRCT2-0.3.5.1-windows-portable-win32.zip",
+            "hash": "89f1caebc948b18b545336086628672ffc0c986180d36a143dc69e2ab831768b"
+        },
+        "64bit": {
+            "url": "https://github.com/OpenRCT2/OpenRCT2/releases/download/v0.3.5.1/OpenRCT2-0.3.5.1-windows-portable-x64.zip",
+            "hash": "b004fe15f112be19b35a7462d5eba5672b07d4c9b7d79ec2388a1de360a8b97c"
+        }
+    }
 }
diff --git a/bucket/openspades.json b/bucket/openspades.json
index 4bc04204..cd4ea452 100644
--- a/bucket/openspades.json
+++ b/bucket/openspades.json
@@ -1,23 +1,23 @@
 {
-    "homepage": "https://openspades.yvt.jp/",
-    "description": "Voxel first-person shooter compatible with Ace of Spades 0.75",
     "version": "0.1.3",
+    "description": "Voxel first-person shooter compatible with Ace of Spades 0.75",
+    "homepage": "https://openspades.yvt.jp/",
     "license": "GPL-3.0-or-later",
     "url": "https://github.com/yvt/openspades/releases/download/v0.1.3/OpenSpades-0.1.3-Windows.zip",
     "hash": "c1e72ee70615cc750445c9f1cd2f8afa68b6867f148ffd52e50e927982f3a36e",
-    "autoupdate": {
-        "url": "https://github.com/yvt/openspades/releases/download/v$version/OpenSpades-$version-Windows.zip",
-        "extract_dir": "OpenSpades-$version-Windows"
-    },
-    "bin": "OpenSpades.exe",
-    "checkver": {
-        "github": "https://github.com/yvt/openspades"
-    },
     "extract_dir": "OpenSpades-0.1.3-Windows",
+    "bin": "OpenSpades.exe",
     "shortcuts": [
         [
             "OpenSpades.exe",
             "OpenSpades"
         ]
-    ]
+    ],
+    "checkver": {
+        "github": "https://github.com/yvt/openspades"
+    },
+    "autoupdate": {
+        "url": "https://github.com/yvt/openspades/releases/download/v$version/OpenSpades-$version-Windows.zip",
+        "extract_dir": "OpenSpades-$version-Windows"
+    }
 }
diff --git a/bucket/openttd.json b/bucket/openttd.json
index 594e0089..eaf76f80 100644
--- a/bucket/openttd.json
+++ b/bucket/openttd.json
@@ -1,8 +1,20 @@
 {
-    "homepage": "https://www.openttd.org/",
-    "description": "Simulation game based upon Transport Tycoon Deluxe",
     "version": "1.10.0",
+    "description": "Simulation game based upon Transport Tycoon Deluxe",
+    "homepage": "https://www.openttd.org/",
     "license": "GPL-2.0-or-later",
+    "pre_install": [
+        "Move-Item \"$dir\\opengfx-0.6.0.tar\" \"$dir\\baseset\"",
+        "Move-Item \"$dir\\opensfx-0.2.3\" \"$dir\\baseset\"",
+        "Move-Item \"$dir\\openmsx-0.3.1\" \"$dir\\baseset\""
+    ],
+    "bin": "openttd.exe",
+    "shortcuts": [
+        [
+            "openttd.exe",
+            "OpenTTD"
+        ]
+    ],
     "architecture": {
         "32bit": {
             "url": [
@@ -32,17 +44,5 @@
                 "92e293ae89f13ad679f43185e83fb81fb8cad47fe63f4af3d3d9f955130460f5"
             ]
         }
-    },
-    "bin": "openttd.exe",
-    "pre_install": [
-        "Move-Item \"$dir\\opengfx-0.6.0.tar\" \"$dir\\baseset\"",
-        "Move-Item \"$dir\\opensfx-0.2.3\" \"$dir\\baseset\"",
-        "Move-Item \"$dir\\openmsx-0.3.1\" \"$dir\\baseset\""
-    ],
-    "shortcuts": [
-        [
-            "openttd.exe",
-            "OpenTTD"
-        ]
-    ]
+    }
 }
diff --git a/bucket/openxcom.json b/bucket/openxcom.json
index 7fa7d21e..6f32781f 100644
--- a/bucket/openxcom.json
+++ b/bucket/openxcom.json
@@ -1,7 +1,7 @@
 {
-    "homepage": "https://openxcom.org/",
-    "description": "Open source reimplementation of the 'UFO: Enemy Unknown' and 'X-COM: Terror From the Deep' video games",
     "version": "2021_12_21_1139",
+    "description": "Open source reimplementation of the 'UFO: Enemy Unknown' and 'X-COM: Terror From the Deep' video games",
+    "homepage": "https://openxcom.org/",
     "license": "GPL-3.0-or-later",
     "notes": [
         "OpenXcom requires a vanilla copy of the X-COM resources.",
@@ -13,24 +13,24 @@
     ],
     "url": "https://openxcom.org/git_builds/openxcom_git_master_2021_12_21_1139.zip",
     "hash": "a1b992565914469fe2378117128cf544d01098a29e15d6bd06661d2bbc65a7d5",
-    "autoupdate": {
-        "url": "https://openxcom.org/git_builds/openxcom_git_master_$version.zip"
-    },
+    "extract_dir": "openxcom",
     "bin": [
         [
             "openxcom.exe",
             "OpenXcom"
         ]
     ],
+    "shortcuts": [
+        [
+            "openxcom.exe",
+            "OpenXcom"
+        ]
+    ],
     "checkver": {
         "url": "https://openxcom.org/git-builds/",
         "regex": "openxcom_git_master_([\\d_]+)\\.zip"
     },
-    "extract_dir": "openxcom",
-    "shortcuts": [
-        [
-            "openxcom.exe",
-            "OpenXcom"
-        ]
-    ]
+    "autoupdate": {
+        "url": "https://openxcom.org/git_builds/openxcom_git_master_$version.zip"
+    }
 }
diff --git a/bucket/osulazer.json b/bucket/osulazer.json
index 7326e557..2816f835 100644
--- a/bucket/osulazer.json
+++ b/bucket/osulazer.json
@@ -1,23 +1,23 @@
 {
-    "homepage": "https://osu.ppy.sh/",
-    "description": "A free-to-win rhythm game. Rhythm is just a click away!",
     "version": "2022.306.0",
+    "description": "A free-to-win rhythm game. Rhythm is just a click away!",
+    "homepage": "https://osu.ppy.sh/",
     "license": "MIT",
     "url": "https://github.com/ppy/osu/releases/download/2022.226.0/osulazer-2022.226.0-full.nupkg#/dl.7z",
     "hash": "c8529859c3814668f1f4d37a3eff9a931d5bed47436242e5602c2871798aba49",
-    "autoupdate": {
-        "url": "https://github.com/ppy/osu/releases/download/$version/osulazer-$version-full.nupkg#/dl.7z"
-    },
-    "bin": "osulazer.exe",
-    "checkver": {
-        "github": "https://github.com/ppy/osu"
-    },
     "extract_dir": "lib\\net45",
     "pre_install": "Rename-Item -Path $dir/osu!.exe -NewName $dir/osulazer.exe",
+    "bin": "osulazer.exe",
     "shortcuts": [
         [
             "osulazer.exe",
             "osu! Lazer"
         ]
-    ]
+    ],
+    "checkver": {
+        "github": "https://github.com/ppy/osu"
+    },
+    "autoupdate": {
+        "url": "https://github.com/ppy/osu/releases/download/$version/osulazer-$version-full.nupkg#/dl.7z"
+    }
 }
diff --git a/bucket/pacmc.json b/bucket/pacmc.json
index f2e1531f..883696f2 100644
--- a/bucket/pacmc.json
+++ b/bucket/pacmc.json
@@ -1,23 +1,23 @@
 {
-    "homepage": "https://github.com/jakobkmar/pacmc",
-    "description": "An easy to use package manager for Fabric Minecraft mods",
     "version": "0.4.2",
+    "description": "An easy to use package manager for Fabric Minecraft mods",
+    "homepage": "https://github.com/jakobkmar/pacmc",
     "license": "GPL-3.0-or-later",
-    "url": "https://github.com/jakobkmar/pacmc/releases/download/0.4.2/pacmc-0.4.2.zip",
-    "hash": "41e2542633c9cf795b6b29565f8dd810cb1aeb3c633fc8afc4e199668f714ad4",
-    "autoupdate": {
-        "url": "https://github.com/jakobkmar/pacmc/releases/download/$version/pacmc-$version.zip",
-        "extract_dir": "pacmc-$version"
-    },
-    "bin": "bin/pacmc.bat",
-    "checkver": {
-        "github": "https://github.com/jakobkmar/pacmc"
-    },
-    "extract_dir": "pacmc-0.4.2",
     "suggest": {
         "JDK": [
             "java/oraclejdk",
             "java/openjdk"
         ]
+    },
+    "url": "https://github.com/jakobkmar/pacmc/releases/download/0.4.2/pacmc-0.4.2.zip",
+    "hash": "41e2542633c9cf795b6b29565f8dd810cb1aeb3c633fc8afc4e199668f714ad4",
+    "extract_dir": "pacmc-0.4.2",
+    "bin": "bin/pacmc.bat",
+    "checkver": {
+        "github": "https://github.com/jakobkmar/pacmc"
+    },
+    "autoupdate": {
+        "url": "https://github.com/jakobkmar/pacmc/releases/download/$version/pacmc-$version.zip",
+        "extract_dir": "pacmc-$version"
     }
 }
diff --git a/bucket/paintball2.json b/bucket/paintball2.json
index 4ba6e4fe..85bbd4d3 100644
--- a/bucket/paintball2.json
+++ b/bucket/paintball2.json
@@ -1,23 +1,23 @@
 {
-    "homepage": "http://digitalpaint.org/",
-    "description": "Fast-paced paintball first-person shooter based on the Quake 2 engine",
     "version": "build045",
+    "description": "Fast-paced paintball first-person shooter based on the Quake 2 engine",
+    "homepage": "http://digitalpaint.org/",
     "license": "Custom",
     "url": "https://downloads.sourceforge.net/project/paintball2/Paintball%202/Paintball%202.0%20Alpha%20build045/paintball2_build045_full.exe#/dl.7z",
     "hash": "sha1:e29e8750110a1052012c813d380ab522cd0d1d7b",
-    "autoupdate": {
-        "url": "https://downloads.sourceforge.net/project/paintball2/Paintball%202/Paintball%202.0%20Alpha%20$version/paintball2_$version_full.exe#/dl.7z"
-    },
     "bin": "paintball2.exe",
-    "checkver": {
-        "url": "http://digitalpaint.org/files/",
-        "regex": "paintball2_([\\da-z]+)_full\\.exe"
-    },
-    "persist": "pball\\configs",
     "shortcuts": [
         [
             "paintball2.exe",
             "Paintball 2"
         ]
-    ]
+    ],
+    "persist": "pball\\configs",
+    "checkver": {
+        "url": "http://digitalpaint.org/files/",
+        "regex": "paintball2_([\\da-z]+)_full\\.exe"
+    },
+    "autoupdate": {
+        "url": "https://downloads.sourceforge.net/project/paintball2/Paintball%202/Paintball%202.0%20Alpha%20$version/paintball2_$version_full.exe#/dl.7z"
+    }
 }
diff --git a/bucket/pathofbuilding-community.json b/bucket/pathofbuilding-community.json
index 5c17d48d..bd9310ac 100644
--- a/bucket/pathofbuilding-community.json
+++ b/bucket/pathofbuilding-community.json
@@ -1,33 +1,33 @@
 {
-    "homepage": "https://github.com/PathOfBuildingCommunity/PathOfBuilding",
-    "description": "Offline build planner for Path of Exile, Community Fork",
     "version": "2.15.1",
+    "description": "Offline build planner for Path of Exile, Community Fork",
+    "homepage": "https://github.com/PathOfBuildingCommunity/PathOfBuilding",
     "license": "MIT",
     "url": "https://github.com/PathOfBuildingCommunity/PathOfBuilding/releases/download/v2.15.1/PathOfBuildingCommunity-Portable-2.15.1.zip",
     "hash": "d0e6ba8cdbad1ec01b63b840086902a807f8e61372ff311f657321e853561177",
-    "autoupdate": {
-        "url": "https://github.com/PathOfBuildingCommunity/PathOfBuilding/releases/download/v$version/PathOfBuildingCommunity-Portable-$version.zip"
-    },
+    "pre_install": [
+        "if(!(Test-Path \"$dir\\Settings.xml\")) {",
+        "    Set-Content \"$dir\\Settings.xml\" -Value '<?xml version=\"1.0\" encoding=\"UTF-8\"?><PathOfBuilding></PathOfBuilding>' -Encoding ascii",
+        "}"
+    ],
     "bin": [
         [
             "Path of Building.exe",
             "pathofbuilding-community"
         ]
     ],
-    "checkver": "github",
-    "persist": [
-        "Builds",
-        "Settings.xml"
-    ],
-    "pre_install": [
-        "if(!(Test-Path \"$dir\\Settings.xml\")) {",
-        "    Set-Content \"$dir\\Settings.xml\" -Value '<?xml version=\"1.0\" encoding=\"UTF-8\"?><PathOfBuilding></PathOfBuilding>' -Encoding ascii",
-        "}"
-    ],
     "shortcuts": [
         [
             "Path of Building.exe",
             "Path of Building Community"
         ]
-    ]
+    ],
+    "persist": [
+        "Builds",
+        "Settings.xml"
+    ],
+    "checkver": "github",
+    "autoupdate": {
+        "url": "https://github.com/PathOfBuildingCommunity/PathOfBuilding/releases/download/v$version/PathOfBuildingCommunity-Portable-$version.zip"
+    }
 }
diff --git a/bucket/pathofbuilding.json b/bucket/pathofbuilding.json
index 1011fb7c..20f78bc5 100644
--- a/bucket/pathofbuilding.json
+++ b/bucket/pathofbuilding.json
@@ -1,28 +1,28 @@
 {
-    "homepage": "https://github.com/Openarl/PathOfBuilding",
-    "description": "Offline build planner for Path of Exile",
     "version": "1.4.170",
+    "description": "Offline build planner for Path of Exile",
+    "homepage": "https://github.com/Openarl/PathOfBuilding",
     "license": "MIT",
     "url": "https://github.com/Openarl/PathOfBuilding/releases/download/v1.4.170/PathOfBuilding-1.4.170.zip",
     "hash": "95e5aef339b95b2a048d17763564b4cfda4f8e752a6798a0438427e76bdd712f",
-    "autoupdate": {
-        "url": "https://github.com/Openarl/PathOfBuilding/releases/download/v$version/PathOfBuilding-$version.zip"
-    },
-    "bin": "Path of Building.exe",
-    "checkver": "github",
-    "persist": [
-        "Builds",
-        "Settings.xml"
-    ],
     "pre_install": [
         "if(!(Test-Path \"$dir\\Settings.xml\")) {",
         "    Set-Content \"$dir\\Settings.xml\" -Value '<?xml version=\"1.0\" encoding=\"UTF-8\"?><PathOfBuilding></PathOfBuilding>' -Encoding ascii",
         "}"
     ],
+    "bin": "Path of Building.exe",
     "shortcuts": [
         [
             "Path of Building.exe",
             "Path of Building"
         ]
-    ]
+    ],
+    "persist": [
+        "Builds",
+        "Settings.xml"
+    ],
+    "checkver": "github",
+    "autoupdate": {
+        "url": "https://github.com/Openarl/PathOfBuilding/releases/download/v$version/PathOfBuilding-$version.zip"
+    }
 }
diff --git a/bucket/pcsx2-dev.json b/bucket/pcsx2-dev.json
index 8b0eb71d..61fa6dcf 100644
--- a/bucket/pcsx2-dev.json
+++ b/bucket/pcsx2-dev.json
@@ -1,16 +1,56 @@
 {
-    "homepage": "https://pcsx2.net/",
-    "description": "A feature rich FOSS PlayStation 2 emulator (development version)",
     "version": "1.7.2415",
+    "description": "A feature rich FOSS PlayStation 2 emulator (development version)",
+    "homepage": "https://pcsx2.net/",
     "license": {
-        "identifier": "GPL-3.0",
-        "url": "https://github.com/PCSX2/pcsx2/blob/master/COPYING.GPLv3"
+        "url": "https://github.com/PCSX2/pcsx2/blob/master/COPYING.GPLv3",
+        "identifier": "GPL-3.0"
     },
     "notes": [
         "ATTENTION: PCSX2 requires a dump of the PS2 BIOS to function.",
         "Place the BIOS file in $persist_dir\\bios",
         "Learn more at https://wiki.pcsx2.net/Setting_up_Windows_version#BIOS"
     ],
+    "suggest": {
+        "Microsoft Visual C++ Runtime 2019": "extras/vcredist2019"
+    },
+    "pre_install": [
+        "if (!(Test-Path \"$persist_dir\")) {",
+        "   New-item \"$persist_dir\" -ItemType Directory | Out-Null",
+        "   if (Test-Path \"$env:USERPROFILE\\Documents\\PCSX2\") {",
+        "       Write-host \"Migrating AppData...\" -ForegroundColor yellow",
+        "       Copy-Item -Path \"$env:USERPROFILE\\Documents\\PCSX2\\*\" -Destination \"$persist_dir\" -Recurse",
+        "       Remove-Item -Path \"$env:USERPROFILE\\Documents\\PCSX2\" -Recurse",
+        "   }",
+        "}"
+    ],
+    "persist": [
+        "bios",
+        "cheats_ws",
+        "cheats",
+        "inis",
+        "logs",
+        "memcards",
+        "portable.ini",
+        "shaders\\GSdx_FX_Settings.ini",
+        "snaps",
+        "sstates"
+    ],
+    "checkver": {
+        "url": "https://github.com/PCSX2/pcsx2/releases.atom",
+        "regex": "v(?<basever>\\d+\\.\\d+)\\.(?<build>\\d+)",
+        "replace": "${basever}.${build}"
+    },
+    "autoupdate": {
+        "architecture": {
+            "32bit": {
+                "url": "https://github.com/PCSX2/pcsx2/releases/download/v$version/pcsx2-v$version-windows-32bit-AVX2.7z"
+            },
+            "64bit": {
+                "url": "https://github.com/PCSX2/pcsx2/releases/download/v$version/pcsx2-v$version-windows-64bit-AVX2.7z"
+            }
+        }
+    },
     "architecture": {
         "32bit": {
             "url": "https://github.com/PCSX2/pcsx2/releases/download/v1.7.2415/pcsx2-v1.7.2415-windows-32bit-AVX2.7z",
@@ -44,45 +84,5 @@
                 ]
             ]
         }
-    },
-    "autoupdate": {
-        "architecture": {
-            "32bit": {
-                "url": "https://github.com/PCSX2/pcsx2/releases/download/v$version/pcsx2-v$version-windows-32bit-AVX2.7z"
-            },
-            "64bit": {
-                "url": "https://github.com/PCSX2/pcsx2/releases/download/v$version/pcsx2-v$version-windows-64bit-AVX2.7z"
-            }
-        }
-    },
-    "checkver": {
-        "url": "https://github.com/PCSX2/pcsx2/releases.atom",
-        "regex": "v(?<basever>\\d+\\.\\d+)\\.(?<build>\\d+)",
-        "replace": "${basever}.${build}"
-    },
-    "persist": [
-        "bios",
-        "cheats_ws",
-        "cheats",
-        "inis",
-        "logs",
-        "memcards",
-        "portable.ini",
-        "shaders\\GSdx_FX_Settings.ini",
-        "snaps",
-        "sstates"
-    ],
-    "pre_install": [
-        "if (!(Test-Path \"$persist_dir\")) {",
-        "   New-item \"$persist_dir\" -ItemType Directory | Out-Null",
-        "   if (Test-Path \"$env:USERPROFILE\\Documents\\PCSX2\") {",
-        "       Write-host \"Migrating AppData...\" -ForegroundColor yellow",
-        "       Copy-Item -Path \"$env:USERPROFILE\\Documents\\PCSX2\\*\" -Destination \"$persist_dir\" -Recurse",
-        "       Remove-Item -Path \"$env:USERPROFILE\\Documents\\PCSX2\" -Recurse",
-        "   }",
-        "}"
-    ],
-    "suggest": {
-        "Microsoft Visual C++ Runtime 2019": "extras/vcredist2019"
     }
 }
diff --git a/bucket/pcsx2.json b/bucket/pcsx2.json
index a84c74e6..bc7b8649 100644
--- a/bucket/pcsx2.json
+++ b/bucket/pcsx2.json
@@ -1,27 +1,39 @@
 {
-    "homepage": "https://pcsx2.net/",
-    "description": "A feature rich FOSS PlayStation 2 emulator",
     "version": "1.6.0",
+    "description": "A feature rich FOSS PlayStation 2 emulator",
+    "homepage": "https://pcsx2.net/",
     "license": {
-        "identifier": "GPL-3.0",
-        "url": "https://github.com/PCSX2/pcsx2/blob/master/COPYING.GPLv3"
+        "url": "https://github.com/PCSX2/pcsx2/blob/master/COPYING.GPLv3",
+        "identifier": "GPL-3.0"
     },
     "notes": [
         "ATTENTION: PCSX2 requires a dump of the PS2 BIOS to function.",
         "Place the BIOS file in $persist_dir\\bios",
         "Learn more at https://wiki.pcsx2.net/Setting_up_Windows_version#BIOS"
     ],
+    "suggest": {
+        "Microsoft Visual C++ Runtime 2019": "extras/vcredist2019"
+    },
     "url": "https://github.com/PCSX2/pcsx2/releases/download/v1.6.0/pcsx2-1.6.0-binaries.7z",
     "hash": "f3401d6f74a4306797d9aab298d58c3b3898eb563495c463993f378c9f4801cb",
-    "autoupdate": {
-        "url": "https://github.com/PCSX2/pcsx2/releases/download/v$version/pcsx2-$version-binaries.7z",
-        "extract_dir": "PCSX2 $version"
-    },
-    "bin": "pcsx2.exe",
-    "checkver": {
-        "github": "https://github.com/PCSX2/pcsx2/"
-    },
     "extract_dir": "PCSX2 1.6.0",
+    "pre_install": [
+        "if (!(Test-Path \"$persist_dir\")) {",
+        "   New-item \"$persist_dir\" -ItemType Directory | Out-Null",
+        "   if (Test-Path \"$env:USERPROFILE\\Documents\\PCSX2\") {",
+        "       Write-host \"Migrating AppData...\" -ForegroundColor yellow",
+        "       Copy-Item -Path \"$env:USERPROFILE\\Documents\\PCSX2\\*\" -Destination \"$persist_dir\" -Recurse",
+        "       Remove-Item -Path \"$env:USERPROFILE\\Documents\\PCSX2\" -Recurse",
+        "   }",
+        "}"
+    ],
+    "bin": "pcsx2.exe",
+    "shortcuts": [
+        [
+            "pcsx2.exe",
+            "PCSX2"
+        ]
+    ],
     "persist": [
         "bios",
         "cheats_ws",
@@ -34,23 +46,11 @@
         "snaps",
         "sstates"
     ],
-    "pre_install": [
-        "if (!(Test-Path \"$persist_dir\")) {",
-        "   New-item \"$persist_dir\" -ItemType Directory | Out-Null",
-        "   if (Test-Path \"$env:USERPROFILE\\Documents\\PCSX2\") {",
-        "       Write-host \"Migrating AppData...\" -ForegroundColor yellow",
-        "       Copy-Item -Path \"$env:USERPROFILE\\Documents\\PCSX2\\*\" -Destination \"$persist_dir\" -Recurse",
-        "       Remove-Item -Path \"$env:USERPROFILE\\Documents\\PCSX2\" -Recurse",
-        "   }",
-        "}"
-    ],
-    "shortcuts": [
-        [
-            "pcsx2.exe",
-            "PCSX2"
-        ]
-    ],
-    "suggest": {
-        "Microsoft Visual C++ Runtime 2019": "extras/vcredist2019"
+    "checkver": {
+        "github": "https://github.com/PCSX2/pcsx2/"
+    },
+    "autoupdate": {
+        "url": "https://github.com/PCSX2/pcsx2/releases/download/v$version/pcsx2-$version-binaries.7z",
+        "extract_dir": "PCSX2 $version"
     }
 }
diff --git a/bucket/polymc.json b/bucket/polymc.json
index dd0c37b1..55c0476f 100644
--- a/bucket/polymc.json
+++ b/bucket/polymc.json
@@ -1,18 +1,23 @@
 {
-    "homepage": "https://polymc.github.io/",
-    "description": "An Open Source Minecraft launcher with the ability to manage multiple instances, accounts and mods. Focused on user freedom and free redistributability.",
     "version": "1.0.6",
+    "description": "An Open Source Minecraft launcher with the ability to manage multiple instances, accounts and mods. Focused on user freedom and free redistributability.",
+    "homepage": "https://polymc.github.io/",
     "license": "GPL-3.0-or-later",
     "url": "https://packages.polymc.org/1.0.6/win32/win32-1.0.6.zip",
     "hash": "06e7d942a5d88dfd128f8c8c8f32f6d29d46a8df612e4f5402684f9e0b5f0de9",
-    "autoupdate": {
-        "url": "https://packages.polymc.org/$version/win32/win32-$version.zip"
-    },
+    "pre_install": [
+        "if (-not (Test-Path \"$dir\\accounts.json\")) { New-Item \"$dir\\accounts.json\" -ItemType File | Out-Null }",
+        "if (-not (Test-Path \"$dir\\polymc.cfg\")) { New-Item \"$dir\\polymc.cfg\" -ItemType File -Value \"Analytics=false`r`nAutoUpdate=false`r`nIconTheme=pe_colored`r`nLaunchMaximized=true\" | Out-Null }",
+        "if (-not (Test-Path -Path \"$dir\\mods\")) { New-Item \"$dir\\mods\" -ItemType Directory | Out-Null }",
+        "if (-not (Test-Path -Path \"$dir\\icons\")) { New-Item \"$dir\\icons\" -ItemType Directory | Out-Null }"
+    ],
     "bin": "PolyMC.exe",
-    "checkver": {
-        "url": "https://github.com/PolyMC/PolyMC/tags",
-        "regex": "releases/tag/(\\d{1,2}\\.\\d{1,2}\\.\\d{1,2})"
-    },
+    "shortcuts": [
+        [
+            "PolyMC.exe",
+            "PolyMC"
+        ]
+    ],
     "persist": [
         "accounts",
         "assets",
@@ -26,16 +31,11 @@
         "accounts.json",
         "polymc.cfg"
     ],
-    "pre_install": [
-        "if (-not (Test-Path \"$dir\\accounts.json\")) { New-Item \"$dir\\accounts.json\" -ItemType File | Out-Null }",
-        "if (-not (Test-Path \"$dir\\polymc.cfg\")) { New-Item \"$dir\\polymc.cfg\" -ItemType File -Value \"Analytics=false`r`nAutoUpdate=false`r`nIconTheme=pe_colored`r`nLaunchMaximized=true\" | Out-Null }",
-        "if (-not (Test-Path -Path \"$dir\\mods\")) { New-Item \"$dir\\mods\" -ItemType Directory | Out-Null }",
-        "if (-not (Test-Path -Path \"$dir\\icons\")) { New-Item \"$dir\\icons\" -ItemType Directory | Out-Null }"
-    ],
-    "shortcuts": [
-        [
-            "PolyMC.exe",
-            "PolyMC"
-        ]
-    ]
+    "checkver": {
+        "url": "https://github.com/PolyMC/PolyMC/tags",
+        "regex": "releases/tag/(\\d{1,2}\\.\\d{1,2}\\.\\d{1,2})"
+    },
+    "autoupdate": {
+        "url": "https://packages.polymc.org/$version/win32/win32-$version.zip"
+    }
 }
diff --git a/bucket/powdertoy.json b/bucket/powdertoy.json
index 1d0baffc..217d3f6b 100644
--- a/bucket/powdertoy.json
+++ b/bucket/powdertoy.json
@@ -1,8 +1,32 @@
 {
-    "homepage": "https://powdertoy.co.uk/",
-    "description": "A free physics sandbox game, capable of simulating many interactions",
     "version": "96.2",
+    "description": "A free physics sandbox game, capable of simulating many interactions",
+    "homepage": "https://powdertoy.co.uk/",
     "license": "GPL-3.0-only",
+    "pre_install": [
+        "if (!(Test-Path \"$persist_dir\")) {",
+        "   New-item \"$dir\\powder.pref\" -ItemType File | Out-Null",
+        "}"
+    ],
+    "persist": [
+        "Saves",
+        "powder.pref"
+    ],
+    "checkver": {
+        "url": "https://powdertoy.co.uk/",
+        "regex": "(?<build>[\\d\\.]+) \\|",
+        "replace": "${1}"
+    },
+    "autoupdate": {
+        "architecture": {
+            "32bit": {
+                "url": "https://powdertoy.co.uk/Download/powder-win32.zip"
+            },
+            "64bit": {
+                "url": "https://powdertoy.co.uk/Download/powder.zip"
+            }
+        }
+    },
     "architecture": {
         "32bit": {
             "url": "https://powdertoy.co.uk/Download/powder-win32.zip",
@@ -31,29 +55,5 @@
                 ]
             ]
         }
-    },
-    "autoupdate": {
-        "architecture": {
-            "32bit": {
-                "url": "https://powdertoy.co.uk/Download/powder-win32.zip"
-            },
-            "64bit": {
-                "url": "https://powdertoy.co.uk/Download/powder.zip"
-            }
-        }
-    },
-    "checkver": {
-        "url": "https://powdertoy.co.uk/",
-        "regex": "(?<build>[\\d\\.]+) \\|",
-        "replace": "${1}"
-    },
-    "persist": [
-        "Saves",
-        "powder.pref"
-    ],
-    "pre_install": [
-        "if (!(Test-Path \"$persist_dir\")) {",
-        "   New-item \"$dir\\powder.pref\" -ItemType File | Out-Null",
-        "}"
-    ]
+    }
 }
diff --git a/bucket/ppsspp-dev.json b/bucket/ppsspp-dev.json
index 8d7aa95a..d510ef9d 100644
--- a/bucket/ppsspp-dev.json
+++ b/bucket/ppsspp-dev.json
@@ -1,10 +1,37 @@
 {
-    "homepage": "https://www.ppsspp.org",
-    "description": "Sony PSP emulator (Development)",
     "version": "1.12.3-985",
+    "description": "Sony PSP emulator (Development)",
+    "homepage": "https://www.ppsspp.org",
     "license": {
-        "identifier": "GPL 2.0 or later",
-        "url": "https://github.com/hrydgard/ppsspp/blob/master/LICENSE.TXT"
+        "url": "https://github.com/hrydgard/ppsspp/blob/master/LICENSE.TXT",
+        "identifier": "GPL 2.0 or later"
+    },
+    "extract_dir": "ppsspp",
+    "pre_install": [
+        "if (!(Test-Path \"$persist_dir\")) {",
+        "   New-item \"$persist_dir\" -ItemType Directory | Out-Null",
+        "   New-item \"$persist_dir\\memstick\" -ItemType Directory | Out-Null",
+        "}"
+    ],
+    "persist": [
+        "memstick",
+        "assets",
+        "demos"
+    ],
+    "checkver": {
+        "url": "https://buildbot.orphis.net/ppsspp/index.php",
+        "regex": "v(?<basever>\\d{1,2}\\.\\d{1,2}\\.\\d{1,2})-(?<build>\\d{1,4})-g(?<commit>[a-f0-9]{9})",
+        "replace": "${basever}-${build}"
+    },
+    "autoupdate": {
+        "architecture": {
+            "32bit": {
+                "url": "https://buildbot.orphis.net/ppsspp/index.php?m=dl&rev=v$matchBasever-$matchBuild-$commit&platform=windows-x86"
+            },
+            "64bit": {
+                "url": "https://buildbot.orphis.net/ppsspp/index.php?m=dl&rev=v$matchBasever-$matchBuild-$commit&platform=windows-amd64"
+            }
+        }
     },
     "architecture": {
         "32bit": {
@@ -39,32 +66,5 @@
                 ]
             ]
         }
-    },
-    "autoupdate": {
-        "architecture": {
-            "32bit": {
-                "url": "https://buildbot.orphis.net/ppsspp/index.php?m=dl&rev=v$matchBasever-$matchBuild-$commit&platform=windows-x86"
-            },
-            "64bit": {
-                "url": "https://buildbot.orphis.net/ppsspp/index.php?m=dl&rev=v$matchBasever-$matchBuild-$commit&platform=windows-amd64"
-            }
-        }
-    },
-    "checkver": {
-        "url": "https://buildbot.orphis.net/ppsspp/index.php",
-        "regex": "v(?<basever>\\d{1,2}\\.\\d{1,2}\\.\\d{1,2})-(?<build>\\d{1,4})-g(?<commit>[a-f0-9]{9})",
-        "replace": "${basever}-${build}"
-    },
-    "extract_dir": "ppsspp",
-    "persist": [
-        "memstick",
-        "assets",
-        "demos"
-    ],
-    "pre_install": [
-        "if (!(Test-Path \"$persist_dir\")) {",
-        "   New-item \"$persist_dir\" -ItemType Directory | Out-Null",
-        "   New-item \"$persist_dir\\memstick\" -ItemType Directory | Out-Null",
-        "}"
-    ]
+    }
 }
diff --git a/bucket/ppsspp.json b/bucket/ppsspp.json
index a74bc771..f9fb75b7 100644
--- a/bucket/ppsspp.json
+++ b/bucket/ppsspp.json
@@ -1,13 +1,35 @@
 {
-    "homepage": "https://www.ppsspp.org",
-    "description": "Sony PSP emulator",
     "version": "1.12.3",
+    "description": "Sony PSP emulator",
+    "homepage": "https://www.ppsspp.org",
     "license": {
-        "identifier": "GPL 2.0 or later",
-        "url": "https://github.com/hrydgard/ppsspp/blob/master/LICENSE.TXT"
+        "url": "https://github.com/hrydgard/ppsspp/blob/master/LICENSE.TXT",
+        "identifier": "GPL 2.0 or later"
     },
     "url": "https://ppsspp.org/files/1_12_3/ppsspp_win.zip",
     "hash": "c29b1faf56df9c9926cfb77f874484571fbe8e59689b1a39091425ab309e6463",
+    "extract_dir": "ppsspp",
+    "pre_install": [
+        "if (!(Test-Path \"$persist_dir\")) {",
+        "   New-item \"$persist_dir\" -ItemType Directory | Out-Null",
+        "   New-item \"$persist_dir\\memstick\" -ItemType Directory | Out-Null",
+        "}"
+    ],
+    "persist": [
+        "assets",
+        "demos",
+        "memstick"
+    ],
+    "checkver": {
+        "url": "https://www.ppsspp.org/downloads.html",
+        "regex": "Download ((?<major>\\d)\\.(?<minor>\\d{1,3})\\.(?<patch>\\d{1,3})) zip",
+        "replace": "${major}.${minor}.${patch}"
+    },
+    "autoupdate": {
+        "64bit": {
+            "url": "https://ppsspp.org/files/${major}_${minor}_${patch}/ppsspp_win.zip"
+        }
+    },
     "architecture": {
         "64bit": {
             "bin": [
@@ -23,27 +45,5 @@
                 ]
             ]
         }
-    },
-    "autoupdate": {
-        "64bit": {
-            "url": "https://ppsspp.org/files/${major}_${minor}_${patch}/ppsspp_win.zip"
-        }
-    },
-    "checkver": {
-        "url": "https://www.ppsspp.org/downloads.html",
-        "regex": "Download ((?<major>\\d)\\.(?<minor>\\d{1,3})\\.(?<patch>\\d{1,3})) zip",
-        "replace": "${major}.${minor}.${patch}"
-    },
-    "extract_dir": "ppsspp",
-    "persist": [
-        "assets",
-        "demos",
-        "memstick"
-    ],
-    "pre_install": [
-        "if (!(Test-Path \"$persist_dir\")) {",
-        "   New-item \"$persist_dir\" -ItemType Directory | Out-Null",
-        "   New-item \"$persist_dir\\memstick\" -ItemType Directory | Out-Null",
-        "}"
-    ]
+    }
 }
diff --git a/bucket/prboom-plus.json b/bucket/prboom-plus.json
index 633862bd..cdf43172 100644
--- a/bucket/prboom-plus.json
+++ b/bucket/prboom-plus.json
@@ -1,7 +1,7 @@
 {
-    "homepage": "http://prboom-plus.sourceforge.net/",
-    "description": "Enhanced, highly-compatible source port for Doom",
     "version": "2.6.2",
+    "description": "Enhanced, highly-compatible source port for Doom",
+    "homepage": "http://prboom-plus.sourceforge.net/",
     "license": "GPL-2.0-or-later",
     "notes": [
         "Place WAD files (game data) in:",
@@ -10,16 +10,10 @@
     ],
     "url": "https://github.com/coelckers/prboom-plus/releases/download/v2.6.2/prboom-plus-262-w32.zip",
     "hash": "20313e00d8841a618e23e7c671d65870194bee634468fecd2f3697ac05f21476",
-    "autoupdate": {
-        "url": "https://github.com/coelckers/prboom-plus/releases/download/v$version/prboom-plus-$cleanVersion-w32.zip"
-    },
-    "checkver": {
-        "github": "https://github.com/coelckers/prboom-plus"
-    },
+    "pre_install": "New-Item -ItemType Directory -Force -Path $persist_dir\\..\\_doom | Out-Null",
     "env_set": {
         "DOOMWADDIR": "$persist_dir\\..\\_doom"
     },
-    "pre_install": "New-Item -ItemType Directory -Force -Path $persist_dir\\..\\_doom | Out-Null",
     "shortcuts": [
         [
             "prboom-plus.exe",
@@ -56,5 +50,11 @@
             "PrBoom+ (FreeDM)",
             "-iwad freedm.wad"
         ]
-    ]
+    ],
+    "checkver": {
+        "github": "https://github.com/coelckers/prboom-plus"
+    },
+    "autoupdate": {
+        "url": "https://github.com/coelckers/prboom-plus/releases/download/v$version/prboom-plus-$cleanVersion-w32.zip"
+    }
 }
diff --git a/bucket/project64-dev.json b/bucket/project64-dev.json
index e60c4762..011e5ece 100644
--- a/bucket/project64-dev.json
+++ b/bucket/project64-dev.json
@@ -1,27 +1,25 @@
 {
-    "homepage": "https://www.pj64-emu.com/",
-    "description": "Nintendo 64 emulator",
     "version": "4.0.0-5758-928dfe3",
+    "description": "Nintendo 64 emulator",
+    "homepage": "https://www.pj64-emu.com/",
     "license": {
-        "identifier": "GPL-2.0",
-        "url": "https://github.com/project64/project64/blob/develop/license.md"
+        "url": "https://github.com/project64/project64/blob/develop/license.md",
+        "identifier": "GPL-2.0"
     },
     "url": "https://www.pj64-emu.com/file/setup-project64-Dev-4-0-0-5758-928dfe3/",
     "hash": "77dbd38dd45250b1c5d077c822835b462f1a695ef9d317f70463040aa3875130",
-    "autoupdate": {
-        "url": "https://www.pj64-emu.com/file/setup-project64-Dev-$dashVersion/"
-    },
     "bin": [
         [
             "Project64.exe",
             "Project64-dev"
         ]
     ],
-    "checkver": {
-        "url": "https://www.pj64-emu.com/nightly-builds",
-        "regex": "((?<major>[\\d]+)\\.(?<minor>[\\d]+)\\.(?<patch>[\\d]+)-(?<build>[\\d]+)-(?<commit>[\\da-f]+))"
-    },
-    "innosetup": true,
+    "shortcuts": [
+        [
+            "Project64.exe",
+            "Project64 (development)"
+        ]
+    ],
     "persist": [
         "Config",
         "Logs",
@@ -31,10 +29,12 @@
         "Games",
         "ROMs"
     ],
-    "shortcuts": [
-        [
-            "Project64.exe",
-            "Project64 (development)"
-        ]
-    ]
+    "checkver": {
+        "url": "https://www.pj64-emu.com/nightly-builds",
+        "regex": "((?<major>[\\d]+)\\.(?<minor>[\\d]+)\\.(?<patch>[\\d]+)-(?<build>[\\d]+)-(?<commit>[\\da-f]+))"
+    },
+    "autoupdate": {
+        "url": "https://www.pj64-emu.com/file/setup-project64-Dev-$dashVersion/"
+    },
+    "innosetup": true
 }
diff --git a/bucket/project64.json b/bucket/project64.json
index 8644b777..0ae7c3d6 100644
--- a/bucket/project64.json
+++ b/bucket/project64.json
@@ -1,20 +1,19 @@
 {
-    "homepage": "https://www.pj64-emu.com/",
-    "description": "Nintendo 64 emulator",
     "version": "3.0.1",
+    "description": "Nintendo 64 emulator",
+    "homepage": "https://www.pj64-emu.com/",
     "license": {
-        "identifier": "GPL-2.0",
-        "url": "https://github.com/project64/project64/blob/develop/license.md"
+        "url": "https://github.com/project64/project64/blob/develop/license.md",
+        "identifier": "GPL-2.0"
     },
     "url": "https://www.pj64-emu.com/download/project64-3-0-1-zip",
     "hash": "0cf95cbb70f33166258eff125f592bdf8534e8170af5f2b98a3d01b1516cead4",
-    "autoupdate": {
-        "url": "https://www.pj64-emu.com$matchUrl"
-    },
-    "checkver": {
-        "url": "https://www.pj64-emu.com/public-releases",
-        "regex": "<a href=\"(?<url>[^\"]*)\">Project64  ([0-9]+(\\.[0-9]+)+) Zip</a>"
-    },
+    "shortcuts": [
+        [
+            "Project64.exe",
+            "Project64"
+        ]
+    ],
     "persist": [
         "Config",
         "Logs",
@@ -24,10 +23,11 @@
         "Games",
         "ROMs"
     ],
-    "shortcuts": [
-        [
-            "Project64.exe",
-            "Project64"
-        ]
-    ]
+    "checkver": {
+        "url": "https://www.pj64-emu.com/public-releases",
+        "regex": "<a href=\"(?<url>[^\"]*)\">Project64  ([0-9]+(\\.[0-9]+)+) Zip</a>"
+    },
+    "autoupdate": {
+        "url": "https://www.pj64-emu.com$matchUrl"
+    }
 }
diff --git a/bucket/ps3-system-software.json b/bucket/ps3-system-software.json
index e29df12f..53db67fe 100644
--- a/bucket/ps3-system-software.json
+++ b/bucket/ps3-system-software.json
@@ -1,18 +1,18 @@
 {
-    "homepage": "https://www.playstation.com/en-us/support/hardware/ps3/system-software/",
-    "description": "Sony PlayStation 3 system software",
     "version": "4.88",
+    "description": "Sony PlayStation 3 system software",
+    "homepage": "https://www.playstation.com/en-us/support/hardware/ps3/system-software/",
     "license": {
-        "identifier": "Proprietary",
-        "url": "https://doc.dl.playstation.net/doc/ps3-eula/ps3_eula_en.html"
+        "url": "https://doc.dl.playstation.net/doc/ps3-eula/ps3_eula_en.html",
+        "identifier": "Proprietary"
     },
     "url": "http://dus01.ps3.update.playstation.net/update/ps3/image/us/2021_0601_a0b63a3e4ae92ed176d6b9a67ce447f0/PS3UPDAT.PUP",
     "hash": "8491361628abe5862f5101e57878b5852b175b887a98cfc6ba9a3e67d1f6530a",
-    "autoupdate": {
-        "url": "http://dus01.ps3.update.playstation.net/update/ps3/image/us/$matchTime/PS3UPDAT.PUP"
-    },
     "checkver": {
         "url": "https://www.playstation.com/en-us/support/hardware/ps3/system-software/",
         "regex": "(?sm)PlayStation®3 System Software Update ((?:\\d+)?(?:\\.?\\d*)).*?ps3/image/us/(?<time>[\\w_]+)/PS3UPDAT.PUP"
+    },
+    "autoupdate": {
+        "url": "http://dus01.ps3.update.playstation.net/update/ps3/image/us/$matchTime/PS3UPDAT.PUP"
     }
 }
diff --git a/bucket/pychess.json b/bucket/pychess.json
index c301665f..e14e2519 100644
--- a/bucket/pychess.json
+++ b/bucket/pychess.json
@@ -1,7 +1,7 @@
 {
-    "homepage": "https://pychess.github.io/",
-    "description": "A chess client for Linux and Windows",
     "version": "1.0.3",
+    "description": "A chess client for Linux and Windows",
+    "homepage": "https://pychess.github.io/",
     "license": "GPL-3.0",
     "notes": [
         "Auto saves are stored in C:\\Users\\[USERNAME]",
@@ -10,18 +10,18 @@
     ],
     "url": "https://github.com/pychess/pychess/releases/download/1.0.3/pychess-1.0.3-mingw.msi",
     "hash": "cf7a80a114d370c2e9147934afb270e10f36a496ed34ac09c3b054e014216353",
-    "autoupdate": {
-        "url": "https://github.com/pychess/pychess/releases/download/$version/pychess-$version-$matchBuild.msi"
-    },
     "bin": "pychess.exe",
-    "checkver": {
-        "url": "https://github.com/pychess/pychess/releases",
-        "regex": "PyChess-([\\d.]+)-(?<build>[\\da-zA-Z]+)\\.msi"
-    },
     "shortcuts": [
         [
             "pychess.exe",
             "PyChess"
         ]
-    ]
+    ],
+    "checkver": {
+        "url": "https://github.com/pychess/pychess/releases",
+        "regex": "PyChess-([\\d.]+)-(?<build>[\\da-zA-Z]+)\\.msi"
+    },
+    "autoupdate": {
+        "url": "https://github.com/pychess/pychess/releases/download/$version/pychess-$version-$matchBuild.msi"
+    }
 }
diff --git a/bucket/q2pro.json b/bucket/q2pro.json
index dc9f2fa2..73b437f9 100644
--- a/bucket/q2pro.json
+++ b/bucket/q2pro.json
@@ -1,7 +1,7 @@
 {
-    "homepage": "http://www.skuller.net/q2pro/",
-    "description": "Quake 2 source port focused on multiplayer gameplay",
     "version": "nightly",
+    "description": "Quake 2 source port focused on multiplayer gameplay",
+    "homepage": "http://www.skuller.net/q2pro/",
     "license": "GPL-2.0-or-later",
     "notes": [
         "Place game data files (such as pak0.pak-pak2.pak) in:",
@@ -9,10 +9,6 @@
         "    $persist_dir\\baseq2\\"
     ],
     "url": "https://skuller.net/q2pro/nightly/q2pro-client_win32_x86.zip",
-    "autoupdate": {
-        "url": "https://skuller.net/q2pro/nightly/q2pro-client_win32_x86.zip"
-    },
-    "bin": "q2pro64.exe",
     "installer": {
         "script": [
             "$persistFolders = @(",
@@ -25,11 +21,15 @@
             "}"
         ]
     },
-    "persist": "baseq2",
+    "bin": "q2pro64.exe",
     "shortcuts": [
         [
             "q2pro.exe",
             "Q2PRO Client"
         ]
-    ]
+    ],
+    "persist": "baseq2",
+    "autoupdate": {
+        "url": "https://skuller.net/q2pro/nightly/q2pro-client_win32_x86.zip"
+    }
 }
diff --git a/bucket/quakespasm.json b/bucket/quakespasm.json
index fbea8c17..d3410b29 100644
--- a/bucket/quakespasm.json
+++ b/bucket/quakespasm.json
@@ -1,7 +1,7 @@
 {
-    "homepage": "http://quakespasm.sourceforge.net/",
-    "description": "Conservative Quake source port for singleplayer gameplay",
     "version": "0.94.3",
+    "description": "Conservative Quake source port for singleplayer gameplay",
+    "homepage": "http://quakespasm.sourceforge.net/",
     "license": "GPL-2.0-or-later",
     "notes": [
         "Place game data files (such as pak0.pak and pak1.pak) in:",
@@ -18,30 +18,6 @@
         "- Quake Mission Pack 3 - Abyss of Pandemonium:",
         "    $persist_dir\\abyss\\"
     ],
-    "architecture": {
-        "32bit": {
-            "url": "https://downloads.sourceforge.net/project/quakespasm/Windows/quakespasm-0.94.3_windows.zip",
-            "hash": "sha1:eb16e18c91fd3d4631bacceb17a8b8a3afbb5599",
-            "extract_dir": "quakespasm-0.94.3_windows"
-        },
-        "64bit": {
-            "url": "https://downloads.sourceforge.net/project/quakespasm/Windows/quakespasm-0.94.3_win64.zip",
-            "hash": "sha1:f2e13616bc5f350262d79927a55d40dae30a5b3a",
-            "extract_dir": "quakespasm-0.94.3_win64"
-        }
-    },
-    "autoupdate": {
-        "architecture": {
-            "32bit": {
-                "url": "https://downloads.sourceforge.net/project/quakespasm/Windows/quakespasm-$version_windows.zip",
-                "extract_dir": "quakespasm-$version_windows"
-            },
-            "64bit": {
-                "url": "https://downloads.sourceforge.net/project/quakespasm/Windows/quakespasm-$version_win64.zip",
-                "extract_dir": "quakespasm-$version_win64"
-            }
-        }
-    },
     "bin": [
         [
             "quakespasm.exe",
@@ -49,16 +25,6 @@
             "-basedir $persist_dir"
         ]
     ],
-    "checkver": {
-        "url": "http://quakespasm.sourceforge.net/download.htm",
-        "regex": "/Windows/quakespasm-(\\d+\\.\\d+\\.\\d+)_windows"
-    },
-    "persist": [
-        "id1",
-        "hipnotic",
-        "rogue",
-        "abyss"
-    ],
     "shortcuts": [
         [
             "quakespasm.exe",
@@ -79,5 +45,39 @@
             "QuakeSpasm (Abyss of Pandemonium)",
             "-game abyss"
         ]
-    ]
+    ],
+    "persist": [
+        "id1",
+        "hipnotic",
+        "rogue",
+        "abyss"
+    ],
+    "checkver": {
+        "url": "http://quakespasm.sourceforge.net/download.htm",
+        "regex": "/Windows/quakespasm-(\\d+\\.\\d+\\.\\d+)_windows"
+    },
+    "autoupdate": {
+        "architecture": {
+            "32bit": {
+                "url": "https://downloads.sourceforge.net/project/quakespasm/Windows/quakespasm-$version_windows.zip",
+                "extract_dir": "quakespasm-$version_windows"
+            },
+            "64bit": {
+                "url": "https://downloads.sourceforge.net/project/quakespasm/Windows/quakespasm-$version_win64.zip",
+                "extract_dir": "quakespasm-$version_win64"
+            }
+        }
+    },
+    "architecture": {
+        "32bit": {
+            "url": "https://downloads.sourceforge.net/project/quakespasm/Windows/quakespasm-0.94.3_windows.zip",
+            "hash": "sha1:eb16e18c91fd3d4631bacceb17a8b8a3afbb5599",
+            "extract_dir": "quakespasm-0.94.3_windows"
+        },
+        "64bit": {
+            "url": "https://downloads.sourceforge.net/project/quakespasm/Windows/quakespasm-0.94.3_win64.zip",
+            "hash": "sha1:f2e13616bc5f350262d79927a55d40dae30a5b3a",
+            "extract_dir": "quakespasm-0.94.3_win64"
+        }
+    }
 }
diff --git a/bucket/r2modman.json b/bucket/r2modman.json
index da085ba4..297a475b 100644
--- a/bucket/r2modman.json
+++ b/bucket/r2modman.json
@@ -1,14 +1,16 @@
 {
-    "homepage": "https://github.com/ebkr/r2modmanPlus",
-    "description": "A simple, clean, and easy to use mod manager for Risk of Rain 2, Dyson Sphere Program, Valheim and GTFO",
     "version": "3.1.27",
+    "description": "A simple, clean, and easy to use mod manager for Risk of Rain 2, Dyson Sphere Program, Valheim and GTFO",
+    "homepage": "https://github.com/ebkr/r2modmanPlus",
     "license": "MIT",
-    "architecture": {
-        "64bit": {
-            "url": "https://github.com/ebkr/r2modmanPlus/releases/download/v3.1.27/r2modman-3.1.27.exe#/r2modman.exe",
-            "hash": "9a4e11887045c1d6c3fcd9858e41f9a2d95692224eaa84fc064bcd7bed49c384"
-        }
-    },
+    "bin": "r2modman.exe",
+    "shortcuts": [
+        [
+            "r2modman.exe",
+            "r2modman"
+        ]
+    ],
+    "checkver": "github",
     "autoupdate": {
         "architecture": {
             "64bit": {
@@ -16,12 +18,10 @@
             }
         }
     },
-    "bin": "r2modman.exe",
-    "checkver": "github",
-    "shortcuts": [
-        [
-            "r2modman.exe",
-            "r2modman"
-        ]
-    ]
+    "architecture": {
+        "64bit": {
+            "url": "https://github.com/ebkr/r2modmanPlus/releases/download/v3.1.27/r2modman-3.1.27.exe#/r2modman.exe",
+            "hash": "9a4e11887045c1d6c3fcd9858e41f9a2d95692224eaa84fc064bcd7bed49c384"
+        }
+    }
 }
diff --git a/bucket/rayman-control-panel.json b/bucket/rayman-control-panel.json
index c89430ba..5ddd94d0 100644
--- a/bucket/rayman-control-panel.json
+++ b/bucket/rayman-control-panel.json
@@ -1,18 +1,18 @@
 {
-    "homepage": "https://github.com/RayCarrot/RayCarrot.RCP.Metro",
-    "description": "Unified configuration and modding control panel for all PC Rayman games",
     "version": "13.0.1",
+    "description": "Unified configuration and modding control panel for all PC Rayman games",
+    "homepage": "https://github.com/RayCarrot/RayCarrot.RCP.Metro",
     "license": "MIT",
     "url": "https://github.com/RayCarrot/RayCarrot.RCP.Metro/releases/download/13.0.1/Rayman.Control.Panel.exe",
     "hash": "14c9954226f50dc3dcf21c06e046697729af2a3b9d630578167c66223fbc7069",
-    "autoupdate": {
-        "url": "https://github.com/RayCarrot/RayCarrot.RCP.Metro/releases/download/$version/Rayman.Control.Panel.exe"
-    },
-    "checkver": "github",
     "shortcuts": [
         [
             "Rayman.Control.Panel.exe",
             "Rayman Control Panel"
         ]
-    ]
+    ],
+    "checkver": "github",
+    "autoupdate": {
+        "url": "https://github.com/RayCarrot/RayCarrot.RCP.Metro/releases/download/$version/Rayman.Control.Panel.exe"
+    }
 }
diff --git a/bucket/raze.json b/bucket/raze.json
index 5b131a11..b683554d 100644
--- a/bucket/raze.json
+++ b/bucket/raze.json
@@ -1,18 +1,23 @@
 {
-    "homepage": "https://github.com/coelckers/Raze",
-    "description": "Modern source port for Duke Nukem 3D, Blood, Redneck Rampage, Shadow Warrior and Exhumed/Powerslave",
     "version": "1.4.1",
+    "description": "Modern source port for Duke Nukem 3D, Blood, Redneck Rampage, Shadow Warrior and Exhumed/Powerslave",
+    "homepage": "https://github.com/coelckers/Raze",
     "license": "Custom",
     "notes": [
         "Place GRP and RTS files (game data) in:",
         "",
         "    $persist_dir\\data"
     ],
-    "architecture": {
-        "64bit": {
-            "url": "https://github.com/coelckers/Raze/releases/download/1.4.1/raze_1.4.1.zip",
-            "hash": "29b6805caf33760d58ccfb5082f4002c173b5d239ac02c149b866a845a33888b"
-        }
+    "bin": "raze.exe",
+    "shortcuts": [
+        [
+            "raze.exe",
+            "Raze"
+        ]
+    ],
+    "persist": "data",
+    "checkver": {
+        "github": "https://github.com/coelckers/raze"
     },
     "autoupdate": {
         "architecture": {
@@ -21,15 +26,10 @@
             }
         }
     },
-    "bin": "raze.exe",
-    "checkver": {
-        "github": "https://github.com/coelckers/raze"
-    },
-    "persist": "data",
-    "shortcuts": [
-        [
-            "raze.exe",
-            "Raze"
-        ]
-    ]
+    "architecture": {
+        "64bit": {
+            "url": "https://github.com/coelckers/Raze/releases/download/1.4.1/raze_1.4.1.zip",
+            "hash": "29b6805caf33760d58ccfb5082f4002c173b5d239ac02c149b866a845a33888b"
+        }
+    }
 }
diff --git a/bucket/rbdoom-3-bfg.json b/bucket/rbdoom-3-bfg.json
index cc927689..129631aa 100644
--- a/bucket/rbdoom-3-bfg.json
+++ b/bucket/rbdoom-3-bfg.json
@@ -1,7 +1,7 @@
 {
-    "homepage": "https://github.com/RobertBeckebans/RBDOOM-3-BFG",
-    "description": "Source port for Doom 3: BFG Edition",
     "version": "v1.4.0",
+    "description": "Source port for Doom 3: BFG Edition",
+    "homepage": "https://github.com/RobertBeckebans/RBDOOM-3-BFG",
     "license": "https://github.com/RobertBeckebans/RBDOOM-3-BFG/blob/master/COPYING.txt",
     "notes": [
         "Place game data in:",
@@ -14,18 +14,18 @@
     ],
     "url": "https://github.com/RobertBeckebans/RBDOOM-3-BFG/releases/download/v1.4.0/RBDOOM-3-BFG-1.4.0.9-lite-win64-20220306-git-f81a8c1.7z",
     "hash": "c116eba68c0c2abc6bed8ef6343d62e4f00f2328b98c0fc5a56523166e540c87",
-    "autoupdate": {
-        "url": "https://github.com/RobertBeckebans/RBDOOM-3-BFG/releases/download/$version/RBDOOM-3-BFG-$matchFile.7z"
-    },
-    "checkver": {
-        "url": "https://github.com/RobertBeckebans/RBDOOM-3-BFG/releases/latest",
-        "regex": "/RobertBeckebans/RBDOOM-3-BFG/releases/download/([a-zA-Z\\d.\\-]+)/RBDOOM-3-BFG-(?<file>[a-zA-Z\\d.\\-]+)\\.7z"
-    },
-    "persist": "base",
     "shortcuts": [
         [
             "RBDoom3BFG.exe",
             "RBDOOM-3-BFG"
         ]
-    ]
+    ],
+    "persist": "base",
+    "checkver": {
+        "url": "https://github.com/RobertBeckebans/RBDOOM-3-BFG/releases/latest",
+        "regex": "/RobertBeckebans/RBDOOM-3-BFG/releases/download/([a-zA-Z\\d.\\-]+)/RBDOOM-3-BFG-(?<file>[a-zA-Z\\d.\\-]+)\\.7z"
+    },
+    "autoupdate": {
+        "url": "https://github.com/RobertBeckebans/RBDOOM-3-BFG/releases/download/$version/RBDOOM-3-BFG-$matchFile.7z"
+    }
 }
diff --git a/bucket/rbxfpsunlocker.json b/bucket/rbxfpsunlocker.json
index f62f24c6..3511df4a 100644
--- a/bucket/rbxfpsunlocker.json
+++ b/bucket/rbxfpsunlocker.json
@@ -1,23 +1,8 @@
 {
-    "homepage": "https://github.com/axstin/rbxfpsunlocker",
-    "description": "Removes Roblox's default 60 FPS cap",
     "version": "4.4.2",
+    "description": "Removes Roblox's default 60 FPS cap",
+    "homepage": "https://github.com/axstin/rbxfpsunlocker",
     "license": "MIT",
-    "architecture": {
-        "64bit": {
-            "url": "https://github.com/axstin/rbxfpsunlocker/releases/download/v4.4.2/rbxfpsunlocker-x64.zip",
-            "hash": "a7b6560104164e5fc4c01d5da889777c2c5fb504ef15b6cda224d60a46010517"
-        }
-    },
-    "autoupdate": {
-        "architecture": {
-            "64bit": {
-                "url": "https://github.com/axstin/rbxfpsunlocker/releases/download/v$version/rbxfpsunlocker-x64.zip"
-            }
-        }
-    },
-    "checkver": "github",
-    "persist": "settings",
     "pre_install": [
         "# Create settings file if it does not exist",
         "if (!(Test-Path \"$persist_dir\\settings\" -PathType Leaf)) {",
@@ -29,5 +14,20 @@
             "rbxfpsunlocker.exe",
             "Roblox FPS Unlocker"
         ]
-    ]
+    ],
+    "persist": "settings",
+    "checkver": "github",
+    "autoupdate": {
+        "architecture": {
+            "64bit": {
+                "url": "https://github.com/axstin/rbxfpsunlocker/releases/download/v$version/rbxfpsunlocker-x64.zip"
+            }
+        }
+    },
+    "architecture": {
+        "64bit": {
+            "url": "https://github.com/axstin/rbxfpsunlocker/releases/download/v4.4.2/rbxfpsunlocker-x64.zip",
+            "hash": "a7b6560104164e5fc4c01d5da889777c2c5fb504ef15b6cda224d60a46010517"
+        }
+    }
 }
diff --git a/bucket/redeclipse.json b/bucket/redeclipse.json
index b28ea910..7729d72d 100644
--- a/bucket/redeclipse.json
+++ b/bucket/redeclipse.json
@@ -1,19 +1,12 @@
 {
-    "homepage": "https://redeclipse.net/",
-    "description": "Free arena shooter with parkour elements and a cooperative map editor",
     "version": "2.0.0",
+    "description": "Free arena shooter with parkour elements and a cooperative map editor",
+    "homepage": "https://redeclipse.net/",
     "license": "Zlib",
     "url": "https://github.com/redeclipse/base/releases/download/v2.0.0/redeclipse_2.0.0_win.zip",
     "hash": "baf9477e68359e622c8fff315d93eab703169aea7ad0b31708e84caf899371dc",
-    "autoupdate": {
-        "url": "https://github.com/redeclipse/base/releases/download/v$version/redeclipse_$version_win.zip",
-        "extract_dir": "redeclipse-$version-win"
-    },
-    "bin": "redeclipse.bat",
-    "checkver": {
-        "github": "https://github.com/redeclipse/base"
-    },
     "extract_dir": "redeclipse-2.0.0-win",
+    "bin": "redeclipse.bat",
     "shortcuts": [
         [
             "redeclipse.bat",
@@ -21,5 +14,12 @@
             "",
             "src/redeclipse.ico"
         ]
-    ]
+    ],
+    "checkver": {
+        "github": "https://github.com/redeclipse/base"
+    },
+    "autoupdate": {
+        "url": "https://github.com/redeclipse/base/releases/download/v$version/redeclipse_$version_win.zip",
+        "extract_dir": "redeclipse-$version-win"
+    }
 }
diff --git a/bucket/redream-dev.json b/bucket/redream-dev.json
index 1fa20ddf..6c18d198 100644
--- a/bucket/redream-dev.json
+++ b/bucket/redream-dev.json
@@ -1,16 +1,32 @@
 {
-    "homepage": "https://redream.io",
-    "description": "Sega Dreamcast emulator that can render games in HD and 4K (development)",
     "version": "1.5.0-1026-g7b7ec5d",
+    "description": "Sega Dreamcast emulator that can render games in HD and 4K (development)",
+    "homepage": "https://redream.io",
     "license": {
-        "identifier": "Freeware",
-        "url": "https://redream.io"
+        "url": "https://redream.io",
+        "identifier": "Freeware"
     },
-    "architecture": {
-        "64bit": {
-            "url": "https://redream.io/download/redream.x86_64-windows-v1.5.0-1026-g7b7ec5d.zip",
-            "hash": "4d5e897ce64fde063878d166afc540944d08a2784fe529344008ab1e6370329b"
-        }
+    "pre_install": [
+        "if (!(Test-Path \"$persist_dir\")) {",
+        "   New-item \"$persist_dir\" -ItemType Directory | Out-Null",
+        "   New-Item \"$persist_dir\\redream.cfg\" -Type File | Out-Null",
+        "}"
+    ],
+    "bin": "redream.exe",
+    "shortcuts": [
+        [
+            "redream.exe",
+            "Redream (dev)"
+        ]
+    ],
+    "persist": [
+        "cache",
+        "saves",
+        "redream.cfg"
+    ],
+    "checkver": {
+        "url": "https://redream.io/download",
+        "regex": "v(\\d\\.\\d\\.\\d-\\d{4}-g[a-f0-9]+)"
     },
     "autoupdate": {
         "architecture": {
@@ -19,26 +35,10 @@
             }
         }
     },
-    "bin": "redream.exe",
-    "checkver": {
-        "url": "https://redream.io/download",
-        "regex": "v(\\d\\.\\d\\.\\d-\\d{4}-g[a-f0-9]+)"
-    },
-    "persist": [
-        "cache",
-        "saves",
-        "redream.cfg"
-    ],
-    "pre_install": [
-        "if (!(Test-Path \"$persist_dir\")) {",
-        "   New-item \"$persist_dir\" -ItemType Directory | Out-Null",
-        "   New-Item \"$persist_dir\\redream.cfg\" -Type File | Out-Null",
-        "}"
-    ],
-    "shortcuts": [
-        [
-            "redream.exe",
-            "Redream (dev)"
-        ]
-    ]
+    "architecture": {
+        "64bit": {
+            "url": "https://redream.io/download/redream.x86_64-windows-v1.5.0-1026-g7b7ec5d.zip",
+            "hash": "4d5e897ce64fde063878d166afc540944d08a2784fe529344008ab1e6370329b"
+        }
+    }
 }
diff --git a/bucket/redream.json b/bucket/redream.json
index 585e6de3..ccc5d107 100644
--- a/bucket/redream.json
+++ b/bucket/redream.json
@@ -1,16 +1,32 @@
 {
-    "homepage": "https://redream.io",
-    "description": "Sega Dreamcast emulator that can render games in HD and 4K",
     "version": "1.5.0",
+    "description": "Sega Dreamcast emulator that can render games in HD and 4K",
+    "homepage": "https://redream.io",
     "license": {
-        "identifier": "Freeware",
-        "url": "https://redream.io"
+        "url": "https://redream.io",
+        "identifier": "Freeware"
     },
-    "architecture": {
-        "64bit": {
-            "url": "https://redream.io/download/redream.x86_64-windows-v1.5.0.zip",
-            "hash": "c29b1faf56df9c9926cfb77f874484571fbe8e59689b1a39091425ab309e6463"
-        }
+    "pre_install": [
+        "if (!(Test-Path \"$persist_dir\")) {",
+        "   New-item \"$persist_dir\" -ItemType Directory | Out-Null",
+        "   New-Item \"$persist_dir\\redream.cfg\" -Type File | Out-Null",
+        "}"
+    ],
+    "bin": "redream.exe",
+    "shortcuts": [
+        [
+            "redream.exe",
+            "Redream"
+        ]
+    ],
+    "persist": [
+        "cache",
+        "saves",
+        "redream.cfg"
+    ],
+    "checkver": {
+        "url": "https://redream.io/download",
+        "regex": "v(\\d\\.\\d\\.\\d)"
     },
     "autoupdate": {
         "architecture": {
@@ -19,26 +35,10 @@
             }
         }
     },
-    "bin": "redream.exe",
-    "checkver": {
-        "url": "https://redream.io/download",
-        "regex": "v(\\d\\.\\d\\.\\d)"
-    },
-    "persist": [
-        "cache",
-        "saves",
-        "redream.cfg"
-    ],
-    "pre_install": [
-        "if (!(Test-Path \"$persist_dir\")) {",
-        "   New-item \"$persist_dir\" -ItemType Directory | Out-Null",
-        "   New-Item \"$persist_dir\\redream.cfg\" -Type File | Out-Null",
-        "}"
-    ],
-    "shortcuts": [
-        [
-            "redream.exe",
-            "Redream"
-        ]
-    ]
+    "architecture": {
+        "64bit": {
+            "url": "https://redream.io/download/redream.x86_64-windows-v1.5.0.zip",
+            "hash": "c29b1faf56df9c9926cfb77f874484571fbe8e59689b1a39091425ab309e6463"
+        }
+    }
 }
diff --git a/bucket/retroarch-nightly.json b/bucket/retroarch-nightly.json
index fc13809e..068ac078 100644
--- a/bucket/retroarch-nightly.json
+++ b/bucket/retroarch-nightly.json
@@ -1,42 +1,33 @@
 {
-    "homepage": "https://www.retroarch.com/",
-    "description": "Frontend for emulators, game engines and media players (nightly)",
     "version": "nightly",
+    "description": "Frontend for emulators, game engines and media players (nightly)",
+    "homepage": "https://www.retroarch.com/",
     "license": {
-        "identifier": "GPL-3.0",
-        "url": "https://github.com/libretro/RetroArch/blob/master/COPYING"
+        "url": "https://github.com/libretro/RetroArch/blob/master/COPYING",
+        "identifier": "GPL-3.0"
     },
     "notes": [
         "ATTENTION: Retroarch requires BIOS/firmware files for some emulation.",
         "It is recommended to read the libretro docs for each core you plan to use.",
         "See https://docs.libretro.com/library/bios/ for more information."
     ],
-    "architecture": {
-        "32bit": {
-            "url": "https://buildbot.libretro.com/nightly/windows/x86/RetroArch.7z",
-            "extract_dir": "RetroArch-Win32"
-        },
-        "64bit": {
-            "url": "https://buildbot.libretro.com/nightly/windows/x86_64/RetroArch.7z",
-            "extract_dir": "RetroArch-Win64"
-        }
-    },
-    "autoupdate": {
-        "architecture": {
-            "32bit": {
-                "url": "https://buildbot.libretro.com/nightly/windows/x86/RetroArch.7z"
-            },
-            "64bit": {
-                "url": "https://buildbot.libretro.com/nightly/windows/x86_64/RetroArch.7z"
-            }
-        }
-    },
+    "pre_install": [
+        "if (!(Test-Path \"$persist_dir\\retroarch.cfg\")) {",
+        "    New-Item \"$persist_dir\\retroarch.cfg\" -Type File | Out-Null",
+        "}"
+    ],
     "bin": [
         [
             "retroarch.exe",
             "retroarch-nightly"
         ]
     ],
+    "shortcuts": [
+        [
+            "retroarch.exe",
+            "RetroArch (nightly)"
+        ]
+    ],
     "persist": [
         "assets\\wallpapers",
         "cores",
@@ -52,15 +43,24 @@
         "thumbnails",
         "retroarch.cfg"
     ],
-    "pre_install": [
-        "if (!(Test-Path \"$persist_dir\\retroarch.cfg\")) {",
-        "    New-Item \"$persist_dir\\retroarch.cfg\" -Type File | Out-Null",
-        "}"
-    ],
-    "shortcuts": [
-        [
-            "retroarch.exe",
-            "RetroArch (nightly)"
-        ]
-    ]
+    "autoupdate": {
+        "architecture": {
+            "32bit": {
+                "url": "https://buildbot.libretro.com/nightly/windows/x86/RetroArch.7z"
+            },
+            "64bit": {
+                "url": "https://buildbot.libretro.com/nightly/windows/x86_64/RetroArch.7z"
+            }
+        }
+    },
+    "architecture": {
+        "32bit": {
+            "url": "https://buildbot.libretro.com/nightly/windows/x86/RetroArch.7z",
+            "extract_dir": "RetroArch-Win32"
+        },
+        "64bit": {
+            "url": "https://buildbot.libretro.com/nightly/windows/x86_64/RetroArch.7z",
+            "extract_dir": "RetroArch-Win64"
+        }
+    }
 }
diff --git a/bucket/retroarch.json b/bucket/retroarch.json
index 7d1d42fe..4215b274 100644
--- a/bucket/retroarch.json
+++ b/bucket/retroarch.json
@@ -1,49 +1,33 @@
 {
-    "homepage": "https://www.retroarch.com/",
-    "description": "Frontend for emulators, game engines and media players",
     "version": "1.10.1",
+    "description": "Frontend for emulators, game engines and media players",
+    "homepage": "https://www.retroarch.com/",
     "license": {
-        "identifier": "GPL-3.0",
-        "url": "https://github.com/libretro/RetroArch/blob/master/COPYING"
+        "url": "https://github.com/libretro/RetroArch/blob/master/COPYING",
+        "identifier": "GPL-3.0"
     },
     "notes": [
         "ATTENTION: Retroarch requires BIOS/firmware files for some emulation.",
         "It is recommended to read the libretro docs for each core you plan to use.",
         "See https://docs.libretro.com/library/bios/ for more information."
     ],
-    "architecture": {
-        "32bit": {
-            "url": "https://buildbot.libretro.com/stable/1.10.1/windows/x86/RetroArch.7z",
-            "hash": "5892ca9f77ca8f976bc760c0c02188ac4b46e4d7718eaa65f39a015637ae28e5",
-            "extract_dir": "RetroArch-Win32"
-        },
-        "64bit": {
-            "url": "https://buildbot.libretro.com/stable/1.10.1/windows/x86_64/RetroArch.7z",
-            "hash": "a0f4e74317c5e399c0d5bf1472d082801fd349b85950f5a6b56c6fc0dd0f5675",
-            "extract_dir": "RetroArch-Win64"
-        }
-    },
-    "autoupdate": {
-        "architecture": {
-            "32bit": {
-                "url": "https://buildbot.libretro.com/stable/$matchMain/windows/x86/RetroArch.7z"
-            },
-            "64bit": {
-                "url": "https://buildbot.libretro.com/stable/$matchMain/windows/x86_64/RetroArch.7z"
-            }
-        }
-    },
+    "pre_install": [
+        "if (!(Test-Path \"$persist_dir\\retroarch.cfg\")) {",
+        "    New-Item \"$dir\\retroarch.cfg\" -Type File | Out-Null",
+        "}"
+    ],
     "bin": [
         [
             "retroarch.exe",
             "retroarch"
         ]
     ],
-    "checkver": {
-        "url": "https://www.retroarch.com/?page=platforms",
-        "regex": "The current stable version is: (?<main>[\\d.]+)(\\s*(\\(|\\[)(\\w+)(\\)|\\]))?",
-        "replace": "${5}${3}"
-    },
+    "shortcuts": [
+        [
+            "retroarch.exe",
+            "RetroArch"
+        ]
+    ],
     "persist": [
         "assets\\wallpapers",
         "cores",
@@ -59,15 +43,31 @@
         "thumbnails",
         "retroarch.cfg"
     ],
-    "pre_install": [
-        "if (!(Test-Path \"$persist_dir\\retroarch.cfg\")) {",
-        "    New-Item \"$dir\\retroarch.cfg\" -Type File | Out-Null",
-        "}"
-    ],
-    "shortcuts": [
-        [
-            "retroarch.exe",
-            "RetroArch"
-        ]
-    ]
+    "checkver": {
+        "url": "https://www.retroarch.com/?page=platforms",
+        "regex": "The current stable version is: (?<main>[\\d.]+)(\\s*(\\(|\\[)(\\w+)(\\)|\\]))?",
+        "replace": "${5}${3}"
+    },
+    "autoupdate": {
+        "architecture": {
+            "32bit": {
+                "url": "https://buildbot.libretro.com/stable/$matchMain/windows/x86/RetroArch.7z"
+            },
+            "64bit": {
+                "url": "https://buildbot.libretro.com/stable/$matchMain/windows/x86_64/RetroArch.7z"
+            }
+        }
+    },
+    "architecture": {
+        "32bit": {
+            "url": "https://buildbot.libretro.com/stable/1.10.1/windows/x86/RetroArch.7z",
+            "hash": "5892ca9f77ca8f976bc760c0c02188ac4b46e4d7718eaa65f39a015637ae28e5",
+            "extract_dir": "RetroArch-Win32"
+        },
+        "64bit": {
+            "url": "https://buildbot.libretro.com/stable/1.10.1/windows/x86_64/RetroArch.7z",
+            "hash": "a0f4e74317c5e399c0d5bf1472d082801fd349b85950f5a6b56c6fc0dd0f5675",
+            "extract_dir": "RetroArch-Win64"
+        }
+    }
 }
diff --git a/bucket/rgbds.json b/bucket/rgbds.json
index 52efab5b..4492a28e 100644
--- a/bucket/rgbds.json
+++ b/bucket/rgbds.json
@@ -1,17 +1,16 @@
 {
-    "homepage": "https://rednex.github.io/rgbds/",
-    "description": "A free assembler/linker package for the Game Boy and Game Boy Color",
     "version": "0.5.2",
+    "description": "A free assembler/linker package for the Game Boy and Game Boy Color",
+    "homepage": "https://rednex.github.io/rgbds/",
     "license": "MIT",
-    "architecture": {
-        "32bit": {
-            "url": "https://github.com/rednex/rgbds/releases/download/v0.5.2/rgbds-0.5.2-win32.zip",
-            "hash": "00233a80fe8269fa0be99504a5f2ef308b38f8094bd28dab7232e76ed306500d"
-        },
-        "64bit": {
-            "url": "https://github.com/rednex/rgbds/releases/download/v0.5.2/rgbds-0.5.2-win64.zip",
-            "hash": "36907be26993876b1cacf320d6db18436eabe045ae731a09a183183a9f9591c8"
-        }
+    "bin": [
+        "rgbasm.exe",
+        "rgbfix.exe",
+        "rgbgfx.exe",
+        "rgblink.exe"
+    ],
+    "checkver": {
+        "github": "https://github.com/rednex/rgbds"
     },
     "autoupdate": {
         "architecture": {
@@ -23,13 +22,14 @@
             }
         }
     },
-    "bin": [
-        "rgbasm.exe",
-        "rgbfix.exe",
-        "rgbgfx.exe",
-        "rgblink.exe"
-    ],
-    "checkver": {
-        "github": "https://github.com/rednex/rgbds"
+    "architecture": {
+        "32bit": {
+            "url": "https://github.com/rednex/rgbds/releases/download/v0.5.2/rgbds-0.5.2-win32.zip",
+            "hash": "00233a80fe8269fa0be99504a5f2ef308b38f8094bd28dab7232e76ed306500d"
+        },
+        "64bit": {
+            "url": "https://github.com/rednex/rgbds/releases/download/v0.5.2/rgbds-0.5.2-win64.zip",
+            "hash": "36907be26993876b1cacf320d6db18436eabe045ae731a09a183183a9f9591c8"
+        }
     }
 }
diff --git a/bucket/rpcs3.json b/bucket/rpcs3.json
index ff5280af..670fe241 100644
--- a/bucket/rpcs3.json
+++ b/bucket/rpcs3.json
@@ -1,36 +1,20 @@
 {
-    "homepage": "https://rpcs3.net/",
-    "description": "Open-source Sony PlayStation 3 emulator",
     "version": "0.0.21-13334",
+    "description": "Open-source Sony PlayStation 3 emulator",
+    "homepage": "https://rpcs3.net/",
     "license": {
-        "identifier": "GPL-2.0",
-        "url": "https://github.com/RPCS3/rpcs3/blob/master/LICENSE"
+        "url": "https://github.com/RPCS3/rpcs3/blob/master/LICENSE",
+        "identifier": "GPL-2.0"
     },
     "notes": [
         "ATTENTION: RPCS3 requires a copy of the official PS3 firmware to function.",
         "Install the ps3-system-software package.  You must still manually load PS3UPDAT.PUP",
         "See the official quickstart guide for further instructions: https://rpcs3.net/quickstart"
     ],
-    "architecture": {
-        "64bit": {
-            "url": "https://github.com/rpcs3/rpcs3-binaries-win/releases/download/build-00f6763228b912a0e38374fc6ee4f6f62d5dccd2/rpcs3-v0.0.21-13334-00f67632_win64.7z",
-            "hash": "3ab71e31011c97c710f2b127faa94de19e52a81348f10413a5a0d51e14e5cd85"
-        }
-    },
-    "autoupdate": {
-        "url": "https://github.com/rpcs3/rpcs3-binaries-win/releases/download/build-$matchFullhash/rpcs3-v$matchBuild-$matchShorthash_win64.7z",
-        "hash": {
-            "url": "https://rpcs3.net/compatibility?b",
-            "regex": "Windows SHA-256: ($sha256)"
-        }
-    },
-    "bin": "rpcs3.exe",
-    "checkver": {
-        "url": "https://rpcs3.net/compatibility?b",
-        "regex": "/rpcs3-binaries-win/releases/download/build-(?<fullhash>[0-9a-f]+)/rpcs3-v(?<build>[0-9]+\\.[0-9]+\\.[0-9]+\\-[0-9]+)-(?<shorthash>[0-9a-f]{8})",
-        "replace": "${build}"
-    },
     "depends": "ps3-system-software",
+    "suggest": {
+        "Microsoft Visual C++ Runtime 2019": "extras/vcredist2019"
+    },
     "installer": {
         "script": [
             "if (!(Test-Path \"$persist_dir\\config.yml\")) {",
@@ -41,6 +25,13 @@
             "}"
         ]
     },
+    "bin": "rpcs3.exe",
+    "shortcuts": [
+        [
+            "rpcs3.exe",
+            "RPCS3"
+        ]
+    ],
     "persist": [
         "dev_flash",
         "dev_flash2",
@@ -58,13 +49,22 @@
         "Icons",
         "patches"
     ],
-    "shortcuts": [
-        [
-            "rpcs3.exe",
-            "RPCS3"
-        ]
-    ],
-    "suggest": {
-        "Microsoft Visual C++ Runtime 2019": "extras/vcredist2019"
+    "checkver": {
+        "url": "https://rpcs3.net/compatibility?b",
+        "regex": "/rpcs3-binaries-win/releases/download/build-(?<fullhash>[0-9a-f]+)/rpcs3-v(?<build>[0-9]+\\.[0-9]+\\.[0-9]+\\-[0-9]+)-(?<shorthash>[0-9a-f]{8})",
+        "replace": "${build}"
+    },
+    "autoupdate": {
+        "url": "https://github.com/rpcs3/rpcs3-binaries-win/releases/download/build-$matchFullhash/rpcs3-v$matchBuild-$matchShorthash_win64.7z",
+        "hash": {
+            "url": "https://rpcs3.net/compatibility?b",
+            "regex": "Windows SHA-256: ($sha256)"
+        }
+    },
+    "architecture": {
+        "64bit": {
+            "url": "https://github.com/rpcs3/rpcs3-binaries-win/releases/download/build-00f6763228b912a0e38374fc6ee4f6f62d5dccd2/rpcs3-v0.0.21-13334-00f67632_win64.7z",
+            "hash": "3ab71e31011c97c710f2b127faa94de19e52a81348f10413a5a0d51e14e5cd85"
+        }
     }
 }
diff --git a/bucket/rtcwcoop.json b/bucket/rtcwcoop.json
index b87597ea..b1996782 100644
--- a/bucket/rtcwcoop.json
+++ b/bucket/rtcwcoop.json
@@ -1,56 +1,16 @@
 {
-    "homepage": "https://www.rtcwcoop.com/",
-    "description": "Source port for playing Return to Castle Wolfenstein cooperatively",
     "version": "1.0.2",
+    "description": "Source port for playing Return to Castle Wolfenstein cooperatively",
+    "homepage": "https://www.rtcwcoop.com/",
     "license": "https://github.com/rtcwcoop/rtcwcoop/blob/master/COPYING.txt",
     "notes": [
         "Place game data files (such as pak0.pk3, sp_pak1.pk3-sp_pak4.pk3, mp_*.pk3) in:",
         "",
         "    $persist_dir\\Main\\"
     ],
-    "architecture": {
-        "32bit": {
-            "url": "https://github.com/rtcwcoop/rtcwcoop/releases/download/1.0.2/rtcwcoop-1.0.2-win-x86.zip",
-            "hash": "7946046c9de3189d9f08d7a9d345b3a2b9b5f2fb3b58d7e56f0709fb18112119",
-            "bin": [
-                [
-                    "RTCWCoop.x86.exe",
-                    "rtcwcoop"
-                ],
-                [
-                    "RTCWCoopDED.x86.exe",
-                    "rtcwcoopded"
-                ]
-            ],
-            "extract_dir": "rtcwcoop-1.0.2-win-x86",
-            "shortcuts": [
-                [
-                    "RTCWCoop.x86.exe",
-                    "Return to Castle Wolfenstein - Coop"
-                ]
-            ]
-        },
-        "64bit": {
-            "url": "https://github.com/rtcwcoop/rtcwcoop/releases/download/1.0.2/rtcwcoop-1.0.2-win-x64.zip",
-            "hash": "3eb112b1198cf6f1b820dc29c90c6bd5e4acc91b59011934de4c2a7d66b85982",
-            "bin": [
-                [
-                    "RTCWCoop.x64.exe",
-                    "rtcwcoop"
-                ],
-                [
-                    "RTCWCoopDED.x64.exe",
-                    "rtcwcoopded"
-                ]
-            ],
-            "extract_dir": "rtcwcoop-1.0.2-win-x64",
-            "shortcuts": [
-                [
-                    "RTCWCoop.x64.exe",
-                    "Return to Castle Wolfenstein - Coop"
-                ]
-            ]
-        }
+    "persist": "Main",
+    "checkver": {
+        "github": "https://github.com/rtcwcoop/rtcwcoop"
     },
     "autoupdate": {
         "architecture": {
@@ -64,8 +24,48 @@
             }
         }
     },
-    "checkver": {
-        "github": "https://github.com/rtcwcoop/rtcwcoop"
-    },
-    "persist": "Main"
+    "architecture": {
+        "32bit": {
+            "url": "https://github.com/rtcwcoop/rtcwcoop/releases/download/1.0.2/rtcwcoop-1.0.2-win-x86.zip",
+            "hash": "7946046c9de3189d9f08d7a9d345b3a2b9b5f2fb3b58d7e56f0709fb18112119",
+            "extract_dir": "rtcwcoop-1.0.2-win-x86",
+            "bin": [
+                [
+                    "RTCWCoop.x86.exe",
+                    "rtcwcoop"
+                ],
+                [
+                    "RTCWCoopDED.x86.exe",
+                    "rtcwcoopded"
+                ]
+            ],
+            "shortcuts": [
+                [
+                    "RTCWCoop.x86.exe",
+                    "Return to Castle Wolfenstein - Coop"
+                ]
+            ]
+        },
+        "64bit": {
+            "url": "https://github.com/rtcwcoop/rtcwcoop/releases/download/1.0.2/rtcwcoop-1.0.2-win-x64.zip",
+            "hash": "3eb112b1198cf6f1b820dc29c90c6bd5e4acc91b59011934de4c2a7d66b85982",
+            "extract_dir": "rtcwcoop-1.0.2-win-x64",
+            "bin": [
+                [
+                    "RTCWCoop.x64.exe",
+                    "rtcwcoop"
+                ],
+                [
+                    "RTCWCoopDED.x64.exe",
+                    "rtcwcoopded"
+                ]
+            ],
+            "shortcuts": [
+                [
+                    "RTCWCoop.x64.exe",
+                    "Return to Castle Wolfenstein - Coop"
+                ]
+            ]
+        }
+    }
 }
diff --git a/bucket/runebook.json b/bucket/runebook.json
index bc73e972..5dc0247e 100644
--- a/bucket/runebook.json
+++ b/bucket/runebook.json
@@ -1,16 +1,10 @@
 {
-    "homepage": "https://github.com/Soundofdarkness/RuneBook",
-    "description": "Arcane Rune Pages manager for League of Legends",
     "version": "1.15.0",
+    "description": "Arcane Rune Pages manager for League of Legends",
+    "homepage": "https://github.com/Soundofdarkness/RuneBook",
     "license": "MIT",
     "url": "https://github.com/Soundofdarkness/RuneBook/releases/download/v1.15.0/RuneBook_1.15.0.exe#/dl.7z",
     "hash": "81a1b9c4bbaf4f2de12c3a68e88bef29379cc61a5639519ef1528907c4895f62",
-    "autoupdate": {
-        "url": "https://github.com/Soundofdarkness/RuneBook/releases/download/v$version/RuneBook_$version.exe#/dl.7z"
-    },
-    "checkver": {
-        "github": "https://github.com/Soundofdarkness/RuneBook/"
-    },
     "installer": {
         "script": [
             "Expand-7zipArchive \"$dir\\`$PLUGINSDIR\\app-64.7z\" \"$dir\"",
@@ -22,5 +16,11 @@
             "RuneBook.exe",
             "RuneBook"
         ]
-    ]
+    ],
+    "checkver": {
+        "github": "https://github.com/Soundofdarkness/RuneBook/"
+    },
+    "autoupdate": {
+        "url": "https://github.com/Soundofdarkness/RuneBook/releases/download/v$version/RuneBook_$version.exe#/dl.7z"
+    }
 }
diff --git a/bucket/rvgl.json b/bucket/rvgl.json
index 86e87f89..49f869e6 100644
--- a/bucket/rvgl.json
+++ b/bucket/rvgl.json
@@ -1,8 +1,14 @@
 {
-    "homepage": "https://rvgl.re-volt.io/",
-    "description": "Modern reimplementation of the classic RC racing game Re-Volt (full package with extras)",
     "version": "nightly",
+    "description": "Modern reimplementation of the classic RC racing game Re-Volt (full package with extras)",
+    "homepage": "https://rvgl.re-volt.io/",
     "license": "Freeware",
+    "shortcuts": [
+        [
+            "rvgl.exe",
+            "RVGL"
+        ]
+    ],
     "architecture": {
         "32bit": {
             "url": "https://distribute.re-volt.io/releases/rvgl_full_win32_online.zip"
@@ -10,11 +16,5 @@
         "64bit": {
             "url": "https://distribute.re-volt.io/releases/rvgl_full_win64_online.zip"
         }
-    },
-    "shortcuts": [
-        [
-            "rvgl.exe",
-            "RVGL"
-        ]
-    ]
+    }
 }
diff --git a/bucket/ryujinx.json b/bucket/ryujinx.json
index b671870b..7444a515 100644
--- a/bucket/ryujinx.json
+++ b/bucket/ryujinx.json
@@ -1,34 +1,16 @@
 {
-    "homepage": "https://ryujinx.org/",
-    "description": "A simple, experimental Nintendo Switch emulator",
     "version": "1.1.63",
+    "description": "A simple, experimental Nintendo Switch emulator",
+    "homepage": "https://ryujinx.org/",
     "license": {
-        "identifier": "MIT",
-        "url": "https://github.com/Ryujinx/Ryujinx/blob/master/LICENSE.txt"
+        "url": "https://github.com/Ryujinx/Ryujinx/blob/master/LICENSE.txt",
+        "identifier": "MIT"
     },
     "notes": [
         "ATTENTION: Ryujinx requires Nintendo Switch firmware and a prod.keys file to function.",
         "Learn more at https://github.com/Ryujinx/Ryujinx/wiki/Ryujinx-Setup-&-Configuration-Guide"
     ],
-    "architecture": {
-        "64bit": {
-            "url": "https://github.com/Ryujinx/release-channel-master/releases/download/1.1.63/ryujinx-1.1.63-win_x64.zip",
-            "hash": "8067c77680fc49d1fafa9926ec9bc6b14e849d0850a2adb620742343ec27d996"
-        }
-    },
-    "autoupdate": {
-        "architecture": {
-            "64bit": {
-                "url": "https://github.com/Ryujinx/release-channel-master/releases/download/$version/ryujinx-$version-win_x64.zip"
-            }
-        }
-    },
-    "bin": "Ryujinx.exe",
-    "checkver": {
-        "github": "https://github.com/Ryujinx/release-channel-master"
-    },
     "extract_dir": "publish",
-    "persist": "portable",
     "pre_install": [
         "if (!(Test-Path \"$persist_dir\")) {",
         "   New-item \"$persist_dir\\portable\" -ItemType Directory | Out-Null",
@@ -39,10 +21,28 @@
         "   }",
         "}"
     ],
+    "bin": "Ryujinx.exe",
     "shortcuts": [
         [
             "Ryujinx.exe",
             "Ryujinx"
         ]
-    ]
+    ],
+    "persist": "portable",
+    "checkver": {
+        "github": "https://github.com/Ryujinx/release-channel-master"
+    },
+    "autoupdate": {
+        "architecture": {
+            "64bit": {
+                "url": "https://github.com/Ryujinx/release-channel-master/releases/download/$version/ryujinx-$version-win_x64.zip"
+            }
+        }
+    },
+    "architecture": {
+        "64bit": {
+            "url": "https://github.com/Ryujinx/release-channel-master/releases/download/1.1.61/ryujinx-1.1.61-win_x64.zip",
+            "hash": "c3140e64910a686ad9603ac89ef20214fea924732726d588920bda07c4eabd43"
+        }
+    }
 }
diff --git a/bucket/sauerbraten.json b/bucket/sauerbraten.json
index 69aa8125..aa4291fb 100644
--- a/bucket/sauerbraten.json
+++ b/bucket/sauerbraten.json
@@ -1,16 +1,10 @@
 {
-    "homepage": "http://sauerbraten.org/",
-    "description": "First-person shooter featuring a real-time cooperative map editor",
     "version": "2020_12_21",
+    "description": "First-person shooter featuring a real-time cooperative map editor",
+    "homepage": "http://sauerbraten.org/",
     "license": "http://sauerbraten.org/README.html#license",
     "url": "https://sourceforge.net/projects/sauerbraten/files/sauerbraten/2020_11_29/sauerbraten_2020_12_21_windows.exe#/dl.7z",
     "hash": "89842b3fe5cf591b761b84948e97e3a68e2fa451f5a0afb102a9347efca0a41e",
-    "autoupdate": {
-        "url": "https://sourceforge.net/projects/sauerbraten/files/sauerbraten/$version/sauerbraten_$version_windows.exe#/dl.7z"
-    },
-    "checkver": {
-        "regex": "sauerbraten_([a-zA-Z\\d.\\-_]+)_windows.exe"
-    },
     "shortcuts": [
         [
             "sauerbraten.bat",
@@ -18,5 +12,11 @@
             "",
             "docs/favicon.ico"
         ]
-    ]
+    ],
+    "checkver": {
+        "regex": "sauerbraten_([a-zA-Z\\d.\\-_]+)_windows.exe"
+    },
+    "autoupdate": {
+        "url": "https://sourceforge.net/projects/sauerbraten/files/sauerbraten/$version/sauerbraten_$version_windows.exe#/dl.7z"
+    }
 }
diff --git a/bucket/scummvm.json b/bucket/scummvm.json
index fb3022e7..a9c144af 100644
--- a/bucket/scummvm.json
+++ b/bucket/scummvm.json
@@ -1,22 +1,25 @@
 {
-    "homepage": "https://www.scummvm.org/",
-    "description": "ScummVM is a program which allows you to run certain classic graphical adventure and role-playing games",
     "version": "2.5.1",
+    "description": "ScummVM is a program which allows you to run certain classic graphical adventure and role-playing games",
+    "homepage": "https://www.scummvm.org/",
     "license": {
-        "identifier": "GPL-3.0",
-        "url": "https://github.com/scummvm/scummvm/blob/master/COPYING"
+        "url": "https://github.com/scummvm/scummvm/blob/master/COPYING",
+        "identifier": "GPL-3.0"
     },
-    "architecture": {
-        "32bit": {
-            "url": "https://downloads.scummvm.org/frs/scummvm/2.5.1/scummvm-2.5.1-win32.zip",
-            "hash": "107c551ca527617f0cf3de986b0a4c8355d12d722ec1cda33a392884225c4251",
-            "extract_dir": "scummvm-2.5.1-win32"
-        },
-        "64bit": {
-            "url": "https://downloads.scummvm.org/frs/scummvm/2.5.1/scummvm-2.5.1-win32-x86_64.zip",
-            "hash": "ad407cf1ccaf8ceb428595cf60d345c61ea07a7cb71a9d065b4f5104cb7f99b8",
-            "extract_dir": "scummvm-2.5.1-win32-x86_64"
-        }
+    "shortcuts": [
+        [
+            "scummvm.exe",
+            "ScummVM"
+        ]
+    ],
+    "persist": [
+        "scummvm.ini",
+        "saves",
+        "themes",
+        "extras"
+    ],
+    "checkver": {
+        "github": "https://github.com/scummvm/scummvm"
     },
     "autoupdate": {
         "hash": {
@@ -33,19 +36,16 @@
             }
         }
     },
-    "checkver": {
-        "github": "https://github.com/scummvm/scummvm"
-    },
-    "persist": [
-        "scummvm.ini",
-        "saves",
-        "themes",
-        "extras"
-    ],
-    "shortcuts": [
-        [
-            "scummvm.exe",
-            "ScummVM"
-        ]
-    ]
+    "architecture": {
+        "32bit": {
+            "url": "https://downloads.scummvm.org/frs/scummvm/2.5.1/scummvm-2.5.1-win32.zip",
+            "hash": "107c551ca527617f0cf3de986b0a4c8355d12d722ec1cda33a392884225c4251",
+            "extract_dir": "scummvm-2.5.1-win32"
+        },
+        "64bit": {
+            "url": "https://downloads.scummvm.org/frs/scummvm/2.5.1/scummvm-2.5.1-win32-x86_64.zip",
+            "hash": "ad407cf1ccaf8ceb428595cf60d345c61ea07a7cb71a9d065b4f5104cb7f99b8",
+            "extract_dir": "scummvm-2.5.1-win32-x86_64"
+        }
+    }
 }
diff --git a/bucket/sil.json b/bucket/sil.json
index 5cd94a7a..d4303ac0 100644
--- a/bucket/sil.json
+++ b/bucket/sil.json
@@ -1,24 +1,12 @@
 {
-    "homepage": "http://www.amirrorclear.net/flowers/game/sil/",
-    "description": "A roguelike in the first age of Middle-earth, variant of Angband",
     "version": "1.3.0",
+    "description": "A roguelike in the first age of Middle-earth, variant of Angband",
+    "homepage": "http://www.amirrorclear.net/flowers/game/sil/",
     "license": "GPL-2.0-only",
     "notes": "Configuration files cannot be persisted, but will be retained during the update",
     "url": "http://www.amirrorclear.net/flowers/game/sil/Sil-130-Win.zip",
     "hash": "613a9bbd6dc9869fe6fd352f6e3af21060421ab5c56cf27db3f1c2ce49b5a908",
-    "autoupdate": {
-        "url": "http://www.amirrorclear.net/flowers/game/sil/Sil-$cleanVersion-Win.zip"
-    },
-    "bin": "sil.exe",
-    "checkver": {
-        "regex": "Sil-(?<major>[\\d])(?<minor>[\\d])(?<patch>[\\d])-Win.zip",
-        "replace": "${major}.${minor}.${patch}"
-    },
     "extract_dir": "sil",
-    "persist": [
-        "lib\\save",
-        "lib\\user"
-    ],
     "post_install": [
         "'sil.INI' | ForEach-Object {",
         "    if (Test-Path \"$persist_dir\\$_.bak\") {",
@@ -26,6 +14,7 @@
         "    }",
         "}"
     ],
+    "bin": "sil.exe",
     "shortcuts": [
         [
             "sil.exe",
@@ -36,11 +25,22 @@
             "Sil Manual"
         ]
     ],
+    "persist": [
+        "lib\\save",
+        "lib\\user"
+    ],
     "uninstaller": {
         "script": [
             "'sil.INI' | ForEach-Object {",
             "    Copy-Item \"$dir\\$_\" \"$persist_dir\\$_.bak\" -Force",
             "}"
         ]
+    },
+    "checkver": {
+        "regex": "Sil-(?<major>[\\d])(?<minor>[\\d])(?<patch>[\\d])-Win.zip",
+        "replace": "${major}.${minor}.${patch}"
+    },
+    "autoupdate": {
+        "url": "http://www.amirrorclear.net/flowers/game/sil/Sil-$cleanVersion-Win.zip"
     }
 }
diff --git a/bucket/simutrans.json b/bucket/simutrans.json
index 9927881f..13cf2619 100644
--- a/bucket/simutrans.json
+++ b/bucket/simutrans.json
@@ -1,12 +1,12 @@
 {
-    "homepage": "https://www.simutrans.com/",
-    "description": "Transport management simulation game",
     "version": "121.0",
+    "description": "Transport management simulation game",
+    "homepage": "https://www.simutrans.com/",
     "license": "Artistic-1.0",
     "url": "https://downloads.sourceforge.net/project/simutrans/simutrans/121-0/simuwin-sdl-121-0.zip",
     "hash": "2c5c167b796afc44d762c71555cc8d05223fcc58dbc3d70af212a42f836ff181",
-    "bin": "simutrans.exe",
     "extract_dir": "simutrans",
+    "bin": "simutrans.exe",
     "shortcuts": [
         [
             "simutrans.exe",
diff --git a/bucket/slade.json b/bucket/slade.json
index 124ef81c..2e6358df 100644
--- a/bucket/slade.json
+++ b/bucket/slade.json
@@ -1,22 +1,22 @@
 {
-    "homepage": "http://slade.mancubus.net/",
-    "description": "Level and resource editor for Doom engine games",
     "version": "3.1.13",
+    "description": "Level and resource editor for Doom engine games",
+    "homepage": "http://slade.mancubus.net/",
     "license": "GPL-2.0-or-later",
+    "depends": "extras/vcredist2015",
     "url": "http://slade.mancubus.net/files/3.1.13/slade_3.1.13.7z",
     "hash": "2ede0f2b8bbb8f9235b29ee3e218db965bfab1690d2c854792b50bafb7b409b6",
-    "autoupdate": {
-        "url": "http://slade.mancubus.net/files/$version/slade_$version.7z"
-    },
     "bin": "SLADE.exe",
-    "checkver": {
-        "github": "https://github.com/sirjuddington/SLADE"
-    },
-    "depends": "extras/vcredist2015",
     "shortcuts": [
         [
             "SLADE.exe",
             "SLADE"
         ]
-    ]
+    ],
+    "checkver": {
+        "github": "https://github.com/sirjuddington/SLADE"
+    },
+    "autoupdate": {
+        "url": "http://slade.mancubus.net/files/$version/slade_$version.7z"
+    }
 }
diff --git a/bucket/snes9x-dev.json b/bucket/snes9x-dev.json
index 05b7170b..17f7f59a 100644
--- a/bucket/snes9x-dev.json
+++ b/bucket/snes9x-dev.json
@@ -1,10 +1,33 @@
 {
-    "homepage": "http://www.snes9x.com/",
-    "description": "SNES (Super Nintendo Entertainment System) emulator",
     "version": "1.61-1040",
+    "description": "SNES (Super Nintendo Entertainment System) emulator",
+    "homepage": "http://www.snes9x.com/",
     "license": {
-        "identifier": "Freeware",
-        "url": "https://github.com/snes9xgit/snes9x/blob/master/LICENSE"
+        "url": "https://github.com/snes9xgit/snes9x/blob/master/LICENSE",
+        "identifier": "Freeware"
+    },
+    "pre_install": [
+        "if (!(Test-Path \"$persist_dir\\snes9x.conf\")) {",
+        "    New-Item \"$dir\\snes9x.conf\" -Type File | Out-Null",
+        "}"
+    ],
+    "persist": [
+        "Saves",
+        "snes9x.conf"
+    ],
+    "checkver": {
+        "url": "https://ci.appveyor.com/api/projects/snes9x/snes9x",
+        "regex": "\"jobId\":\"(?<win32>.*?)\".*?arch=win32,.*?\"jobId\":\"(?<x64>.*?)\".*?arch=win32-x64,.*\"version\":\"(?<version>.*?)\".*\"commitId\":\"(?<commit>.{7}).*\""
+    },
+    "autoupdate": {
+        "architecture": {
+            "32bit": {
+                "url": "https://ci.appveyor.com/api/buildjobs/$matchWin32/artifacts/snes9x-$matchVersion-$matchCommit-win32.zip"
+            },
+            "64bit": {
+                "url": "https://ci.appveyor.com/api/buildjobs/$matchX64/artifacts/snes9x-$matchVersion-$matchCommit-win32-x64.zip"
+            }
+        }
     },
     "architecture": {
         "32bit": {
@@ -34,28 +57,5 @@
                 ]
             ]
         }
-    },
-    "autoupdate": {
-        "architecture": {
-            "32bit": {
-                "url": "https://ci.appveyor.com/api/buildjobs/$matchWin32/artifacts/snes9x-$matchVersion-$matchCommit-win32.zip"
-            },
-            "64bit": {
-                "url": "https://ci.appveyor.com/api/buildjobs/$matchX64/artifacts/snes9x-$matchVersion-$matchCommit-win32-x64.zip"
-            }
-        }
-    },
-    "checkver": {
-        "url": "https://ci.appveyor.com/api/projects/snes9x/snes9x",
-        "regex": "\"jobId\":\"(?<win32>.*?)\".*?arch=win32,.*?\"jobId\":\"(?<x64>.*?)\".*?arch=win32-x64,.*\"version\":\"(?<version>.*?)\".*\"commitId\":\"(?<commit>.{7}).*\""
-    },
-    "persist": [
-        "Saves",
-        "snes9x.conf"
-    ],
-    "pre_install": [
-        "if (!(Test-Path \"$persist_dir\\snes9x.conf\")) {",
-        "    New-Item \"$dir\\snes9x.conf\" -Type File | Out-Null",
-        "}"
-    ]
+    }
 }
diff --git a/bucket/snes9x.json b/bucket/snes9x.json
index d2667ca0..c210b169 100644
--- a/bucket/snes9x.json
+++ b/bucket/snes9x.json
@@ -1,10 +1,40 @@
 {
-    "homepage": "http://www.snes9x.com/",
-    "description": "SNES (Super Nintendo Entertainment System) emulator",
     "version": "1.61",
+    "description": "SNES (Super Nintendo Entertainment System) emulator",
+    "homepage": "http://www.snes9x.com/",
     "license": {
-        "identifier": "Non-commercial",
-        "url": "https://github.com/snes9xgit/snes9x/blob/master/LICENSE"
+        "url": "https://github.com/snes9xgit/snes9x/blob/master/LICENSE",
+        "identifier": "Non-commercial"
+    },
+    "pre_install": [
+        "if (!(Test-Path \"$persist_dir\\snes9x.conf\")) {",
+        "    New-Item \"$dir\\snes9x.conf\" -Type File | Out-Null",
+        "}"
+    ],
+    "persist": [
+        "BIOS",
+        "Cheats",
+        "Movies",
+        "Patches",
+        "Roms",
+        "SatData",
+        "Saves",
+        "Screenshots",
+        "SPCs",
+        "snes9x.conf"
+    ],
+    "checkver": {
+        "github": "https://github.com/snes9xgit/snes9x"
+    },
+    "autoupdate": {
+        "architecture": {
+            "32bit": {
+                "url": "https://github.com/snes9xgit/snes9x/releases/download/$version/snes9x-$version-win32.zip"
+            },
+            "64bit": {
+                "url": "https://github.com/snes9xgit/snes9x/releases/download/$version/snes9x-$version-win32-x64.zip"
+            }
+        }
     },
     "architecture": {
         "32bit": {
@@ -34,35 +64,5 @@
                 ]
             ]
         }
-    },
-    "autoupdate": {
-        "architecture": {
-            "32bit": {
-                "url": "https://github.com/snes9xgit/snes9x/releases/download/$version/snes9x-$version-win32.zip"
-            },
-            "64bit": {
-                "url": "https://github.com/snes9xgit/snes9x/releases/download/$version/snes9x-$version-win32-x64.zip"
-            }
-        }
-    },
-    "checkver": {
-        "github": "https://github.com/snes9xgit/snes9x"
-    },
-    "persist": [
-        "BIOS",
-        "Cheats",
-        "Movies",
-        "Patches",
-        "Roms",
-        "SatData",
-        "Saves",
-        "Screenshots",
-        "SPCs",
-        "snes9x.conf"
-    ],
-    "pre_install": [
-        "if (!(Test-Path \"$persist_dir\\snes9x.conf\")) {",
-        "    New-Item \"$dir\\snes9x.conf\" -Type File | Out-Null",
-        "}"
-    ]
+    }
 }
diff --git a/bucket/spearmint.json b/bucket/spearmint.json
index 66958864..7650ee26 100644
--- a/bucket/spearmint.json
+++ b/bucket/spearmint.json
@@ -1,7 +1,7 @@
 {
-    "homepage": "https://clover.moe/spearmint/",
-    "description": "Heavily modified version of the Quake III Arena engine, directly based on ioquake3 (November 2018)",
     "version": "1.0.3",
+    "description": "Heavily modified version of the Quake III Arena engine, directly based on ioquake3 (November 2018)",
+    "homepage": "https://clover.moe/spearmint/",
     "license": "https://github.com/zturtleman/spearmint/blob/master/COPYING.txt",
     "notes": [
         "Place game data files (such as pak0.pk3-pak8.pk3) in:",
@@ -22,8 +22,46 @@
         "they are available at http://ioquake3.org/extras/patch-data/",
         ""
     ],
+    "suggest": {
+        "Quake 3 engines": "openarena"
+    },
     "url": "https://github.com/zturtleman/spearmint/releases/download/release-1.0.3/spearmint-1.0.3-windows.zip",
     "hash": "d179d9a9d2213cc013e442df876090cc1f428dd9a98057a3065a8806c823872c",
+    "extract_dir": "spearmint-1.0.3-windows",
+    "installer": {
+        "script": [
+            "$persistFolders = @(",
+            "   \"baseoa\"",
+            "   \"baseq3\"",
+            "   \"demoq3\"",
+            "   \"missionpack\"",
+            "   \"missionpackoa\"",
+            "   \"tademo\"",
+            ")",
+            "$persistFolders | ForEach-Object {",
+            "   if (Test-Path \"$persist_dir\\$_\") {",
+            "      Copy-Item -Force -Recurse \"$dir\\$_\\*\" \"$persist_dir\\$_\"",
+            "   }",
+            "}"
+        ]
+    },
+    "persist": [
+        "baseoa",
+        "baseq3",
+        "demoq3",
+        "missionpack",
+        "missionpackoa",
+        "settings",
+        "tademo"
+    ],
+    "checkver": {
+        "url": "https://github.com/zturtleman/spearmint/releases/latest",
+        "regex": "<title>Release Spearmint ([\\d.-]+)"
+    },
+    "autoupdate": {
+        "url": "https://github.com/zturtleman/spearmint/releases/download/release-$version/spearmint-$version-windows.zip",
+        "extract_dir": "spearmint-$version-windows"
+    },
     "architecture": {
         "32bit": {
             "bin": [
@@ -93,43 +131,5 @@
                 ]
             ]
         }
-    },
-    "autoupdate": {
-        "url": "https://github.com/zturtleman/spearmint/releases/download/release-$version/spearmint-$version-windows.zip",
-        "extract_dir": "spearmint-$version-windows"
-    },
-    "checkver": {
-        "url": "https://github.com/zturtleman/spearmint/releases/latest",
-        "regex": "<title>Release Spearmint ([\\d.-]+)"
-    },
-    "extract_dir": "spearmint-1.0.3-windows",
-    "installer": {
-        "script": [
-            "$persistFolders = @(",
-            "   \"baseoa\"",
-            "   \"baseq3\"",
-            "   \"demoq3\"",
-            "   \"missionpack\"",
-            "   \"missionpackoa\"",
-            "   \"tademo\"",
-            ")",
-            "$persistFolders | ForEach-Object {",
-            "   if (Test-Path \"$persist_dir\\$_\") {",
-            "      Copy-Item -Force -Recurse \"$dir\\$_\\*\" \"$persist_dir\\$_\"",
-            "   }",
-            "}"
-        ]
-    },
-    "persist": [
-        "baseoa",
-        "baseq3",
-        "demoq3",
-        "missionpack",
-        "missionpackoa",
-        "settings",
-        "tademo"
-    ],
-    "suggest": {
-        "Quake 3 engines": "openarena"
     }
 }
diff --git a/bucket/speed-dreams.json b/bucket/speed-dreams.json
index 05947c2a..e39399c9 100644
--- a/bucket/speed-dreams.json
+++ b/bucket/speed-dreams.json
@@ -1,7 +1,7 @@
 {
-    "homepage": "http://www.speed-dreams.org/",
-    "description": "3D simulation racing game",
     "version": "2.2.2",
+    "description": "3D simulation racing game",
+    "homepage": "http://www.speed-dreams.org/",
     "license": "GPL-2.0-or-later",
     "url": [
         "https://downloads.sourceforge.net/project/speed-dreams/2.2.2/speed-dreams-base-2.2.2-r6553-win32-setup.exe#/dl1.7z",
diff --git a/bucket/springlobby.json b/bucket/springlobby.json
index c16827b7..c9b6431d 100644
--- a/bucket/springlobby.json
+++ b/bucket/springlobby.json
@@ -1,22 +1,22 @@
 {
-    "homepage": "https://springlobby.info/",
-    "description": "Lobby client for Spring RTS-based games",
     "version": "0.273",
+    "description": "Lobby client for Spring RTS-based games",
+    "homepage": "https://springlobby.info/",
     "license": "GPL-2.0-or-later",
     "url": "https://springlobby.springrts.com/dl/stable/springlobby-0.273-win32.zip",
     "hash": "4431610cc2dcac6d61743ff2f130011c17ae427e677b9349cdbffd20c23c8948",
-    "autoupdate": {
-        "url": "https://springlobby.springrts.com/dl/stable/springlobby-$version-win32.zip"
-    },
     "bin": "springlobby.exe",
-    "checkver": {
-        "url": "https://springlobby.springrts.com/",
-        "re": "ZIP \\(([0-9].[0-9]+)\\)"
-    },
     "shortcuts": [
         [
             "springlobby.exe",
             "SpringLobby"
         ]
-    ]
+    ],
+    "checkver": {
+        "url": "https://springlobby.springrts.com/",
+        "re": "ZIP \\(([0-9].[0-9]+)\\)"
+    },
+    "autoupdate": {
+        "url": "https://springlobby.springrts.com/dl/stable/springlobby-$version-win32.zip"
+    }
 }
diff --git a/bucket/srb2kart.json b/bucket/srb2kart.json
index dccf1898..5cfd5d83 100644
--- a/bucket/srb2kart.json
+++ b/bucket/srb2kart.json
@@ -1,21 +1,21 @@
 {
-    "homepage": "https://kartkrew.org/",
-    "description": "SRB2Kart is a kart racing mod based on the 3D Sonic the Hedgehog fangame Sonic Robo Blast 2, based on a modified version of Doom Legacy.",
     "version": "1.3",
+    "description": "SRB2Kart is a kart racing mod based on the 3D Sonic the Hedgehog fangame Sonic Robo Blast 2, based on a modified version of Doom Legacy.",
+    "homepage": "https://kartkrew.org/",
     "license": "GPL-2.0-or-later",
     "url": "https://github.com/STJr/Kart-Public/releases/download/v1.3/srb2kart-v13-Installer.exe#/dl.7z",
     "hash": "9a198781cc1f1df2b0a3b6dcf6677c0a8663d0dc182d20cd6bae1bc78f37632e",
-    "autoupdate": {
-        "url": "https://github.com/STJr/Kart-Public/releases/download/v$version/srb2kart-v$cleanVersion-Installer.exe#/dl.7z"
-    },
     "bin": "srb2kart.exe",
-    "checkver": {
-        "github": "https://github.com/STJr/Kart-Public/"
-    },
     "shortcuts": [
         [
             "srb2kart.exe",
             "SRB2Kart"
         ]
-    ]
+    ],
+    "checkver": {
+        "github": "https://github.com/STJr/Kart-Public/"
+    },
+    "autoupdate": {
+        "url": "https://github.com/STJr/Kart-Public/releases/download/v$version/srb2kart-v$cleanVersion-Installer.exe#/dl.7z"
+    }
 }
diff --git a/bucket/stella.json b/bucket/stella.json
index 4a036852..61a3b3b6 100644
--- a/bucket/stella.json
+++ b/bucket/stella.json
@@ -1,10 +1,19 @@
 {
-    "homepage": "https://stella-emu.github.io/",
-    "description": "Multi-platform Atari 2600 VCS emulator",
     "version": "6.6",
+    "description": "Multi-platform Atari 2600 VCS emulator",
+    "homepage": "https://stella-emu.github.io/",
     "license": "GPL-2.0-only",
     "url": "https://github.com/stella-emu/stella/releases/download/6.6/Stella-6.6-windows.zip",
     "hash": "c36667c37c190ef5fd8d93e25ccdefc9adc017785364e1aec2433b4fa707e637",
+    "extract_dir": "Stella-6.6",
+    "persist": "config",
+    "checkver": {
+        "github": "https://github.com/stella-emu/stella"
+    },
+    "autoupdate": {
+        "url": "https://github.com/stella-emu/stella/releases/download/$version/Stella-$version-windows.zip",
+        "extract_dir": "Stella-$version"
+    },
     "architecture": {
         "32bit": {
             "shortcuts": [
@@ -22,14 +31,5 @@
                 ]
             ]
         }
-    },
-    "autoupdate": {
-        "url": "https://github.com/stella-emu/stella/releases/download/$version/Stella-$version-windows.zip",
-        "extract_dir": "Stella-$version"
-    },
-    "checkver": {
-        "github": "https://github.com/stella-emu/stella"
-    },
-    "extract_dir": "Stella-6.6",
-    "persist": "config"
+    }
 }
diff --git a/bucket/stuntrally.json b/bucket/stuntrally.json
index 5f23ea17..1b0918f4 100644
--- a/bucket/stuntrally.json
+++ b/bucket/stuntrally.json
@@ -1,7 +1,7 @@
 {
-    "homepage": "https://stuntrally.tuxfamily.org/",
-    "description": "Semi-realistic 3D rally racing game featuring a track editor",
     "version": "2.6",
+    "description": "Semi-realistic 3D rally racing game featuring a track editor",
+    "homepage": "https://stuntrally.tuxfamily.org/",
     "license": "GPL-3.0-or-later",
     "notes": [
         "In case of errors about missing Direct3D RenderSystem, set up DirectX using the installer below:",
@@ -10,17 +10,10 @@
     ],
     "url": "https://downloads.sourceforge.net/project/stuntrally/2.6/StuntRally-2.6-installer.exe#/dl.7z",
     "hash": "262bf0b87be2a5a2cf5f9f5b176b3afbab4e0b67bfb2eff6c31a0dc02468f5fa",
-    "autoupdate": {
-        "url": "https://downloads.sourceforge.net/project/stuntrally/$version/StuntRally-$version-installer.exe#/dl.7z"
-    },
     "bin": [
         "StuntRally.exe",
         "SR-Editor.exe"
     ],
-    "checkver": {
-        "url": "https://stuntrally.tuxfamily.org/downloads",
-        "regex": "latest version is <strong>([\\d.]+)</strong>"
-    },
     "shortcuts": [
         [
             "StuntRally.exe",
@@ -30,5 +23,12 @@
             "SR-Editor.exe",
             "Stunt Rally Track Editor"
         ]
-    ]
+    ],
+    "checkver": {
+        "url": "https://stuntrally.tuxfamily.org/downloads",
+        "regex": "latest version is <strong>([\\d.]+)</strong>"
+    },
+    "autoupdate": {
+        "url": "https://downloads.sourceforge.net/project/stuntrally/$version/StuntRally-$version-installer.exe#/dl.7z"
+    }
 }
diff --git a/bucket/supertux.json b/bucket/supertux.json
index c2798545..62a100b4 100644
--- a/bucket/supertux.json
+++ b/bucket/supertux.json
@@ -1,17 +1,23 @@
 {
-    "homepage": "https://www.supertux.org/",
-    "description": "2D platformer inspired by the Super Mario Bros series",
     "version": "0.6.3",
+    "description": "2D platformer inspired by the Super Mario Bros series",
+    "homepage": "https://www.supertux.org/",
     "license": "GPL-2.0-or-later",
-    "architecture": {
-        "32bit": {
-            "url": "https://github.com/SuperTux/supertux/releases/download/v0.6.3/SuperTux-v0.6.3-win32.msi",
-            "hash": "8da658fa2b055e98685814575d372d1ce96d779ab9dea83cded9c97b2e66dc82"
-        },
-        "64bit": {
-            "url": "https://github.com/SuperTux/supertux/releases/download/v0.6.3/SuperTux-v0.6.3-win64.msi",
-            "hash": "97502d37e9525a5aa184adf44f9da7cf3a89a96755b61a0de4ea6002c8c1e232"
-        }
+    "extract_dir": "SuperTux",
+    "bin": [
+        [
+            "bin\\supertux2.exe",
+            "supertux"
+        ]
+    ],
+    "shortcuts": [
+        [
+            "bin\\supertux2.exe",
+            "SuperTux"
+        ]
+    ],
+    "checkver": {
+        "github": "https://github.com/SuperTux/supertux"
     },
     "autoupdate": {
         "architecture": {
@@ -23,20 +29,14 @@
             }
         }
     },
-    "bin": [
-        [
-            "bin\\supertux2.exe",
-            "supertux"
-        ]
-    ],
-    "checkver": {
-        "github": "https://github.com/SuperTux/supertux"
-    },
-    "extract_dir": "SuperTux",
-    "shortcuts": [
-        [
-            "bin\\supertux2.exe",
-            "SuperTux"
-        ]
-    ]
+    "architecture": {
+        "32bit": {
+            "url": "https://github.com/SuperTux/supertux/releases/download/v0.6.3/SuperTux-v0.6.3-win32.msi",
+            "hash": "8da658fa2b055e98685814575d372d1ce96d779ab9dea83cded9c97b2e66dc82"
+        },
+        "64bit": {
+            "url": "https://github.com/SuperTux/supertux/releases/download/v0.6.3/SuperTux-v0.6.3-win64.msi",
+            "hash": "97502d37e9525a5aa184adf44f9da7cf3a89a96755b61a0de4ea6002c8c1e232"
+        }
+    }
 }
diff --git a/bucket/supertuxkart.json b/bucket/supertuxkart.json
index fbde19cf..c6c9310a 100644
--- a/bucket/supertuxkart.json
+++ b/bucket/supertuxkart.json
@@ -1,17 +1,17 @@
 {
-    "homepage": "https://supertuxkart.net/Main_Page",
-    "description": "Arcade 3D racer with a variety of characters, tracks and modes",
     "version": "1.3",
+    "description": "Arcade 3D racer with a variety of characters, tracks and modes",
+    "homepage": "https://supertuxkart.net/Main_Page",
     "license": "GPL-3.0-or-later",
-    "architecture": {
-        "32bit": {
-            "url": "https://github.com/supertuxkart/stk-code/releases/download/1.3/SuperTuxKart-1.3-installer-i686.exe#/dl.7z",
-            "hash": "4379102b1e8de7356038a0eef42520202ee043f00a04a399b958d2c3df24825c"
-        },
-        "64bit": {
-            "url": "https://github.com/supertuxkart/stk-code/releases/download/1.3/SuperTuxKart-1.3-installer-x86_64.exe#/dl.7z",
-            "hash": "262bb2936bcb2acee818b052a0bfb6d437f21ef7e7634d502336c297a9cc0c9e"
-        }
+    "bin": "supertuxkart.exe",
+    "shortcuts": [
+        [
+            "supertuxkart.exe",
+            "SuperTuxKart"
+        ]
+    ],
+    "checkver": {
+        "github": "https://github.com/supertuxkart/stk-code"
     },
     "autoupdate": {
         "architecture": {
@@ -23,14 +23,14 @@
             }
         }
     },
-    "bin": "supertuxkart.exe",
-    "checkver": {
-        "github": "https://github.com/supertuxkart/stk-code"
-    },
-    "shortcuts": [
-        [
-            "supertuxkart.exe",
-            "SuperTuxKart"
-        ]
-    ]
+    "architecture": {
+        "32bit": {
+            "url": "https://github.com/supertuxkart/stk-code/releases/download/1.3/SuperTuxKart-1.3-installer-i686.exe#/dl.7z",
+            "hash": "4379102b1e8de7356038a0eef42520202ee043f00a04a399b958d2c3df24825c"
+        },
+        "64bit": {
+            "url": "https://github.com/supertuxkart/stk-code/releases/download/1.3/SuperTuxKart-1.3-installer-x86_64.exe#/dl.7z",
+            "hash": "262bb2936bcb2acee818b052a0bfb6d437f21ef7e7634d502336c297a9cc0c9e"
+        }
+    }
 }
diff --git a/bucket/sw-exporter.json b/bucket/sw-exporter.json
index 15f7bc21..68650d20 100644
--- a/bucket/sw-exporter.json
+++ b/bucket/sw-exporter.json
@@ -1,10 +1,26 @@
 {
-    "homepage": "https://github.com/Xzandro/sw-exporter",
-    "description": "Parse intercepted data from Summoner's War and extract information on the monsters and runes of the user. They can then be uploaded to https://swarfarm.com/ for example.",
     "version": "0.0.48",
+    "description": "Parse intercepted data from Summoner's War and extract information on the monsters and runes of the user. They can then be uploaded to https://swarfarm.com/ for example.",
+    "homepage": "https://github.com/Xzandro/sw-exporter",
     "license": "Apache-2.0",
     "url": "https://github.com/Xzandro/sw-exporter/releases/download/v0.0.48/Summoners-War-Exporter-Portable-0.0.48-win.exe#/dl.7z",
     "hash": "63e36a973d0994f5cd823c440652acdeb4f613cea0fe1f63058e903244a47f17",
+    "bin": [
+        [
+            "Summoners War Exporter.exe",
+            "sw-exporter"
+        ]
+    ],
+    "shortcuts": [
+        [
+            "Summoners War Exporter.exe",
+            "Summoner's War Exporter"
+        ]
+    ],
+    "checkver": "github",
+    "autoupdate": {
+        "url": "https://github.com/Xzandro/sw-exporter/releases/download/v$version/Summoners-War-Exporter-Portable-$version-win.exe#/dl.7z"
+    },
     "architecture": {
         "32bit": {
             "installer": {
@@ -22,21 +38,5 @@
                 ]
             }
         }
-    },
-    "autoupdate": {
-        "url": "https://github.com/Xzandro/sw-exporter/releases/download/v$version/Summoners-War-Exporter-Portable-$version-win.exe#/dl.7z"
-    },
-    "bin": [
-        [
-            "Summoners War Exporter.exe",
-            "sw-exporter"
-        ]
-    ],
-    "checkver": "github",
-    "shortcuts": [
-        [
-            "Summoners War Exporter.exe",
-            "Summoner's War Exporter"
-        ]
-    ]
+    }
 }
diff --git a/bucket/taisei.json b/bucket/taisei.json
index 9895d716..f0d066af 100644
--- a/bucket/taisei.json
+++ b/bucket/taisei.json
@@ -1,18 +1,16 @@
 {
-    "homepage": "https://github.com/taisei-project/taisei",
-    "description": "Free and open source Touhou Project clone and fangame",
     "version": "1.3.2",
+    "description": "Free and open source Touhou Project clone and fangame",
+    "homepage": "https://github.com/taisei-project/taisei",
     "license": "MIT",
-    "architecture": {
-        "32bit": {
-            "url": "https://github.com/taisei-project/taisei/releases/download/v1.3.2/Taisei-1.3.2-windows-x86.zip",
-            "hash": "057a8698712f44e6db07f49c0ad667a536f3143efadd1d7dc1c93ce75d12135a"
-        },
-        "64bit": {
-            "url": "https://github.com/taisei-project/taisei/releases/download/v1.3.2/Taisei-1.3.2-windows-x86_64.zip",
-            "hash": "b7dd2960435c04fae78711d51608d1db79b504f6312ca2b5a53e186897996920"
-        }
-    },
+    "bin": "taisei.exe",
+    "shortcuts": [
+        [
+            "taisei.exe",
+            "Taisei"
+        ]
+    ],
+    "checkver": "github",
     "autoupdate": {
         "architecture": {
             "32bit": {
@@ -23,12 +21,14 @@
             }
         }
     },
-    "bin": "taisei.exe",
-    "checkver": "github",
-    "shortcuts": [
-        [
-            "taisei.exe",
-            "Taisei"
-        ]
-    ]
+    "architecture": {
+        "32bit": {
+            "url": "https://github.com/taisei-project/taisei/releases/download/v1.3.2/Taisei-1.3.2-windows-x86.zip",
+            "hash": "057a8698712f44e6db07f49c0ad667a536f3143efadd1d7dc1c93ce75d12135a"
+        },
+        "64bit": {
+            "url": "https://github.com/taisei-project/taisei/releases/download/v1.3.2/Taisei-1.3.2-windows-x86_64.zip",
+            "hash": "b7dd2960435c04fae78711d51608d1db79b504f6312ca2b5a53e186897996920"
+        }
+    }
 }
diff --git a/bucket/teeworlds.json b/bucket/teeworlds.json
index 03b3bb46..f9e69f3d 100644
--- a/bucket/teeworlds.json
+++ b/bucket/teeworlds.json
@@ -1,19 +1,20 @@
 {
-    "homepage": "https://teeworlds.com/",
-    "description": "2D retro multiplayer shooter",
     "version": "0.7.5",
+    "description": "2D retro multiplayer shooter",
+    "homepage": "https://teeworlds.com/",
     "license": "Zlib",
-    "architecture": {
-        "32bit": {
-            "url": "https://github.com/teeworlds/teeworlds/releases/download/0.7.5/teeworlds-0.7.5-win32.zip",
-            "hash": "87a18d85be3a63eb7ab38d6a2db717c63b4129dee7c91fb9f1d7812373752117",
-            "extract_dir": "teeworlds-0.7.5-win32"
-        },
-        "64bit": {
-            "url": "https://github.com/teeworlds/teeworlds/releases/download/0.7.5/teeworlds-0.7.5-win64.zip",
-            "hash": "83cd75884a0e8339b4910da1bfe4d737af794d35600cd065e7c2222750b37585",
-            "extract_dir": "teeworlds-0.7.5-win64"
-        }
+    "bin": [
+        "teeworlds.exe",
+        "teeworlds_srv.exe"
+    ],
+    "shortcuts": [
+        [
+            "teeworlds.exe",
+            "Teeworlds"
+        ]
+    ],
+    "checkver": {
+        "github": "https://github.com/teeworlds/teeworlds"
     },
     "autoupdate": {
         "architecture": {
@@ -27,17 +28,16 @@
             }
         }
     },
-    "bin": [
-        "teeworlds.exe",
-        "teeworlds_srv.exe"
-    ],
-    "checkver": {
-        "github": "https://github.com/teeworlds/teeworlds"
-    },
-    "shortcuts": [
-        [
-            "teeworlds.exe",
-            "Teeworlds"
-        ]
-    ]
+    "architecture": {
+        "32bit": {
+            "url": "https://github.com/teeworlds/teeworlds/releases/download/0.7.5/teeworlds-0.7.5-win32.zip",
+            "hash": "87a18d85be3a63eb7ab38d6a2db717c63b4129dee7c91fb9f1d7812373752117",
+            "extract_dir": "teeworlds-0.7.5-win32"
+        },
+        "64bit": {
+            "url": "https://github.com/teeworlds/teeworlds/releases/download/0.7.5/teeworlds-0.7.5-win64.zip",
+            "hash": "83cd75884a0e8339b4910da1bfe4d737af794d35600cd065e7c2222750b37585",
+            "extract_dir": "teeworlds-0.7.5-win64"
+        }
+    }
 }
diff --git a/bucket/tesseract-game.json b/bucket/tesseract-game.json
index e4dcf6de..ce57ba0d 100644
--- a/bucket/tesseract-game.json
+++ b/bucket/tesseract-game.json
@@ -1,7 +1,7 @@
 {
-    "homepage": "http://tesseract.gg/",
-    "description": "First-person shooter featuring real-time lighting and a cooperative map editor",
     "version": "nightly",
+    "description": "First-person shooter featuring real-time lighting and a cooperative map editor",
+    "homepage": "http://tesseract.gg/",
     "license": "https://websvn.tuxfamily.org/filedetails.php?repname=tesseract%2Fmain&path=%2Fsrc%2Freadme_tesseract.txt",
     "url": "http://mappinghell.net/tesseract/tesseract-nightly.zip",
     "extract_dir": "tesseract",
diff --git a/bucket/tic-80.json b/bucket/tic-80.json
index 1d84aa4d..8b11c209 100644
--- a/bucket/tic-80.json
+++ b/bucket/tic-80.json
@@ -1,20 +1,20 @@
 {
-    "homepage": "https://tic80.com",
-    "description": "TIC-80 is a fantasy computer for making, playing and sharing tiny games",
     "version": "0.90.1723",
+    "description": "TIC-80 is a fantasy computer for making, playing and sharing tiny games",
+    "homepage": "https://tic80.com",
     "license": "MIT",
     "url": "https://github.com/nesbox/TIC-80/releases/download/v0.90.1723/tic80-v0.90-win.zip",
     "hash": "5f4c3bbbbb57eddadee93d26dcc04cedab6621a255f29d4b71daed49938f446d",
-    "autoupdate": {
-        "url": "https://github.com/nesbox/TIC-80/releases/download/v$version/tic80-v$majorVersion.$minorVersion-win.zip"
-    },
-    "checkver": {
-        "github": "https://github.com/nesbox/TIC-80"
-    },
     "shortcuts": [
         [
             "tic80.exe",
             "TIC-80"
         ]
-    ]
+    ],
+    "checkver": {
+        "github": "https://github.com/nesbox/TIC-80"
+    },
+    "autoupdate": {
+        "url": "https://github.com/nesbox/TIC-80/releases/download/v$version/tic80-v$majorVersion.$minorVersion-win.zip"
+    }
 }
diff --git a/bucket/tickompiler.json b/bucket/tickompiler.json
index 9e792968..35d59d33 100644
--- a/bucket/tickompiler.json
+++ b/bucket/tickompiler.json
@@ -1,19 +1,19 @@
 {
-    "homepage": "https://github.com/rhmodding/Tickompiler",
-    "description": "A compiler/decompiler for Tickflow, a language based on the bytecode format used by the game Rhythm Heaven Megamix",
     "version": "1.9.1",
+    "description": "A compiler/decompiler for Tickflow, a language based on the bytecode format used by the game Rhythm Heaven Megamix",
+    "homepage": "https://github.com/rhmodding/Tickompiler",
     "license": "MIT",
+    "suggest": {
+        "Java Runtime Environment": "java/adoptopenjdk-hotspot-jre"
+    },
     "url": "https://github.com/rhmodding/Tickompiler/releases/download/v1.9.1/tickompiler.jar",
     "hash": "0bd1c8ac711f063c18f01d179de719cc240135ff4f5eb441ccfe4f9fc8834d30",
-    "autoupdate": {
-        "url": "https://github.com/rhmodding/Tickompiler/releases/download/v$version/tickompiler.jar"
-    },
+    "pre_install": "\"@java -jar \"\"$dir\\tickompiler.jar\"\" %*\" | out-file -en oem \"$dir\\tickompiler.cmd\"",
     "bin": "tickompiler.cmd",
     "checkver": {
         "github": "https://github.com/rhmodding/Tickompiler/"
     },
-    "pre_install": "\"@java -jar \"\"$dir\\tickompiler.jar\"\" %*\" | out-file -en oem \"$dir\\tickompiler.cmd\"",
-    "suggest": {
-        "Java Runtime Environment": "java/adoptopenjdk-hotspot-jre"
+    "autoupdate": {
+        "url": "https://github.com/rhmodding/Tickompiler/releases/download/v$version/tickompiler.jar"
     }
 }
diff --git a/bucket/tome4.json b/bucket/tome4.json
index 614be4f3..7e92815d 100644
--- a/bucket/tome4.json
+++ b/bucket/tome4.json
@@ -1,13 +1,10 @@
 {
-    "homepage": "https://te4.org",
     "version": "1.7.0",
+    "homepage": "https://te4.org",
     "license": "GPL-3.0-only",
     "url": "http://te4.org/dl/t-engine/t-engine4-windows-1.7.0.zip",
     "hash": "76ac63f8682642015b4ac14af2b9caab1ffc6c8260a51ad34c26eccffaca3197",
-    "autoupdate": {
-        "url": "http://te4.org/dl/t-engine/t-engine4-windows-$version.zip",
-        "extract_dir": "t-engine4-windows-$version"
-    },
+    "extract_dir": "t-engine4-windows-1.7.0",
     "bin": [
         [
             "t-engine.exe",
@@ -18,12 +15,6 @@
             "tome4-launcher"
         ]
     ],
-    "checkver": {
-        "url": "https://te4.org/download",
-        "re": "Tales of Maj'Eyal Installer (.*) for Windows"
-    },
-    "extract_dir": "t-engine4-windows-1.7.0",
-    "persist": "game\\addons",
     "shortcuts": [
         [
             "t-engine.exe",
@@ -33,5 +24,14 @@
             "t-engine-launcher.exe",
             "Tales of Maj'Eyal Launcher"
         ]
-    ]
+    ],
+    "persist": "game\\addons",
+    "checkver": {
+        "url": "https://te4.org/download",
+        "re": "Tales of Maj'Eyal Installer (.*) for Windows"
+    },
+    "autoupdate": {
+        "url": "http://te4.org/dl/t-engine/t-engine4-windows-$version.zip",
+        "extract_dir": "t-engine4-windows-$version"
+    }
 }
diff --git a/bucket/tooniversal.json b/bucket/tooniversal.json
index 936fbd54..d29d6f75 100644
--- a/bucket/tooniversal.json
+++ b/bucket/tooniversal.json
@@ -1,12 +1,19 @@
 {
-    "homepage": "https://tooniversal.com",
-    "description": "Tooniversal Studios is a free-to-play private server of Disney's Toontown Online. Create your own Toon and join the battle to save Toontown from the evil Cogs.",
     "version": "1.1.0.1",
+    "description": "Tooniversal Studios is a free-to-play private server of Disney's Toontown Online. Create your own Toon and join the battle to save Toontown from the evil Cogs.",
+    "homepage": "https://tooniversal.com",
     "license": "Proprietary",
     "notes": "This is only the launcher, an account is required to play.",
     "url": "https://cdn.tooniversal.com/release/tooniversal_setup.exe#/dl.7z",
     "hash": "EC2D254CB5557630E513748BA02A3EF8E87E1D90CF032A4606AC471118F986C0",
+    "pre_install": "Remove-Item $dir -Recurse -Force  -Include * -Exclude Tooniversal-Launcher.exe",
     "bin": "Tooniversal-Launcher.exe",
+    "shortcuts": [
+        [
+            "Tooniversal-Launcher.exe",
+            "Tooniversal Studios"
+        ]
+    ],
     "persist": [
         "resources",
         "user",
@@ -14,12 +21,5 @@
         "cgGL.dll",
         "tooniversal.bin",
         "tooniversal.exe"
-    ],
-    "pre_install": "Remove-Item $dir -Recurse -Force  -Include * -Exclude Tooniversal-Launcher.exe",
-    "shortcuts": [
-        [
-            "Tooniversal-Launcher.exe",
-            "Tooniversal Studios"
-        ]
     ]
 }
diff --git a/bucket/toontownfellowship.json b/bucket/toontownfellowship.json
index ef48b0cb..22f7d597 100644
--- a/bucket/toontownfellowship.json
+++ b/bucket/toontownfellowship.json
@@ -1,13 +1,13 @@
 {
-    "homepage": "https://www.toontownfellowship.com",
-    "description": "Third-party private server for the massively multiplayer online game Toontown",
     "version": "1.0.0",
+    "description": "Third-party private server for the massively multiplayer online game Toontown",
+    "homepage": "https://www.toontownfellowship.com",
     "license": "Proprietary",
     "notes": "This is only the launcher. A free account is required to play.",
     "url": "https://www.toontownfellowship.com/download/windows/Launcher2.exe",
     "hash": "1f980d61e54847b68c495ddc7eaaa876a6c8bed5d90bffcf65e27dcac2b7fca2",
-    "bin": "ToontownFellowship.exe",
     "pre_install": "Rename-Item -Path $dir/Launcher2.exe -NewName $dir/ToontownFellowship.exe",
+    "bin": "ToontownFellowship.exe",
     "shortcuts": [
         [
             "ToontownFellowship.exe",
diff --git a/bucket/toontownoffline.json b/bucket/toontownoffline.json
index f2dc6910..6d99afde 100644
--- a/bucket/toontownoffline.json
+++ b/bucket/toontownoffline.json
@@ -1,25 +1,25 @@
 {
-    "homepage": "https://ttoffline.com",
-    "description": "Toontown Offline is a sandbox version of Disneys Toontown Online. Hop in and explore the world of Toontown without the need of an internet connection- play on Windows, macOS and Linux. Enjoy Toontown Offline by yourself in Offline Mode, or connect to a Mini-Server and play with up to 15 other Toons! Play Toontown how it was when Disney left it, or check out the vast amount of new content we offer to that is exclusive to Toontown Offline. We have a bunch of new features that introduce sandbox mechanics, and others that expand upon the Toontown storyline- more of which is in active development.",
     "version": "1.0.0",
+    "description": "Toontown Offline is a sandbox version of Disneys Toontown Online. Hop in and explore the world of Toontown without the need of an internet connection- play on Windows, macOS and Linux. Enjoy Toontown Offline by yourself in Offline Mode, or connect to a Mini-Server and play with up to 15 other Toons! Play Toontown how it was when Disney left it, or check out the vast amount of new content we offer to that is exclusive to Toontown Offline. We have a bunch of new features that introduce sandbox mechanics, and others that expand upon the Toontown storyline- more of which is in active development.",
+    "homepage": "https://ttoffline.com",
     "license": "Proprietary",
     "url": "https://toontownoffline.net/launcher/ttoff-launcher-win32-setup.exe#/dl.7z",
     "hash": "474b8fb5bb04908918bcc9719339189e7313e2839ee3f11f327d4e9e66ae45b8",
-    "bin": "ToontownOffline.exe",
-    "persist": [
-        "astron",
-        "resources",
-        "offline.exe",
-        "settings.json"
-    ],
     "pre_install": [
         "Remove-Item $dir -Recurse -Force  -Include * -Exclude 'Toontown Offline.exe'",
         "Rename-Item -Path $dir/'Toontown Offline.exe' -NewName $dir/ToontownOffline.exe"
     ],
+    "bin": "ToontownOffline.exe",
     "shortcuts": [
         [
             "ToontownOffline.exe",
             "Toontown Offline"
         ]
+    ],
+    "persist": [
+        "astron",
+        "resources",
+        "offline.exe",
+        "settings.json"
     ]
 }
diff --git a/bucket/toontownrewritten.json b/bucket/toontownrewritten.json
index 24ec5d03..e08e851d 100644
--- a/bucket/toontownrewritten.json
+++ b/bucket/toontownrewritten.json
@@ -1,12 +1,22 @@
 {
-    "homepage": "https://toontownrewritten.com/",
-    "description": "Toontown Rewritten is a massively multiplayer online game built for kids, teens, and adults of all ages. Create your own Toon and join the never-ending battle against the Cogs who want to turn Toontown into their latest business venture.",
     "version": "1.3.2",
+    "description": "Toontown Rewritten is a massively multiplayer online game built for kids, teens, and adults of all ages. Create your own Toon and join the never-ending battle against the Cogs who want to turn Toontown into their latest business venture.",
+    "homepage": "https://toontownrewritten.com/",
     "license": "Proprietary",
     "notes": "This is only the launcher, an account is required to play.",
     "url": "https://cdn.toontownrewritten.com/launcher/windows/TTRInstaller-v1.3.2.exe#/dl.7z",
     "hash": "edef11a77ff331bfa1555616dfa1904036bf62e461d382661a7229296ab40d08",
+    "pre_install": [
+        "Remove-Item $dir -Recurse -Force  -Include * -Exclude Launcher.exe",
+        "Rename-Item -Path $dir/Launcher.exe -NewName $dir/ToontownRewritten.exe"
+    ],
     "bin": "ToontownRewritten.exe",
+    "shortcuts": [
+        [
+            "ToontownRewritten.exe",
+            "Toontown Rewritten"
+        ]
+    ],
     "persist": [
         "OpenAL32.dll",
         "phase_3.5.mf",
@@ -27,15 +37,5 @@
         "winter_decorations.mf",
         "winter_music.mf",
         "winter_snow.mf"
-    ],
-    "pre_install": [
-        "Remove-Item $dir -Recurse -Force  -Include * -Exclude Launcher.exe",
-        "Rename-Item -Path $dir/Launcher.exe -NewName $dir/ToontownRewritten.exe"
-    ],
-    "shortcuts": [
-        [
-            "ToontownRewritten.exe",
-            "Toontown Rewritten"
-        ]
     ]
 }
diff --git a/bucket/trenchbroom.json b/bucket/trenchbroom.json
index ef482551..c50ff1cf 100644
--- a/bucket/trenchbroom.json
+++ b/bucket/trenchbroom.json
@@ -1,22 +1,22 @@
 {
-    "homepage": "https://kristianduske.com/trenchbroom/",
-    "description": "Level editor for Quake-based games",
     "version": "2021.1",
+    "description": "Level editor for Quake-based games",
+    "homepage": "https://kristianduske.com/trenchbroom/",
     "license": "GPL-3.0-or-later",
+    "depends": "extras/vcredist2015",
     "url": "https://github.com/kduske/TrenchBroom/releases/download/v2021.1/TrenchBroom-Win32-v2021.1-Release.7z",
     "hash": "307d310cb8f440d283abf2eec6e003cb937380d1f151084b92aa7ccbb4ff96ae",
-    "autoupdate": {
-        "url": "https://github.com/kduske/TrenchBroom/releases/download/v$version/TrenchBroom-Win32-v$version-Release.7z"
-    },
     "bin": "TrenchBroom.exe",
-    "checkver": {
-        "github": "https://github.com/kduske/TrenchBroom"
-    },
-    "depends": "extras/vcredist2015",
     "shortcuts": [
         [
             "TrenchBroom.exe",
             "TrenchBroom"
         ]
-    ]
+    ],
+    "checkver": {
+        "github": "https://github.com/kduske/TrenchBroom"
+    },
+    "autoupdate": {
+        "url": "https://github.com/kduske/TrenchBroom/releases/download/v$version/TrenchBroom-Win32-v$version-Release.7z"
+    }
 }
diff --git a/bucket/triplea.json b/bucket/triplea.json
index f8f4b8a8..9e7f3c4c 100644
--- a/bucket/triplea.json
+++ b/bucket/triplea.json
@@ -1,17 +1,28 @@
 {
-    "homepage": "https://triplea-game.org/",
-    "description": "Turn-based free and open-source strategy game based on the Axis & Allies board game",
     "version": "2.5.22294",
+    "description": "Turn-based free and open-source strategy game based on the Axis & Allies board game",
+    "homepage": "https://triplea-game.org/",
     "license": "GPL-3.0-only",
-    "architecture": {
-        "32bit": {
-            "url": "https://github.com/triplea-game/triplea/releases/download/2.5.22294/TripleA_2.5.22294_windows-32bit.exe",
-            "hash": "1b8c3d87f6c16b0c1b4bdbe415972b9be4846a44f0dc89d46fab005dfd02bedd"
-        },
-        "64bit": {
-            "url": "https://github.com/triplea-game/triplea/releases/download/2.5.22294/TripleA_2.5.22294_windows-64bit.exe",
-            "hash": "0eddc4e13bff3a1bfcad6a1d5f2429557552076d0c70f5fcd1aaf8f1cf889dea"
-        }
+    "installer": {
+        "args": [
+            "-q",
+            "-dir $dir"
+        ],
+        "keep": true
+    },
+    "bin": "TripleA.exe",
+    "shortcuts": [
+        [
+            "TripleA.exe",
+            "TripleA"
+        ]
+    ],
+    "persist": [
+        "savedGames",
+        "downloadedMaps"
+    ],
+    "checkver": {
+        "github": "https://github.com/triplea-game/triplea"
     },
     "autoupdate": {
         "architecture": {
@@ -23,25 +34,14 @@
             }
         }
     },
-    "bin": "TripleA.exe",
-    "checkver": {
-        "github": "https://github.com/triplea-game/triplea"
-    },
-    "installer": {
-        "args": [
-            "-q",
-            "-dir $dir"
-        ],
-        "keep": true
-    },
-    "persist": [
-        "savedGames",
-        "downloadedMaps"
-    ],
-    "shortcuts": [
-        [
-            "TripleA.exe",
-            "TripleA"
-        ]
-    ]
+    "architecture": {
+        "32bit": {
+            "url": "https://github.com/triplea-game/triplea/releases/download/2.5.22294/TripleA_2.5.22294_windows-32bit.exe",
+            "hash": "1b8c3d87f6c16b0c1b4bdbe415972b9be4846a44f0dc89d46fab005dfd02bedd"
+        },
+        "64bit": {
+            "url": "https://github.com/triplea-game/triplea/releases/download/2.5.22294/TripleA_2.5.22294_windows-64bit.exe",
+            "hash": "0eddc4e13bff3a1bfcad6a1d5f2429557552076d0c70f5fcd1aaf8f1cf889dea"
+        }
+    }
 }
diff --git a/bucket/ufoai.json b/bucket/ufoai.json
index 60782e37..29066ac1 100644
--- a/bucket/ufoai.json
+++ b/bucket/ufoai.json
@@ -1,26 +1,26 @@
 {
-    "homepage": "https://ufoai.org/",
-    "description": "Squad-based tactical strategy game inspired by XCOM",
     "version": "2.5",
+    "description": "Squad-based tactical strategy game inspired by XCOM",
+    "homepage": "https://ufoai.org/",
     "license": "GPL-2.0-or-later",
     "url": "https://downloads.sourceforge.net/project/ufoai/UFO_AI%202.x/2.5/ufoai-2.5-win32.exe#/dl.7z",
     "hash": "89aab99f6ef664b853f6eeddf7959240751870cbfa2ab4d3745bd09b568222d8",
-    "autoupdate": {
-        "url": "https://downloads.sourceforge.net/project/ufoai/UFO_AI%202.x/$version/ufoai-$version-win32.exe#/dl.7z"
-    },
     "bin": [
         "ufo.exe",
         "ufoded.exe",
         "ufo2map.exe"
     ],
-    "checkver": {
-        "url": "https://ufoai.org/wiki/Download",
-        "regex": "The latest stable release is version ([\\d.r]+)\\."
-    },
     "shortcuts": [
         [
             "ufo.exe",
             "UFO - Alien Invasion"
         ]
-    ]
+    ],
+    "checkver": {
+        "url": "https://ufoai.org/wiki/Download",
+        "regex": "The latest stable release is version ([\\d.r]+)\\."
+    },
+    "autoupdate": {
+        "url": "https://downloads.sourceforge.net/project/ufoai/UFO_AI%202.x/$version/ufoai-$version-win32.exe#/dl.7z"
+    }
 }
diff --git a/bucket/uhexen2.json b/bucket/uhexen2.json
index 15f41831..8bd340e2 100644
--- a/bucket/uhexen2.json
+++ b/bucket/uhexen2.json
@@ -1,22 +1,24 @@
 {
-    "homepage": "http://uhexen2.sourceforge.net/",
-    "description": "Faithful Hexen II source port (also known as Hammer of Thyrion)",
     "version": "1.5.9",
+    "description": "Faithful Hexen II source port (also known as Hammer of Thyrion)",
+    "homepage": "http://uhexen2.sourceforge.net/",
     "license": "GPL-2.0-or-later",
     "notes": [
         "Place game data files (pak0.pak, pak1.pak) in:",
         "",
         "    $persist_dir\\data1\\"
     ],
-    "architecture": {
-        "32bit": {
-            "url": "https://downloads.sourceforge.net/project/uhexen2/Hammer%20of%20Thyrion/1.5.9/Windows/hexen2-1.5.9-win32.zip",
-            "hash": "ae180c355416d10a17beded7e50c4d3e2e3c0f95646262ebf411e9d38e16e1a4"
-        },
-        "64bit": {
-            "url": "https://downloads.sourceforge.net/project/uhexen2/Hammer%20of%20Thyrion/1.5.9/Win64/hexen2-1.5.9-win64.zip",
-            "hash": "938d5e4bc394bd91aafa2e81cea78630bcefd0f00211d59238cf06cbc6c62c2a"
-        }
+    "extract_dir": "hexen2-1.5.9",
+    "shortcuts": [
+        [
+            "glh2.exe",
+            "uHexen2 - Hammer of Thyrion"
+        ]
+    ],
+    "persist": "data1",
+    "checkver": {
+        "url": "http://uhexen2.sourceforge.net/download.html",
+        "regex": "Latest Hammer of Thyrion version is ([\\d.r]+)<"
     },
     "autoupdate": {
         "architecture": {
@@ -28,16 +30,14 @@
             }
         }
     },
-    "checkver": {
-        "url": "http://uhexen2.sourceforge.net/download.html",
-        "regex": "Latest Hammer of Thyrion version is ([\\d.r]+)<"
-    },
-    "extract_dir": "hexen2-1.5.9",
-    "persist": "data1",
-    "shortcuts": [
-        [
-            "glh2.exe",
-            "uHexen2 - Hammer of Thyrion"
-        ]
-    ]
+    "architecture": {
+        "32bit": {
+            "url": "https://downloads.sourceforge.net/project/uhexen2/Hammer%20of%20Thyrion/1.5.9/Windows/hexen2-1.5.9-win32.zip",
+            "hash": "ae180c355416d10a17beded7e50c4d3e2e3c0f95646262ebf411e9d38e16e1a4"
+        },
+        "64bit": {
+            "url": "https://downloads.sourceforge.net/project/uhexen2/Hammer%20of%20Thyrion/1.5.9/Win64/hexen2-1.5.9-win64.zip",
+            "hash": "938d5e4bc394bd91aafa2e81cea78630bcefd0f00211d59238cf06cbc6c62c2a"
+        }
+    }
 }
diff --git a/bucket/umoria.json b/bucket/umoria.json
index 26a9c3eb..d807c70c 100644
--- a/bucket/umoria.json
+++ b/bucket/umoria.json
@@ -1,18 +1,19 @@
 {
-    "homepage": "https://umoria.org/",
-    "description": "A single player roguelike based on Lord of the Rings",
     "version": "5.7.15",
+    "description": "A single player roguelike based on Lord of the Rings",
+    "homepage": "https://umoria.org/",
     "license": "GPL-2.0",
     "notes": "To run umoria in the console, use: 'Push-Location $(scoop which umoria | Split-Path); umoria.exe; Pop-Location'.",
-    "architecture": {
-        "32bit": {
-            "url": "https://github.com/dungeons-of-moria/umoria/releases/download/v5.7.15/umoria-5-7-15-win32.zip",
-            "hash": "101f520fd057398ceced4de42e733523e60cfc850316dde7cc6ebee7c02f1a2c"
-        },
-        "64bit": {
-            "url": "https://github.com/dungeons-of-moria/umoria/releases/download/v5.7.15/umoria-5-7-15-win64.zip",
-            "hash": "21385709f5df60f1dd2c4a944ad8fcb7c4ea613c1948a4034e6cc15170e4ea59"
-        }
+    "extract_dir": "umoria",
+    "bin": "umoria.exe",
+    "shortcuts": [
+        [
+            "umoria.exe",
+            "Umoria"
+        ]
+    ],
+    "checkver": {
+        "github": "https://github.com/dungeons-of-moria/umoria"
     },
     "autoupdate": {
         "architecture": {
@@ -24,15 +25,14 @@
             }
         }
     },
-    "bin": "umoria.exe",
-    "checkver": {
-        "github": "https://github.com/dungeons-of-moria/umoria"
-    },
-    "extract_dir": "umoria",
-    "shortcuts": [
-        [
-            "umoria.exe",
-            "Umoria"
-        ]
-    ]
+    "architecture": {
+        "32bit": {
+            "url": "https://github.com/dungeons-of-moria/umoria/releases/download/v5.7.15/umoria-5-7-15-win32.zip",
+            "hash": "101f520fd057398ceced4de42e733523e60cfc850316dde7cc6ebee7c02f1a2c"
+        },
+        "64bit": {
+            "url": "https://github.com/dungeons-of-moria/umoria/releases/download/v5.7.15/umoria-5-7-15-win64.zip",
+            "hash": "21385709f5df60f1dd2c4a944ad8fcb7c4ea613c1948a4034e6cc15170e4ea59"
+        }
+    }
 }
diff --git a/bucket/undertale-mod-tool.json b/bucket/undertale-mod-tool.json
index 8fbc222d..3b8d3f59 100644
--- a/bucket/undertale-mod-tool.json
+++ b/bucket/undertale-mod-tool.json
@@ -1,20 +1,20 @@
 {
-    "homepage": "https://github.com/krzys-h/UndertaleModTool",
-    "description": "The most complete tool for modding, decompiling and unpacking Undertale (and other Game Maker: Studio games!)",
     "version": "0.4.0.3",
+    "description": "The most complete tool for modding, decompiling and unpacking Undertale (and other Game Maker: Studio games!)",
+    "homepage": "https://github.com/krzys-h/UndertaleModTool",
     "license": "GPL-3.0-only",
     "url": "https://github.com/krzys-h/UndertaleModTool/releases/download/0.4.0.3/UndertaleModTool_v0.4.0.3.zip",
     "hash": "4f820d3e757d8da4b96b7843917a124bb1b1809aa9d51d525075622c6941acf3",
-    "autoupdate": {
-        "url": "https://github.com/krzys-h/UndertaleModTool/releases/download/$version/UndertaleModTool_v$version.zip"
-    },
     "bin": "UndertaleModTool.exe",
-    "checkver": "github",
-    "persist": "UndertaleModTool.exe.config",
     "shortcuts": [
         [
             "UndertaleModTool.exe",
             "Undertale Mod Tool"
         ]
-    ]
+    ],
+    "persist": "UndertaleModTool.exe.config",
+    "checkver": "github",
+    "autoupdate": {
+        "url": "https://github.com/krzys-h/UndertaleModTool/releases/download/$version/UndertaleModTool_v$version.zip"
+    }
 }
diff --git a/bucket/urbanterror.json b/bucket/urbanterror.json
index 37a8793d..9199675c 100644
--- a/bucket/urbanterror.json
+++ b/bucket/urbanterror.json
@@ -1,23 +1,23 @@
 {
-    "homepage": "https://www.urbanterror.info/",
-    "description": "Multiplayer semi-realistic first-person shooter running on ioquake3",
     "version": "4.3.4",
+    "description": "Multiplayer semi-realistic first-person shooter running on ioquake3",
+    "homepage": "https://www.urbanterror.info/",
     "license": "https://www.urbanterror.info/support/202-quake-3-sdk/",
     "url": "http://cdn.urbanterror.info/urt/43/releases/zips/UrbanTerror434_full.zip",
     "hash": "716669cc6c525663b791852e51ff9c94d96f382be39279dab6084dddacb5a4e7",
-    "autoupdate": {
-        "url": "http://cdn.urbanterror.info/urt/$majorVersion$minorVersion/releases/zips/UrbanTerror$cleanVersion_full.zip"
-    },
-    "checkver": {
-        "url": "https://www.urbanterror.info/downloads/",
-        "re": "Current version \\(([\\d.]+)\\)"
-    },
     "extract_dir": "UrbanTerror43",
-    "persist": "q3ut4",
     "shortcuts": [
         [
             "Quake3-UrT.exe",
             "Urban Terror"
         ]
-    ]
+    ],
+    "persist": "q3ut4",
+    "checkver": {
+        "url": "https://www.urbanterror.info/downloads/",
+        "re": "Current version \\(([\\d.]+)\\)"
+    },
+    "autoupdate": {
+        "url": "http://cdn.urbanterror.info/urt/$majorVersion$minorVersion/releases/zips/UrbanTerror$cleanVersion_full.zip"
+    }
 }
diff --git a/bucket/vdrift.json b/bucket/vdrift.json
index e3eaf4f7..1f9ef1e5 100644
--- a/bucket/vdrift.json
+++ b/bucket/vdrift.json
@@ -1,24 +1,24 @@
 {
-    "homepage": "https://vdrift.net/",
-    "description": "3D simulation racing game",
     "version": "2014-10-20",
+    "description": "3D simulation racing game",
+    "homepage": "https://vdrift.net/",
     "license": "GPL-2.0-or-later",
-    "architecture": {
-        "64bit": {
-            "url": "https://downloads.sourceforge.net/project/vdrift/vdrift/vdrift-2014-10-20/vdrift-win64-2014-10-20.exe#/dl.7z",
-            "hash": "7149ca6cf41388e29a8a681198fad2452fb4506a1d3404e1dbcb08e9a2c1904d"
-        }
-    },
-    "autoupdate": {
-        "url": "https://downloads.sourceforge.net/project/vdrift/vdrift/vdrift-$version/vdrift-win64-$version.exe#/dl.7z"
-    },
-    "checkver": {
-        "regex": "vdrift-win64-([\\d\\-]{10})\\.exe"
-    },
     "shortcuts": [
         [
             "vdrift.exe",
             "VDrift"
         ]
-    ]
+    ],
+    "checkver": {
+        "regex": "vdrift-win64-([\\d\\-]{10})\\.exe"
+    },
+    "autoupdate": {
+        "url": "https://downloads.sourceforge.net/project/vdrift/vdrift/vdrift-$version/vdrift-win64-$version.exe#/dl.7z"
+    },
+    "architecture": {
+        "64bit": {
+            "url": "https://downloads.sourceforge.net/project/vdrift/vdrift/vdrift-2014-10-20/vdrift-win64-2014-10-20.exe#/dl.7z",
+            "hash": "7149ca6cf41388e29a8a681198fad2452fb4506a1d3404e1dbcb08e9a2c1904d"
+        }
+    }
 }
diff --git a/bucket/visualboyadvance-m-nightly.json b/bucket/visualboyadvance-m-nightly.json
index e56fefad..baaae778 100644
--- a/bucket/visualboyadvance-m-nightly.json
+++ b/bucket/visualboyadvance-m-nightly.json
@@ -1,19 +1,29 @@
 {
-    "homepage": "https://vba-m.com",
-    "description": "Community-maintained, improved version of the VisualBoyAdvance Game Boy emulator (nightly)",
     "version": "nightly",
+    "description": "Community-maintained, improved version of the VisualBoyAdvance Game Boy emulator (nightly)",
+    "homepage": "https://vba-m.com",
     "license": {
-        "identifier": "GPL-2.0",
-        "url": "http://www.gnu.org/licenses/gpl-2.0.html"
-    },
-    "architecture": {
-        "32bit": {
-            "url": "https://nightly.vba-m.com/visualboyadvance-m-Win-x86_32.zip"
-        },
-        "64bit": {
-            "url": "https://nightly.vba-m.com/visualboyadvance-m-Win-x86_64.zip"
-        }
+        "url": "http://www.gnu.org/licenses/gpl-2.0.html",
+        "identifier": "GPL-2.0"
     },
+    "bin": [
+        [
+            "visualboyadvance-m.exe",
+            "visualboyadvance-m-nightly"
+        ]
+    ],
+    "shortcuts": [
+        [
+            "visualboyadvance-m.exe",
+            "VisualBoyAdvance-M (nightly)"
+        ]
+    ],
+    "persist": [
+        "Battery",
+        "Recording",
+        "Screenshot",
+        "State"
+    ],
     "autoupdate": {
         "architecture": {
             "32bit": {
@@ -24,22 +34,12 @@
             }
         }
     },
-    "bin": [
-        [
-            "visualboyadvance-m.exe",
-            "visualboyadvance-m-nightly"
-        ]
-    ],
-    "persist": [
-        "Battery",
-        "Recording",
-        "Screenshot",
-        "State"
-    ],
-    "shortcuts": [
-        [
-            "visualboyadvance-m.exe",
-            "VisualBoyAdvance-M (nightly)"
-        ]
-    ]
+    "architecture": {
+        "32bit": {
+            "url": "https://nightly.vba-m.com/visualboyadvance-m-Win-x86_32.zip"
+        },
+        "64bit": {
+            "url": "https://nightly.vba-m.com/visualboyadvance-m-Win-x86_64.zip"
+        }
+    }
 }
diff --git a/bucket/visualboyadvance-m.json b/bucket/visualboyadvance-m.json
index 2c948600..dc3e1f29 100644
--- a/bucket/visualboyadvance-m.json
+++ b/bucket/visualboyadvance-m.json
@@ -1,20 +1,26 @@
 {
-    "homepage": "https://vba-m.com",
-    "description": "Community-maintained, improved version of the VisualBoyAdvance Game Boy emulator",
     "version": "2.1.4",
+    "description": "Community-maintained, improved version of the VisualBoyAdvance Game Boy emulator",
+    "homepage": "https://vba-m.com",
     "license": {
-        "identifier": "GPL-2.0",
-        "url": "http://www.gnu.org/licenses/gpl-2.0.html"
+        "url": "http://www.gnu.org/licenses/gpl-2.0.html",
+        "identifier": "GPL-2.0"
     },
-    "architecture": {
-        "32bit": {
-            "url": "https://github.com/visualboyadvance-m/visualboyadvance-m/releases/download/v2.1.4/visualboyadvance-m-Win-32bit.zip",
-            "hash": "753b896b5f6b1a05052ef8e6e5b06bc80f9d9b8dfc9870b0dbc282227b089e5d"
-        },
-        "64bit": {
-            "url": "https://github.com/visualboyadvance-m/visualboyadvance-m/releases/download/v2.1.4/visualboyadvance-m-Win-64bit.zip",
-            "hash": "e73cb3d4a0f6eb890549f04fef575ff4d9d3beb3b20b4877c4039cc2d9342311"
-        }
+    "bin": "visualboyadvance-m.exe",
+    "shortcuts": [
+        [
+            "visualboyadvance-m.exe",
+            "VisualBoyAdvance-M"
+        ]
+    ],
+    "persist": [
+        "Battery",
+        "Recording",
+        "Screenshot",
+        "State"
+    ],
+    "checkver": {
+        "github": "https://github.com/visualboyadvance-m/visualboyadvance-m"
     },
     "autoupdate": {
         "architecture": {
@@ -26,20 +32,14 @@
             }
         }
     },
-    "bin": "visualboyadvance-m.exe",
-    "checkver": {
-        "github": "https://github.com/visualboyadvance-m/visualboyadvance-m"
-    },
-    "persist": [
-        "Battery",
-        "Recording",
-        "Screenshot",
-        "State"
-    ],
-    "shortcuts": [
-        [
-            "visualboyadvance-m.exe",
-            "VisualBoyAdvance-M"
-        ]
-    ]
+    "architecture": {
+        "32bit": {
+            "url": "https://github.com/visualboyadvance-m/visualboyadvance-m/releases/download/v2.1.4/visualboyadvance-m-Win-32bit.zip",
+            "hash": "753b896b5f6b1a05052ef8e6e5b06bc80f9d9b8dfc9870b0dbc282227b089e5d"
+        },
+        "64bit": {
+            "url": "https://github.com/visualboyadvance-m/visualboyadvance-m/releases/download/v2.1.4/visualboyadvance-m-Win-64bit.zip",
+            "hash": "e73cb3d4a0f6eb890549f04fef575ff4d9d3beb3b20b4877c4039cc2d9342311"
+        }
+    }
 }
diff --git a/bucket/vita3k.json b/bucket/vita3k.json
index 3789d861..59fa9a70 100644
--- a/bucket/vita3k.json
+++ b/bucket/vita3k.json
@@ -1,16 +1,33 @@
 {
-    "homepage": "https://vita3k.org",
-    "description": "PlayStation Vita emulator (Development)",
     "version": "9549d86",
+    "description": "PlayStation Vita emulator (Development)",
+    "homepage": "https://vita3k.org",
     "license": {
-        "identifier": "GPL-2.0",
-        "url": "https://github.com/Vita3K/Vita3K/blob/master/COPYING.txt"
+        "url": "https://github.com/Vita3K/Vita3K/blob/master/COPYING.txt",
+        "identifier": "GPL-2.0"
     },
-    "architecture": {
-        "64bit": {
-            "url": "https://github.com/Vita3K/Vita3K/releases/download/continuous/windows-latest.zip",
-            "hash": "ae1b3f0926f3f961da53741bef96b99b482729dc8834fb88d6c0e43bb18c1696"
-        }
+    "pre_install": [
+        "if (!(Test-Path \"$persist_dir\")) {",
+        "   New-item \"$persist_dir\" -ItemType Directory | Out-Null",
+        "   New-Item \"$persist_dir\\config.yml\" -Type File | Out-Null",
+        "}"
+    ],
+    "bin": "Vita3K.exe",
+    "shortcuts": [
+        [
+            "Vita3K.exe",
+            "Vita3K"
+        ]
+    ],
+    "persist": [
+        "data",
+        "lang",
+        "shaders-builtin",
+        "config.yml"
+    ],
+    "checkver": {
+        "github": "https://github.com/Vita3K/Vita3K",
+        "regex": "commit[/:]\\s?([a-f0-9]{7})"
     },
     "autoupdate": {
         "architecture": {
@@ -19,27 +36,10 @@
             }
         }
     },
-    "bin": "Vita3K.exe",
-    "checkver": {
-        "github": "https://github.com/Vita3K/Vita3K",
-        "regex": "commit[/:]\\s?([a-f0-9]{7})"
-    },
-    "persist": [
-        "data",
-        "lang",
-        "shaders-builtin",
-        "config.yml"
-    ],
-    "pre_install": [
-        "if (!(Test-Path \"$persist_dir\")) {",
-        "   New-item \"$persist_dir\" -ItemType Directory | Out-Null",
-        "   New-Item \"$persist_dir\\config.yml\" -Type File | Out-Null",
-        "}"
-    ],
-    "shortcuts": [
-        [
-            "Vita3K.exe",
-            "Vita3K"
-        ]
-    ]
+    "architecture": {
+        "64bit": {
+            "url": "https://github.com/Vita3K/Vita3K/releases/download/continuous/windows-latest.zip",
+            "hash": "ae1b3f0926f3f961da53741bef96b99b482729dc8834fb88d6c0e43bb18c1696"
+        }
+    }
 }
diff --git a/bucket/vkquake.json b/bucket/vkquake.json
index 29222883..c6890d3e 100644
--- a/bucket/vkquake.json
+++ b/bucket/vkquake.json
@@ -1,7 +1,7 @@
 {
-    "homepage": "https://github.com/Novum/vkQuake",
-    "description": "Quake 1 port using Vulkan instead of OpenGL for rendering, based on QuakeSpasm",
     "version": "1.12.2",
+    "description": "Quake 1 port using Vulkan instead of OpenGL for rendering, based on QuakeSpasm",
+    "homepage": "https://github.com/Novum/vkQuake",
     "license": "GPL-2.0-or-later",
     "notes": [
         "Place game data files (such as pak0.pak and pak1.pak) in:",
@@ -18,29 +18,8 @@
         "- Quake Mission Pack 3 - Abyss of Pandemonium:",
         "    $persist_dir\\abyss\\"
     ],
-    "architecture": {
-        "32bit": {
-            "url": "https://github.com/Novum/vkQuake/releases/download/1.12.2/vkquake-1.12.2_win32.zip",
-            "hash": "c5cca583cea3701157e9b38b0ef6c8f993720842cfb73db43a8deea32a454949",
-            "extract_dir": "vkquake-1.12.2_win32"
-        },
-        "64bit": {
-            "url": "https://github.com/Novum/vkQuake/releases/download/1.12.2/vkquake-1.12.2_win64.zip",
-            "hash": "49304558a6afebf912b3e231c958eb0ac7531947736d3c6ddbc4c211f1ea7a41",
-            "extract_dir": "vkquake-1.12.2_win64"
-        }
-    },
-    "autoupdate": {
-        "architecture": {
-            "32bit": {
-                "url": "https://github.com/Novum/vkQuake/releases/download/$version/vkquake-$version_win32.zip",
-                "extract_dir": "vkquake-$version_win32"
-            },
-            "64bit": {
-                "url": "https://github.com/Novum/vkQuake/releases/download/$version/vkquake-$version_win64.zip",
-                "extract_dir": "vkquake-$version_win64"
-            }
-        }
+    "suggest": {
+        "vcredist": "extras/vcredist2019"
     },
     "bin": [
         [
@@ -49,13 +28,6 @@
             "-basedir $persist_dir"
         ]
     ],
-    "checkver": "github",
-    "persist": [
-        "id1",
-        "hipnotic",
-        "rogue",
-        "abyss"
-    ],
     "shortcuts": [
         [
             "vkQuake.exe",
@@ -77,7 +49,35 @@
             "-game abyss"
         ]
     ],
-    "suggest": {
-        "vcredist": "extras/vcredist2019"
+    "persist": [
+        "id1",
+        "hipnotic",
+        "rogue",
+        "abyss"
+    ],
+    "checkver": "github",
+    "autoupdate": {
+        "architecture": {
+            "32bit": {
+                "url": "https://github.com/Novum/vkQuake/releases/download/$version/vkquake-$version_win32.zip",
+                "extract_dir": "vkquake-$version_win32"
+            },
+            "64bit": {
+                "url": "https://github.com/Novum/vkQuake/releases/download/$version/vkquake-$version_win64.zip",
+                "extract_dir": "vkquake-$version_win64"
+            }
+        }
+    },
+    "architecture": {
+        "32bit": {
+            "url": "https://github.com/Novum/vkQuake/releases/download/1.12.2/vkquake-1.12.2_win32.zip",
+            "hash": "c5cca583cea3701157e9b38b0ef6c8f993720842cfb73db43a8deea32a454949",
+            "extract_dir": "vkquake-1.12.2_win32"
+        },
+        "64bit": {
+            "url": "https://github.com/Novum/vkQuake/releases/download/1.12.2/vkquake-1.12.2_win64.zip",
+            "hash": "49304558a6afebf912b3e231c958eb0ac7531947736d3c6ddbc4c211f1ea7a41",
+            "extract_dir": "vkquake-1.12.2_win64"
+        }
     }
 }
diff --git a/bucket/vkquake2.json b/bucket/vkquake2.json
index ded2bc27..d433e954 100644
--- a/bucket/vkquake2.json
+++ b/bucket/vkquake2.json
@@ -1,7 +1,7 @@
 {
-    "homepage": "https://github.com/kondrak/vkQuake2",
-    "description": "Quake II source port based on v3.21 with Vulkan support",
     "version": "1.5.8",
+    "description": "Quake II source port based on v3.21 with Vulkan support",
+    "homepage": "https://github.com/kondrak/vkQuake2",
     "license": "GPL-2.0-or-later",
     "notes": [
         "",
@@ -37,31 +37,9 @@
         "",
         ""
     ],
-    "architecture": {
-        "32bit": {
-            "url": "https://github.com/kondrak/vkQuake2/releases/download/1.5.8/vkquake2-1.5.8_win32.zip",
-            "hash": "0d3663db931cebe70df3f6bafb70b254e3e35224086ad313f011f280b2be2e1c",
-            "extract_dir": "vkquake2-1.5.8_win32"
-        },
-        "64bit": {
-            "url": "https://github.com/kondrak/vkQuake2/releases/download/1.5.8/vkquake2-1.5.8_win64.zip",
-            "hash": "3750af2d44c64b040d92604444f89840db66648ca2610399db406365537a6593",
-            "extract_dir": "vkquake2-1.5.8_win64"
-        }
+    "suggest": {
+        "vcredist": "extras/vcredist2019"
     },
-    "autoupdate": {
-        "architecture": {
-            "32bit": {
-                "url": "https://github.com/kondrak/vkQuake2/releases/download/$version/vkquake2-$version_win32.zip",
-                "extract_dir": "vkquake2-$version_win32"
-            },
-            "64bit": {
-                "url": "https://github.com/kondrak/vkQuake2/releases/download/$version/vkquake2-$version_win64.zip",
-                "extract_dir": "vkquake2-$version_win64"
-            }
-        }
-    },
-    "checkver": "github",
     "installer": {
         "script": [
             "$persistFolders = @(",
@@ -78,13 +56,6 @@
             "}"
         ]
     },
-    "persist": [
-        "baseq2",
-        "ctf",
-        "rogue",
-        "xatrix",
-        "zaero"
-    ],
     "shortcuts": [
         [
             "Quake2.exe",
@@ -106,7 +77,36 @@
             "+set game zaero"
         ]
     ],
-    "suggest": {
-        "vcredist": "extras/vcredist2019"
+    "persist": [
+        "baseq2",
+        "ctf",
+        "rogue",
+        "xatrix",
+        "zaero"
+    ],
+    "checkver": "github",
+    "autoupdate": {
+        "architecture": {
+            "32bit": {
+                "url": "https://github.com/kondrak/vkQuake2/releases/download/$version/vkquake2-$version_win32.zip",
+                "extract_dir": "vkquake2-$version_win32"
+            },
+            "64bit": {
+                "url": "https://github.com/kondrak/vkQuake2/releases/download/$version/vkquake2-$version_win64.zip",
+                "extract_dir": "vkquake2-$version_win64"
+            }
+        }
+    },
+    "architecture": {
+        "32bit": {
+            "url": "https://github.com/kondrak/vkQuake2/releases/download/1.5.8/vkquake2-1.5.8_win32.zip",
+            "hash": "0d3663db931cebe70df3f6bafb70b254e3e35224086ad313f011f280b2be2e1c",
+            "extract_dir": "vkquake2-1.5.8_win32"
+        },
+        "64bit": {
+            "url": "https://github.com/kondrak/vkQuake2/releases/download/1.5.8/vkquake2-1.5.8_win64.zip",
+            "hash": "3750af2d44c64b040d92604444f89840db66648ca2610399db406365537a6593",
+            "extract_dir": "vkquake2-1.5.8_win64"
+        }
     }
 }
diff --git a/bucket/vortex.json b/bucket/vortex.json
index 36212022..e5883f68 100644
--- a/bucket/vortex.json
+++ b/bucket/vortex.json
@@ -1,19 +1,16 @@
 {
-    "homepage": "https://www.nexusmods.com/about/vortex/",
-    "description": "Open-source mod manager from Nexus Mods",
     "version": "1.5.6",
+    "description": "Open-source mod manager from Nexus Mods",
+    "homepage": "https://www.nexusmods.com/about/vortex/",
     "license": "GPL-3.0-or-later",
-    "architecture": {
-        "64bit": {
-            "url": "https://github.com/Nexus-Mods/Vortex/releases/download/v1.5.6/vortex-setup-1.5.6.exe#/dl.7z",
-            "hash": "97939854b6db27a870a27ea8a6bfe0b74b18aae9932600387ef1ef28be0c060a",
-            "installer": {
-                "script": [
-                    "Expand-7zipArchive \"$dir\\`$PLUGINSDIR\\app-64.7z\" \"$dir\"",
-                    "Remove-Item \"$dir\\`$PLUGINSDIR\", \"$dir\\Uninstall*\" -Force -Recurse"
-                ]
-            }
-        }
+    "shortcuts": [
+        [
+            "Vortex.exe",
+            "Vortex"
+        ]
+    ],
+    "checkver": {
+        "github": "https://github.com/Nexus-Mods/Vortex"
     },
     "autoupdate": {
         "architecture": {
@@ -26,13 +23,16 @@
             }
         }
     },
-    "checkver": {
-        "github": "https://github.com/Nexus-Mods/Vortex"
-    },
-    "shortcuts": [
-        [
-            "Vortex.exe",
-            "Vortex"
-        ]
-    ]
+    "architecture": {
+        "64bit": {
+            "url": "https://github.com/Nexus-Mods/Vortex/releases/download/v1.5.6/vortex-setup-1.5.6.exe#/dl.7z",
+            "hash": "97939854b6db27a870a27ea8a6bfe0b74b18aae9932600387ef1ef28be0c060a",
+            "installer": {
+                "script": [
+                    "Expand-7zipArchive \"$dir\\`$PLUGINSDIR\\app-64.7z\" \"$dir\"",
+                    "Remove-Item \"$dir\\`$PLUGINSDIR\", \"$dir\\Uninstall*\" -Force -Recurse"
+                ]
+            }
+        }
+    }
 }
diff --git a/bucket/warsow.json b/bucket/warsow.json
index ff9412ad..217ef191 100644
--- a/bucket/warsow.json
+++ b/bucket/warsow.json
@@ -1,10 +1,18 @@
 {
-    "homepage": "https://warsow.net/",
-    "description": "Free fast-paced first-person shooter set in a cyberpunk universe",
     "version": "2.1.2",
+    "description": "Free fast-paced first-person shooter set in a cyberpunk universe",
+    "homepage": "https://warsow.net/",
     "license": "GPL-2.0-or-later",
     "url": "http://warsow.net/warsow-2.1.2.tar.gz",
     "hash": "2c6f05b3ca365557a53013e20a7ecc424869b551c3b0e056d0e3e1c27354c21f",
+    "extract_dir": "warsow-2.1.2",
+    "bin": "warsow.bat",
+    "shortcuts": [
+        [
+            "warsow.bat",
+            "Warsow"
+        ]
+    ],
     "architecture": {
         "32bit": {
             "pre_install": "Set-Content -Path \"$dir\\warsow.bat\" -Value \"pushd $dir && warsow_x86.exe && popd\""
@@ -12,13 +20,5 @@
         "64bit": {
             "pre_install": "Set-Content -Path \"$dir\\warsow.bat\" -Value \"pushd $dir && warsow_x64.exe && popd\""
         }
-    },
-    "bin": "warsow.bat",
-    "extract_dir": "warsow-2.1.2",
-    "shortcuts": [
-        [
-            "warsow.bat",
-            "Warsow"
-        ]
-    ]
+    }
 }
diff --git a/bucket/warzone2100.json b/bucket/warzone2100.json
index 40d1069f..bb90d298 100644
--- a/bucket/warzone2100.json
+++ b/bucket/warzone2100.json
@@ -1,21 +1,21 @@
 {
-    "homepage": "https://wz2100.net/",
-    "description": "Real-time strategy game set in a futuristic universe",
     "version": "4.2.6",
+    "description": "Real-time strategy game set in a futuristic universe",
+    "homepage": "https://wz2100.net/",
     "license": "GPL-2.0-or-later",
     "url": "https://github.com/Warzone2100/warzone2100/releases/download/4.2.6/warzone2100_win_x86_portable.exe#/dl.7z",
     "hash": "80e0cea427df095ee6b52a78dd5c17196e45ef03efb507ccecaef01f3836907c",
-    "autoupdate": {
-        "url": "https://github.com/Warzone2100/warzone2100/releases/download/$version/warzone2100_win_x86_portable.exe#/dl.7z"
-    },
     "bin": "bin\\warzone2100.exe",
-    "checkver": {
-        "github": "https://github.com/Warzone2100/warzone2100"
-    },
     "shortcuts": [
         [
             "bin\\warzone2100.exe",
             "Warzone 2100"
         ]
-    ]
+    ],
+    "checkver": {
+        "github": "https://github.com/Warzone2100/warzone2100"
+    },
+    "autoupdate": {
+        "url": "https://github.com/Warzone2100/warzone2100/releases/download/$version/warzone2100_win_x86_portable.exe#/dl.7z"
+    }
 }
diff --git a/bucket/weakauras-companion.json b/bucket/weakauras-companion.json
index fde1b84d..f39b6065 100644
--- a/bucket/weakauras-companion.json
+++ b/bucket/weakauras-companion.json
@@ -1,20 +1,10 @@
 {
-    "homepage": "https://weakauras.wtf/",
-    "description": "Updates WeakAuras installed from Wago.",
     "version": "3.3.4",
+    "description": "Updates WeakAuras installed from Wago.",
+    "homepage": "https://weakauras.wtf/",
     "license": "GPL-2.0-or-later",
     "url": "https://github.com/WeakAuras/WeakAuras-Companion/releases/download/v3.3.4/WeakAuras-Companion-Setup-3.3.4.exe#/dl.7z",
     "hash": "sha512:7c8b15b823e16a7596eead46bb2f3042680ea7819f232e6dae67bc4157ec87f7e4f9e9bafa577b0308e3555c9f28608186ea0fe7abf20b5cc986e935dbbedafc",
-    "autoupdate": {
-        "url": "https://github.com/WeakAuras/WeakAuras-Companion/releases/download/v$version/WeakAuras-Companion-Setup-$version.exe#/dl.7z",
-        "hash": {
-            "url": "$baseurl/latest.yml",
-            "find": "sha512:\\s+(.*)"
-        }
-    },
-    "checkver": {
-        "github": "https://github.com/WeakAuras/WeakAuras-Companion"
-    },
     "extract_dir": "$PLUGINSDIR",
     "installer": {
         "script": [
@@ -27,5 +17,15 @@
             "WeakAuras Companion.exe",
             "WeakAuras Companion"
         ]
-    ]
+    ],
+    "checkver": {
+        "github": "https://github.com/WeakAuras/WeakAuras-Companion"
+    },
+    "autoupdate": {
+        "url": "https://github.com/WeakAuras/WeakAuras-Companion/releases/download/v$version/WeakAuras-Companion-Setup-$version.exe#/dl.7z",
+        "hash": {
+            "url": "$baseurl/latest.yml",
+            "find": "sha512:\\s+(.*)"
+        }
+    }
 }
diff --git a/bucket/wesnoth.json b/bucket/wesnoth.json
index dc32556a..075ff482 100644
--- a/bucket/wesnoth.json
+++ b/bucket/wesnoth.json
@@ -1,23 +1,23 @@
 {
-    "homepage": "https://www.wesnoth.org/",
-    "description": "Turn-based singleplayer and multiplayer strategy game with a high fantasy theme",
     "version": "1.16.2",
+    "description": "Turn-based singleplayer and multiplayer strategy game with a high fantasy theme",
+    "homepage": "https://www.wesnoth.org/",
     "license": "GPL-2.0-or-later",
     "url": "https://sourceforge.net/projects/wesnoth/files/wesnoth-1.16/wesnoth-1.16.2/wesnoth-1.16.2-win64.exe/download#/dl.7z",
     "hash": "c890bb91fbf38c26881ad1f2f5ceb3d9cb5b5565da8ccb43fac2bd407ce167b3",
-    "autoupdate": {
-        "url": "https://sourceforge.net/projects/wesnoth/files/wesnoth-$majorVersion.$minorVersion/wesnoth-$version/wesnoth-$version-win64.exe/download#/dl.7z",
-        "hash": {
-            "url": "https://files.wesnoth.org/releases/wesnoth-$version-win64.exe.sha256"
-        }
-    },
-    "checkver": {
-        "github": "https://github.com/wesnoth/wesnoth"
-    },
     "shortcuts": [
         [
             "wesnoth.exe",
             "The Battle for Wesnoth"
         ]
-    ]
+    ],
+    "checkver": {
+        "github": "https://github.com/wesnoth/wesnoth"
+    },
+    "autoupdate": {
+        "url": "https://sourceforge.net/projects/wesnoth/files/wesnoth-$majorVersion.$minorVersion/wesnoth-$version/wesnoth-$version-win64.exe/download#/dl.7z",
+        "hash": {
+            "url": "https://files.wesnoth.org/releases/wesnoth-$version-win64.exe.sha256"
+        }
+    }
 }
diff --git a/bucket/widelands.json b/bucket/widelands.json
index 4469f92e..22bb5855 100644
--- a/bucket/widelands.json
+++ b/bucket/widelands.json
@@ -1,17 +1,17 @@
 {
-    "homepage": "https://www.widelands.org/",
-    "description": "Build an ever growing settlement. Real-time strategy, single and multiplayer",
     "version": "1.0",
+    "description": "Build an ever growing settlement. Real-time strategy, single and multiplayer",
+    "homepage": "https://www.widelands.org/",
     "license": "GPL-2.0-only",
-    "architecture": {
-        "32bit": {
-            "url": "https://launchpad.net/widelands/1.x/1.0/+download/Widelands-x86-1.0.exe",
-            "hash": "md5:b2d8593c96875e084b3e74759d75cdd9"
-        },
-        "64bit": {
-            "url": "https://launchpad.net/widelands/1.x/1.0/+download/Widelands-x64-1.0.exe",
-            "hash": "md5:cd7743416cd87fa0156eddd1e5a00202"
-        }
+    "bin": "widelands.exe",
+    "shortcuts": [
+        [
+            "widelands.exe",
+            "Widelands"
+        ]
+    ],
+    "checkver": {
+        "github": "https://github.com/widelands/widelands"
     },
     "autoupdate": {
         "architecture": {
@@ -29,15 +29,15 @@
             }
         }
     },
-    "bin": "widelands.exe",
-    "checkver": {
-        "github": "https://github.com/widelands/widelands"
+    "architecture": {
+        "32bit": {
+            "url": "https://launchpad.net/widelands/1.x/1.0/+download/Widelands-x86-1.0.exe",
+            "hash": "md5:b2d8593c96875e084b3e74759d75cdd9"
+        },
+        "64bit": {
+            "url": "https://launchpad.net/widelands/1.x/1.0/+download/Widelands-x64-1.0.exe",
+            "hash": "md5:cd7743416cd87fa0156eddd1e5a00202"
+        }
     },
-    "innosetup": true,
-    "shortcuts": [
-        [
-            "widelands.exe",
-            "Widelands"
-        ]
-    ]
+    "innosetup": true
 }
diff --git a/bucket/witchblast.json b/bucket/witchblast.json
index 4f02e12e..1550c8d6 100644
--- a/bucket/witchblast.json
+++ b/bucket/witchblast.json
@@ -1,18 +1,11 @@
 {
-    "homepage": "https://github.com/Cirrus-Minor/witchblast",
-    "description": "Roguelite dungeon crawl shooter similar to The Binding of Isaac",
     "version": "0.7.5",
+    "description": "Roguelite dungeon crawl shooter similar to The Binding of Isaac",
+    "homepage": "https://github.com/Cirrus-Minor/witchblast",
     "license": "GPL-3.0-or-later",
     "url": "https://github.com/Cirrus-Minor/witchblast/releases/download/v0.7.5/Witch.Blast.v0.7.5.zip",
     "hash": "2ed55f51f5a7a1a59d45175242bd62ae602361fc70d337ef7406d5b516398661",
-    "##": "Note: No Autoupdate due to inconsistent releases, downloads etc. Also, a new release seems unlikely",
-    "checkver": "github",
     "extract_dir": "Witch Blast v0.7.5",
-    "persist": [
-        "config.dat",
-        "game.sav",
-        "data"
-    ],
     "pre_install": [
         "if (!(Test-Path \"$dir\\config.dat\")) { Set-Content -Value $null -Path \"$dir\\config.dat\" }",
         "if (!(Test-Path \"$dir\\game.sav\")) { Set-Content -Value $null -Path \"$dir\\game.sav\" }"
@@ -22,5 +15,12 @@
             "Witch Blast.exe",
             "Witch Blast"
         ]
-    ]
+    ],
+    "persist": [
+        "config.dat",
+        "game.sav",
+        "data"
+    ],
+    "checkver": "github",
+    "##": "Note: No Autoupdate due to inconsistent releases, downloads etc. Also, a new release seems unlikely"
 }
diff --git a/bucket/wowup.json b/bucket/wowup.json
index bea62534..0eefd32a 100644
--- a/bucket/wowup.json
+++ b/bucket/wowup.json
@@ -1,20 +1,10 @@
 {
-    "homepage": "https://wowup.io/",
-    "description": "World of Warcraft addon updater.",
     "version": "2.6.2",
+    "description": "World of Warcraft addon updater.",
+    "homepage": "https://wowup.io/",
     "license": "GPL-3.0-or-later",
     "url": "https://github.com/WowUp/WowUp/releases/download/v2.6.2/WowUp-Setup-2.6.2.exe#/dl.7z",
     "hash": "sha512:a7deb136d768d334707628307f80d233aeadc0b7d58f1e12791f1837656e110052bee6d7636c94631610c758d63cdbb3be22365e9285fd3fedd55055e3228c3b",
-    "autoupdate": {
-        "url": "https://github.com/WowUp/WowUp/releases/download/v$version/WowUp-Setup-$version.exe#/dl.7z",
-        "hash": {
-            "url": "$baseurl/latest.yml",
-            "find": "sha512:\\s+(.*)"
-        }
-    },
-    "checkver": {
-        "github": "https://github.com/WowUp/WowUp"
-    },
     "extract_dir": "$PLUGINSDIR",
     "installer": {
         "script": [
@@ -27,5 +17,15 @@
             "WowUp.exe",
             "WowUp"
         ]
-    ]
+    ],
+    "checkver": {
+        "github": "https://github.com/WowUp/WowUp"
+    },
+    "autoupdate": {
+        "url": "https://github.com/WowUp/WowUp/releases/download/v$version/WowUp-Setup-$version.exe#/dl.7z",
+        "hash": {
+            "url": "$baseurl/latest.yml",
+            "find": "sha512:\\s+(.*)"
+        }
+    }
 }
diff --git a/bucket/wyrmsun.json b/bucket/wyrmsun.json
index 1ff9c85b..d02e40d8 100644
--- a/bucket/wyrmsun.json
+++ b/bucket/wyrmsun.json
@@ -1,7 +1,7 @@
 {
-    "homepage": "https://andrettin.github.io/",
-    "description": "Real-time strategy game with retro graphics",
     "version": "3.5.4",
+    "description": "Real-time strategy game with retro graphics",
+    "homepage": "https://andrettin.github.io/",
     "license": "GPL-2.0-only",
     "url": [
         "https://github.com/Andrettin/Wyrmsun/releases/download/v3.5.4/wyrmsun.exe",
@@ -15,14 +15,14 @@
         "a749e02e74a96680ea95db3035eab1a48fbd70f9a49ee6b66a317cb05c8f88fa",
         "6ac5a8fcc32fee798e4e3590bace26a7741a66f205458690fc2c0a111035ded6"
     ],
-    "checkver": {
-        "github": "https://github.com/Andrettin/Wyrmsun"
-    },
     "extract_dir": "Wyrmsun-3.5.4",
     "shortcuts": [
         [
             "wyrmsun.exe",
             "Wyrmsun"
         ]
-    ]
+    ],
+    "checkver": {
+        "github": "https://github.com/Andrettin/Wyrmsun"
+    }
 }
diff --git a/bucket/xebra.json b/bucket/xebra.json
index 8eab58da..7885bb8c 100644
--- a/bucket/xebra.json
+++ b/bucket/xebra.json
@@ -1,7 +1,7 @@
 {
-    "homepage": "http://drhell.web.fc2.com/ps1/",
-    "description": "PlayStation emulator focused on accuracy",
     "version": "211031",
+    "description": "PlayStation emulator focused on accuracy",
+    "homepage": "http://drhell.web.fc2.com/ps1/",
     "license": "Freeware",
     "notes": [
         "Warning: XEBRA.INI is not persisted across updates because of version incompatibilities.",
@@ -12,18 +12,6 @@
     ],
     "url": "https://drhell.web.fc2.com/ps1/xebra211031.zip",
     "hash": "1bbb3eb5abfb6a53da8a35012cb1d78ec63f5e1bc28ae24614c22dd5cb4d7046",
-    "autoupdate": {
-        "url": "https://drhell.web.fc2.com/ps1/xebra$version.zip"
-    },
-    "checkver": {
-        "regex": "xebra([\\da-z]+)\\.zip"
-    },
-    "persist": [
-        "BU00",
-        "BU10",
-        "OSROM",
-        "VIDEO.DLL"
-    ],
     "pre_install": [
         "'BU00', 'BU10', 'OSROM', 'VIDEO.DLL' | ForEach-Object {",
         "    if (!(Test-Path \"$persist_dir\\$_\")) {",
@@ -36,5 +24,17 @@
             "XEBRA.EXE",
             "XEBRA"
         ]
-    ]
+    ],
+    "persist": [
+        "BU00",
+        "BU10",
+        "OSROM",
+        "VIDEO.DLL"
+    ],
+    "checkver": {
+        "regex": "xebra([\\da-z]+)\\.zip"
+    },
+    "autoupdate": {
+        "url": "https://drhell.web.fc2.com/ps1/xebra$version.zip"
+    }
 }
diff --git a/bucket/xemu.json b/bucket/xemu.json
index 8316a54c..2ce946f2 100644
--- a/bucket/xemu.json
+++ b/bucket/xemu.json
@@ -1,16 +1,32 @@
 {
-    "homepage": "https://xemu.app",
-    "description": "Original Xbox Emulator",
     "version": "0.6.2-79-ga32f271d55",
+    "description": "Original Xbox Emulator",
+    "homepage": "https://xemu.app",
     "license": {
-        "identifier": "GPL-2.0",
-        "url": "https://github.com/mborgerson/xemu/blob/master/LICENSE"
+        "url": "https://github.com/mborgerson/xemu/blob/master/LICENSE",
+        "identifier": "GPL-2.0"
     },
-    "architecture": {
-        "64bit": {
-            "url": "https://github.com/mborgerson/xemu/releases/download/gh-release%2F0.6.2-79-ga32f271d55/xemu-win-release.zip",
-            "hash": "c5859c7ac639160950048e4b5ff67984417533e24fc91de65369394d2f9aba51"
-        }
+    "pre_install": [
+        "if (!(Test-Path \"$persist_dir\")) {",
+        "   New-item \"$persist_dir\" -ItemType Directory | Out-Null",
+        "   New-item \"$persist_dir\\bios\" -ItemType Directory | Out-Null",
+        "   New-item \"$persist_dir\\data\" -ItemType Directory | Out-Null",
+        "}"
+    ],
+    "bin": "xemu.exe",
+    "shortcuts": [
+        [
+            "xemu.exe",
+            "Xemu"
+        ]
+    ],
+    "persist": [
+        "bios",
+        "data"
+    ],
+    "checkver": {
+        "github": "https://github.com/mborgerson/xemu",
+        "regex": "([\\d\\.]+-\\d{1,2}-g[a-f0-9]+)"
     },
     "autoupdate": {
         "architecture": {
@@ -19,26 +35,10 @@
             }
         }
     },
-    "bin": "xemu.exe",
-    "checkver": {
-        "github": "https://github.com/mborgerson/xemu",
-        "regex": "([\\d\\.]+-\\d{1,2}-g[a-f0-9]+)"
-    },
-    "persist": [
-        "bios",
-        "data"
-    ],
-    "pre_install": [
-        "if (!(Test-Path \"$persist_dir\")) {",
-        "   New-item \"$persist_dir\" -ItemType Directory | Out-Null",
-        "   New-item \"$persist_dir\\bios\" -ItemType Directory | Out-Null",
-        "   New-item \"$persist_dir\\data\" -ItemType Directory | Out-Null",
-        "}"
-    ],
-    "shortcuts": [
-        [
-            "xemu.exe",
-            "Xemu"
-        ]
-    ]
+    "architecture": {
+        "64bit": {
+            "url": "https://github.com/mborgerson/xemu/releases/download/gh-release%2F0.6.2-79-ga32f271d55/xemu-win-release.zip",
+            "hash": "c5859c7ac639160950048e4b5ff67984417533e24fc91de65369394d2f9aba51"
+        }
+    }
 }
diff --git a/bucket/xenia-canary.json b/bucket/xenia-canary.json
index 8466d548..a3e23be3 100644
--- a/bucket/xenia-canary.json
+++ b/bucket/xenia-canary.json
@@ -1,30 +1,11 @@
 {
-    "homepage": "https://xenia.jp",
-    "description": "Xbox 360 Research Emulator (development version)",
     "version": "nightly",
+    "description": "Xbox 360 Research Emulator (development version)",
+    "homepage": "https://xenia.jp",
     "license": {
-        "identifier": "BSD-3-Clause",
-        "url": "https://github.com/xenia-canary/xenia-canary/blob/canary_pr/LICENSE"
+        "url": "https://github.com/xenia-canary/xenia-canary/blob/canary_pr/LICENSE",
+        "identifier": "BSD-3-Clause"
     },
-    "architecture": {
-        "64bit": {
-            "url": "https://github.com/xenia-canary/xenia-canary/releases/download/experimental/xenia_canary.zip"
-        }
-    },
-    "autoupdate": {
-        "architecture": {
-            "64bit": {
-                "url": "https://github.com/xenia-canary/xenia-canary/releases/download/experimental/xenia_canary.zip"
-            }
-        }
-    },
-    "bin": "xenia_canary.exe",
-    "persist": [
-        "portable.txt",
-        "xenia-canary.config.toml",
-        "content",
-        "cache"
-    ],
     "pre_install": [
         "if (!(Test-Path \"$persist_dir\")) {",
         "   New-item \"$persist_dir\" -ItemType Directory | Out-Null",
@@ -37,10 +18,29 @@
         "   }",
         "}"
     ],
+    "bin": "xenia_canary.exe",
     "shortcuts": [
         [
             "xenia_canary.exe",
             "Xenia Canary"
         ]
-    ]
+    ],
+    "persist": [
+        "portable.txt",
+        "xenia-canary.config.toml",
+        "content",
+        "cache"
+    ],
+    "autoupdate": {
+        "architecture": {
+            "64bit": {
+                "url": "https://github.com/xenia-canary/xenia-canary/releases/download/experimental/xenia_canary.zip"
+            }
+        }
+    },
+    "architecture": {
+        "64bit": {
+            "url": "https://github.com/xenia-canary/xenia-canary/releases/download/experimental/xenia_canary.zip"
+        }
+    }
 }
diff --git a/bucket/xenia.json b/bucket/xenia.json
index afafbd17..e231fec3 100644
--- a/bucket/xenia.json
+++ b/bucket/xenia.json
@@ -1,35 +1,11 @@
 {
-    "homepage": "https://xenia.jp",
-    "description": "Xbox 360 Research Emulator",
     "version": "1.0.2589",
+    "description": "Xbox 360 Research Emulator",
+    "homepage": "https://xenia.jp",
     "license": {
-        "identifier": "BSD-3-Clause",
-        "url": "https://github.com/xenia-project/xenia/blob/master/LICENSE"
+        "url": "https://github.com/xenia-project/xenia/blob/master/LICENSE",
+        "identifier": "BSD-3-Clause"
     },
-    "architecture": {
-        "64bit": {
-            "url": "https://github.com/xenia-project/release-builds-windows/releases/download/v1.0.2589-master/xenia_master.zip",
-            "hash": "cc30dd93743be74a6c3f7a3b1448b19a90a209673fb8b744f43b6d8b293ae49a"
-        }
-    },
-    "autoupdate": {
-        "architecture": {
-            "64bit": {
-                "url": "https://github.com/xenia-project/release-builds-windows/releases/download/v$version-master/xenia_master.zip"
-            }
-        }
-    },
-    "bin": "xenia.exe",
-    "checkver": {
-        "github": "https://github.com/xenia-project/release-builds-windows",
-        "regex": "v([\\d.]+)-master/xenia_master\\.zip"
-    },
-    "persist": [
-        "portable.txt",
-        "xenia.config.toml",
-        "content",
-        "cache"
-    ],
     "pre_install": [
         "if (!(Test-Path \"$persist_dir\")) {",
         "   New-item \"$persist_dir\" -ItemType Directory | Out-Null",
@@ -42,10 +18,34 @@
         "   }",
         "}"
     ],
+    "bin": "xenia.exe",
     "shortcuts": [
         [
             "xenia.exe",
             "Xenia"
         ]
-    ]
+    ],
+    "persist": [
+        "portable.txt",
+        "xenia.config.toml",
+        "content",
+        "cache"
+    ],
+    "checkver": {
+        "github": "https://github.com/xenia-project/release-builds-windows",
+        "regex": "v([\\d.]+)-master/xenia_master\\.zip"
+    },
+    "autoupdate": {
+        "architecture": {
+            "64bit": {
+                "url": "https://github.com/xenia-project/release-builds-windows/releases/download/v$version-master/xenia_master.zip"
+            }
+        }
+    },
+    "architecture": {
+        "64bit": {
+            "url": "https://github.com/xenia-project/release-builds-windows/releases/download/v1.0.2589-master/xenia_master.zip",
+            "hash": "cc30dd93743be74a6c3f7a3b1448b19a90a209673fb8b744f43b6d8b293ae49a"
+        }
+    }
 }
diff --git a/bucket/xmoto.json b/bucket/xmoto.json
index 9f51b489..4876267f 100644
--- a/bucket/xmoto.json
+++ b/bucket/xmoto.json
@@ -1,12 +1,12 @@
 {
-    "homepage": "https://xmoto.tuxfamily.org/",
-    "description": "Difficult 2D motocross racing/stunts game",
     "version": "0.5.11",
+    "description": "Difficult 2D motocross racing/stunts game",
+    "homepage": "https://xmoto.tuxfamily.org/",
     "license": "GPL-2.0-or-later",
     "url": "http://download.tuxfamily.org/xmoto/xmoto/0.5.11/xmoto-0.5.11-win32.zip",
     "hash": "0f9db7e042ab3a05ff131a66a20baf78539a869e8676cdec9054854cb9c6a32e",
-    "bin": "xmoto.exe",
     "extract_dir": "xmoto-0.5.11-win32",
+    "bin": "xmoto.exe",
     "shortcuts": [
         [
             "xmoto.exe",
diff --git a/bucket/xonotic.json b/bucket/xonotic.json
index 3f011986..4faccc9b 100644
--- a/bucket/xonotic.json
+++ b/bucket/xonotic.json
@@ -1,17 +1,23 @@
 {
-    "homepage": "https://xonotic.org/",
-    "description": "Free fast-paced first-person shooter",
     "version": "0.8.2",
+    "description": "Free fast-paced first-person shooter",
+    "homepage": "https://xonotic.org/",
     "license": "GPL-3.0-or-later",
     "url": "https://dl.xonotic.org/xonotic-0.8.2.zip",
     "hash": "a22f7230f486c5825b55cfdadd73399c9b0fae98c9e081dd8ac76eca08359ad5",
-    "architecture": {
-        "32bit": {
-            "pre_install": "Set-Content -Path \"$dir\\xonotic.bat\" -Value \"pushd $dir && xonotic-x86.exe && popd\""
-        },
-        "64bit": {
-            "pre_install": "Set-Content -Path \"$dir\\xonotic.bat\" -Value \"pushd $dir && xonotic.exe && popd\""
-        }
+    "extract_dir": "Xonotic",
+    "bin": "xonotic.bat",
+    "shortcuts": [
+        [
+            "xonotic.bat",
+            "Xonotic",
+            "",
+            "misc/logos/icons_ico/xonotic.ico"
+        ]
+    ],
+    "checkver": {
+        "url": "https://xonotic.org/download/",
+        "regex": "Xonotic ([\\d.]+) for"
     },
     "autoupdate": {
         "url": "https://dl.xonotic.org/xonotic-$version.zip",
@@ -20,18 +26,12 @@
             "find": "sha256sum: *?([a-fA-F\\d]{64})"
         }
     },
-    "bin": "xonotic.bat",
-    "checkver": {
-        "url": "https://xonotic.org/download/",
-        "regex": "Xonotic ([\\d.]+) for"
-    },
-    "extract_dir": "Xonotic",
-    "shortcuts": [
-        [
-            "xonotic.bat",
-            "Xonotic",
-            "",
-            "misc/logos/icons_ico/xonotic.ico"
-        ]
-    ]
+    "architecture": {
+        "32bit": {
+            "pre_install": "Set-Content -Path \"$dir\\xonotic.bat\" -Value \"pushd $dir && xonotic-x86.exe && popd\""
+        },
+        "64bit": {
+            "pre_install": "Set-Content -Path \"$dir\\xonotic.bat\" -Value \"pushd $dir && xonotic.exe && popd\""
+        }
+    }
 }
diff --git a/bucket/yquake2.json b/bucket/yquake2.json
index b8e4603c..6280953b 100644
--- a/bucket/yquake2.json
+++ b/bucket/yquake2.json
@@ -1,7 +1,7 @@
 {
-    "homepage": "https://www.yamagi.org/quake2/",
-    "description": "Conservative Quake 2 source port focused on singleplayer and cooperative gameplay",
     "version": "8.01",
+    "description": "Conservative Quake 2 source port focused on singleplayer and cooperative gameplay",
+    "homepage": "https://www.yamagi.org/quake2/",
     "license": "GPL-2.0-or-later",
     "notes": [
         "Place game data files (such as pak0.pak-pak2.pak) in:",
@@ -32,27 +32,11 @@
     ],
     "url": "https://deponie.yamagi.org/quake2/windows/quake2-8.01.zip",
     "hash": "0b036e7a7ab00a6cc3b2f94045dd5e15d8ae37d3d626a4dcf1c9ecbd2f23596a",
-    "autoupdate": {
-        "url": "https://deponie.yamagi.org/quake2/windows/quake2-$matchVer.zip",
-        "extract_dir": "quake2-$matchVer"
-    },
+    "extract_dir": "quake2-8.01",
     "bin": [
         "yquake2.exe",
         "q2ded.exe"
     ],
-    "checkver": {
-        "url": "https://deponie.yamagi.org/quake2/windows",
-        "regex": "(?'ver'\\d\\.\\d{2}[a-z]?)",
-        "replace": "${ver}",
-        "reverse": true
-    },
-    "extract_dir": "quake2-8.01",
-    "persist": [
-        "baseq2",
-        "rogue",
-        "xatrix",
-        "zaero"
-    ],
     "shortcuts": [
         [
             "yquake2.exe",
@@ -73,5 +57,21 @@
             "Yamagi Quake 2 (Zaero)",
             "+set game zaero"
         ]
-    ]
+    ],
+    "persist": [
+        "baseq2",
+        "rogue",
+        "xatrix",
+        "zaero"
+    ],
+    "checkver": {
+        "url": "https://deponie.yamagi.org/quake2/windows",
+        "regex": "(?'ver'\\d\\.\\d{2}[a-z]?)",
+        "replace": "${ver}",
+        "reverse": true
+    },
+    "autoupdate": {
+        "url": "https://deponie.yamagi.org/quake2/windows/quake2-$matchVer.zip",
+        "extract_dir": "quake2-$matchVer"
+    }
 }
diff --git a/bucket/yuzu-pineapple.json b/bucket/yuzu-pineapple.json
index 22944adf..24d69eb5 100644
--- a/bucket/yuzu-pineapple.json
+++ b/bucket/yuzu-pineapple.json
@@ -1,43 +1,12 @@
 {
-    "homepage": "https://github.com/pineappleEA/pineapple-src",
-    "description": "A Yuzu Early Access fork with Linux-specific patches",
     "version": "EA-2529",
+    "description": "A Yuzu Early Access fork with Linux-specific patches",
+    "homepage": "https://github.com/pineappleEA/pineapple-src",
     "license": {
-        "identifier": "GPL-2.0",
-        "url": "https://github.com/pineappleEA/pineapple-src/blob/main/LICENSE"
-    },
-    "architecture": {
-        "64bit": {
-            "url": "https://github.com/pineappleEA/pineapple-src/releases/download/EA-2529/Windows-Yuzu-EA-2529.7z",
-            "hash": "8cccc74ea196ff39f128ee01cf9a551fafba4d67ca8cc34e1f2a50df96f4adb8"
-        }
-    },
-    "autoupdate": {
-        "architecture": {
-            "64bit": {
-                "url": "https://github.com/pineappleEA/pineapple-src/releases/download/$version/Windows-Yuzu-$version.7z"
-            }
-        }
-    },
-    "bin": [
-        [
-            "yuzu.exe",
-            "yuzu-dev"
-        ],
-        [
-            "yuzu-cmd.exe",
-            "yuzu-cmd-dev"
-        ]
-    ],
-    "checkver": {
-        "github": "https://github.com/pineappleEA/pineapple-src",
-        "regex": "(EA-\\d+) \\(auto-updater\\)"
+        "url": "https://github.com/pineappleEA/pineapple-src/blob/main/LICENSE",
+        "identifier": "GPL-2.0"
     },
     "extract_dir": "yuzu-windows-msvc-early-access",
-    "persist": [
-        "user",
-        "plugins"
-    ],
     "pre_install": [
         "if (!(Test-Path \"$persist_dir\")) {",
         "   New-item \"$persist_dir\" -ItemType Directory | Out-Null",
@@ -49,10 +18,41 @@
         "   }",
         "}"
     ],
+    "bin": [
+        [
+            "yuzu.exe",
+            "yuzu-dev"
+        ],
+        [
+            "yuzu-cmd.exe",
+            "yuzu-cmd-dev"
+        ]
+    ],
     "shortcuts": [
         [
             "yuzu.exe",
             "Yuzu (Development)"
         ]
-    ]
+    ],
+    "persist": [
+        "user",
+        "plugins"
+    ],
+    "checkver": {
+        "github": "https://github.com/pineappleEA/pineapple-src",
+        "regex": "(EA-\\d+) \\(auto-updater\\)"
+    },
+    "autoupdate": {
+        "architecture": {
+            "64bit": {
+                "url": "https://github.com/pineappleEA/pineapple-src/releases/download/$version/Windows-Yuzu-$version.7z"
+            }
+        }
+    },
+    "architecture": {
+        "64bit": {
+            "url": "https://github.com/pineappleEA/pineapple-src/releases/download/EA-2529/Windows-Yuzu-EA-2529.7z",
+            "hash": "8cccc74ea196ff39f128ee01cf9a551fafba4d67ca8cc34e1f2a50df96f4adb8"
+        }
+    }
 }
diff --git a/bucket/yuzu.json b/bucket/yuzu.json
index 2cfd71c0..29d149e4 100644
--- a/bucket/yuzu.json
+++ b/bucket/yuzu.json
@@ -1,37 +1,12 @@
 {
-    "homepage": "https://yuzu-emu.org/",
-    "description": "Experimental emulator for the Nintendo Switch",
     "version": "0-943",
+    "description": "Experimental emulator for the Nintendo Switch",
+    "homepage": "https://yuzu-emu.org/",
     "license": {
-        "identifier": "GPL-2.0",
-        "url": "https://github.com/yuzu-emu/yuzu-mainline/blob/master/license.txt"
-    },
-    "architecture": {
-        "64bit": {
-            "url": "https://github.com/yuzu-emu/yuzu-mainline/releases/download/mainline-0-943/yuzu-windows-msvc-20220306-3a401ca22.7z",
-            "hash": "77a10c8b46c0663b241458675a068e761845578f9b2d1a8f99bb100f3f82ab1c"
-        }
-    },
-    "autoupdate": {
-        "architecture": {
-            "64bit": {
-                "url": "https://github.com/yuzu-emu/yuzu-mainline/releases/download/mainline-$version/yuzu-windows-msvc-$matchDate-$matchCommit.7z"
-            }
-        }
-    },
-    "bin": [
-        "yuzu.exe",
-        "yuzu-cmd.exe"
-    ],
-    "checkver": {
-        "github": "https://github.com/yuzu-emu/yuzu-mainline",
-        "regex": "download/mainline-([\\d.-]+)/yuzu-windows-msvc-(?<date>[\\d]{8})-(?<commit>[\\da-f]+).7z"
+        "url": "https://github.com/yuzu-emu/yuzu-mainline/blob/master/license.txt",
+        "identifier": "GPL-2.0"
     },
     "extract_dir": "yuzu-windows-msvc",
-    "persist": [
-        "user",
-        "plugins"
-    ],
     "pre_install": [
         "if (!(Test-Path \"$persist_dir\")) {",
         "   New-item \"$persist_dir\" -ItemType Directory | Out-Null",
@@ -43,10 +18,35 @@
         "   }",
         "}"
     ],
+    "bin": [
+        "yuzu.exe",
+        "yuzu-cmd.exe"
+    ],
     "shortcuts": [
         [
             "yuzu.exe",
             "Yuzu"
         ]
-    ]
+    ],
+    "persist": [
+        "user",
+        "plugins"
+    ],
+    "checkver": {
+        "github": "https://github.com/yuzu-emu/yuzu-mainline",
+        "regex": "download/mainline-([\\d.-]+)/yuzu-windows-msvc-(?<date>[\\d]{8})-(?<commit>[\\da-f]+).7z"
+    },
+    "autoupdate": {
+        "architecture": {
+            "64bit": {
+                "url": "https://github.com/yuzu-emu/yuzu-mainline/releases/download/mainline-$version/yuzu-windows-msvc-$matchDate-$matchCommit.7z"
+            }
+        }
+    },
+    "architecture": {
+        "64bit": {
+            "url": "https://github.com/yuzu-emu/yuzu-mainline/releases/download/mainline-0-943/yuzu-windows-msvc-20220306-3a401ca22.7z",
+            "hash": "77a10c8b46c0663b241458675a068e761845578f9b2d1a8f99bb100f3f82ab1c"
+        }
+    }
 }
diff --git a/bucket/zandronum.json b/bucket/zandronum.json
index 4fcf2f6f..d9985488 100644
--- a/bucket/zandronum.json
+++ b/bucket/zandronum.json
@@ -1,7 +1,7 @@
 {
-    "homepage": "https://zandronum.com/",
-    "description": "Modern multiplayer-oriented source port for Doom",
     "version": "3.0",
+    "description": "Modern multiplayer-oriented source port for Doom",
+    "homepage": "https://zandronum.com/",
     "license": "https://zdoom.org/wiki/license",
     "notes": [
         "Place WAD files (game data) in:",
@@ -10,11 +10,11 @@
     ],
     "url": "https://zandronum.com/downloads/zandronum3.0-win32-base.zip",
     "hash": "c261ecbc6931bf5245d5447f4702e8aa8b59445c93a5b5cadebcb0fdc0747551",
-    "bin": "zandronum.exe",
+    "pre_install": "New-Item -ItemType Directory -Force -Path $persist_dir\\..\\_doom | Out-Null",
     "env_set": {
         "DOOMWADDIR": "$persist_dir\\..\\_doom"
     },
-    "pre_install": "New-Item -ItemType Directory -Force -Path $persist_dir\\..\\_doom | Out-Null",
+    "bin": "zandronum.exe",
     "shortcuts": [
         [
             "zandronum.exe",
diff --git a/bucket/zdbsp.json b/bucket/zdbsp.json
index 3cb6193e..7b038c12 100644
--- a/bucket/zdbsp.json
+++ b/bucket/zdbsp.json
@@ -1,7 +1,7 @@
 {
-    "homepage": "https://zdoom.org/downloads#zdbsp",
-    "description": "Advanced node builder for Doom maps with UDMF support",
     "version": "1.19",
+    "description": "Advanced node builder for Doom maps with UDMF support",
+    "homepage": "https://zdoom.org/downloads#zdbsp",
     "license": "GPL-2.0-or-later",
     "url": "https://zdoom.org/files/utils/zdbsp/zdbsp-1.19.zip",
     "hash": "899b4f5046111536ae1e6ed377c519e8740bcb070863a06348f9111b3bcb1080",
diff --git a/bucket/zdl.json b/bucket/zdl.json
index 6e65174a..a14ede22 100644
--- a/bucket/zdl.json
+++ b/bucket/zdl.json
@@ -1,17 +1,18 @@
 {
-    "homepage": "https://zdoom.org/wiki/ZDL",
-    "description": "ZDL is a frontend (\"launcher\") for ZDoom based Doom engine source ports.",
     "version": "3-1.1",
+    "description": "ZDL is a frontend (\"launcher\") for ZDoom based Doom engine source ports.",
+    "homepage": "https://zdoom.org/wiki/ZDL",
     "license": "GPL-3.0-or-later",
-    "architecture": {
-        "32bit": {
-            "url": "https://github.com/lcferrum/qzdl/releases/download/3-1.1/ZDL_3-1.1_Win_x86.zip",
-            "hash": "11a6775460df1823feedf3ca20e7d0cb691bf70f20c77b2e0255b99ced55691a"
-        },
-        "64bit": {
-            "url": "https://github.com/lcferrum/qzdl/releases/download/3-1.1/ZDL_3-1.1_Win_x86.zip",
-            "hash": "11a6775460df1823feedf3ca20e7d0cb691bf70f20c77b2e0255b99ced55691a"
-        }
+    "bin": "ZDL.exe",
+    "shortcuts": [
+        [
+            "ZDL.exe",
+            "ZDL"
+        ]
+    ],
+    "checkver": {
+        "github": "https://github.com/lcferrum/qzdl",
+        "regex": "/releases/tag/([\\w.-]+)"
     },
     "autoupdate": {
         "architecture": {
@@ -23,15 +24,14 @@
             }
         }
     },
-    "bin": "ZDL.exe",
-    "checkver": {
-        "github": "https://github.com/lcferrum/qzdl",
-        "regex": "/releases/tag/([\\w.-]+)"
-    },
-    "shortcuts": [
-        [
-            "ZDL.exe",
-            "ZDL"
-        ]
-    ]
+    "architecture": {
+        "32bit": {
+            "url": "https://github.com/lcferrum/qzdl/releases/download/3-1.1/ZDL_3-1.1_Win_x86.zip",
+            "hash": "11a6775460df1823feedf3ca20e7d0cb691bf70f20c77b2e0255b99ced55691a"
+        },
+        "64bit": {
+            "url": "https://github.com/lcferrum/qzdl/releases/download/3-1.1/ZDL_3-1.1_Win_x86.zip",
+            "hash": "11a6775460df1823feedf3ca20e7d0cb691bf70f20c77b2e0255b99ced55691a"
+        }
+    }
 }
diff --git a/bucket/zokumbsp.json b/bucket/zokumbsp.json
index f23f6194..60afaa23 100644
--- a/bucket/zokumbsp.json
+++ b/bucket/zokumbsp.json
@@ -1,7 +1,7 @@
 {
-    "homepage": "http://www.doom2.net/zokum/zokumbsp/",
-    "description": "Node builder for Doom maps (compatible with original executables and Chocolate Doom)",
     "version": "1.1",
+    "description": "Node builder for Doom maps (compatible with original executables and Chocolate Doom)",
+    "homepage": "http://www.doom2.net/zokum/zokumbsp/",
     "license": "GPL-2.0-or-later",
     "url": "http://www.doom2.net/zokum/zokumbsp/releases/zokumbsp-1.1-win64-mingw.zip",
     "hash": "b25f89b3c999ee39ca830a516a5a43a57be488f28d56344bc851c6935a615293",