diff --git a/core/baseinit/sources b/core/baseinit/sources
index bfcd6d60..26dfa5f3 100644
--- a/core/baseinit/sources
+++ b/core/baseinit/sources
@@ -1 +1 @@
-https://github.com/kisslinux/init/archive/1.0.2.tar.gz
+https://github.com/kisslinux/init/archive/VERSION.tar.gz
diff --git a/core/binutils/sources b/core/binutils/sources
index bba397f6..bf13052d 100644
--- a/core/binutils/sources
+++ b/core/binutils/sources
@@ -1 +1 @@
-https://ftp.gnu.org/gnu/binutils/binutils-2.36.1.tar.xz
+https://ftp.gnu.org/gnu/binutils/binutils-VERSION.tar.xz
diff --git a/core/bison/sources b/core/bison/sources
index a0f39c98..c71bba6c 100644
--- a/core/bison/sources
+++ b/core/bison/sources
@@ -1 +1 @@
-https://ftp.gnu.org/gnu/bison/bison-3.7.6.tar.xz
+https://ftp.gnu.org/gnu/bison/bison-VERSION.tar.xz
diff --git a/core/busybox/depends b/core/busybox/depends
index 491a13c6..1f97bc3a 100644
--- a/core/busybox/depends
+++ b/core/busybox/depends
@@ -1,3 +1 @@
-bzip2
-gzip
 linux-headers make
diff --git a/core/busybox/sources b/core/busybox/sources
index 40787e74..9888e749 100644
--- a/core/busybox/sources
+++ b/core/busybox/sources
@@ -1,4 +1,4 @@
-https://busybox.net/downloads/busybox-1.33.1.tar.bz2
+https://busybox.net/downloads/busybox-VERSION.tar.bz2
 patches/adduser-no-setgid.patch patch
 patches/fsck-resolve-uuid.patch patch
 patches/modprobe-kernel-version.patch patch
diff --git a/core/busybox/version b/core/busybox/version
index 0be643da..a2e6ee1d 100644
--- a/core/busybox/version
+++ b/core/busybox/version
@@ -1 +1 @@
-1.33.1 3
+1.33.1 5
diff --git a/core/bzip2/sources b/core/bzip2/sources
index a04bc1bb..92aeb182 100644
--- a/core/bzip2/sources
+++ b/core/bzip2/sources
@@ -1 +1 @@
-https://sourceware.org/pub/bzip2/bzip2-1.0.8.tar.gz
+https://sourceware.org/pub/bzip2/bzip2-VERSION.tar.gz
diff --git a/core/curl/sources b/core/curl/sources
index 4c9b3f00..8f66b9cc 100644
--- a/core/curl/sources
+++ b/core/curl/sources
@@ -1 +1 @@
-https://curl.haxx.se/download/curl-7.77.0.tar.xz
+https://curl.haxx.se/download/curl-VERSION.tar.xz
diff --git a/core/flex/sources b/core/flex/sources
index c10fca72..13416697 100644
--- a/core/flex/sources
+++ b/core/flex/sources
@@ -1 +1 @@
-https://github.com/westes/flex/releases/download/v2.6.4/flex-2.6.4.tar.gz
+https://github.com/westes/flex/releases/download/vVERSION/flex-VERSION.tar.gz
diff --git a/core/gcc/sources b/core/gcc/sources
index 5db1e1aa..3dc576c7 100644
--- a/core/gcc/sources
+++ b/core/gcc/sources
@@ -1,4 +1,4 @@
-https://gcc.gnu.org/pub/gcc/releases/gcc-11.1.0/gcc-11.1.0.tar.xz gcc
+https://gcc.gnu.org/pub/gcc/releases/gcc-VERSION/gcc-VERSION.tar.xz gcc
 https://ftp.gnu.org/gnu/gmp/gmp-6.2.1.tar.xz gcc/gmp
 https://ftp.gnu.org/gnu/mpfr/mpfr-4.1.0.tar.xz gcc/mpfr
 https://ftp.gnu.org/gnu/mpc/mpc-1.2.1.tar.gz gcc/mpc
diff --git a/core/git/sources b/core/git/sources
index 311ad2e7..ce3eea28 100644
--- a/core/git/sources
+++ b/core/git/sources
@@ -1,2 +1,2 @@
-https://mirrors.edge.kernel.org/pub/software/scm/git/git-2.32.0.tar.xz
-https://mirrors.edge.kernel.org/pub/software/scm/git/git-manpages-2.32.0.tar.xz man
+https://mirrors.edge.kernel.org/pub/software/scm/git/git-VERSION.tar.xz
+https://mirrors.edge.kernel.org/pub/software/scm/git/git-manpages-VERSION.tar.xz man
diff --git a/core/grub/sources b/core/grub/sources
index f61f977c..5ebd598f 100644
--- a/core/grub/sources
+++ b/core/grub/sources
@@ -1,3 +1,3 @@
-https://ftp.gnu.org/gnu/grub/grub-2.06.tar.xz grub-pc
-https://ftp.gnu.org/gnu/grub/grub-2.06.tar.xz grub-efi
+https://ftp.gnu.org/gnu/grub/grub-VERSION.tar.xz grub-pc
+https://ftp.gnu.org/gnu/grub/grub-VERSION.tar.xz grub-efi
 files/grub.default
diff --git a/core/gzip/build b/core/gzip/build
deleted file mode 100755
index e0219aa3..00000000
--- a/core/gzip/build
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh -e
-
-make CC="${CC:-cc} -static"
-
-mkdir -p \
-    "$1/usr/bin" \
-    "$1/usr/share/man/man1"
-
-cp -f pigz unpigz "$1/usr/bin"
-cp -f pigz.1 "$1/usr/share/man/man1"
-
-ln -sf pigz   "$1/usr/bin/gzip"
-ln -sf pigz   "$1/usr/bin/zcat"
-ln -sf unpigz "$1/usr/bin/gunzip"
-ln -sf pigz.1 "$1/usr/share/man/man1/gzip.1"
diff --git a/core/gzip/build b/core/gzip/build
new file mode 120000
index 00000000..29a0f496
--- /dev/null
+++ b/core/gzip/build
@@ -0,0 +1 @@
+../pigz/build
\ No newline at end of file
diff --git a/core/gzip/checksums b/core/gzip/checksums
deleted file mode 100644
index 60713b92..00000000
--- a/core/gzip/checksums
+++ /dev/null
@@ -1 +0,0 @@
-2eed7b0d7449d1d70903f2a62cd6005d262eb3a8c9e98687bc8cbb5809db2a7d
diff --git a/core/gzip/checksums b/core/gzip/checksums
new file mode 120000
index 00000000..9d348313
--- /dev/null
+++ b/core/gzip/checksums
@@ -0,0 +1 @@
+../pigz/checksums
\ No newline at end of file
diff --git a/core/gzip/post-install b/core/gzip/post-install
new file mode 100755
index 00000000..55ed6dc9
--- /dev/null
+++ b/core/gzip/post-install
@@ -0,0 +1,14 @@
+#!/bin/sh -e
+
+cat <<EOF
+
+NOTE: The gzip package will be removed 22/07/2021
+      and replaced with pigz. Run the following
+      to transition before the deadline.
+
+      kiss b pigz
+      kiss i pigz
+      kiss a | grep ^pigz | kiss a -
+      kiss r gzip
+
+EOF
diff --git a/core/gzip/version b/core/gzip/version
index ae65f8fe..82096ecf 100644
--- a/core/gzip/version
+++ b/core/gzip/version
@@ -1 +1 @@
-1.10 2.6
+1.10 1
diff --git a/core/kiss/checksums b/core/kiss/checksums
index f540767b..0bf22f05 100644
--- a/core/kiss/checksums
+++ b/core/kiss/checksums
@@ -1,3 +1,3 @@
-cfd09ffe51bafad3dce325220be76dedd82f0b405936405e9ca7e3672955b552
-216132a362faa22d9b52600ffce2de0eb2e9d343fdb248673ceb891948075c38
+ab36a61bb9919093adc3dbf58b10c5ef4f301dd473b6f3a0975391037c2eb1ce
+57b9045da1f4c78d120bca151670c06efdd3b27ebcf84b5aa881455dee0d1bdc
 62e1a1a1d427aa5c1ac55d0a5451440fdbc03f1a995eb7cd3bf45a2d858e0d07
