diff --git a/bucket/broot.json b/bucket/broot.json
index d63298d599..7441f3d16b 100644
--- a/bucket/broot.json
+++ b/bucket/broot.json
@@ -1,12 +1,12 @@
 {
-    "version": "1.1.10",
+    "version": "1.1.11",
     "description": "A new way to see and navigate directory trees",
     "homepage": "https://dystroy.org/broot/",
     "license": "MIT",
     "architecture": {
         "64bit": {
-            "url": "https://github.com/Canop/broot/releases/download/v1.1.10/broot_1.1.10.zip",
-            "hash": "880eb402bb668316fc6dd7390bf57a1ef63b6000569e9d42200a234f4b28b74f",
+            "url": "https://github.com/Canop/broot/releases/download/v1.1.11/broot_1.1.11.zip",
+            "hash": "96d7b8e683ceb0504c99be0075e12cd2b28dae6a8eb55541ef37c8c2bc2f4621",
             "extract_dir": "build\\x86_64-pc-windows-gnu"
         }
     },
diff --git a/bucket/r.json b/bucket/r.json
index e24112e688..007ac52304 100644
--- a/bucket/r.json
+++ b/bucket/r.json
@@ -1,8 +1,20 @@
 {
-    "homepage": "https://www.r-project.org",
-    "description": "A free software environment for statistical computing and graphics.",
     "version": "4.0.3",
+    "description": "A free software environment for statistical computing and graphics.",
+    "homepage": "https://www.r-project.org",
     "license": "GPL-2.0-only",
+    "notes": [
+        "For source packages installation, please install 'rtools'.",
+        "",
+        "You'll need to type 'r.ps1' or 'r.cmd' to run R, because in Powershell 'r' runs the last command. Alternatively 'rterm' can be used to start the interactive R terminal session.",
+        "",
+        "You can remove Powershell's 'r' command with:",
+        "    rm alias:\\r",
+        "",
+        "... but this only affects your current session: if you'd like to remove it for all future sessions you need to add the command above to your Powershell profile.",
+        "",
+        "Annoying, right?! You might want to check out Pshazz (scoop install pshazz)--this has a plugin to remove some crazy aliases from Powershell, as well as many other improvements."
+    ],
     "url": "https://cloud.r-project.org/bin/windows/base/R-4.0.3-win.exe",
     "hash": "md5:2260e461a47cd77268fd325eee3205a3",
     "innosetup": true,
@@ -62,18 +74,6 @@
             "}"
         ]
     },
