diff --git a/bucket/composer.json b/bucket/composer.json
index 6839e4a5dd..8e48cbdda4 100644
--- a/bucket/composer.json
+++ b/bucket/composer.json
@@ -3,13 +3,13 @@
     "description": "Dependency Manager for PHP",
     "homepage": "https://getcomposer.org/",
     "license": "MIT",
+    "notes": "'composer selfupdate' is aliased to 'scoop update composer'",
     "suggest": {
         "PHP": [
             "php",
             "php-nts"
         ]
     },
-    "notes": "'composer selfupdate' is aliased to 'scoop update composer'",
     "url": "https://getcomposer.org/download/2.0.8/composer.phar",
     "hash": "2021f0d52b446e0efe3c548cc058ab5671fa38cdbcf814e7911c7e9d71d61538",
     "pre_install": [
@@ -23,10 +23,10 @@
         "}"
     ],
     "bin": "composer.ps1",
+    "env_add_path": "home\\vendor\\bin",
     "env_set": {
         "COMPOSER_HOME": "$persist_dir\\home"
     },
-    "env_add_path": "home\\vendor\\bin",
     "persist": "home",
     "checkver": "Latest: <strong>\\s*([\\d.]+)\\s*</strong>",
     "autoupdate": {
diff --git a/bucket/dark.json b/bucket/dark.json
index fe11f91dcb..90f0b74656 100644
--- a/bucket/dark.json
+++ b/bucket/dark.json
@@ -1,8 +1,8 @@
 {
+    "version": "3.11.2",
+    "description": "WiX (Windows Installer XML) Toolset Decompiler",
     "homepage": "https://wixtoolset.org/",
     "license": "MS-RL",
-    "description": "WiX (Windows Installer XML) Toolset Decompiler",
-    "version": "3.11.2",
     "url": "https://raw.githubusercontent.com/ScoopInstaller/Binary/master/dark/dark-3.11.2.zip",
     "hash": "93ce1a4d962acaf85997829581de3f9354d215067ca4578fc92d618d721c085c",
     "bin": "dark.exe",
diff --git a/bucket/datamash.json b/bucket/datamash.json
index 18d8854649..5b4d71ccfb 100644
--- a/bucket/datamash.json
+++ b/bucket/datamash.json
@@ -1,8 +1,8 @@
 {
     "version": "1.3",
     "description": "GNU datamash is a command-line program which performs basic numeric, textual and statistical operations on input textual data files",
-    "license": "GPL-3.0-or-later",
     "homepage": "https://www.gnu.org/software/datamash/",
+    "license": "GPL-3.0-or-later",
     "architecture": {
         "64bit": {
             "url": "http://download.savannah.gnu.org/releases/datamash/windows-binaries/datamash-1.3-no-locale-64bit.exe#/datamash.exe",
@@ -16,7 +16,7 @@
     "bin": "datamash.exe",
     "checkver": {
         "url": "http://download-mirror.savannah.gnu.org/releases/datamash/windows-binaries/",
-        "re": "datamash-([\\d.]+)-no-locale",
+        "regex": "datamash-([\\d.]+)-no-locale",
         "reverse": true
     },
     "autoupdate": {
diff --git a/bucket/dd.json b/bucket/dd.json
index 1526c6cd98..3266c50bab 100644
--- a/bucket/dd.json
+++ b/bucket/dd.json
@@ -1,8 +1,8 @@
 {
+    "version": "0.6beta3",
+    "description": "Allows the flexible copying of data in a win32 environment",
     "homepage": "http://www.chrysocome.net/dd",
     "license": "GPL-2.0-only",
-    "description": "Allows the flexible copying of data in a win32 environment",
-    "version": "0.6beta3",
     "url": "http://www.chrysocome.net/downloads/dd-0.6beta3.zip",
     "hash": "c7a6a4cc4a107030b072fb479173d66e6d1d1098cf740c6da4e9378c16b81c17",
     "bin": "dd.exe"
diff --git a/bucket/dep.json b/bucket/dep.json
index 2ee5e9a0d1..f61c420b05 100644
--- a/bucket/dep.json
+++ b/bucket/dep.json
@@ -1,7 +1,7 @@
 {
-    "homepage": "https://github.com/golang/dep",
-    "description": "Go dependency management tool",
     "version": "0.5.4",
+    "description": "Go dependency management tool",
+    "homepage": "https://github.com/golang/dep",
     "license": "BSD-3-Clause",
     "architecture": {
         "64bit": {
@@ -13,12 +13,7 @@
             "hash": "b4b2157cf6cec9c5ed03e30e9e1c1fce61c3ad9178b16942ea349cbb7dbce4b3"
         }
     },
-    "bin": [
-        [
-            "dep.exe",
-            "dep"
-        ]
-    ],
+    "bin": "dep.exe",
     "checkver": "github",
     "autoupdate": {
         "architecture": {
diff --git a/bucket/devd.json b/bucket/devd.json
index 90d6f21b83..435231074e 100644
--- a/bucket/devd.json
+++ b/bucket/devd.json
@@ -1,17 +1,25 @@
 {
-    "homepage": "https://corte.si/posts/devd/intro/index.html",
-    "description": "A small, self-contained, command-line-only HTTP server for developers",
-    "license": "MIT",
     "version": "0.9",
-    "url": "https://github.com/cortesi/devd/releases/download/v0.9/devd-0.9-windows64.zip",
-    "hash": "650575ac95228dd62fd3bb8a42d640daa476c23ae3bc58ac1ba8931e26096aa2",
-    "extract_dir": "devd-0.9-windows64",
+    "description": "A small, self-contained, command-line-only HTTP server for developers",
+    "homepage": "https://corte.si/posts/devd/intro/index.html",
+    "license": "MIT",
+    "architecture": {
+        "64bit": {
+            "url": "https://github.com/cortesi/devd/releases/download/v0.9/devd-0.9-windows64.zip",
+            "hash": "650575ac95228dd62fd3bb8a42d640daa476c23ae3bc58ac1ba8931e26096aa2",
+            "extract_dir": "devd-0.9-windows64"
+        }
+    },
     "bin": "devd.exe",
     "checkver": {
         "github": "https://github.com/cortesi/devd"
     },
     "autoupdate": {
-        "url": "https://github.com/cortesi/devd/releases/download/v$version/devd-$version-windows64.zip",
-        "extract_dir": "devd-$version-windows64"
+        "architecture": {
+            "64bit": {
+                "url": "https://github.com/cortesi/devd/releases/download/v$version/devd-$version-windows64.zip",
+                "extract_dir": "devd-$version-windows64"
+            }
+        }
     }
 }
diff --git a/bucket/digdag.json b/bucket/digdag.json
index 8068abf3ac..c5aabfd5ff 100644
--- a/bucket/digdag.json
+++ b/bucket/digdag.json
@@ -1,15 +1,14 @@
 {
-    "homepage": "https://www.digdag.io/",
-    "description": "A simple, open source, multi-cloud workflow engine that helps you to build, run, schedule, and monitor complex pipelines of tasks",
-    "license": "Apache-2.0",
     "version": "0.9.42",
+    "description": "A simple, open source, multi-cloud workflow engine that helps you to build, run, schedule, and monitor complex pipelines of tasks",
+    "homepage": "https://www.digdag.io/",
+    "license": "Apache-2.0",
     "url": "https://dl.bintray.com/digdag/maven/digdag-0.9.42.jar#/digdag.jar",
     "hash": "71071424a5beeb881cb4ccb06067a556a3673caf3dc8850dd584357e99134b21",
-    "pre_install": "\"@java -jar \"\"$dir\\digdag.jar\"\" %*\" | out-file -en oem \"$dir\\digdag.cmd\"",
-    "bin": "digdag.cmd",
+    "bin": "digdag.jar",
     "checkver": {
         "url": "https://api.bintray.com/packages/digdag/maven/digdag",
-        "jp": "$.latest_version"
+        "jsonpath": "$.latest_version"
     },
     "autoupdate": {
         "url": "https://dl.bintray.com/digdag/maven/digdag-$version.jar#/digdag.jar",
diff --git a/bucket/docker-machine.json b/bucket/docker-machine.json
index e8812b5d24..e0c9ef015e 100644
--- a/bucket/docker-machine.json
+++ b/bucket/docker-machine.json
@@ -1,7 +1,7 @@
 {
-    "homepage": "https://github.com/docker/machine",
-    "description": "Docker Machine is a tool that lets you install Docker Engine on virtual hosts, and manage the hosts with commands",
     "version": "0.16.2",
+    "description": "Docker Machine is a tool that lets you install Docker Engine on virtual hosts, and manage the hosts with commands",
+    "homepage": "https://github.com/docker/machine",
     "license": "Apache-2.0",
     "architecture": {
         "64bit": {
@@ -13,12 +13,7 @@
             "hash": "2b67d7b6cd95983bdb01da472a541052f3ca236950354c7e76f215fbf9188745"
         }
     },
-    "bin": [
-        [
-            "docker-machine.exe",
-            "docker-machine"
-        ]
-    ],
+    "bin": "docker-machine.exe",
     "checkver": "github",
     "autoupdate": {
         "architecture": {
diff --git a/bucket/docker-nightly.json b/bucket/docker-nightly.json
index a112721e58..ca7c98a370 100644
--- a/bucket/docker-nightly.json
+++ b/bucket/docker-nightly.json
@@ -1,26 +1,8 @@
 {
-    "homepage": "https://master.dockerproject.org",
-    "license": "Apache-2.0",
     "version": "nightly",
     "description": "Run the latest master build of docker client and engine",
-    "url": "https://master.dockerproject.org/windows/x86_64/docker.zip",
-    "extract_dir": "docker",
-    "depends": [
-        "sudo",
-        "lcow"
-    ],
-    "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"
-    },
-    "bin": [
-        "dockerd.exe",
-        "docker.exe"
-    ],
+    "homepage": "https://master.dockerproject.org",
+    "license": "Apache-2.0",
     "notes": [
         "Make sure to have container features enabled (will need a restart afterwards):",
         "sudo Enable-WindowsOptionalFeature -Online -FeatureName containers -All -NoRestart",
@@ -47,5 +29,23 @@
         "(gwmi win32_service -filter \"name='docker'\").delete()",
         "",
         "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"
+    },
+    "depends": [
+        "sudo",
+        "lcow"
+    ],
+    "url": "https://master.dockerproject.org/windows/x86_64/docker.zip",
+    "extract_dir": "docker",
+    "bin": [
+        "dockerd.exe",
+        "docker.exe"
     ]
 }
diff --git a/bucket/docker.json b/bucket/docker.json
index e993f2422a..f8bd827ebc 100644
--- a/bucket/docker.json
+++ b/bucket/docker.json
@@ -1,5 +1,7 @@
 {
     "version": "19.03.1",
+    "description": "Docker is an open platform for developing, shipping, and running applications. Docker enables you to separate your applications from your infrastructure so you can deliver software quickly.",
+    "homepage": "https://docker.com",
     "license": "Apache-2.0",
     "architecture": {
         "64bit": {
@@ -7,10 +9,8 @@
             "hash": "bf39c167f1c2bfc18651c5ebcbc2deb044119dc527f49f3b0c1012c4fe8e9768"
         }
     },
-    "homepage": "https://docker.com",
-    "description": "Docker is an open platform for developing, shipping, and running applications. Docker enables you to separate your applications from your infrastructure so you can deliver software quickly.",
     "innosetup": true,
-    "post_install": "rm -r \"$dir\\installers\"",
+    "pre_install": "Remove-Item \"$dir\\installers\" -Recurse",
     "bin": [
         "docker.exe",
         "docker-compose.exe",
@@ -24,7 +24,7 @@
     ],
     "checkver": {
         "github": "https://github.com/docker/toolbox",
-        "re": "/releases/tag/(?:v)?([\\d\\w.-]+)"
+        "regex": "/releases/tag/v([\\w.-]+)"
     },
     "autoupdate": {
         "architecture": {
@@ -34,7 +34,7 @@
         },
         "hash": {
             "url": "$baseurl/sha256sum.txt",
-            "find": "([a-fA-F0-9]{64})\\s+DockerToolbox.exe"
+            "regex": "$sha256\\s+DockerToolbox.exe"
         }
     }
 }
diff --git a/bucket/dos2unix.json b/bucket/dos2unix.json
index 02890af759..2695d10306 100644
--- a/bucket/dos2unix.json
+++ b/bucket/dos2unix.json
@@ -1,7 +1,7 @@
 {
-    "homepage": "http://dos2unix.sourceforge.net/",
-    "description": "Convert text files with DOS or Mac line endings to Unix line endings and vice versa",
     "version": "7.4.2",
+    "description": "Convert text files with DOS or Mac line endings to Unix line endings and vice versa",
+    "homepage": "http://dos2unix.sourceforge.net/",
     "license": "BSD-2-Clause",
     "architecture": {
         "64bit": {
diff --git a/bucket/dosbox.json b/bucket/dosbox.json
index 3dde603c3c..0aa0d0bbe0 100644
--- a/bucket/dosbox.json
+++ b/bucket/dosbox.json
@@ -1,7 +1,7 @@
 {
-    "homepage": "https://www.dosbox.com/",
-    "description": "DOSBox emulates an Intel x86 PC, complete with sound, graphics, mouse, joystick, modem, etc.",
     "version": "0.74-3",
+    "description": "DOSBox emulates an Intel x86 PC, complete with sound, graphics, mouse, joystick, modem, etc.",
+    "homepage": "https://www.dosbox.com/",
     "license": "GPL-2.0-only",
     "url": "https://downloads.sourceforge.net/project/dosbox/dosbox/0.74-3/DOSBox0.74-3-win32-installer.exe#/dl.7z",
     "hash": "sha1:c8c1f5a5d17336607c886444518e74e3d1a4e041",
diff --git a/bucket/dotnet-sdk.json b/bucket/dotnet-sdk.json
index 524483b481..16484dbf0c 100644
--- a/bucket/dotnet-sdk.json
+++ b/bucket/dotnet-sdk.json
@@ -1,8 +1,11 @@
 {
     "version": "5.0.101",
-    "homepage": "https://www.microsoft.com/net/",
     "description": ".NET is a free, cross-platform, open source developer platform for building many different types of applications.",
+    "homepage": "https://www.microsoft.com/net/",
     "license": "MIT",
+    "suggest": {
+        "Visual C++ Redistributable 2019": "extras/vcredist2019"
+    },
     "architecture": {
         "64bit": {
             "url": "https://dotnetcli.blob.core.windows.net/dotnet/Sdk/5.0.101/dotnet-sdk-5.0.101-win-x64.zip",
@@ -14,9 +17,6 @@
         }
     },
     "bin": "dotnet.exe",
-    "suggest": {
-        "Visual C++ Redistributable 2019": "extras/vcredist2019"
-    },
     "env_add_path": ".",
     "env_set": {
         "DOTNET_ROOT": "$dir",
diff --git a/bucket/dotnet.json b/bucket/dotnet.json
index 116b62adff..c782fc9523 100644
--- a/bucket/dotnet.json
+++ b/bucket/dotnet.json
@@ -1,8 +1,9 @@
 {
     "version": "1.1.1",
-    "homepage": "https://www.microsoft.com/net/core#windows",
     "description": ".NET is a free, cross-platform, open source developer platform for building many different types of applications.",
+    "homepage": "https://www.microsoft.com/net/core#windows",
     "license": "MIT",
+    "notes": "This app is deprecated. Install `dotnet-sdk` instead.",
     "architecture": {
         "64bit": {
             "url": "https://go.microsoft.com/fwlink/?linkid=843454#/dl.7z",
@@ -13,6 +14,5 @@
             "hash": "3a8d7316dd774d54e27a332c5d1e73d7813fecd10b670249f480ae917226e444"
         }
     },
-    "bin": "dotnet.exe",
-    "notes": "This app is deprecated. Install `dotnet-sdk` instead."
+    "bin": "dotnet.exe"
 }
diff --git a/bucket/draft.json b/bucket/draft.json
index ee6917c207..4ae193b9ea 100644
--- a/bucket/draft.json
+++ b/bucket/draft.json
@@ -1,19 +1,17 @@
 {
-    "homepage": "https://github.com/Azure/draft",
-    "description": "Create cloud-native applications on Kubernetes.",
-    "license": "MIT",
     "version": "0.16.0",
+    "description": "Create cloud-native applications on Kubernetes.",
+    "homepage": "https://github.com/Azure/draft",
+    "license": "MIT",
     "architecture": {
         "64bit": {
             "url": "https://azuredraft.blob.core.windows.net/draft/draft-v0.16.0-windows-amd64.tar.gz",
-            "hash": "3f2dd8d8216847be2978ac0091d65438652d131ee22e63b415ad86d7dd0354b2"
+            "hash": "3f2dd8d8216847be2978ac0091d65438652d131ee22e63b415ad86d7dd0354b2",
+            "extract_dir": "windows-amd64"
         }
     },
-    "extract_dir": "windows-amd64",
     "bin": "draft.exe",
-    "checkver": {
-        "github": "https://github.com/Azure/draft"
-    },
+    "checkver": "github",
     "autoupdate": {
         "architecture": {
             "64bit": {
diff --git a/bucket/tflint.json b/bucket/tflint.json
index 0ff74cefb2..1e5e50eca9 100644
--- a/bucket/tflint.json
+++ b/bucket/tflint.json
@@ -1,16 +1,16 @@
 {
-    "version": "0.23.0",
+    "version": "0.23.1",
     "description": "A Terraform linter focused on possible errors, best practices, etc.",
     "homepage": "https://github.com/terraform-linters/tflint",
     "license": "MPL-2.0",
     "architecture": {
         "64bit": {
-            "url": "https://github.com/terraform-linters/tflint/releases/download/v0.23.0/tflint_windows_amd64.zip",
-            "hash": "4df0e195a1418646394c491ada14a0c6e2c8092796926f97d9f49f1e1592a55d"
+            "url": "https://github.com/terraform-linters/tflint/releases/download/v0.23.1/tflint_windows_amd64.zip",
+            "hash": "c7fffa0ff8a1c2edc074997847cd96d19644eb23715c92b9134be7ef60148eaa"
         },
         "32bit": {
-            "url": "https://github.com/terraform-linters/tflint/releases/download/v0.23.0/tflint_windows_386.zip",
-            "hash": "911f5d5365af93385f5459afe230b47a6cc921ad42a73aed0db446cbd4839ecb"
+            "url": "https://github.com/terraform-linters/tflint/releases/download/v0.23.1/tflint_windows_386.zip",
+            "hash": "b83ae5a0b1dd53db6aa4fa541b0376266743c1ba96fa42f2f992f77675954072"
         }
     },
     "bin": "tflint.exe",