diff --git a/core/kiss/sources b/core/kiss/sources
index 90abfbaf..34af83f0 100644
--- a/core/kiss/sources
+++ b/core/kiss/sources
@@ -1,3 +1,3 @@
-https://github.com/kisslinux/kiss/archive/5.5.2.tar.gz
-https://github.com/kisslinux/website/archive/cf694f277a8247fb9cb69a6111cec80abb10734d.tar.gz docs
+https://github.com/kisslinux/kiss/archive/5.5.6.tar.gz
+https://github.com/kisslinux/website/archive/e5f0396efbb86b050fbee881483258d0d20a2d4f.tar.gz docs
 https://github.com/kisslinux/wiki/archive/89d4946d128dff35df87d3210fe10a591559296a.tar.gz wiki
diff --git a/core/kiss/version b/core/kiss/version
index 924347e2..3c4b3130 100644
--- a/core/kiss/version
+++ b/core/kiss/version
@@ -1 +1 @@
-5.5.2 1
+5.5.6 1
diff --git a/core/linux-headers/sources b/core/linux-headers/sources
index d155ce3a..148f2801 100644
--- a/core/linux-headers/sources
+++ b/core/linux-headers/sources
@@ -1 +1 @@
-https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.47.tar.xz
+https://cdn.kernel.org/pub/linux/kernel/vMAJOR.x/linux-VERSION.tar.xz
diff --git a/core/m4/sources b/core/m4/sources
index bde2eff2..313e1b34 100644
--- a/core/m4/sources
+++ b/core/m4/sources
@@ -1 +1 @@
-https://ftp.gnu.org/gnu/m4/m4-1.4.19.tar.xz
+https://ftp.gnu.org/gnu/m4/m4-VERSION.tar.xz
diff --git a/core/make/sources b/core/make/sources
index 038f47fa..b201338d 100644
--- a/core/make/sources
+++ b/core/make/sources
@@ -1 +1 @@
-https://ftp.gnu.org/gnu/make/make-4.3.tar.gz
+https://ftp.gnu.org/gnu/make/make-VERSION.tar.gz
diff --git a/core/musl/sources b/core/musl/sources
index f9e8b81c..a45a1bd6 100644
--- a/core/musl/sources
+++ b/core/musl/sources
@@ -1,4 +1,4 @@
-https://www.musl-libc.org/releases/musl-1.2.2.tar.gz
+https://www.musl-libc.org/releases/musl-VERSION.tar.gz
 files/cdefs.h
 files/queue.h
 files/tree.h
diff --git a/core/openssl/build b/core/openssl/build
index a97554bf..240bd480 100755
--- a/core/openssl/build
+++ b/core/openssl/build
@@ -10,7 +10,11 @@
 
 make depend
 make
-make DESTDIR="$1" install_sw install_ssldirs install_man_docs
+
+make DESTDIR="$1" \
+    install_sw \
+    install_ssldirs \
+    install_man_docs
 
 cp -f update-certdata.sh "$1/etc/ssl"
 
diff --git a/core/openssl/sources b/core/openssl/sources
index ecfe35e6..542a9064 100644
--- a/core/openssl/sources
+++ b/core/openssl/sources
@@ -1,3 +1,3 @@
-https://www.openssl.org/source/openssl-1.1.1k.tar.gz
+https://www.openssl.org/source/openssl-VERSION.tar.gz
 https://causal.agency/libretls/libretls-3.3.3p1.tar.gz libretls
 files/update-certdata.sh
diff --git a/core/pigz/build b/core/pigz/build
new file mode 100755
index 00000000..e0219aa3
--- /dev/null
+++ b/core/pigz/build
@@ -0,0 +1,15 @@
+#!/bin/sh -e
+
+make CC="${CC:-cc} -static"
+
+mkdir -p \
+    "$1/usr/bin" \
+    "$1/usr/share/man/man1"
+
+cp -f pigz unpigz "$1/usr/bin"
+cp -f pigz.1 "$1/usr/share/man/man1"
+
+ln -sf pigz   "$1/usr/bin/gzip"
+ln -sf pigz   "$1/usr/bin/zcat"
+ln -sf unpigz "$1/usr/bin/gunzip"
+ln -sf pigz.1 "$1/usr/share/man/man1/gzip.1"
diff --git a/core/pigz/checksums b/core/pigz/checksums
new file mode 100644
index 00000000..60713b92
--- /dev/null
+++ b/core/pigz/checksums
@@ -0,0 +1 @@
+2eed7b0d7449d1d70903f2a62cd6005d262eb3a8c9e98687bc8cbb5809db2a7d
diff --git a/core/pigz/sources b/core/pigz/sources
new file mode 100644
index 00000000..beac01e0
--- /dev/null
+++ b/core/pigz/sources
@@ -0,0 +1 @@
+https://zlib.net/pigz/pigz-VERSION.tar.gz
diff --git a/core/pigz/version b/core/pigz/version
new file mode 100644
index 00000000..eb0c981f
--- /dev/null
+++ b/core/pigz/version
@@ -0,0 +1 @@
+2.6 1
diff --git a/core/xz/sources b/core/xz/sources
index 657c0bec..82bd92be 100644
--- a/core/xz/sources
+++ b/core/xz/sources
@@ -1 +1 @@
-https://nchc.dl.sourceforge.net/project/lzmautils/xz-5.2.5.tar.bz2
+https://nchc.dl.sourceforge.net/project/lzmautils/xz-VERSION.tar.bz2
diff --git a/core/zlib/sources b/core/zlib/sources
index 17f901f4..c52cb60b 100644
--- a/core/zlib/sources
+++ b/core/zlib/sources
@@ -1 +1 @@
-https://zlib.net/zlib-1.2.11.tar.gz
+https://zlib.net/zlib-VERSION.tar.gz
diff --git a/extra/adwaita-icon-theme/sources b/extra/adwaita-icon-theme/sources
index 6e01b154..5333a226 100644
--- a/extra/adwaita-icon-theme/sources
+++ b/extra/adwaita-icon-theme/sources
@@ -1 +1 @@
-https://download.gnome.org/sources/adwaita-icon-theme/40/adwaita-icon-theme-40.1.1.tar.xz
+https://download.gnome.org/sources/adwaita-icon-theme/MAJOR/adwaita-icon-theme-VERSION.tar.xz
diff --git a/extra/alsa-lib/sources b/extra/alsa-lib/sources
index 03510ebe..f5591cc1 100644
--- a/extra/alsa-lib/sources
+++ b/extra/alsa-lib/sources
@@ -1,2 +1,2 @@
-https://www.alsa-project.org/files/pub/lib/alsa-lib-1.2.5.1.tar.bz2
+https://www.alsa-project.org/files/pub/lib/alsa-lib-VERSION.tar.bz2
 patches/fix-dlo.patch
diff --git a/extra/alsa-utils/sources b/extra/alsa-utils/sources
index b27d4326..c4444fab 100644
--- a/extra/alsa-utils/sources
+++ b/extra/alsa-utils/sources
@@ -1 +1 @@
-https://www.alsa-project.org/files/pub/utils/alsa-utils-1.2.5.1.tar.bz2
+https://www.alsa-project.org/files/pub/utils/alsa-utils-VERSION.tar.bz2
diff --git a/extra/atk/sources b/extra/atk/sources
index 069914bf..41dbfb8a 100644
--- a/extra/atk/sources
+++ b/extra/atk/sources
@@ -1 +1 @@
-https://ftp.gnome.org/pub/gnome/sources/atk/2.36/atk-2.36.0.tar.xz
+https://ftp.gnome.org/pub/gnome/sources/atk/MAJOR.MINOR/atk-VERSION.tar.xz
diff --git a/extra/cairo/sources b/extra/cairo/sources
index e43c5aab..bea153b4 100644
--- a/extra/cairo/sources
+++ b/extra/cairo/sources
@@ -1 +1 @@
-https://cairographics.org/releases/cairo-1.16.0.tar.xz
+https://cairographics.org/releases/cairo-VERSION.tar.xz
diff --git a/extra/cbindgen/sources b/extra/cbindgen/sources
index 53e0396c..5315cc87 100644
--- a/extra/cbindgen/sources
+++ b/extra/cbindgen/sources
@@ -1,4 +1,4 @@
-https://github.com/eqrion/cbindgen/archive/v0.19.0.tar.gz
+https://github.com/eqrion/cbindgen/archive/vVERSION.tar.gz
 
 # This is a pre-generated list of crate dependencies. This list may
 # change between releases. This allows us to pre-cache each of the