-    "notes": [
-        "For source packages installation, please install 'rtools'.",
-        "",
-        "You'll need to type 'r.ps1' or 'r.cmd' to run R, because in Powershell 'r' runs the last command. Alternatively 'rterm' can be used to start the interactive R terminal session.",
-        "",
-        "You can remove Powershell's 'r' command with:",
-        "    rm alias:\\r",
-        "",
-        "... but this only affects your current session: if you'd like to remove it for all future sessions you need to add the command above to your Powershell profile.",
-        "",
-        "Annoying, right?! You might want to check out Pshazz (scoop install pshazz)--this has a plugin to remove some crazy aliases from Powershell, as well as many other improvements."
-    ],
     "checkver": {
         "url": "https://cloud.r-project.org/bin/windows/base/md5sum.txt",
         "regex": "R-([\\d.]+)"
diff --git a/bucket/rainbow.json b/bucket/rainbow.json
index d78bc3358f..4c469017c6 100644
--- a/bucket/rainbow.json
+++ b/bucket/rainbow.json
@@ -1,7 +1,7 @@
 {
-    "homepage": "https://github.com/arsham/rainbow",
-    "description": "Print text in rainbow pattern.",
     "version": "1.0.1",
+    "description": "Print text in rainbow pattern.",
+    "homepage": "https://github.com/arsham/rainbow",
     "license": "Apache-2.0",
     "url": "https://github.com/arsham/rainbow/releases/download/v1.0.1/rainbow_windows_v1.0.1.zip",
     "hash": "bab9af652642e1e7066b8c9c174a9621e9bed2e8acd1823001bd11b922488d24",
diff --git a/bucket/rancher-compose.json b/bucket/rancher-compose.json
index 72fc0e3942..e466c96a9e 100644
--- a/bucket/rancher-compose.json
+++ b/bucket/rancher-compose.json
@@ -1,16 +1,16 @@
 {
-    "homepage": "https://rancher.com/",
-    "description": "A complete software stack for teams adopting containers.",
     "version": "0.12.5",
+    "description": "A complete software stack for teams adopting containers.",
+    "homepage": "https://rancher.com/",
     "license": "Apache-2.0",
     "architecture": {
-        "32bit": {
-            "url": "https://github.com/rancher/rancher-compose/releases/download/v0.12.5/rancher-compose-windows-386-v0.12.5.zip",
-            "hash": "cc2d9c8a8389e80544aa11737af38ac34bb1b4dc803c8c25b027721216e48520"
-        },
         "64bit": {
             "url": "https://github.com/rancher/rancher-compose/releases/download/v0.12.5/rancher-compose-windows-amd64-v0.12.5.zip",
             "hash": "465e651c5fedcdd91417a7e25bcab351c9e99732192263afbcb91496138ef7d9"
+        },
+        "32bit": {
+            "url": "https://github.com/rancher/rancher-compose/releases/download/v0.12.5/rancher-compose-windows-386-v0.12.5.zip",
+            "hash": "cc2d9c8a8389e80544aa11737af38ac34bb1b4dc803c8c25b027721216e48520"
         }
     },
     "extract_dir": "rancher-compose-v0.12.5",
@@ -20,11 +20,11 @@
     },
     "autoupdate": {
         "architecture": {
-            "32bit": {
-                "url": "https://github.com/rancher/rancher-compose/releases/download/v$version/rancher-compose-windows-386-v$version.zip"
-            },
             "64bit": {
                 "url": "https://github.com/rancher/rancher-compose/releases/download/v$version/rancher-compose-windows-amd64-v$version.zip"
+            },
+            "32bit": {
+                "url": "https://github.com/rancher/rancher-compose/releases/download/v$version/rancher-compose-windows-386-v$version.zip"
             }
         },
         "extract_dir": "rancher-compose-v$version"
diff --git a/bucket/ravendb.json b/bucket/ravendb.json
index 95d222ca2f..506e77c6d0 100644
--- a/bucket/ravendb.json
+++ b/bucket/ravendb.json
@@ -1,7 +1,7 @@
 {
-    "homepage": "https://ravendb.net",
-    "description": "NoSQL database built on .NET Core.",
     "version": "5.1.2",
+    "description": "NoSQL database built on .NET Core.",
+    "homepage": "https://ravendb.net",
     "license": {
         "identifier": "Freeware",
         "url": "https://ravendb.net/terms/commercial"
@@ -10,13 +10,13 @@
         "Visual C++ Redistributable 2015": "extras/vcredist2015"
     },
     "architecture": {
-        "32bit": {
-            "url": "https://daily-builds.s3.amazonaws.com/RavenDB-5.1.2-windows-x86.zip",
-            "hash": "4f3fd6d42fb45458ec24c5cefab2a16527cf3c5aa2a9bb69946b98a10804d92a"
-        },
         "64bit": {
             "url": "https://daily-builds.s3.amazonaws.com/RavenDB-5.1.2-windows-x64.zip",
             "hash": "e13c11f0aefb677b7f3586b7eb733f23f06b8bae625227bc3a06b54e4ce7365e"
+        },
+        "32bit": {
+            "url": "https://daily-builds.s3.amazonaws.com/RavenDB-5.1.2-windows-x86.zip",
+            "hash": "4f3fd6d42fb45458ec24c5cefab2a16527cf3c5aa2a9bb69946b98a10804d92a"
         }
     },
     "installer": {
@@ -50,11 +50,11 @@
     },
     "autoupdate": {
         "architecture": {
-            "32bit": {
-                "url": "https://daily-builds.s3.amazonaws.com/RavenDB-$version-windows-x86.zip"
-            },
             "64bit": {
                 "url": "https://daily-builds.s3.amazonaws.com/RavenDB-$version-windows-x64.zip"
+            },
+            "32bit": {
+                "url": "https://daily-builds.s3.amazonaws.com/RavenDB-$version-windows-x86.zip"
             }
         }
     }
diff --git a/bucket/rcedit.json b/bucket/rcedit.json
index 486ba82906..8f2929e442 100644
--- a/bucket/rcedit.json
+++ b/bucket/rcedit.json
@@ -1,8 +1,8 @@
 {
-    "homepage": "https://github.com/electron/rcedit",
-    "description": "Command-line tool for editing resources of PE executables",
-    "license": "MIT",
     "version": "1.1.1",
+    "description": "Command-line tool for editing resources of PE executables",
+    "homepage": "https://github.com/electron/rcedit",
+    "license": "MIT",
     "architecture": {
         "64bit": {
             "url": "https://github.com/electron/rcedit/releases/download/v1.1.1/rcedit-x64.exe#/rcedit.exe",
diff --git a/bucket/red.json b/bucket/red.json
index b3754a1a9f..4ff29896f6 100644
--- a/bucket/red.json
+++ b/bucket/red.json
@@ -1,7 +1,7 @@
 {
-    "homepage": "https://www.red-lang.org",
     "version": "0.6.4",
     "description": "Programming language inspired by Rebol.",
+    "homepage": "https://www.red-lang.org",
     "license": {
         "identifier": "BSD-3-Clause,BSL-1.0",
         "url": "https://github.com/red/red#license"
@@ -11,7 +11,7 @@
     "bin": "red.exe",
     "checkver": {
         "url": "http://static.red-lang.org/download.html",
-        "re": "Red\\s+([\\d.]+)\\s+for"
+        "regex": "Red\\s+([\\d.]+)\\s+for"
     },
     "autoupdate": {
         "url": "https://static.red-lang.org/dl/win/red-$cleanVersion.exe#/red.exe",
diff --git a/bucket/redis.json b/bucket/redis.json
index 6c3e79c879..895266e402 100644
--- a/bucket/redis.json
+++ b/bucket/redis.json
@@ -1,7 +1,7 @@
 {
-    "homepage": "https://redis.io",
-    "description": "In-memory data structure store, used as a database, cache and message broker.",
     "version": "3.2.100",
+    "description": "In-memory data structure store, used as a database, cache and message broker.",
+    "homepage": "https://redis.io",
     "license": "BSD-3-Clause",
     "url": "https://github.com/MicrosoftArchive/redis/releases/download/win-3.2.100/Redis-x64-3.2.100.zip",
     "hash": "73775183186ebd1917353a8ae62303a328cedfff58164c9bf46e2b46977a9475",
@@ -13,6 +13,6 @@
     ],
     "checkver": {
         "url": "https://github.com/MicrosoftArchive/redis/releases/",
-        "re": ">win-(\\d+\\.\\d+\\.\\d+)<"
+        "regex": ">win-([\\d.]+)<"
     }
 }
diff --git a/bucket/rget.json b/bucket/rget.json
index 1a6062c8da..2cdb6b3491 100644
--- a/bucket/rget.json
+++ b/bucket/rget.json
@@ -1,8 +1,8 @@
 {
-    "homepage": "https://github.com/merklecounty/rget",
-    "description": "Downloads URLs and verifies the contents against a publicly recorded cryptographic log.",
-    "license": "Apache-2.0",
     "version": "0.0.7",
+    "description": "Downloads URLs and verifies the contents against a publicly recorded cryptographic log.",
+    "homepage": "https://github.com/merklecounty/rget",
+    "license": "Apache-2.0",
     "architecture": {
         "64bit": {
             "url": "https://github.com/merklecounty/rget/releases/download/v0.0.7/rget-v0.0.7-windows-amd64.tar.gz",
@@ -16,10 +16,10 @@
         "architecture": {
             "64bit": {
                 "url": "https://github.com/merklecounty/rget/releases/download/v$version/rget-v$version-windows-amd64.tar.gz",
-                "extract_dir": "rget-v$version-windows-amd64",
                 "hash": {
                     "url": "$baseurl/SHA256SUMS"
-                }
+                },
+                "extract_dir": "rget-v$version-windows-amd64"
             }
         }
     }
diff --git a/bucket/ripgrep.json b/bucket/ripgrep.json
index 8b9489aff6..72848a18e4 100644
--- a/bucket/ripgrep.json
+++ b/bucket/ripgrep.json
@@ -1,8 +1,11 @@
 {
-    "homepage": "https://github.com/BurntSushi/ripgrep",
-    "description": "Recursively searches directories for a regex pattern.",
-    "license": "MIT",
     "version": "12.1.1",
+    "description": "Recursively searches directories for a regex pattern.",
+    "homepage": "https://github.com/BurntSushi/ripgrep",
+    "license": "MIT",
+    "suggest": {
+        "vcredist": "extras/vcredist2015"
+    },
     "architecture": {
         "64bit": {
             "url": "https://github.com/BurntSushi/ripgrep/releases/download/12.1.1/ripgrep-12.1.1-x86_64-pc-windows-msvc.zip",
@@ -28,8 +31,5 @@
                 "extract_dir": "ripgrep-$version-i686-pc-windows-msvc"
             }
         }
-    },
-    "suggest": {
-        "vcredist": "extras/vcredist2015"
     }
 }
diff --git a/bucket/rktools2k3.json b/bucket/rktools2k3.json
index d8c9c8a98a..4b5811059f 100644
--- a/bucket/rktools2k3.json
+++ b/bucket/rktools2k3.json
@@ -1,7 +1,7 @@
 {
-    "homepage": "https://github.com/kodybrown/rktools2k3",
-    "description": "Streamline manage administrator tasks. (troubleshooting OS, manage AD, deploy applications, ...)",
     "version": "1.0",
+    "description": "Streamline manage administrator tasks. (troubleshooting OS, manage AD, deploy applications, ...)",
+    "homepage": "https://github.com/kodybrown/rktools2k3",
     "license": {
         "identifier": "Freeware",
         "url": "https://www.microsoft.com/en-us/legal/intellectualproperty/copyright/default.aspx"
diff --git a/bucket/rtmpdump.json b/bucket/rtmpdump.json
index f5b696cc7b..e18277c1a5 100644
--- a/bucket/rtmpdump.json
+++ b/bucket/rtmpdump.json
@@ -1,7 +1,7 @@
 {
-    "homepage": "https://rtmpdump.mplayerhq.hu/",
-    "description": "A toolkit for RTMP streams with support for all forms of RTMP (rtmp, rtmpt, rtmpe, rtmpte, and rtmps).",
     "version": "2.3",
+    "description": "A toolkit for RTMP streams with support for all forms of RTMP (rtmp, rtmpt, rtmpe, rtmpte, and rtmps).",
+    "homepage": "https://rtmpdump.mplayerhq.hu/",
     "license": "GPL-2.0-only",
     "url": "https://rtmpdump.mplayerhq.hu/download/rtmpdump-2.3-windows.zip",
     "hash": "6948aa372f04952d5675917c6ca2c7c0bf6b109de21a4323adc93247fff0189f",
diff --git a/bucket/rtools.json b/bucket/rtools.json
index 837cd1a5b4..13108f359b 100644
--- a/bucket/rtools.json
+++ b/bucket/rtools.json
@@ -1,8 +1,9 @@
 {
-    "homepage": "https://cloud.r-project.org/bin/windows/Rtools",
-    "description": "Tools for building packages for R under Microsoft Windows, or for building R itself.",
-    "license": "BSD-3-Clause",
     "version": "4.0.0",
+    "description": "Tools for building packages for R under Microsoft Windows, or for building R itself.",
+    "homepage": "https://cloud.r-project.org/bin/windows/Rtools",
+    "license": "BSD-3-Clause",
+    "notes": "For R 3.3.x to 3.6.x, please use 'versions/rtools35'.",
     "architecture": {
         "64bit": {
             "url": "https://cloud.r-project.org/bin/windows/Rtools/rtools40-x86_64.exe",
@@ -78,6 +79,5 @@
                 "url": "https://cloud.r-project.org/bin/windows/Rtools/rtools$majorVersion$minorVersion-i686.exe"
             }
         }
-    },
-    "notes": "For R 3.3.x to 3.6.x, please use 'versions/rtools35'."
+    }
 }
diff --git a/bucket/runat.json b/bucket/runat.json
index e075165bba..1e2e99a463 100644
--- a/bucket/runat.json
+++ b/bucket/runat.json
@@ -1,7 +1,7 @@
 {
-    "homepage": "https://github.com/lukesampson/psutils",
-    "description": "A replacement for the at command which Microsoft has deprecated and removed in Windows 2012.",
     "version": "0.2018.07.25",
+    "description": "A replacement for the at command which Microsoft has deprecated and removed in Windows 2012.",
+    "homepage": "https://github.com/lukesampson/psutils",
     "license": "MIT",
     "url": "https://raw.githubusercontent.com/lukesampson/psutils/3290c04d7653ea8183a5e11d3d5a4e46716035d1/runat.ps1",
     "hash": "3a7f3cf34a9695ae607627f4d3c041543909c217f54997ebbeb3871ce6f96889",
diff --git a/bucket/rustup-msvc.json b/bucket/rustup-msvc.json
index 8fa2aeddc2..aadbf6f965 100644
--- a/bucket/rustup-msvc.json
+++ b/bucket/rustup-msvc.json
@@ -1,8 +1,9 @@
 {
-    "homepage": "https://rustup.rs",
     "version": "1.23.1",
-    "license": "MIT|Apache-2.0",
     "description": "Manage multiple rust installations with ease",
+    "homepage": "https://rustup.rs",
+    "license": "MIT|Apache-2.0",
+    "notes": "To use the MSVC ABI without Visual Studio 2015 (or higher) installed, you will need the Visual Studio 2017 Build Tools: https://www.visualstudio.com/downloads/#build-tools-for-visual-studio-2017",
     "architecture": {
         "64bit": {
             "url": "https://static.rust-lang.org/rustup/archive/1.23.1/x86_64-pc-windows-msvc/rustup-init.exe",
@@ -13,15 +14,6 @@
             "hash": "c1288bc054bcdb1106686d63db9527481ac823fa0ef2538b7012cfe7d0f3d307"
         }
     },
-    "persist": [
-        ".cargo",
-        ".rustup"
-    ],
-    "env_add_path": ".cargo\\bin",
-    "env_set": {
-        "CARGO_HOME": "$persist_dir\\.cargo",
-        "RUSTUP_HOME": "$persist_dir\\.rustup"
-    },
     "installer": {
         "script": [
             "[Environment]::SetEnvironmentVariable('CARGO_HOME', \"$persist_dir\\.cargo\", 'Process')",
@@ -29,6 +21,15 @@
             "Invoke-ExternalCommand -Path \"$dir\\rustup-init.exe\" -Args '-y --no-modify-path' | Out-Null"
         ]
     },
+    "env_add_path": ".cargo\\bin",
+    "env_set": {
+        "CARGO_HOME": "$persist_dir\\.cargo",
+        "RUSTUP_HOME": "$persist_dir\\.rustup"
+    },
+    "persist": [
+        ".cargo",
+        ".rustup"
+    ],
     "checkver": {
         "url": "https://raw.githubusercontent.com/rust-lang-nursery/rustup.rs/master/Cargo.toml",
         "regex": "version = \"([\\d.]+)\""
@@ -45,6 +46,5 @@
         "hash": {
             "url": "$url.sha256"
         }
-    },
-    "notes": "To use the MSVC ABI without Visual Studio 2015 (or higher) installed, you will need the Visual Studio 2017 Build Tools: https://www.visualstudio.com/downloads/#build-tools-for-visual-studio-2017"
+    }
 }
diff --git a/bucket/rustup.json b/bucket/rustup.json
index 3e3ced66a4..3f9ae7e19d 100644
--- a/bucket/rustup.json
+++ b/bucket/rustup.json
@@ -1,8 +1,9 @@
 {
-    "homepage": "https://rustup.rs",
     "version": "1.23.1",
-    "license": "MIT|Apache-2.0",
     "description": "Manage multiple rust installations with ease",
+    "homepage": "https://rustup.rs",
+    "license": "MIT|Apache-2.0",
+    "notes": "To use the MSVC ABI without Visual Studio 2015 (or higher) installed, you will need the Visual Studio 2017 Build Tools: https://www.visualstudio.com/downloads/#build-tools-for-visual-studio-2017",
     "architecture": {
         "64bit": {
             "url": "https://static.rust-lang.org/rustup/archive/1.23.1/x86_64-pc-windows-gnu/rustup-init.exe",
@@ -13,15 +14,6 @@
             "hash": "034d88f7b1c98622cab525df504d63c8ff8eaf0534e16284a056680c6ffc0d6a"
         }
     },
-    "persist": [
-        ".cargo",
-        ".rustup"
-    ],
-    "env_add_path": ".cargo\\bin",
-    "env_set": {
-        "CARGO_HOME": "$persist_dir\\.cargo",
-        "RUSTUP_HOME": "$persist_dir\\.rustup"
-    },
     "installer": {
         "script": [
             "[Environment]::SetEnvironmentVariable('CARGO_HOME', \"$persist_dir\\.cargo\", 'Process')",
@@ -29,6 +21,15 @@
             "Invoke-ExternalCommand -Path \"$dir\\rustup-init.exe\" -Args '-y --no-modify-path' | Out-Null"
         ]
     },
+    "env_add_path": ".cargo\\bin",
+    "env_set": {
+        "CARGO_HOME": "$persist_dir\\.cargo",
+        "RUSTUP_HOME": "$persist_dir\\.rustup"
+    },
+    "persist": [
+        ".cargo",
+        ".rustup"
+    ],
     "checkver": {
         "url": "https://raw.githubusercontent.com/rust-lang-nursery/rustup.rs/master/Cargo.toml",
         "regex": "version = \"([\\d.]+)\""
@@ -45,6 +46,5 @@
         "hash": {
             "url": "$url.sha256"
         }
-    },
-    "notes": "To use the MSVC ABI without Visual Studio 2015 (or higher) installed, you will need the Visual Studio 2017 Build Tools: https://www.visualstudio.com/downloads/#build-tools-for-visual-studio-2017"
+    }
 }