diff --git a/bucket/android-studio-beta.json b/bucket/android-studio-beta.json
index 871345980a8..0033fdd3f92 100644
--- a/bucket/android-studio-beta.json
+++ b/bucket/android-studio-beta.json
@@ -8,8 +8,8 @@
     },
     "suggest": {
         "SDK": [
-            "android-clt",
-            "android-sdk"
+            "main/android-clt",
+            "extras/android-sdk"
         ]
     },
     "architecture": {
diff --git a/bucket/android-studio-canary.json b/bucket/android-studio-canary.json
index 4c13bddfa61..eddb60f1c42 100644
--- a/bucket/android-studio-canary.json
+++ b/bucket/android-studio-canary.json
@@ -8,8 +8,8 @@
     },
     "suggest": {
         "SDK": [
-            "android-clt",
-            "android-sdk"
+            "main/android-clt",
+            "extras/android-sdk"
         ]
     },
     "architecture": {
diff --git a/bucket/ant19.json b/bucket/ant19.json
index a2c5ae208f8..64718ee7ac7 100644
--- a/bucket/ant19.json
+++ b/bucket/ant19.json
@@ -1,8 +1,14 @@
 {
     "version": "1.9.16",
-    "homepage": "https://ant.apache.org/",
     "description": "Apache Ant, a Java library and command-line tool for compiling, assembling, testing and running Java and non-Java applications. (version 1.9)",
+    "homepage": "https://ant.apache.org/",
     "license": "Apache 2.0",
+    "suggest": {
+        "JDK": [
+            "java/oraclejdk",
+            "java/openjdk"
+        ]
+    },
     "url": "https://www.apache.org/dist/ant/binaries/apache-ant-1.9.16-bin.zip",
     "hash": "sha512:b9324cffeb5b113fa289126db1408b9a0125757b598d763f076fc5deec97fb43f27979974cadcac79b6573d84dcb2d1d5bf59b7972fb2abe5ed3d9fed445b04e",
     "extract_dir": "apache-ant-1.9.16",
@@ -10,21 +16,15 @@
     "env_set": {
         "ANT_HOME": "$dir"
     },
-    "suggest": {
-        "JDK": [
-            "java/oraclejdk",
-            "java/openjdk"
-        ]
-    },
     "checkver": {
         "url": "https://ant.apache.org/bindownload.cgi",
         "regex": "apache-ant-(1.9.\\d+)-bin.zip"
     },
     "autoupdate": {
         "url": "https://www.apache.org/dist/ant/binaries/apache-ant-$version-bin.zip",
-        "extract_dir": "apache-ant-$version",
         "hash": {
             "url": "$url.sha512"
-        }
+        },
+        "extract_dir": "apache-ant-$version"
     }
 }