diff --git a/extra/ccache/sources b/extra/ccache/sources
index 016b70da..3358eaee 100644
--- a/extra/ccache/sources
+++ b/extra/ccache/sources
@@ -1 +1 @@
-https://github.com/ccache/ccache/releases/download/v4.3/ccache-4.3.tar.xz
+https://github.com/ccache/ccache/releases/download/vVERSION/ccache-VERSION.tar.xz
diff --git a/extra/clang/sources b/extra/clang/sources
index a26e29c6..8cdc3098 100644
--- a/extra/clang/sources
+++ b/extra/clang/sources
@@ -1 +1 @@
-https://github.com/llvm/llvm-project/releases/download/llvmorg-12.0.1/clang-12.0.1.src.tar.xz
+https://github.com/llvm/llvm-project/releases/download/llvmorg-VERSION/clang-VERSION.src.tar.xz
diff --git a/extra/cmake/sources b/extra/cmake/sources
index 5c663bab..47f9bc86 100644
--- a/extra/cmake/sources
+++ b/extra/cmake/sources
@@ -1,2 +1,2 @@
-https://cmake.org/files/v3.21/cmake-3.21.0.tar.gz
+https://cmake.org/files/vMAJOR.MINOR/cmake-VERSION.tar.gz
 patches/cmake-no-execinfo.patch
diff --git a/extra/dhcpcd/sources b/extra/dhcpcd/sources
index f5f44a0f..0eb7df43 100644
--- a/extra/dhcpcd/sources
+++ b/extra/dhcpcd/sources
@@ -1,2 +1,2 @@
-https://github.com/rsmarples/dhcpcd/archive/dhcpcd-9.4.0.tar.gz
+https://github.com/rsmarples/dhcpcd/archive/dhcpcd-VERSION.tar.gz
 files/dhcpcd.run
diff --git a/extra/dosfstools/sources b/extra/dosfstools/sources
index 6334e346..a2062140 100644
--- a/extra/dosfstools/sources
+++ b/extra/dosfstools/sources
@@ -1 +1 @@
-https://github.com/dosfstools/dosfstools/releases/download/v4.2/dosfstools-4.2.tar.gz
+https://github.com/dosfstools/dosfstools/releases/download/vVERSION/dosfstools-VERSION.tar.gz
diff --git a/extra/e2fsprogs/sources b/extra/e2fsprogs/sources
index 08bfe540..4040f467 100644
--- a/extra/e2fsprogs/sources
+++ b/extra/e2fsprogs/sources
@@ -1 +1 @@
-https://github.com/tytso/e2fsprogs/archive/v1.46.2.tar.gz
+https://github.com/tytso/e2fsprogs/archive/vVERSION.tar.gz
diff --git a/extra/efibootmgr/sources b/extra/efibootmgr/sources
index 434c4628..2bcb405e 100644
--- a/extra/efibootmgr/sources
+++ b/extra/efibootmgr/sources
@@ -1 +1 @@
-https://github.com/rhboot/efibootmgr/archive/4069341e184471dccf407ca8410daa4c4fd634f5.tar.gz
+https://github.com/rhboot/efibootmgr/archive/VERSION.tar.gz
diff --git a/extra/efibootmgr/version b/extra/efibootmgr/version
index 293443cf..4087c294 100644
--- a/extra/efibootmgr/version
+++ b/extra/efibootmgr/version
@@ -1 +1 @@
-17 6
+4069341e184471dccf407ca8410daa4c4fd634f5 1
diff --git a/extra/efivar/sources b/extra/efivar/sources
index e4982ba6..a2129c7d 100644
--- a/extra/efivar/sources
+++ b/extra/efivar/sources
@@ -1 +1 @@
-https://github.com/rhboot/efivar/archive/cff88dd96b9d43e2c5875a24ba6180b196890ded.tar.gz
+https://github.com/rhboot/efivar/archive/VERSION.tar.gz
diff --git a/extra/efivar/version b/extra/efivar/version
index 6bee7bf5..78460d59 100644
--- a/extra/efivar/version
+++ b/extra/efivar/version
@@ -1 +1 @@
-37 4
+cff88dd96b9d43e2c5875a24ba6180b196890ded 1
diff --git a/extra/eiwd/sources b/extra/eiwd/sources
index 6bdc1203..8a2d6314 100644
--- a/extra/eiwd/sources
+++ b/extra/eiwd/sources
@@ -1,2 +1,2 @@
-https://github.com/illiliti/eiwd/releases/download/1.15-1/iwd-1.15.tar.xz
+https://github.com/illiliti/eiwd/releases/download/VERSION/iwd-MAJOR.MINOR.tar.xz
 files/eiwd.run
diff --git a/extra/expat/sources b/extra/expat/sources
index c60068c7..fb6bf816 100644
--- a/extra/expat/sources
+++ b/extra/expat/sources
@@ -1 +1 @@
-https://github.com/libexpat/libexpat/releases/download/R_2_4_1/expat-2.4.1.tar.bz2
+https://github.com/libexpat/libexpat/releases/download/R_MAJOR_MINOR_PATCH/expat-VERSION.tar.bz2
diff --git a/extra/ffmpeg/sources b/extra/ffmpeg/sources
index 6135be76..5eff499f 100644
--- a/extra/ffmpeg/sources
+++ b/extra/ffmpeg/sources
@@ -1 +1 @@
-https://ffmpeg.org/releases/ffmpeg-4.4.tar.xz
+https://ffmpeg.org/releases/ffmpeg-VERSION.tar.xz
diff --git a/extra/firefox-privacy/build b/extra/firefox-privacy/build
index 8ddf24f4..d2b5ea7f 100755
--- a/extra/firefox-privacy/build
+++ b/extra/firefox-privacy/build
@@ -4,6 +4,6 @@ mkdir -p \
     "$1/usr/lib/firefox/browser/defaults/preferences" \
     "$1/usr/lib/firefox/distribution"
 
-cp -f vendor-*.js     "$1/usr/lib/firefox/browser/defaults/preferences"
-cp -f policies-*.json "$1/usr/lib/firefox/distribution"
+cp -f vendor.js     "$1/usr/lib/firefox/browser/defaults/preferences"
+cp -f policies.json "$1/usr/lib/firefox/distribution"
 
diff --git a/extra/firefox-privacy/files/policies-1.0.json b/extra/firefox-privacy/files/policies.json
similarity index 100%
rename from extra/firefox-privacy/files/policies-1.0.json
rename to extra/firefox-privacy/files/policies.json
diff --git a/extra/firefox-privacy/files/vendor-1.0.js b/extra/firefox-privacy/files/vendor.js
similarity index 100%
rename from extra/firefox-privacy/files/vendor-1.0.js
rename to extra/firefox-privacy/files/vendor.js
diff --git a/extra/firefox-privacy/sources b/extra/firefox-privacy/sources
index 5cd0524f..6e3034d1 100644
--- a/extra/firefox-privacy/sources
+++ b/extra/firefox-privacy/sources
@@ -1,2 +1,2 @@
-files/vendor-1.0.js
-files/policies-1.0.json
+files/vendor.js
+files/policies.json
diff --git a/extra/firefox/sources b/extra/firefox/sources
index 261bcf83..0dcfef14 100644
--- a/extra/firefox/sources
+++ b/extra/firefox/sources
@@ -1,4 +1,4 @@
-https://ftp.mozilla.org/pub/firefox/releases/90.0/source/firefox-90.0.source.tar.xz
+https://ftp.mozilla.org/pub/firefox/releases/VERSION/source/firefox-VERSION.source.tar.xz
 https://ftp.gnu.org/gnu/autoconf/autoconf-2.13.tar.gz autoconf2.13/
 https://www.tortall.net/projects/yasm/releases/yasm-1.3.0.tar.gz yasm/
 patches/no-x11.patch
