diff --git a/bucket/clink.json b/bucket/clink.json
index ec70d1b56b..72af8a14d7 100644
--- a/bucket/clink.json
+++ b/bucket/clink.json
@@ -1,5 +1,5 @@
 {
-    "version": "1.1.19",
+    "version": "1.1.20",
     "description": "Powerful Bash-style command line editing for cmd.exe",
     "homepage": "https://chrisant996.github.io/clink/",
     "license": "GPL-3.0-only",
@@ -7,8 +7,8 @@
         "Run 'clink inject' to start clink on the current cmd",
         "Run 'clink autorun install' to auto start clink"
     ],
-    "url": "https://github.com/chrisant996/clink/releases/download/v1.1.19/clink.1.1.19.adf144.zip",
-    "hash": "8508fa24dfe3c8a4e1d932540eabfd14ab10cf64d535f710886d1c3f87d5906a",
+    "url": "https://github.com/chrisant996/clink/releases/download/v1.1.20/clink.1.1.20.fa19d6.zip",
+    "hash": "8ca0c886967f1d8aae4a337fe9c77a3686445d8dc36577223dba4bfd7a339a1c",
     "bin": "clink.bat",
     "persist": "profile",
     "checkver": {
diff --git a/bucket/jabba.json b/bucket/jabba.json
index 50257b992e..a2fa37989d 100644
--- a/bucket/jabba.json
+++ b/bucket/jabba.json
@@ -1,14 +1,14 @@
 {
-    "homepage": "https://github.com/shyiko/jabba",
     "version": "0.11.2",
-    "license": "Apache-2.0",
     "description": "Java Version Manager",
+    "homepage": "https://github.com/shyiko/jabba",
+    "license": "Apache-2.0",
     "architecture": {
         "64bit": {
             "url": "https://github.com/shyiko/jabba/releases/download/0.11.2/jabba-0.11.2-windows-amd64.exe#/jabba.exe",
             "hash": "f0eb517f41fe42499f7abef64edac3226c20b905671f852f36fdfbb6652a3c9b",
             "pre_install": [
-                "New-Item \"$dir\\bin\" -ItemType Directory | Out-Null",
+                "ensure \"$dir\\bin\" | Out-Null",
                 "Move-Item \"$dir\\jabba.exe\" \"$dir\\bin\\jabba.exe\""
             ]
         }
diff --git a/bucket/jar2app.json b/bucket/jar2app.json
index 9183495756..3ac4266301 100644
--- a/bucket/jar2app.json
+++ b/bucket/jar2app.json
@@ -1,11 +1,11 @@
 {
-    "homepage": "https://github.com/Jorl17/jar2app",
-    "description": "Convert any Java jar to a Mac OS X .App bundle.",
     "version": "nightly",
+    "description": "Convert any Java jar to a Mac OS X .App bundle.",
+    "homepage": "https://github.com/Jorl17/jar2app",
     "license": "GPL-2.0-only",
+    "depends": "python",
     "url": "https://github.com/Jorl17/jar2app/archive/master.zip",
     "extract_dir": "jar2app-master",
-    "depends": "python",
     "pre_install": "echo \"python `\"$dir\\jar2app.py`\" @args\" | out-file \"$dir\\jar2app.ps1\"",
     "bin": "jar2app.ps1"
 }
diff --git a/bucket/jojodiff.json b/bucket/jojodiff.json
index f47f725a46..e7c6614e52 100644
--- a/bucket/jojodiff.json
+++ b/bucket/jojodiff.json
@@ -1,7 +1,7 @@
 {
     "version": "0.8.1",
-    "homepage": "http://jojodiff.sourceforge.net/",
     "description": "Binary file diff utility",
+    "homepage": "http://jojodiff.sourceforge.net/",
     "license": "GPL-3.0-or-later",
     "url": "https://downloads.sourceforge.net/project/jojodiff/jojodiff/jojodiff08/jdiff081.zip",
     "hash": "e78cd8e65d2e65849948f893a6561f5b650a91c894f4bf5d1558e36e890b5ce7",
diff --git a/bucket/jom.json b/bucket/jom.json
index c49c4f52dd..74c010cbba 100644
--- a/bucket/jom.json
+++ b/bucket/jom.json
@@ -1,9 +1,9 @@
 {
+    "version": "1.1.3",
+    "description": "Clone of nmake to support the execution of multiple independent commands in parallel",
     "homepage": "https://wiki.qt.io/Jom",
-    "description": "jom is a clone of nmake to support the execution of multiple independent commands in parallel",
     "license": "GPL-3.0-or-later",
     "url": "https://download.qt.io/official_releases/jom/jom_1_1_3.zip",
-    "version": "1.1.3",
     "hash": "128fdd846fe24f8594eed37d1d8929a0ea78df563537c0c1b1861a635013fff8",
     "bin": [
         "ibjom.bat",
@@ -11,7 +11,7 @@
     ],
     "checkver": {
         "url": "https://download.qt.io/official_releases/jom/md5sums.txt",
-        "regex": "jom_(\\d+)_(\\d+)_(\\d+).zip",
+        "regex": "jom_(\\d+)_(\\d+)_(\\d+)\\.zip",
         "reverse": true,
         "replace": "${1}.${2}.${3}"
     },
diff --git a/bucket/jq.json b/bucket/jq.json
index b1e7393cf8..5c6a0a74c1 100644
--- a/bucket/jq.json
+++ b/bucket/jq.json
@@ -1,33 +1,33 @@
 {
     "version": "1.6",
-    "description": "Lightweight and flexible command-line JSON processor.",
+    "description": "Lightweight and flexible command-line JSON processor",
     "homepage": "https://stedolan.github.io/jq/",
     "license": "MIT",
-    "architecture": {
-        "32bit": {
-            "url": "https://github.com/stedolan/jq/releases/download/jq-1.6/jq-win32.exe#/jq.exe",
-            "hash": "0012cb4c0eb6eaf97b842e676e423a69a8fea95055d93830551b4a5a54494bd8"
-        },
-        "64bit": {
-            "url": "https://github.com/stedolan/jq/releases/download/jq-1.6/jq-win64.exe#/jq.exe",
-            "hash": "a51d36968dcbdeabb3142c6f5cf9b401a65dc3a095f3144bd0c118d5bb192753"
-        }
-    },
-    "bin": "jq.exe",
     "suggest": {
         "jid": "jid"
     },
+    "architecture": {
+        "64bit": {
+            "url": "https://github.com/stedolan/jq/releases/download/jq-1.6/jq-win64.exe#/jq.exe",
+            "hash": "a51d36968dcbdeabb3142c6f5cf9b401a65dc3a095f3144bd0c118d5bb192753"
+        },
+        "32bit": {
+            "url": "https://github.com/stedolan/jq/releases/download/jq-1.6/jq-win32.exe#/jq.exe",
+            "hash": "0012cb4c0eb6eaf97b842e676e423a69a8fea95055d93830551b4a5a54494bd8"
+        }
+    },
+    "bin": "jq.exe",
     "checkver": {
         "github": "https://github.com/stedolan/jq/",
-        "regex": "tag/jq-([\\d\\.]+)"
+        "regex": "tag/jq-([\\d.]+)"
     },
     "autoupdate": {
         "architecture": {
-            "32bit": {
-                "url": "https://github.com/stedolan/jq/releases/download/jq-$version/jq-win32.exe#/jq.exe"
-            },
             "64bit": {
                 "url": "https://github.com/stedolan/jq/releases/download/jq-$version/jq-win64.exe#/jq.exe"
+            },
+            "32bit": {
+                "url": "https://github.com/stedolan/jq/releases/download/jq-$version/jq-win32.exe#/jq.exe"
             }
         },
         "hash": {
diff --git a/bucket/jruby.json b/bucket/jruby.json
index 49bea0edeb..1a55609e72 100644
--- a/bucket/jruby.json
+++ b/bucket/jruby.json
@@ -1,15 +1,24 @@
 {
-    "homepage": "https://www.jruby.org/",
-    "description": "The Ruby Programming Language on the JVM.",
     "version": "9.2.14.0",
+    "description": "The Ruby Programming Language on the JVM.",
+    "homepage": "https://www.jruby.org/",
     "license": {
         "identifier": "EPL-1.0|GPL-2.0-only|LGPL-2.1-only",
         "url": "https://github.com/jruby/jruby/blob/master/COPYING"
     },
+    "notes": [
+        "Install a JDK and set JAVA_HOME if you don't already have. JRuby won't work without it.",
+        "Also note that this installation overrides GEM_HOME and GEM_PATH from any previous Ruby or JRuby installation."
+    ],
+    "suggest": {
+        "JDK": [
+            "java/oraclejdk",
+            "java/openjdk"
+        ]
+    },
     "url": "https://s3.amazonaws.com/jruby.org/downloads/9.2.14.0/jruby-bin-9.2.14.0.zip",
     "hash": "90ae86e000e587309c50e0c3c676169eb35d8ee39f250d2204d2feee57946593",
     "extract_dir": "jruby-9.2.14.0",
-    "persist": "gems",
     "env_add_path": [
         "bin",
         "gems\\bin"
@@ -19,25 +28,16 @@
         "GEM_HOME": "$dir\\gems",
         "GEM_PATH": "$dir\\gems"
     },
-    "suggest": {
-        "JDK": [
-            "java/oraclejdk",
-            "java/openjdk"
-        ]
-    },
-    "notes": [
-        "Install a JDK and set JAVA_HOME if you don't already have. JRuby won't work without it.",
-        "Also note that this installation overrides GEM_HOME and GEM_PATH from any previous Ruby or JRuby installation."
-    ],
+    "persist": "gems",
     "checkver": {
         "url": "https://www.jruby.org/download",
-        "re": "Current Release:\\s+JRuby\\s+([\\d.]+)"
+        "regex": "Current Release:\\s+JRuby\\s+([\\d.]+)"
     },
     "autoupdate": {
         "url": "https://s3.amazonaws.com/jruby.org/downloads/$version/jruby-bin-$version.zip",
-        "extract_dir": "jruby-$version",
         "hash": {
             "url": "$url.sha256"
-        }
+        },
+        "extract_dir": "jruby-$version"
     }
 }
diff --git a/bucket/kafka-exporter.json b/bucket/kafka-exporter.json
index fea9673082..e49ae261fd 100644
--- a/bucket/kafka-exporter.json
+++ b/bucket/kafka-exporter.json
@@ -1,31 +1,31 @@
 {
     "version": "1.2.0",
-    "homepage": "https://github.com/danielqsj/kafka_exporter",
     "description": "Kafka exporter for Prometheus",
+    "homepage": "https://github.com/danielqsj/kafka_exporter",
     "license": "Apache-2.0",
-    "bin": "kafka_exporter.exe",
-    "checkver": "github",
     "architecture": {
-        "32bit": {
-            "extract_dir": "kafka_exporter-1.2.0.windows-386",
-            "url": "https://github.com/danielqsj/kafka_exporter/releases/download/v1.2.0/kafka_exporter-1.2.0.windows-386.tar.gz",
-            "hash": "2a7ec7303a9530015756ef0ab4ac596ea196249db4183913f8cd859c3164cfb0"
-        },
         "64bit": {
-            "extract_dir": "kafka_exporter-1.2.0.windows-amd64",
             "url": "https://github.com/danielqsj/kafka_exporter/releases/download/v1.2.0/kafka_exporter-1.2.0.windows-amd64.tar.gz",
-            "hash": "c994cb8009d3fdf78589c507eaccf750a69664f304192e094be2762bc999db76"
+            "hash": "c994cb8009d3fdf78589c507eaccf750a69664f304192e094be2762bc999db76",
+            "extract_dir": "kafka_exporter-1.2.0.windows-amd64"
+        },
+        "32bit": {
+            "url": "https://github.com/danielqsj/kafka_exporter/releases/download/v1.2.0/kafka_exporter-1.2.0.windows-386.tar.gz",
+            "hash": "2a7ec7303a9530015756ef0ab4ac596ea196249db4183913f8cd859c3164cfb0",
+            "extract_dir": "kafka_exporter-1.2.0.windows-386"
         }
     },
+    "bin": "kafka_exporter.exe",
+    "checkver": "github",
     "autoupdate": {
         "architecture": {
-            "32bit": {
-                "extract_dir": "kafka_exporter-$version.windows-386",
-                "url": "https://github.com/danielqsj/kafka_exporter/releases/download/v$version/kafka_exporter-$version.windows-386.tar.gz"
-            },
             "64bit": {
-                "extract_dir": "kafka_exporter-$version.windows-amd64",
-                "url": "https://github.com/danielqsj/kafka_exporter/releases/download/v$version/kafka_exporter-$version.windows-amd64.tar.gz"
+                "url": "https://github.com/danielqsj/kafka_exporter/releases/download/v$version/kafka_exporter-$version.windows-amd64.tar.gz",
+                "extract_dir": "kafka_exporter-$version.windows-amd64"
+            },
+            "32bit": {
+                "url": "https://github.com/danielqsj/kafka_exporter/releases/download/v$version/kafka_exporter-$version.windows-386.tar.gz",
+                "extract_dir": "kafka_exporter-$version.windows-386"
             }
         }
     }
diff --git a/bucket/kapacitor.json b/bucket/kapacitor.json
index 6dc60e39e4..b0dfeab210 100644
--- a/bucket/kapacitor.json
+++ b/bucket/kapacitor.json
@@ -1,8 +1,8 @@
 {
-    "homepage": "https://www.influxdata.com/time-series-platform/kapacitor/",
-    "license": "MIT",
     "version": "1.5.7",
     "description": "Open source framework for processing, monitoring, and alerting on time series data.",
+    "homepage": "https://www.influxdata.com/time-series-platform/kapacitor/",
+    "license": "MIT",
     "architecture": {
         "64bit": {
             "url": "https://dl.influxdata.com/kapacitor/releases/kapacitor-1.5.7_windows_amd64.zip",
@@ -10,14 +10,14 @@
             "extract_dir": "kapacitor-1.5.7-1"
         }
     },
-    "persist": "kapacitor.conf",
     "bin": [
         "kapacitor.exe",
         "kapacitord.exe"
     ],
+    "persist": "kapacitor.conf",
     "checkver": {
         "url": "https://portal.influxdata.com/downloads",
-        "re": ">Kapacitor v([\\d.]+)<"
+        "regex": ">Kapacitor v([\\d.]+)<"
     },
     "autoupdate": {
         "architecture": {