diff --git a/bucket/camunda-operate1.3.json b/bucket/camunda-operate1.3.json
index 8562c81cd6f..81de311e1a5 100644
--- a/bucket/camunda-operate1.3.json
+++ b/bucket/camunda-operate1.3.json
@@ -8,7 +8,7 @@
     },
     "suggest": {
         "JDK": "java/openjdk",
-        "Zeebe": "zeebe1.3",
+        "Zeebe": "versions/zeebe1.3",
         "ElasticSearch": "extras/elasticsearch"
     },
     "architecture": {
diff --git a/bucket/composer1.json b/bucket/composer1.json
index 48784b5e74c..36d9359b54c 100644
--- a/bucket/composer1.json
+++ b/bucket/composer1.json
@@ -4,6 +4,12 @@
     "homepage": "https://getcomposer.org/",
     "license": "MIT",
     "notes": "'composer selfupdate --1' is aliased to 'scoop update composer'",
+    "suggest": {
+        "PHP": [
+            "main/php",
+            "main/php-nts"
+        ]
+    },
     "url": "https://getcomposer.org/download/1.10.26/composer.phar",
     "hash": "cbfe1f85276c57abe464d934503d935aa213494ac286275c8dfabfa91e3dbdc4",
     "pre_install": [
@@ -16,6 +22,10 @@
         "    Move-Item \"$env:Appdata\\Composer\" \"$persist_dir\\home\" -Force",
         "}"
     ],
+    "env_add_path": "home\\vendor\\bin",
+    "env_set": {
+        "COMPOSER_HOME": "$persist_dir\\home"
+    },
     "bin": [
         "composer.ps1",
         [
@@ -23,17 +33,7 @@
             "composer1"
         ]
     ],
-    "env_set": {
-        "COMPOSER_HOME": "$persist_dir\\home"
-    },
-    "env_add_path": "home\\vendor\\bin",
     "persist": "home",
-    "suggest": {
-        "PHP": [
-            "php",
-            "php-nts"
-        ]
-    },
     "checkver": {
         "url": "https://github.com/composer/composer/releases",
         "regex": "tag/(1\\.[\\d.]+)[^-]"
diff --git a/bucket/docker-nightly.json b/bucket/docker-nightly.json
index ca7c98a370f..ce5276bf4dd 100644
--- a/bucket/docker-nightly.json
+++ b/bucket/docker-nightly.json
@@ -31,17 +31,14 @@
         "For help, see https://docs.microsoft.com/en-us/virtualization/windowscontainers/manage-docker/configure-docker-daemon"
     ],
     "suggest": {
-        "Linux container support on Windows": "lcow",
-        "Docker Compose": "docker-compose",
-        "Docker Machine": "docker-machine",
-        "Kubernetes Standalone": "minikube",
-        "Kubernetes Client": "kubectl",
-        "compose.yml to kubernetes.yml": "kompose"
+        "sudo": "gsudo",
+        "Docker Compose": "main/docker-compose",
+        "Docker Machine": "main/docker-machine",
+        "Kubernetes Client": "main/kubectl",
+        "Kubernetes Standalone": "main/minikube",
+        "Linux container support on Windows": "unknown/lcow",
+        "compose.yml to kubernetes.yml": "main/kompose"
     },
-    "depends": [
-        "sudo",
-        "lcow"
-    ],
     "url": "https://master.dockerproject.org/windows/x86_64/docker.zip",
     "extract_dir": "docker",
     "bin": [
diff --git a/bucket/ffmpeg-yt-dlp.json b/bucket/ffmpeg-yt-dlp.json
index 1fc7b2584a0..895930170b5 100644
--- a/bucket/ffmpeg-yt-dlp.json
+++ b/bucket/ffmpeg-yt-dlp.json
@@ -4,7 +4,7 @@
     "homepage": "https://github.com/yt-dlp/FFmpeg-Builds",
     "license": "MIT",
     "suggest": {
-        "yt-dlp": "yt-dlp"
+        "yt-dlp": "main/yt-dlp"
     },
     "architecture": {
         "64bit": {
diff --git a/bucket/gn.json b/bucket/gn.json
index 60ded8fabc7..49a9fcc8dd0 100644
--- a/bucket/gn.json
+++ b/bucket/gn.json
@@ -4,8 +4,8 @@
     "homepage": "https://gn.googlesource.com/gn",
     "license": "BSD-3-Clause",
     "suggest": {
-        "ninja": "ninja",
-        "Python3": "python"
+        "ninja": "main/ninja",
+        "Python3": "main/python"
     },
     "architecture": {
         "64bit": {
diff --git a/bucket/goneovim-nightly.json b/bucket/goneovim-nightly.json
index 4578125f72d..7d1ec856fe6 100644
--- a/bucket/goneovim-nightly.json
+++ b/bucket/goneovim-nightly.json
@@ -4,7 +4,7 @@
     "homepage": "https://github.com/akiyosi/goneovim",
     "license": "MIT",
     "suggest": {
-        "neovim": "neovim"
+        "neovim": "main/neovim"
     },
     "architecture": {
         "64bit": {
diff --git a/bucket/haskell863.json b/bucket/haskell863.json
index abc74db49df..0b00ffe70f2 100644
--- a/bucket/haskell863.json
+++ b/bucket/haskell863.json
@@ -40,7 +40,7 @@
     ],
     "env_add_path": "lib\\extralibs\\bin",
     "suggest": {
-        "Stack": "stack"
+        "Stack": "main/stack"
     },
     "notes": "For Haskell Stack, please install 'stack'."
 }
diff --git a/bucket/jdownloader.json b/bucket/jdownloader.json
index c38876db50e..07d65c547d8 100644
--- a/bucket/jdownloader.json
+++ b/bucket/jdownloader.json
@@ -4,7 +4,7 @@
     "homepage": "https://jdownloader.org",
     "license": "Shareware|AGPL-3.0-only",
     "suggest": {
-        "JRE": "java/adopt8-hotspot-jre"
+        "JRE": "java/temurin8-jre"
     },
     "url": [
         "http://installer.jdownloader.org/JDownloader.jar",
diff --git a/bucket/neovide-dev.json b/bucket/neovide-dev.json
index fb7eebc022f..914ec75a5ff 100644
--- a/bucket/neovide-dev.json
+++ b/bucket/neovide-dev.json
@@ -4,7 +4,7 @@
     "homepage": "https://github.com/Kethku/neovide",
     "license": "MIT",
     "suggest": {
-        "neovim": "neovim"
+        "neovim": "main/neovim"
     },
     "architecture": {
         "64bit": {
diff --git a/bucket/openrgb-nightly.json b/bucket/openrgb-nightly.json
index 1d97b999b39..0c3b55b3bac 100644
--- a/bucket/openrgb-nightly.json
+++ b/bucket/openrgb-nightly.json
@@ -4,7 +4,7 @@
     "homepage": "https://openrgb.org",
     "license": "GPL-2.0-only",
     "suggest": {
-        "vcredist": "vcredist2022"
+        "vcredist": "extras/vcredist2022"
     },
     "architecture": {
         "64bit": {
diff --git a/bucket/openvpn-w7.json b/bucket/openvpn-w7.json
index 6ff3ec15c4f..0f6a4faccfd 100644
--- a/bucket/openvpn-w7.json
+++ b/bucket/openvpn-w7.json
@@ -4,7 +4,7 @@
     "homepage": "https://openvpn.net",
     "license": "GPL-2.0-only",
     "suggest": {
-        "openssl": "openssl"
+        "openssl": "main/openssl"
     },
     "url": "https://swupdate.openvpn.org/community/releases/openvpn-install-2.4.11-I602-Win7.exe",
     "hash": "d419938e490bc124689eae6693d9fd6f22bd256b6adff9402a620f0e7d4a827d",
diff --git a/bucket/oracle-instant-client19.json b/bucket/oracle-instant-client19.json
index e87054393d7..234ffbb5925 100644
--- a/bucket/oracle-instant-client19.json
+++ b/bucket/oracle-instant-client19.json
@@ -6,6 +6,9 @@
         "identifier": "Freeware",
         "url": "https://www.oracle.com/downloads/licenses/instant-client-lic.html"
     },
+    "suggest": {
+        "Visual C++ 2017 Redistributable": "extras/vcredist2017"
+    },
     "architecture": {
         "64bit": {
             "url": "https://download.oracle.com/otn_software/nt/instantclient/1917000/instantclient-basic-windows.x64-19.17.0.0.0dbru.zip",
@@ -24,16 +27,13 @@
             }
         }
     },
-    "suggest": {
-        "Visual C++ 2017 Redistributable": "extras/vcredist2017"
-    },
     "extract_dir": "instantclient_19_17",
     "env_add_path": ".",
     "persist": "network\\admin",
     "checkver": {
+        "useragent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64)",
         "url": "https://www.oracle.com/database/technologies/instant-client/winx64-64-downloads.html",
-        "regex": "Version (19[\\d.]+)",
-        "useragent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64)"
+        "regex": "Version (19[\\d.]+)"
     },
     "autoupdate": {
         "architecture": {
diff --git a/bucket/qt-creator-beta.json b/bucket/qt-creator-beta.json
index fa18122acba..a561db0eda7 100644
--- a/bucket/qt-creator-beta.json
+++ b/bucket/qt-creator-beta.json
@@ -4,7 +4,7 @@
     "homepage": "https://doc.qt.io/qtcreator/index.html",
     "license": "GPL-3.0-only",
     "suggest": {
-        "vcredist": "vcredist2022"
+        "vcredist": "extras/vcredist2022"
     },
     "architecture": {
         "64bit": {
diff --git a/bucket/ruby24.json b/bucket/ruby24.json
index 3ca189c0ac4..d57f94ca1a6 100644
--- a/bucket/ruby24.json
+++ b/bucket/ruby24.json
@@ -3,6 +3,10 @@
     "description": "Ruby, a dynamic programming language with a focus on simplicity and productivity. (version 2.4)",
     "homepage": "https://rubyinstaller.org",
     "license": "BSD-3-Clause",
+    "notes": "Install MSYS2 via 'scoop install msys2' and then run 'ridk install' to install the toolchain!",
+    "suggest": {
+        "MSYS2": "main/msys2"
+    },
     "architecture": {
         "64bit": {
             "url": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-2.4.10-1/rubyinstaller-2.4.10-1-x64.7z",
@@ -15,7 +19,7 @@
             "extract_dir": "rubyinstaller-2.4.10-1-x86"
         }
     },
-    "persist": "gems",
+    "post_install": "gem install rake",
     "env_add_path": [
         "bin",
         "gems\\bin"
@@ -24,9 +28,5 @@
         "GEM_HOME": "$dir\\gems",
         "GEM_PATH": "$dir\\gems"
     },
-    "suggest": {
-        "MSYS2": "msys2"
-    },
-    "post_install": "gem install rake",
-    "notes": "Install MSYS2 via 'scoop install msys2' and then run 'ridk install' to install the toolchain!"
+    "persist": "gems"
 }
diff --git a/bucket/ruby25.json b/bucket/ruby25.json
index 00c6503cc6d..c89fc3ca488 100644
--- a/bucket/ruby25.json
+++ b/bucket/ruby25.json
@@ -3,6 +3,10 @@
     "description": "Ruby, a dynamic programming language with a focus on simplicity and productivity. (version 2.5)",
     "homepage": "https://rubyinstaller.org",
     "license": "BSD-3-Clause",
+    "notes": "Install MSYS2 via 'scoop install msys2' and then run 'ridk install' to install the toolchain!",
+    "suggest": {
+        "MSYS2": "main/msys2"
+    },
     "architecture": {
         "64bit": {
             "url": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-2.5.9-1/rubyinstaller-2.5.9-1-x64.7z",
@@ -15,7 +19,7 @@
             "extract_dir": "rubyinstaller-2.5.9-1-x86"
         }
     },
-    "persist": "gems",
+    "post_install": "gem install rake",
     "env_add_path": [
         "bin",
         "gems\\bin"
@@ -24,9 +28,5 @@
         "GEM_HOME": "$dir\\gems",
         "GEM_PATH": "$dir\\gems"
     },
-    "suggest": {
-        "MSYS2": "msys2"
-    },
-    "post_install": "gem install rake",
-    "notes": "Install MSYS2 via 'scoop install msys2' and then run 'ridk install' to install the toolchain!"
+    "persist": "gems"
 }
diff --git a/bucket/ruby26.json b/bucket/ruby26.json
index 2546c2bf04b..0980cc1e8d9 100644
--- a/bucket/ruby26.json
+++ b/bucket/ruby26.json
@@ -1,8 +1,12 @@
 {
     "version": "2.6.10-1",
-    "homepage": "https://rubyinstaller.org",
     "description": "Ruby, a dynamic programming language with a focus on simplicity and productivity. (version 2.6)",
+    "homepage": "https://rubyinstaller.org",
     "license": "BSD-3-Clause",
+    "notes": "Install MSYS2 via 'scoop install msys2' and then run 'ridk install' to install the toolchain!",
+    "suggest": {
+        "MSYS2": "main/msys2"
+    },
     "architecture": {
         "64bit": {
             "url": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-2.6.10-1/rubyinstaller-2.6.10-1-x64.7z",
@@ -15,7 +19,7 @@
             "extract_dir": "rubyinstaller-2.6.10-1-x86"
         }
     },
-    "persist": "gems",
+    "post_install": "gem install rake",
     "env_add_path": [
         "bin",
         "gems\\bin"
@@ -24,9 +28,5 @@
         "GEM_HOME": "$dir\\gems",
         "GEM_PATH": "$dir\\gems"
     },
-    "suggest": {
-        "MSYS2": "msys2"
-    },
-    "post_install": "gem install rake",
-    "notes": "Install MSYS2 via 'scoop install msys2' and then run 'ridk install' to install the toolchain!"
+    "persist": "gems"
 }
diff --git a/bucket/ruby27.json b/bucket/ruby27.json
index 6b2bd5dd5c9..75d47b2eed9 100644
--- a/bucket/ruby27.json
+++ b/bucket/ruby27.json
@@ -5,7 +5,7 @@
     "license": "BSD-3-Clause",
     "notes": "Install MSYS2 via 'scoop install msys2' and then run 'ridk install' to install the toolchain!",
     "suggest": {
-        "MSYS2": "msys2"
+        "MSYS2": "main/msys2"
     },
     "architecture": {
         "64bit": {
diff --git a/bucket/ruby30.json b/bucket/ruby30.json
index 7e4d42fa0bd..37e73e6162b 100644
--- a/bucket/ruby30.json
+++ b/bucket/ruby30.json
@@ -5,7 +5,7 @@
     "license": "BSD-3-Clause",
     "notes": "Install MSYS2 via 'scoop install msys2' and then run 'ridk install' to install the toolchain!",
     "suggest": {
-        "MSYS2": "msys2"
+        "MSYS2": "main/msys2"
     },
     "architecture": {
         "64bit": {
diff --git a/bucket/snipaste-beta.json b/bucket/snipaste-beta.json
index 5b975de48b4..8c98236adb1 100644
--- a/bucket/snipaste-beta.json
+++ b/bucket/snipaste-beta.json
@@ -1,8 +1,11 @@
 {
-    "homepage": "https://www.snipaste.com/",
     "version": "2.8.3-Beta",
-    "license": "Freeware",
     "description": "Snip & Paste, a simple but powerful snipping tool.",
+    "homepage": "https://www.snipaste.com/",
+    "license": "Freeware",
+    "suggest": {
+        "vcredist": "extras/vcredist2022"
+    },
     "architecture": {
         "64bit": {
             "url": "https://bitbucket.org/liule/snipaste/downloads/Snipaste-2.8.3-Beta-x64.zip",
@@ -14,8 +17,6 @@
         }
     },
     "pre_install": "if (Test-Path \"$persist_dir\\config.ini\") { Copy-Item \"$persist_dir\\config.ini\" \"$dir\\config.ini\" }",
-    "persist": "history",
-    "pre_uninstall": "if (Test-Path \"$dir\\config.ini\") { Copy-Item \"$dir\\config.ini\" \"$persist_dir\\config.ini\" }",
     "bin": "Snipaste.exe",
     "shortcuts": [
         [
@@ -23,9 +24,8 @@
             "Snipaste"
         ]
     ],
-    "suggest": {
-        "vcredist": "extras/vcredist2022"
-    },
+    "persist": "history",
+    "pre_uninstall": "if (Test-Path \"$dir\\config.ini\") { Copy-Item \"$dir\\config.ini\" \"$persist_dir\\config.ini\" }",
     "checkver": {
         "url": "https://bitbucket.org/liule/snipaste/downloads",
         "regex": "Snipaste-(?<main>[\\d.]+)-Beta(?<build>[\\d]*)-x86\\.zip",
diff --git a/bucket/springboot15.json b/bucket/springboot15.json
index 6b1c0ff9ece..e056dba5881 100644
--- a/bucket/springboot15.json
+++ b/bucket/springboot15.json
@@ -3,14 +3,14 @@
     "description": "Create stand-alone, production-grade Spring based Applications that you can \"just run\". (version 1.5)",
     "homepage": "https://spring.io/projects/spring-boot",
     "license": "Apache-2.0",
-    "hash": "96be1826be364f04cdc267aad74134ef46cc8c46a0b795f91aca2c4af831d11f",
-    "url": "https://repo.spring.io/release/org/springframework/boot/spring-boot-cli/1.5.22.RELEASE/spring-boot-cli-1.5.22.RELEASE-bin.zip",
-    "extract_dir": "spring-1.5.22.RELEASE",
-    "bin": "bin\\spring.bat",
     "suggest": {
         "JDK": [
             "java/oraclejdk",
             "java/openjdk"
         ]
-    }
+    },
+    "url": "https://repo.spring.io/release/org/springframework/boot/spring-boot-cli/1.5.22.RELEASE/spring-boot-cli-1.5.22.RELEASE-bin.zip",
+    "hash": "96be1826be364f04cdc267aad74134ef46cc8c46a0b795f91aca2c4af831d11f",
+    "extract_dir": "spring-1.5.22.RELEASE",
+    "bin": "bin\\spring.bat"
 }
diff --git a/bucket/stash-dev.json b/bucket/stash-dev.json
index 2b81ed5f3bb..87595879b5d 100644
--- a/bucket/stash-dev.json
+++ b/bucket/stash-dev.json
@@ -5,8 +5,8 @@
     "license": "AGPL-3.0-only",
     "suggest": {
         "FFmpeg": [
-            "ffmpeg",
-            "ffmpeg-nightly"
+            "main/ffmpeg",
+            "versions/ffmpeg-nightly"
         ]
     },
     "url": "https://github.com/stashapp/stash/releases/download/latest_develop/stash-win.exe",
diff --git a/bucket/tesseract4.json b/bucket/tesseract4.json
index f91b766360e..ab8a0e91c6e 100644
--- a/bucket/tesseract4.json
+++ b/bucket/tesseract4.json
@@ -8,7 +8,7 @@
         "or downloaded manually from https://github.com/tesseract-ocr/tessdata_fast"
     ],
     "suggest": {
-        "tesseract-languages": "tesseract4-languages"
+        "tesseract-languages": "versions/tesseract4-languages"
     },
     "architecture": {
         "64bit": {
@@ -26,6 +26,9 @@
         "   env \"TESSDATA_PREFIX\" $global $langdir",
         "}"
     ],
+    "env_set": {
+        "TESSDATA_PREFIX": "$persist_dir\\tessdata"
+    },
     "bin": [
         "ambiguous_words.exe",
         "classifier_tester.exe",
@@ -44,8 +47,5 @@
         "unicharset_extractor.exe",
         "wordlist2dawg.exe"
     ],
-    "env_set": {
-        "TESSDATA_PREFIX": "$persist_dir\\tessdata"
-    },
     "persist": "tessdata"
 }
diff --git a/bucket/tomcat6.json b/bucket/tomcat6.json
index a89bde170b0..10a92d4874d 100644
--- a/bucket/tomcat6.json
+++ b/bucket/tomcat6.json
@@ -17,11 +17,11 @@
         }
     },
     "extract_dir": "apache-tomcat-6.0.53",
-    "bin": "bin\\catalina.bat",
     "env_set": {
-        "CATALINA_HOME": "$dir",
-        "CATALINA_BASE": "$dir"
+        "CATALINA_BASE": "$dir",
+        "CATALINA_HOME": "$dir"
     },
+    "bin": "bin\\catalina.bat",
     "persist": [
         "conf",
         "webapps"
diff --git a/bucket/tomcat7.json b/bucket/tomcat7.json
index 94de3466c01..acf270d1156 100644
--- a/bucket/tomcat7.json
+++ b/bucket/tomcat7.json
@@ -17,11 +17,11 @@
         }
     },
     "extract_dir": "apache-tomcat-7.0.109",
-    "bin": "bin\\catalina.bat",
     "env_set": {
-        "CATALINA_HOME": "$dir",
-        "CATALINA_BASE": "$dir"
+        "CATALINA_BASE": "$dir",
+        "CATALINA_HOME": "$dir"
     },
+    "bin": "bin\\catalina.bat",
     "persist": [
         "conf",
         "webapps"
diff --git a/bucket/tomcat8.json b/bucket/tomcat8.json
index 6a5258ce047..11b44db0456 100644
--- a/bucket/tomcat8.json
+++ b/bucket/tomcat8.json
@@ -3,6 +3,9 @@
     "description": "Tomcat, an open source implementation of the Java Servlet, JavaServer Pages, Java Expression Language and Java WebSocket technologies. (version 8)",
     "homepage": "https://tomcat.apache.org/",
     "license": "Apache-2.0",
+    "suggest": {
+        "JRE": "java/openjdk"
+    },
     "architecture": {
         "64bit": {
             "url": "https://archive.apache.org/dist/tomcat/tomcat-8/v8.5.85/bin/apache-tomcat-8.5.85-windows-x64.zip",
@@ -14,18 +17,15 @@
         }
     },
     "extract_dir": "apache-tomcat-8.5.85",
-    "bin": "bin\\catalina.bat",
     "env_set": {
-        "CATALINA_HOME": "$dir",
-        "CATALINA_BASE": "$dir"
+        "CATALINA_BASE": "$dir",
+        "CATALINA_HOME": "$dir"
     },
+    "bin": "bin\\catalina.bat",
     "persist": [
         "conf",
         "webapps"
     ],
-    "suggest": {
-        "JRE": "java/openjdk"
-    },
     "checkver": {
         "url": "https://archive.apache.org/dist/tomcat/tomcat-8/?C=M;O=D",
         "regex": "v(?<version>[\\d.]+)"
diff --git a/bucket/tomcat9.json b/bucket/tomcat9.json
index d5d2ba9b66e..6c1cad41e41 100644
--- a/bucket/tomcat9.json
+++ b/bucket/tomcat9.json
@@ -17,11 +17,11 @@
         }
     },
     "extract_dir": "apache-tomcat-9.0.71",
-    "bin": "bin\\catalina.bat",
     "env_set": {
-        "CATALINA_HOME": "$dir",
-        "CATALINA_BASE": "$dir"
+        "CATALINA_BASE": "$dir",
+        "CATALINA_HOME": "$dir"
     },
+    "bin": "bin\\catalina.bat",
     "persist": [
         "conf",
         "webapps"
diff --git a/bucket/v2rayn-pre.json b/bucket/v2rayn-pre.json
index 42754ab2cb7..5ea8a6dcd57 100644
--- a/bucket/v2rayn-pre.json
+++ b/bucket/v2rayn-pre.json
@@ -25,13 +25,6 @@
         "    }",
         "}"
     ],
-    "uninstaller": {
-        "script": [
-            "if (Test-Path \"$dir\\guiConfigs\\config.json\") {",
-            "    Copy-Item \"$dir\\guiConfigs\\config.json\" \"$persist_dir\\guiConfigs\\config.json\" | Out-Null",
-            "}"
-        ]
-    },
     "bin": "v2rayN.exe",
     "shortcuts": [
         [
@@ -40,6 +33,13 @@
         ]
     ],
     "persist": "guiConfigs",
+    "uninstaller": {
+        "script": [
+            "if (Test-Path \"$dir\\guiConfigs\\config.json\") {",
+            "    Copy-Item \"$dir\\guiConfigs\\config.json\" \"$persist_dir\\guiConfigs\\config.json\" | Out-Null",
+            "}"
+        ]
+    },
     "checkver": {
         "url": "https://api.github.com/repos/2dust/v2rayN/releases",
         "regex": "download/([\\d.]+)/"
diff --git a/bucket/vim-nightly.json b/bucket/vim-nightly.json
index a2317625e53..f6c164815f9 100644
--- a/bucket/vim-nightly.json
+++ b/bucket/vim-nightly.json
@@ -5,7 +5,7 @@
     "license": "Vim",
     "notes": "Add gVim as a context menu option by running: \"$dir\\install-context.reg\"",
     "suggest": {
-        "vimtutor": "vimtutor"
+        "vimtutor": "main/vimtutor"
     },
     "architecture": {
         "64bit": {
diff --git a/bucket/vim-tux.json b/bucket/vim-tux.json
index 5ef282a413b..bea072749db 100644
--- a/bucket/vim-tux.json
+++ b/bucket/vim-tux.json
@@ -5,7 +5,7 @@
     "license": "Vim",
     "notes": "Add gVim as a context menu option by running: \"$dir\\install-context.reg\"",
     "suggest": {
-        "vimtutor": "vimtutor"
+        "vimtutor": "main/vimtutor"
     },
     "architecture": {
         "64bit": {
diff --git a/bucket/wox-beta.json b/bucket/wox-beta.json
index ab09d3bd2c0..3bfc2a5ce9d 100644
--- a/bucket/wox-beta.json
+++ b/bucket/wox-beta.json
@@ -4,7 +4,7 @@
     "homepage": "http://www.wox.one",
     "license": "MIT",
     "suggest": {
-        "Python3": "python",
+        "Python3": "main/python",
         "Everything": "extras/everything"
     },
     "url": "https://github.com/Wox-launcher/Wox/releases/download/v1.4.1196/Wox-1.4.1196-full.nupkg",
diff --git a/bucket/youtube-dlc.json b/bucket/youtube-dlc.json
index bf02d0e1bc1..4e7c41c5378 100644
--- a/bucket/youtube-dlc.json
+++ b/bucket/youtube-dlc.json
@@ -5,8 +5,8 @@
     "license": "Unlicense",
     "suggest": {
         "FFmpeg": [
-            "ffmpeg",
-            "ffmpeg-shared"
+            "main/ffmpeg",
+            "main/ffmpeg-shared"
         ]
     },
     "architecture": {
diff --git a/bucket/yt-dlp-daily.json b/bucket/yt-dlp-daily.json
index 2b0bdddcc60..9a6a08d5bc2 100644
--- a/bucket/yt-dlp-daily.json
+++ b/bucket/yt-dlp-daily.json
@@ -4,7 +4,7 @@
     "homepage": "https://github.com/ytdl-patched/yt-dlp",
     "license": "Unlicense",
     "suggest": {
-        "ffmpeg": "ffmpeg-nightly"
+        "ffmpeg": "versions/ffmpeg-nightly"
     },
     "architecture": {
         "64bit": {