diff --git a/extra/fontconfig/sources b/extra/fontconfig/sources
index 8e4b95df..b72ef4b5 100644
--- a/extra/fontconfig/sources
+++ b/extra/fontconfig/sources
@@ -1 +1 @@
-https://freedesktop.org/software/fontconfig/release/fontconfig-2.13.94.tar.xz
+https://freedesktop.org/software/fontconfig/release/fontconfig-VERSION.tar.xz
diff --git a/extra/freetype-harfbuzz/sources b/extra/freetype-harfbuzz/sources
index 18159002..c0bb7429 100644
--- a/extra/freetype-harfbuzz/sources
+++ b/extra/freetype-harfbuzz/sources
@@ -1,2 +1,2 @@
-https://download-mirror.savannah.gnu.org/releases/freetype/freetype-2.10.4.tar.xz freetype
-https://github.com/harfbuzz/harfbuzz/archive/2.8.2.tar.gz harfbuzz
+https://download-mirror.savannah.gnu.org/releases/freetype/freetype-MAJOR.MINOR.PATCH.tar.xz freetype
+https://github.com/harfbuzz/harfbuzz/archive/IDENT.tar.gz harfbuzz
diff --git a/extra/gcompat/sources b/extra/gcompat/sources
index 969d1b65..19d12c43 100644
--- a/extra/gcompat/sources
+++ b/extra/gcompat/sources
@@ -1 +1 @@
-https://distfiles.adelielinux.org/source/gcompat/gcompat-1.0.0.tar.xz
+https://distfiles.adelielinux.org/source/gcompat/gcompat-VERSION.tar.xz
diff --git a/extra/gdk-pixbuf/sources b/extra/gdk-pixbuf/sources
index 680a73f3..3960b0f2 100644
--- a/extra/gdk-pixbuf/sources
+++ b/extra/gdk-pixbuf/sources
@@ -1 +1 @@
-https://download.gnome.org/sources/gdk-pixbuf/2.42/gdk-pixbuf-2.42.6.tar.xz
+https://download.gnome.org/sources/gdk-pixbuf/MAJOR.MINOR/gdk-pixbuf-VERSION.tar.xz
diff --git a/extra/giflib/sources b/extra/giflib/sources
index dc1326bc..c0440abf 100644
--- a/extra/giflib/sources
+++ b/extra/giflib/sources
@@ -1 +1 @@
-https://downloads.sourceforge.net/giflib/giflib-5.2.1.tar.gz
+https://downloads.sourceforge.net/giflib/giflib-VERSION.tar.gz
diff --git a/extra/glib/sources b/extra/glib/sources
index 5c66acab..defa65c7 100644
--- a/extra/glib/sources
+++ b/extra/glib/sources
@@ -1 +1 @@
-https://download.gnome.org/sources/glib/2.68/glib-2.68.3.tar.xz
+https://download.gnome.org/sources/glib/MAJOR.MINOR/glib-VERSION.tar.xz
diff --git a/extra/gnugrep/sources b/extra/gnugrep/sources
index 35d5bb34..675f59c0 100644
--- a/extra/gnugrep/sources
+++ b/extra/gnugrep/sources
@@ -1 +1 @@
-https://ftp.gnu.org/gnu/grep/grep-3.6.tar.xz
+https://ftp.gnu.org/gnu/grep/grep-VERSION.tar.xz
diff --git a/extra/gnupg1/sources b/extra/gnupg1/sources
index 40bad2e7..96eb7707 100644
--- a/extra/gnupg1/sources
+++ b/extra/gnupg1/sources
@@ -1 +1 @@
-https://gnupg.org/ftp/gcrypt/gnupg/gnupg-1.4.23.tar.bz2
+https://gnupg.org/ftp/gcrypt/gnupg/gnupg-VERSION.tar.bz2
diff --git a/extra/gperf/sources b/extra/gperf/sources
index 2ead637b..d7e96a3f 100644
--- a/extra/gperf/sources
+++ b/extra/gperf/sources
@@ -1 +1 @@
-https://ftp.gnu.org/gnu/gperf/gperf-3.1.tar.gz
+https://ftp.gnu.org/gnu/gperf/gperf-VERSION.tar.gz
diff --git a/extra/gtk+3/sources b/extra/gtk+3/sources
index c8a9e117..223dd84b 100644
--- a/extra/gtk+3/sources
+++ b/extra/gtk+3/sources
@@ -1,4 +1,4 @@
-https://download.gnome.org/sources/gtk+/3.24/gtk+-3.24.29.tar.xz
+https://download.gnome.org/sources/gtk+/MAJOR.MINOR/gtk+-VERSION.tar.xz
 https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas/-/archive/40.0/gsettings-desktop-schemas-40.0.tar.gz schemas
 patches/no-fribidi.patch
 patches/schemas.patch
diff --git a/extra/hicolor-icon-theme/sources b/extra/hicolor-icon-theme/sources
index 25bef1de..b00c2d5a 100644
--- a/extra/hicolor-icon-theme/sources
+++ b/extra/hicolor-icon-theme/sources
@@ -1 +1 @@
-https://icon-theme.freedesktop.org/releases/hicolor-icon-theme-0.17.tar.xz
+https://icon-theme.freedesktop.org/releases/hicolor-icon-theme-VERSION.tar.xz
diff --git a/extra/intel-vaapi-driver/sources b/extra/intel-vaapi-driver/sources
index edf4829d..b7273a73 100644
--- a/extra/intel-vaapi-driver/sources
+++ b/extra/intel-vaapi-driver/sources
@@ -1 +1 @@
-https://github.com/intel/intel-vaapi-driver/archive/2.4.1.tar.gz
+https://github.com/intel/intel-vaapi-driver/archive/VERSION.tar.gz
diff --git a/extra/json-c/checksums b/extra/json-c/checksums
index 8c4397bc..3cfa7294 100644
--- a/extra/json-c/checksums
+++ b/extra/json-c/checksums
@@ -1 +1 @@
-4ba9a090a42cf1e12b84c64e4464bb6fb893666841d5843cc5bef90774028882
+b8d80a1ddb718b3ba7492916237bbf86609e9709fb007e7f7d4322f02341a4c6
diff --git a/extra/json-c/sources b/extra/json-c/sources
index d72f151b..7053d052 100644
--- a/extra/json-c/sources
+++ b/extra/json-c/sources
@@ -1 +1 @@
-https://github.com/json-c/json-c/archive/json-c-0.15-20200726.tar.gz
+https://s3.amazonaws.com/json-c_releases/releases/json-c-VERSION.tar.gz
diff --git a/extra/lame/sources b/extra/lame/sources
index 8cc28356..badd89e7 100644
--- a/extra/lame/sources
+++ b/extra/lame/sources
@@ -1 +1 @@
-https://downloads.sourceforge.net/lame/lame-3.100.tar.gz
+https://downloads.sourceforge.net/lame/lame-VERSION.tar.gz
diff --git a/extra/libass/sources b/extra/libass/sources
index 6e432bea..9e679b6b 100644
--- a/extra/libass/sources
+++ b/extra/libass/sources
@@ -1,2 +1,2 @@
-https://github.com/libass/libass/releases/download/0.15.1/libass-0.15.1.tar.xz
+https://github.com/libass/libass/releases/download/VERSION/libass-VERSION.tar.xz
 patches/no-fribidi.patch
diff --git a/extra/libelf/sources b/extra/libelf/sources
index 1903c165..8be59331 100644
--- a/extra/libelf/sources
+++ b/extra/libelf/sources
@@ -1,2 +1,2 @@
-https://sourceware.org/elfutils/ftp/0.185/elfutils-0.185.tar.bz2
+https://sourceware.org/elfutils/ftp/VERSION/elfutils-VERSION.tar.bz2
 files/error.h lib
diff --git a/extra/libepoxy/sources b/extra/libepoxy/sources
index 91bbee9f..58b9f837 100644
--- a/extra/libepoxy/sources
+++ b/extra/libepoxy/sources
@@ -1 +1 @@
-https://github.com/anholt/libepoxy/releases/download/1.5.8/libepoxy-1.5.8.tar.xz
+https://github.com/anholt/libepoxy/releases/download/VERSION/libepoxy-VERSION.tar.xz
diff --git a/extra/liberation-fonts/build b/extra/liberation-fonts/build
deleted file mode 100755
index 081f1d5a..00000000
--- a/extra/liberation-fonts/build
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh -e
-
-mkdir -p   "$1/usr/share/fonts/TTF"
-cp ./*.ttf "$1/usr/share/fonts/TTF"
diff --git a/extra/liberation-fonts/checksums b/extra/liberation-fonts/checksums
deleted file mode 100644
index af2b3014..00000000
--- a/extra/liberation-fonts/checksums
+++ /dev/null
@@ -1 +0,0 @@
-26f85412dd0aa9d061504a1cc8aaf0aa12a70710e8d47d8b65a1251757c1a5ef
diff --git a/extra/liberation-fonts/sources b/extra/liberation-fonts/sources
deleted file mode 100644
index 2d35d418..00000000
--- a/extra/liberation-fonts/sources
+++ /dev/null
@@ -1 +0,0 @@
-https://github.com/liberationfonts/liberation-fonts/files/6418984/liberation-fonts-ttf-2.1.4.tar.gz
diff --git a/extra/liberation-fonts/version b/extra/liberation-fonts/version
deleted file mode 100644
index 0c298421..00000000
--- a/extra/liberation-fonts/version
+++ /dev/null
@@ -1 +0,0 @@
-2.1.4 1
diff --git a/extra/libffi/sources b/extra/libffi/sources
index a966e96d..919d5780 100644
--- a/extra/libffi/sources
+++ b/extra/libffi/sources
@@ -1 +1 @@
-https://github.com/libffi/libffi/releases/download/v3.4.2/libffi-3.4.2.tar.gz
+https://github.com/libffi/libffi/releases/download/vVERSION/libffi-VERSION.tar.gz
diff --git a/extra/libjpeg-turbo/sources b/extra/libjpeg-turbo/sources
index 7ba3be89..9993c543 100644
--- a/extra/libjpeg-turbo/sources
+++ b/extra/libjpeg-turbo/sources
@@ -1,2 +1,2 @@
-https://github.com/libjpeg-turbo/libjpeg-turbo/archive/2.1.0.tar.gz
+https://github.com/libjpeg-turbo/libjpeg-turbo/archive/VERSION.tar.gz
 patches/no-docs.patch
diff --git a/extra/libogg/sources b/extra/libogg/sources
index a8655244..5f0e1af5 100644
--- a/extra/libogg/sources
+++ b/extra/libogg/sources
@@ -1 +1 @@
-https://github.com/xiph/ogg/releases/download/v1.3.5/libogg-1.3.5.tar.xz
+https://github.com/xiph/ogg/releases/download/vVERSION/libogg-VERSION.tar.xz
diff --git a/extra/libpng/sources b/extra/libpng/sources
index d6556f0c..f44cf99c 100644
--- a/extra/libpng/sources
+++ b/extra/libpng/sources
@@ -1,2 +1,2 @@
-https://github.com/glennrp/libpng/archive/v1.6.37.tar.gz
+https://github.com/glennrp/libpng/archive/vVERSION.tar.gz
 patches/libpng-1.6.37-apng.patch
diff --git a/extra/libtheora/sources b/extra/libtheora/sources
index c5eaf319..4e3544c3 100644
--- a/extra/libtheora/sources
+++ b/extra/libtheora/sources
@@ -1,2 +1,2 @@
-https://downloads.xiph.org/releases/theora/libtheora-1.1.1.tar.gz
+https://downloads.xiph.org/releases/theora/libtheora-VERSION.tar.gz
 patches/libtheora-1.1.1-libpng16.patch
diff --git a/extra/libudev-zero/sources b/extra/libudev-zero/sources
index 9aeb5742..7795b998 100644
--- a/extra/libudev-zero/sources
+++ b/extra/libudev-zero/sources
@@ -1 +1 @@
-https://github.com/illiliti/libudev-zero/archive/0.5.2.tar.gz
+https://github.com/illiliti/libudev-zero/archive/VERSION.tar.gz
diff --git a/extra/libva-utils/sources b/extra/libva-utils/sources
index b969808c..ab618afa 100644
--- a/extra/libva-utils/sources
+++ b/extra/libva-utils/sources
@@ -1 +1 @@
-https://github.com/intel/libva-utils/archive/2.12.0.tar.gz
+https://github.com/intel/libva-utils/archive/VERSION.tar.gz
diff --git a/extra/libva/sources b/extra/libva/sources
index ba22be3a..85ebdb29 100644
--- a/extra/libva/sources
+++ b/extra/libva/sources
@@ -1 +1 @@
-https://github.com/intel/libva/archive/2.12.0.tar.gz
+https://github.com/intel/libva/archive/VERSION.tar.gz
diff --git a/extra/libvorbis/sources b/extra/libvorbis/sources
index 16ec9f3f..5077ef3c 100644
--- a/extra/libvorbis/sources
+++ b/extra/libvorbis/sources
@@ -1 +1 @@
-https://ftp.osuosl.org/pub/xiph/releases/vorbis/libvorbis-1.3.7.tar.gz
+https://ftp.osuosl.org/pub/xiph/releases/vorbis/libvorbis-VERSION.tar.gz
diff --git a/extra/libvpx/sources b/extra/libvpx/sources
index 14a6cfda..ef005de6 100644
--- a/extra/libvpx/sources
+++ b/extra/libvpx/sources
@@ -1,4 +1,4 @@
-https://github.com/webmproject/libvpx/archive/v1.10.0.tar.gz
+https://github.com/webmproject/libvpx/archive/vVERSION.tar.gz
 files/vp9_rtcd.h
 files/vp8_rtcd.h
 files/vpx_scale_rtcd.h
diff --git a/extra/libwebp/sources b/extra/libwebp/sources
index 4ed0cd5a..ec5ba057 100644
--- a/extra/libwebp/sources
+++ b/extra/libwebp/sources
@@ -1 +1 @@
-http://downloads.webmproject.org/releases/webp/libwebp-1.2.0.tar.gz
+http://downloads.webmproject.org/releases/webp/libwebp-VERSION.tar.gz
diff --git a/extra/llvm/sources b/extra/llvm/sources
index f19005d8..607e3c70 100644
--- a/extra/llvm/sources
+++ b/extra/llvm/sources
@@ -1 +1 @@
-https://github.com/llvm/llvm-project/releases/download/llvmorg-12.0.1/llvm-12.0.1.src.tar.xz
+https://github.com/llvm/llvm-project/releases/download/llvmorg-VERSION/llvm-VERSION.src.tar.xz
diff --git a/extra/lzip/sources b/extra/lzip/sources
index 850f6cdb..863d6f6c 100644
--- a/extra/lzip/sources
+++ b/extra/lzip/sources
@@ -1 +1 @@
-https://download.savannah.gnu.org/releases/lzip/lzip-1.22.tar.gz
+https://download.savannah.gnu.org/releases/lzip/lzip-VERSION.tar.gz
diff --git a/extra/man-pages/sources b/extra/man-pages/sources
index b29d3dae..b33003f7 100644
--- a/extra/man-pages/sources
+++ b/extra/man-pages/sources
@@ -1,2 +1,2 @@
-https://mirrors.edge.kernel.org/pub/linux/docs/man-pages/man-pages-5.12.tar.xz
+https://mirrors.edge.kernel.org/pub/linux/docs/man-pages/man-pages-VERSION.tar.xz
 https://mirrors.edge.kernel.org/pub/linux/docs/man-pages/man-pages-posix/man-pages-posix-2017-a.tar.xz posix
diff --git a/extra/mandoc/sources b/extra/mandoc/sources
index c5ca229e..d87834c2 100644
--- a/extra/mandoc/sources
+++ b/extra/mandoc/sources
@@ -1,3 +1,3 @@
-https://fossies.org/linux/misc/mandoc-1.14.5.tar.gz
+https://fossies.org/linux/misc/mandoc-VERSION.tar.gz
 patches/mandoc-no-warn.patch
 patches/fix-tbl-segfault.patch
diff --git a/extra/mesa/sources b/extra/mesa/sources
index e17f4db7..b5ee81d1 100644
--- a/extra/mesa/sources
+++ b/extra/mesa/sources
@@ -1,2 +1,2 @@
-https://archive.mesa3d.org/mesa-21.1.5.tar.xz
+https://archive.mesa3d.org/mesa-VERSION.tar.xz
 https://files.pythonhosted.org/packages/source/M/Mako/Mako-1.1.1.tar.gz mako
diff --git a/extra/meson/sources b/extra/meson/sources
index 03d10c5d..69ac65d7 100644
--- a/extra/meson/sources
+++ b/extra/meson/sources
@@ -1 +1 @@
-https://github.com/mesonbuild/meson/archive/0.58.1.tar.gz
+https://github.com/mesonbuild/meson/archive/VERSION.tar.gz
diff --git a/extra/mpv/sources b/extra/mpv/sources
index 0c3bd28e..2b70bd31 100644
--- a/extra/mpv/sources
+++ b/extra/mpv/sources
@@ -1,2 +1,2 @@
-https://github.com/mpv-player/mpv/archive/v0.33.1.tar.gz
+https://github.com/mpv-player/mpv/archive/vVERSION.tar.gz
 https://waf.io/waf-2.0.18
diff --git a/extra/mutt/sources b/extra/mutt/sources
index 3b6f70b3..56eddfa0 100644
--- a/extra/mutt/sources
+++ b/extra/mutt/sources
@@ -1,2 +1,2 @@
-https://bitbucket.org/mutt/mutt/downloads/mutt-2.1.1.tar.gz
+https://bitbucket.org/mutt/mutt/downloads/mutt-VERSION.tar.gz
 https://github.com/cyrusimap/cyrus-sasl/releases/download/cyrus-sasl-2.1.27/cyrus-sasl-2.1.27.tar.gz cyrus-sasl
diff --git a/extra/nasm/sources b/extra/nasm/sources
index 8f328994..bc5ac539 100644
--- a/extra/nasm/sources
+++ b/extra/nasm/sources
@@ -1 +1 @@
-https://www.nasm.us/pub/nasm/releasebuilds/2.15.05/nasm-2.15.05.tar.xz
+https://www.nasm.us/pub/nasm/releasebuilds/VERSION/nasm-VERSION.tar.xz
diff --git a/extra/ncurses/sources b/extra/ncurses/sources
index d56ec1b0..43395955 100644
--- a/extra/ncurses/sources
+++ b/extra/ncurses/sources
@@ -1,2 +1,2 @@
-https://ftp.gnu.org/gnu/ncurses/ncurses-6.2.tar.gz
+https://ftp.gnu.org/gnu/ncurses/ncurses-VERSION.tar.gz
 files/terminfo.src misc
diff --git a/extra/nodejs/sources b/extra/nodejs/sources
index 26692947..b812f1d0 100644
--- a/extra/nodejs/sources
+++ b/extra/nodejs/sources
@@ -1 +1 @@
-https://nodejs.org/download/release/v16.5.0/node-v16.5.0.tar.xz
+https://nodejs.org/download/release/vVERSION/node-vVERSION.tar.xz
diff --git a/extra/opendoas/sources b/extra/opendoas/sources
index 166cbff4..394ad008 100644
--- a/extra/opendoas/sources
+++ b/extra/opendoas/sources
@@ -1,2 +1,2 @@
-https://github.com/Duncaen/OpenDoas/archive/v6.8.1.tar.gz
+https://github.com/Duncaen/OpenDoas/archive/vVERSION.tar.gz
 files/doas.conf
diff --git a/extra/openresolv/sources b/extra/openresolv/sources
index 3e5c81d2..d1b79965 100644
--- a/extra/openresolv/sources
+++ b/extra/openresolv/sources
@@ -1 +1 @@
-https://roy.marples.name/downloads/openresolv/openresolv-3.12.0.tar.xz
+https://roy.marples.name/downloads/openresolv/openresolv-VERSION.tar.xz
diff --git a/extra/openssh/sources b/extra/openssh/sources
index e98b6fe6..5d74c06c 100644
--- a/extra/openssh/sources
+++ b/extra/openssh/sources
@@ -1,2 +1,2 @@
-https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-8.6p1.tar.gz
+https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-VERSION.tar.gz
 files/sshd.run
diff --git a/extra/opus/sources b/extra/opus/sources
index d11f0722..490846e5 100644
--- a/extra/opus/sources
+++ b/extra/opus/sources
@@ -1 +1 @@
-https://archive.mozilla.org/pub/opus/opus-1.3.1.tar.gz
+https://archive.mozilla.org/pub/opus/opus-VERSION.tar.gz
diff --git a/extra/pango/sources b/extra/pango/sources
index 4222e582..14f9d067 100644
--- a/extra/pango/sources
+++ b/extra/pango/sources
@@ -1,2 +1,2 @@
-https://github.com/GNOME/pango/archive/1.48.7.tar.gz
+https://github.com/GNOME/pango/archive/VERSION.tar.gz
 patches/no-fribidi.patch
diff --git a/extra/patchelf/sources b/extra/patchelf/sources
index 813c335d..af3f095b 100644
--- a/extra/patchelf/sources
+++ b/extra/patchelf/sources
@@ -1 +1 @@
-https://github.com/NixOS/patchelf/releases/download/0.12/patchelf-0.12.tar.bz2
+https://github.com/NixOS/patchelf/releases/download/VERSION/patchelf-VERSION.tar.bz2
diff --git a/extra/pcre/sources b/extra/pcre/sources
index 352447f2..79e3af4c 100644
--- a/extra/pcre/sources
+++ b/extra/pcre/sources
@@ -1 +1 @@
-https://ftp.pcre.org/pub/pcre/pcre-8.45.tar.gz
+https://ftp.pcre.org/pub/pcre/pcre-VERSION.tar.gz
diff --git a/extra/perl/sources b/extra/perl/sources
index a06cabd8..89d9cfd6 100644
--- a/extra/perl/sources
+++ b/extra/perl/sources
@@ -1 +1 @@
-https://www.cpan.org/src/5.0/perl-5.34.0.tar.xz
+https://www.cpan.org/src/MAJOR.0/perl-VERSION.tar.xz
diff --git a/extra/pkgconf/sources b/extra/pkgconf/sources
index ff1ef80d..c8b9e534 100644
--- a/extra/pkgconf/sources
+++ b/extra/pkgconf/sources
@@ -1 +1 @@
-https://distfiles.dereferenced.org/pkgconf/pkgconf-1.7.4.tar.xz
+https://distfiles.dereferenced.org/pkgconf/pkgconf-VERSION.tar.xz
diff --git a/extra/plzip/sources b/extra/plzip/sources
index e461eb05..6a179db9 100644
--- a/extra/plzip/sources
+++ b/extra/plzip/sources
@@ -1,2 +1,2 @@
-http://download.savannah.gnu.org/releases/lzip/plzip/plzip-1.9.tar.gz
-http://download.savannah.gnu.org/releases/lzip/lzlib/lzlib-1.9.tar.gz lzlib
+http://download.savannah.gnu.org/releases/lzip/plzip/plzip-VERSION.tar.gz
+http://download.savannah.gnu.org/releases/lzip/lzlib/lzlib-VERSION.tar.gz lzlib
diff --git a/extra/python/sources b/extra/python/sources
index 906d6eb0..c9afa3e6 100644
--- a/extra/python/sources
+++ b/extra/python/sources
@@ -1,2 +1,2 @@
-https://www.python.org/ftp/python/3.9.6/Python-3.9.6.tar.xz
+https://www.python.org/ftp/python/VERSION/Python-VERSION.tar.xz
 patches/python3-always-pip.patch
diff --git a/extra/rsync/sources b/extra/rsync/sources
index 8cf17405..5913385f 100644
--- a/extra/rsync/sources
+++ b/extra/rsync/sources
@@ -1,2 +1,2 @@
-https://download.samba.org/pub/rsync/src/rsync-3.2.3.tar.gz
+https://download.samba.org/pub/rsync/src/rsync-VERSION.tar.gz
 files/mkproto.awk
diff --git a/extra/rust/sources b/extra/rust/sources
index cea27b13..43fc593f 100644
--- a/extra/rust/sources
+++ b/extra/rust/sources
@@ -1,4 +1,4 @@
-https://static.rust-lang.org/dist/rustc-1.53.0-src.tar.xz
+https://static.rust-lang.org/dist/rustc-VERSION-src.tar.xz
 https://static.rust-lang.org/dist/2021-05-06/rust-std-1.52.0-x86_64-unknown-linux-musl.tar.xz?no-extract
 https://static.rust-lang.org/dist/2021-05-06/rustc-1.52.0-x86_64-unknown-linux-musl.tar.xz?no-extract
 https://static.rust-lang.org/dist/2021-05-06/cargo-1.52.0-x86_64-unknown-linux-musl.tar.xz?no-extract
diff --git a/extra/samurai/sources b/extra/samurai/sources
index 21221898..b7c64a70 100644
--- a/extra/samurai/sources
+++ b/extra/samurai/sources
@@ -1 +1 @@
-https://github.com/michaelforney/samurai/releases/download/1.2/samurai-1.2.tar.gz
+https://github.com/michaelforney/samurai/releases/download/VERSION/samurai-VERSION.tar.gz
diff --git a/extra/scdoc/sources b/extra/scdoc/sources
index 5f2684da..4f52f55c 100644
--- a/extra/scdoc/sources
+++ b/extra/scdoc/sources
@@ -1 +1 @@
-https://git.sr.ht/~sircmpwn/scdoc/archive/1.11.1.tar.gz
+https://git.sr.ht/~sircmpwn/scdoc/archive/VERSION.tar.gz
diff --git a/extra/sqlite/sources b/extra/sqlite/sources
index 84fc70ab..d212f2a9 100644
--- a/extra/sqlite/sources
+++ b/extra/sqlite/sources
@@ -1 +1 @@
-https://sqlite.org/2021/sqlite-autoconf-3360000.tar.gz
+https://sqlite.org/2021/sqlite-autoconf-MAJORMINOR0PATCH00.tar.gz
diff --git a/extra/ssu/sources b/extra/ssu/sources
index 4eb057fd..387799a7 100644
--- a/extra/ssu/sources
+++ b/extra/ssu/sources
@@ -1 +1 @@
-https://github.com/illiliti/ssu/archive/refs/tags/0.3.2.tar.gz
+https://github.com/illiliti/ssu/archive/refs/tags/VERSION.tar.gz
diff --git a/extra/strace/sources b/extra/strace/sources
index c362f181..67d88493 100644
--- a/extra/strace/sources
+++ b/extra/strace/sources
@@ -1 +1 @@
-https://github.com/strace/strace/releases/download/v5.12/strace-5.12.tar.xz
+https://github.com/strace/strace/releases/download/vVERSION/strace-VERSION.tar.xz
diff --git a/extra/tiff/sources b/extra/tiff/sources
index 28639005..8c179b55 100644
--- a/extra/tiff/sources
+++ b/extra/tiff/sources
@@ -1 +1 @@
-https://download.osgeo.org/libtiff/tiff-4.3.0.tar.gz
+https://download.osgeo.org/libtiff/tiff-VERSION.tar.gz
diff --git a/extra/ttf-croscore/build b/extra/ttf-croscore/build
new file mode 100755
index 00000000..6394b53b
--- /dev/null
+++ b/extra/ttf-croscore/build
@@ -0,0 +1,8 @@
+#!/bin/sh -e
+
+mkdir -p "$1/usr/share/fonts/TTF/croscore"
+
+cp -f ./*.ttf "$1/usr/share/fonts/TTF/croscore"
+
+# Ensure that font files are readable.
+chmod 644 "$1/usr/share/fonts/TTF/croscore"/*.ttf
diff --git a/extra/ttf-croscore/checksums b/extra/ttf-croscore/checksums
new file mode 100644
index 00000000..84315a3c
--- /dev/null
+++ b/extra/ttf-croscore/checksums
@@ -0,0 +1 @@
+672c3487883ec1ef83d9254240d4327b014212abc823d06d15816095867315e1
diff --git a/extra/ttf-croscore/sources b/extra/ttf-croscore/sources
new file mode 100644
index 00000000..e3d8c83b
--- /dev/null
+++ b/extra/ttf-croscore/sources
@@ -0,0 +1 @@
+http://gsdview.appspot.com/chromeos-localmirror/distfiles/croscorefonts-VERSION.tar.bz2
diff --git a/extra/ttf-croscore/version b/extra/ttf-croscore/version
new file mode 100644
index 00000000..16fb56a6
--- /dev/null
+++ b/extra/ttf-croscore/version
@@ -0,0 +1 @@
+1.31.0 2
diff --git a/extra/tzdata/sources b/extra/tzdata/sources
index 2421adff..ef6466ba 100644
--- a/extra/tzdata/sources
+++ b/extra/tzdata/sources
@@ -1 +1 @@
-https://github.com/eggert/tz/archive/2021a.tar.gz
+https://github.com/eggert/tz/archive/VERSION.tar.gz
diff --git a/extra/util-linux/sources b/extra/util-linux/sources
index 43f8a920..871953c1 100644
--- a/extra/util-linux/sources
+++ b/extra/util-linux/sources
@@ -1 +1 @@
-https://cdn.kernel.org/pub/linux/utils/util-linux/v2.37/util-linux-2.37.tar.xz
+https://cdn.kernel.org/pub/linux/utils/util-linux/vVERSION/util-linux-VERSION.tar.xz
diff --git a/extra/wpa_supplicant/sources b/extra/wpa_supplicant/sources
index 14ad689f..a2c75c03 100644
--- a/extra/wpa_supplicant/sources
+++ b/extra/wpa_supplicant/sources
@@ -1,3 +1,3 @@
-https://w1.fi/releases/wpa_supplicant-2.9.tar.gz
+https://w1.fi/releases/wpa_supplicant-VERSION.tar.gz
 https://github.com/sabotage-linux/libnl-tiny/archive/4225e93bec5304abee3386213213718367e54a93.tar.gz libnl
 files/.config wpa_supplicant/
diff --git a/extra/x264/sources b/extra/x264/sources
index ec3be5cb..5a03a442 100644
--- a/extra/x264/sources
+++ b/extra/x264/sources
@@ -1,2 +1,2 @@
-https://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-20190812-2245-stable.tar.bz2
+https://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-VERSION-stable.tar.bz2
 patches/x264-no-bash.patch
diff --git a/extra/x265/sources b/extra/x265/sources
index 724b4d96..ee355d7f 100644
--- a/extra/x265/sources
+++ b/extra/x265/sources
@@ -1 +1 @@
-https://bitbucket.org/multicoreware/x265_git/downloads/x265_3.5.tar.gz
+https://bitbucket.org/multicoreware/x265_git/downloads/x265_VERSION.tar.gz
diff --git a/extra/xvidcore/sources b/extra/xvidcore/sources
index 9dc4bd67..8cc87b26 100644
--- a/extra/xvidcore/sources
+++ b/extra/xvidcore/sources
@@ -1 +1 @@
-https://downloads.xvid.com/downloads/xvidcore-1.3.7.tar.bz2
+https://downloads.xvid.com/downloads/xvidcore-VERSION.tar.bz2
diff --git a/extra/zip/sources b/extra/zip/sources
index 49a21688..58f0b6a5 100644
--- a/extra/zip/sources
+++ b/extra/zip/sources
@@ -1 +1 @@
-https://downloads.sourceforge.net/infozip/zip30.tar.gz
+https://downloads.sourceforge.net/infozip/zipMAJORMINORPATCH.tar.gz
diff --git a/extra/zstd/sources b/extra/zstd/sources
index b06e693a..c07d5bb2 100644
--- a/extra/zstd/sources
+++ b/extra/zstd/sources
@@ -1 +1 @@
-https://github.com/facebook/zstd/releases/download/v1.5.0/zstd-1.5.0.tar.gz
+https://github.com/facebook/zstd/releases/download/vVERSION/zstd-VERSION.tar.gz
diff --git a/wayland/foot/depends b/wayland/foot/depends
index 4d322e87..5334a684 100644
--- a/wayland/foot/depends
+++ b/wayland/foot/depends
@@ -1,5 +1,6 @@
 fontconfig
 libxkbcommon
+meson   make
 ncurses make
 pkgconf make
 python  make
diff --git a/wayland/foot/sources b/wayland/foot/sources
index a68917ee..5549bc0f 100644
--- a/wayland/foot/sources
+++ b/wayland/foot/sources
@@ -1,3 +1,3 @@
-https://codeberg.org/dnkl/foot/archive/1.8.1.tar.gz
+https://codeberg.org/dnkl/foot/archive/VERSION.tar.gz
 https://codeberg.org/dnkl/fcft/archive/2.4.2.tar.gz subprojects/fcft
 https://codeberg.org/dnkl/tllist/archive/1.0.5.tar.gz subprojects/tllist
diff --git a/wayland/grim/sources b/wayland/grim/sources
index 961c4086..fd86399d 100644
--- a/wayland/grim/sources
+++ b/wayland/grim/sources
@@ -1 +1 @@
-https://github.com/emersion/grim/releases/download/v1.3.2/grim-1.3.2.tar.gz
+https://github.com/emersion/grim/releases/download/vVERSION/grim-VERSION.tar.gz
diff --git a/wayland/libdrm/sources b/wayland/libdrm/sources
index 4de5763c..94c33335 100644
--- a/wayland/libdrm/sources
+++ b/wayland/libdrm/sources
@@ -1 +1 @@
-https://dri.freedesktop.org/libdrm/libdrm-2.4.107.tar.xz
+https://dri.freedesktop.org/libdrm/libdrm-VERSION.tar.xz
diff --git a/wayland/libinput/sources b/wayland/libinput/sources
index 386f149d..3fc45bab 100644
--- a/wayland/libinput/sources
+++ b/wayland/libinput/sources
@@ -1,4 +1,4 @@
-https://github.com/wayland-project/libinput/archive/1.18.0.tar.gz
+https://github.com/wayland-project/libinput/archive/VERSION.tar.gz
 https://bitmath.org/code/mtdev/mtdev-1.1.6.tar.bz2 mtdev
 https://freedesktop.org/software/libevdev/libevdev-1.11.0.tar.xz evdev
 patches/evdev-wrap.patch
diff --git a/wayland/libpciaccess/sources b/wayland/libpciaccess/sources
index e2d1679e..d76bb1fa 100644
--- a/wayland/libpciaccess/sources
+++ b/wayland/libpciaccess/sources
@@ -1 +1 @@
-https://x.org/releases/individual/lib/libpciaccess-0.16.tar.bz2
+https://x.org/releases/individual/lib/libpciaccess-VERSION.tar.bz2
diff --git a/wayland/libseat/sources b/wayland/libseat/sources
index 88be8081..8274228e 100644
--- a/wayland/libseat/sources
+++ b/wayland/libseat/sources
@@ -1,2 +1,2 @@
-https://git.sr.ht/~kennylevinsen/seatd/archive/0.5.0.tar.gz
+https://git.sr.ht/~kennylevinsen/seatd/archive/VERSION.tar.gz
 files/seatd.run
diff --git a/wayland/libxkbcommon/sources b/wayland/libxkbcommon/sources
index 13afc644..3b0242b3 100644
--- a/wayland/libxkbcommon/sources
+++ b/wayland/libxkbcommon/sources
@@ -1 +1 @@
-https://xkbcommon.org/download/libxkbcommon-1.3.0.tar.xz
+https://xkbcommon.org/download/libxkbcommon-VERSION.tar.xz
diff --git a/wayland/pixman/sources b/wayland/pixman/sources
index 3b4975d9..58c1c2b4 100644
--- a/wayland/pixman/sources
+++ b/wayland/pixman/sources
@@ -1 +1 @@
-https://x.org/releases/individual/lib/pixman-0.40.0.tar.xz
+https://x.org/releases/individual/lib/pixman-VERSION.tar.xz
diff --git a/wayland/slurp/sources b/wayland/slurp/sources
index 2eaddc06..4d777421 100644
--- a/wayland/slurp/sources
+++ b/wayland/slurp/sources
@@ -1 +1 @@
-https://github.com/emersion/slurp/releases/download/v1.3.2/slurp-1.3.2.tar.gz
+https://github.com/emersion/slurp/releases/download/vVERSION/slurp-VERSION.tar.gz
diff --git a/wayland/sway-no-seat/sources b/wayland/sway-no-seat/sources
index 808ef16d..c70d2fe6 100644
--- a/wayland/sway-no-seat/sources
+++ b/wayland/sway-no-seat/sources
@@ -1,4 +1,4 @@
-https://github.com/swaywm/sway/archive/4832fc937fae5a5e2af8828a7092c9026bd300e0.tar.gz
+https://github.com/swaywm/sway/archive/VERSION.tar.gz
 https://github.com/swaywm/wlroots/archive/a48e569d3860e91428c74e876a5d886314767c7b.tar.gz subprojects/wlroots
 https://github.com/DCVIII/seatd/archive/23ee555f432f9971a15522fc0b3f980d78ffa6cc.tar.gz subprojects/seatd
 patches/sway-static.patch
diff --git a/wayland/sway-no-seat/version b/wayland/sway-no-seat/version
index a383ea1a..3fd7aa4a 100644
--- a/wayland/sway-no-seat/version
+++ b/wayland/sway-no-seat/version
@@ -1 +1 @@
-git 1
+4832fc937fae5a5e2af8828a7092c9026bd300e0 1
diff --git a/wayland/sway-tiny/post-install b/wayland/sway-tiny/post-install
index e3ec270d..56a4354c 100755
--- a/wayland/sway-tiny/post-install
+++ b/wayland/sway-tiny/post-install
@@ -5,8 +5,8 @@ chmod g+s        "$KISS_ROOT/usr/bin/sway"
 
 cat <<EOF
 
-NOTE: You must be in the 'video', 'audio', and 'tty' 
-      groups. There is no 'input' group requirement 
+NOTE: You must be in the 'video', 'audio', and 'tty'
+      groups. There is no 'input' group requirement
       as this sway binary is setgid input.
 
 NOTE: You must set XDG_RUNTIME_DIR in your shellrc
@@ -22,6 +22,16 @@ NOTE: You must be the first to call DRMSetMaster.
 
       Another option is to setuid root the sway binary.
 
+NOTE: sway-tiny does not spawn a subshell for exec
+      commands, it executes them directly. Use the full
+      path to the program you would like to execute.
+
+      # Will not work.
+      bindsym \$mod+t exec foot
+
+      # Works.
+      bindsym \$mod+t exec /bin/foot
+
 NOTE: This is a fork of sway for KISS Linux. Send all
       bugs/issues to kisslinux/repo and NOT upstream.
 
diff --git a/wayland/sway-tiny/sources b/wayland/sway-tiny/sources
index 4ae0f060..c4980dfb 100644
--- a/wayland/sway-tiny/sources
+++ b/wayland/sway-tiny/sources
@@ -1,4 +1,4 @@
-https://github.com/DCVIII/sway/archive/8f838008e798a7297ae59caccd84aa6fca03a94e.tar.gz
+https://github.com/DCVIII/sway/archive/VERSION.tar.gz
 https://github.com/swaywm/wlroots/archive/bcd5d8504c4370134d5fb3c1c324fcab49fecbb8.tar.gz subprojects/wlroots
 https://github.com/DCVIII/seatd/archive/23ee555f432f9971a15522fc0b3f980d78ffa6cc.tar.gz subprojects/seatd
 patches/no-evdev.patch
diff --git a/wayland/sway-tiny/version b/wayland/sway-tiny/version
index a383ea1a..b196202e 100644
--- a/wayland/sway-tiny/version
+++ b/wayland/sway-tiny/version
@@ -1 +1 @@
-git 1
+8f838008e798a7297ae59caccd84aa6fca03a94e 1
diff --git a/wayland/sway/sources b/wayland/sway/sources
index bc32fa72..1d0d2061 100644
--- a/wayland/sway/sources
+++ b/wayland/sway/sources
@@ -1,2 +1,2 @@
-https://github.com/swaywm/sway/releases/download/1.6.1/sway-1.6.1.tar.gz
+https://github.com/swaywm/sway/releases/download/VERSION/sway-VERSION.tar.gz
 patches/no-evdev.patch
diff --git a/wayland/wayland-protocols/sources b/wayland/wayland-protocols/sources
index 5ae01975..7e070402 100644
--- a/wayland/wayland-protocols/sources
+++ b/wayland/wayland-protocols/sources
@@ -1 +1 @@
-https://wayland.freedesktop.org/releases/wayland-protocols-1.21.tar.xz
+https://wayland.freedesktop.org/releases/wayland-protocols-VERSION.tar.xz
diff --git a/wayland/wayland/sources b/wayland/wayland/sources
index 9e20a50b..8234e0fa 100644
--- a/wayland/wayland/sources
+++ b/wayland/wayland/sources
@@ -1 +1 @@
-https://wayland.freedesktop.org/releases/wayland-1.19.0.tar.xz
+https://wayland.freedesktop.org/releases/wayland-VERSION.tar.xz
diff --git a/wayland/wbg/sources b/wayland/wbg/sources
index c09f1561..57e57b1a 100644
--- a/wayland/wbg/sources
+++ b/wayland/wbg/sources
@@ -1,2 +1,2 @@
-https://codeberg.org/dnkl/wbg/archive/1.0.2.tar.gz
+https://codeberg.org/dnkl/wbg/archive/VERSION.tar.gz
 https://codeberg.org/dnkl/tllist/archive/1.0.5.tar.gz subprojects/tllist
diff --git a/wayland/wl-clipboard/sources b/wayland/wl-clipboard/sources
index 59909ddc..6bbea7f1 100644
--- a/wayland/wl-clipboard/sources
+++ b/wayland/wl-clipboard/sources
@@ -1 +1 @@
-https://github.com/bugaevc/wl-clipboard/archive/d2c32f2b4d469f53070e8c4052dea6f412de3916.tar.gz
+https://github.com/bugaevc/wl-clipboard/archive/VERSION.tar.gz
diff --git a/wayland/wl-clipboard/version b/wayland/wl-clipboard/version
index b31a7f39..78ce0e72 100644
--- a/wayland/wl-clipboard/version
+++ b/wayland/wl-clipboard/version
@@ -1 +1 @@
-2.0.0 1
+d2c32f2b4d469f53070e8c4052dea6f412de3916 1
diff --git a/wayland/wlroots/sources b/wayland/wlroots/sources
index 279f8c2d..760ae9bc 100644
--- a/wayland/wlroots/sources
+++ b/wayland/wlroots/sources
@@ -1 +1 @@
-https://github.com/swaywm/wlroots/releases/download/0.14.1/wlroots-0.14.1.tar.gz
+https://github.com/swaywm/wlroots/releases/download/VERSION/wlroots-VERSION.tar.gz
diff --git a/wayland/wlsunset/sources b/wayland/wlsunset/sources
index 73d71c4b..00efe70f 100644
--- a/wayland/wlsunset/sources
+++ b/wayland/wlsunset/sources
@@ -1 +1 @@
-https://git.sr.ht/~kennylevinsen/wlsunset/archive/0.2.0.tar.gz
+https://git.sr.ht/~kennylevinsen/wlsunset/archive/VERSION.tar.gz
diff --git a/wayland/xkeyboard-config/sources b/wayland/xkeyboard-config/sources
index f7ce651b..f242869a 100644
--- a/wayland/xkeyboard-config/sources
+++ b/wayland/xkeyboard-config/sources
@@ -1,2 +1,2 @@
-https://alpine.global.ssl.fastly.net/alpine/edge/main/x86_64/xkeyboard-config-2.33-r0.apk
+https://alpine.global.ssl.fastly.net/alpine/edge/main/x86_64/xkeyboard-config-VERSION-r0.apk
 https://alpine.global.ssl.fastly.net/alpine/edge/main/x86_64/libx11-1.7.2-r0.apk