diff --git a/xorg/libfontenc/libfontenc.SMBuild b/xorg/libfontenc/libfontenc.SMBuild
index 2cb54ee..5f50dcf 100755
--- a/xorg/libfontenc/libfontenc.SMBuild
+++ b/xorg/libfontenc/libfontenc.SMBuild
@@ -2,7 +2,7 @@ app=libfontenc
 version=1.1.4
 build=1sml
 homepage="https://xorg.freedesktop.org/"
-download="https://xorg.freedesktop.org/releases/individual/lib/libfontenc-1.1.4.tar.gz"
+download="https://xorg.freedesktop.org/releases/individual/lib/libfontenc-$version.tar.gz"
 desc="X11 font encoding library"
 requires="zlib xorg-macros xorgproto"
 
diff --git a/xorg/libgudev/libgudev.SMBuild b/xorg/libgudev/libgudev.SMBuild
index 2ec106b..ccc67ad 100755
--- a/xorg/libgudev/libgudev.SMBuild
+++ b/xorg/libgudev/libgudev.SMBuild
@@ -2,7 +2,7 @@ app=libgudev
 version=231
 build=1sml
 homepage="https://wiki.gnome.org/Projects/libgudev"
-download="https://gitlab.gnome.org/GNOME/libgudev/-/archive/231/libgudev-231.tar.bz2"
+download="https://gitlab.gnome.org/GNOME/libgudev/-/archive/$version/libgudev-$version.tar.bz2"
 desc="GObject bindings for libudev"
 requires="glib git"
 
diff --git a/xorg/libpciaccess/libpciaccess.SMBuild b/xorg/libpciaccess/libpciaccess.SMBuild
index ab02fec..e7787d8 100755
--- a/xorg/libpciaccess/libpciaccess.SMBuild
+++ b/xorg/libpciaccess/libpciaccess.SMBuild
@@ -2,7 +2,7 @@ app=libpciaccess
 version=0.16
 build=1sml
 homepage="https://xorg.freedesktop.org/"
-download="https://xorg.freedesktop.org/releases/individual/lib/libpciaccess-0.16.tar.gz"
+download="https://xorg.freedesktop.org/releases/individual/lib/libpciaccess-$version.tar.gz"
 desc="X11 PCI access library"
 requires="musl xorg-macros"
 
diff --git a/xorg/libsm/libsm.SMBuild b/xorg/libsm/libsm.SMBuild
index 90c979b..9e0df32 100755
--- a/xorg/libsm/libsm.SMBuild
+++ b/xorg/libsm/libsm.SMBuild
@@ -2,7 +2,7 @@ app=libsm
 version=1.2.3
 build=1sml
 homepage="https://xorg.freedesktop.org/"
-download="https://xorg.freedesktop.org/releases/individual/lib/libSM-1.2.3.tar.gz"
+download="https://xorg.freedesktop.org/releases/individual/lib/libSM-$version.tar.gz"
 desc="X11 Session Management library"
 requires="util-linux xorgproto xorg-macros xtrans libice"
 
diff --git a/xorg/libtiff/libtiff.SMBuild b/xorg/libtiff/libtiff.SMBuild
index 0c14bb2..0c19443 100755
--- a/xorg/libtiff/libtiff.SMBuild
+++ b/xorg/libtiff/libtiff.SMBuild
@@ -2,9 +2,9 @@ app=libtiff
 version=4.0.10
 build=1sml
 homepage="http://www.simplesystems.org/libtiff/"
-download="https://download.osgeo.org/libtiff/tiff-4.0.10.tar.gz"
-desc="a library for reading and writing TIFF files"
-requires="xz zlib libjpeg-turbo glu "
+download="https://download.osgeo.org/libtiff/tiff-$version.tar.gz"
+desc="Library for reading and writing TIFF files"
+requires="xz zlib libjpeg-turbo glu"
 
 build() {
   mkandenterbuilddir
diff --git a/xorg/libvdpau/libvdpau.SMBuild b/xorg/libvdpau/libvdpau.SMBuild
index 680af8e..9c24b52 100755
--- a/xorg/libvdpau/libvdpau.SMBuild
+++ b/xorg/libvdpau/libvdpau.SMBuild
@@ -2,9 +2,9 @@ app=libvdpau
 version=1.1.1
 build=1sml
 homepage="https://www.freedesktop.org/wiki/Software/VDPAU/"
-download="https://gitlab.freedesktop.org/vdpau/libvdpau/-/archive/libvdpau-1.1.1/libvdpau-libvdpau-1.1.1.tar.bz2"
+download="https://gitlab.freedesktop.org/vdpau/libvdpau/-/archive/libvdpau-$version/libvdpau-libvdpau-$version.tar.bz2"
 desc="Nvidia VDPAU library"
-requires="libxext "
+requires="libxext"
 
 build() {
   mkandenterbuilddir
diff --git a/xorg/libwacom/libwacom.SMBuild b/xorg/libwacom/libwacom.SMBuild
index 92f4554..85bebcf 100755
--- a/xorg/libwacom/libwacom.SMBuild
+++ b/xorg/libwacom/libwacom.SMBuild
@@ -2,9 +2,9 @@ app=libwacom
 version=0.29
 build=1sml
 homepage="https://github.com/linuxwacom/libwacom"
-download="https://github.com/linuxwacom/libwacom/archive/refs/tags/libwacom-0.29.tar.gz"
+download="https://github.com/linuxwacom/libwacom/archive/refs/tags/libwacom-$version.tar.gz"
 desc="Library to identify Wacom tablets and their features"
-requires="glib libxml2 "
+requires="glib libxml2"
 
 build() {
   mkandenterbuilddir
diff --git a/xorg/libx11/libx11.SMBuild b/xorg/libx11/libx11.SMBuild
index 3bf69de..85acefb 100755
--- a/xorg/libx11/libx11.SMBuild
+++ b/xorg/libx11/libx11.SMBuild
@@ -2,9 +2,9 @@ app=libx11
 version=1.7.1
 build=1sml
 homepage="https://xorg.freedesktop.org/"
-download="https://www.x.org/releases/individual/lib/libX11-1.7.1.tar.bz2"
+download="https://www.x.org/releases/individual/lib/libX11-$version.tar.bz2"
 desc="X11 client-side library"
-requires="xorgproto xorg-macros xtrans libxcb "
+requires="xorgproto xorg-macros xtrans libxcb"
 
 build() {
   mkandenterbuilddir
diff --git a/xorg/libxau/libxau.SMBuild b/xorg/libxau/libxau.SMBuild
index 1417bda..b1a4d9f 100755
--- a/xorg/libxau/libxau.SMBuild
+++ b/xorg/libxau/libxau.SMBuild
@@ -2,7 +2,7 @@ app=libxau
 version=1.0.9
 build=1sml
 homepage="https://xorg.freedesktop.org/"
-download="https://www.x.org/releases/individual/lib/libXau-1.0.9.tar.gz"
+download="https://www.x.org/releases/individual/lib/libXau-$version.tar.gz"
 desc="X11 authorisation library"
 requires="pkgconf xorgproto"
 
diff --git a/xorg/libxaw/libxaw.SMBuild b/xorg/libxaw/libxaw.SMBuild
index 9d447b4..881ff2e 100755
--- a/xorg/libxaw/libxaw.SMBuild
+++ b/xorg/libxaw/libxaw.SMBuild
@@ -2,7 +2,7 @@ app=libxaw
 version=1.0.13
 build=1sml
 homepage="https://xorg.freedesktop.org/"
-download="https://www.x.org/releases/individual/lib/libXaw-1.0.13.tar.bz2"
+download="https://www.x.org/releases/individual/lib/libXaw-$version.tar.bz2"
 desc="X11 Athena Widget library"
 requires="libxmu libxpm"
 
diff --git a/xorg/libxaw3d/libxaw3d.SMBuild b/xorg/libxaw3d/libxaw3d.SMBuild
index 82d5bd8..264646f 100755
--- a/xorg/libxaw3d/libxaw3d.SMBuild
+++ b/xorg/libxaw3d/libxaw3d.SMBuild
@@ -2,7 +2,7 @@ app=libxaw3d
 version=1.6.3
 build=1sml
 homepage="https://xorg.freedesktop.org/"
-download="https://www.x.org/releases/individual/lib/libXaw3d-1.6.3.tar.bz2"
+download="https://www.x.org/releases/individual/lib/libXaw3d-$version.tar.bz2"
 desc="Three-D Athena widgets"
 requires="libxaw"
 
diff --git a/xorg/libxaw3dxft/libxaw3dxft.SMBuild b/xorg/libxaw3dxft/libxaw3dxft.SMBuild
index 6508713..667ef06 100755
--- a/xorg/libxaw3dxft/libxaw3dxft.SMBuild
+++ b/xorg/libxaw3dxft/libxaw3dxft.SMBuild
@@ -2,9 +2,9 @@ app=libxaw3dxft
 version=1.6.2d
 build=1sml
 homepage="http://sourceforge.net/projects/sf-xpaint/files/libxaw3dxft/"
-download="https://sourceforge.net/projects/sf-xpaint/files/libxaw3dxft/libXaw3dXft-1.6.2d.tar.bz2"
+download="https://sourceforge.net/projects/sf-xpaint/files/libxaw3dxft/libXaw3dXft-$version.tar.bz2"
 desc="xaw3d library for xpaint"
-requires="libxmu libxpm libxaw3d "
+requires="libxmu libxpm libxaw3d"
 
 build() {
   mkandenterbuilddir
diff --git a/xorg/libxcb/libxcb.SMBuild b/xorg/libxcb/libxcb.SMBuild
index 4585218..5a8de32 100755
--- a/xorg/libxcb/libxcb.SMBuild
+++ b/xorg/libxcb/libxcb.SMBuild
@@ -2,9 +2,9 @@ app=libxcb
 version=1.14
 build=1sml
 homepage="https://xcb.freedesktop.org/"
-download="https://www.x.org/releases/individual/lib/libxcb-1.14.tar.xz"
+download="https://www.x.org/releases/individual/lib/libxcb-$version.tar.xz"
 desc="X11 client-side library"
-requires="python3 libxslt libxau libxdmcp "
+requires="python3 libxslt libxau libxdmcp"
 
 build() {
   mkandenterbuilddir
diff --git a/xorg/libxcomposite/libxcomposite.SMBuild b/xorg/libxcomposite/libxcomposite.SMBuild
index 0143c05..71e2daa 100755
--- a/xorg/libxcomposite/libxcomposite.SMBuild
+++ b/xorg/libxcomposite/libxcomposite.SMBuild
@@ -2,7 +2,7 @@ app=libxcomposite
 version=0.4.5
 build=1sml
 homepage="https://xorg.freedesktop.org/"
-download="https://www.x.org/releases/individual/lib/libXcomposite-0.4.5.tar.gz"
+download="https://www.x.org/releases/individual/lib/libXcomposite-$version.tar.gz"
 desc="X11 Composite extension library"
 requires="libxfixes"
 
diff --git a/xorg/libxcursor/libxcursor.SMBuild b/xorg/libxcursor/libxcursor.SMBuild
index b284d6d..0c6124b 100755
--- a/xorg/libxcursor/libxcursor.SMBuild
+++ b/xorg/libxcursor/libxcursor.SMBuild
@@ -2,9 +2,9 @@ app=libxcursor
 version=1.2.0
 build=1sml
 homepage="https://xorg.freedesktop.org/"
-download="https://www.x.org/releases/individual/lib/libXcursor-1.2.0.tar.bz2"
+download="https://www.x.org/releases/individual/lib/libXcursor-$version.tar.bz2"
 desc="X cursor management library"
-requires="libxfixes libxrender "
+requires="libxfixes libxrender"
 
 build() {
   mkandenterbuilddir
diff --git a/xorg/libxdamage/libxdamage.SMBuild b/xorg/libxdamage/libxdamage.SMBuild
index 2d5e1cb..180c0fc 100755
--- a/xorg/libxdamage/libxdamage.SMBuild
+++ b/xorg/libxdamage/libxdamage.SMBuild
@@ -2,7 +2,7 @@ app=libxdamage
 version=1.1.5
 build=1sml
 homepage="https://xorg.freedesktop.org/"
-download="https://www.x.org/releases/individual/lib/libXdamage-1.1.5.tar.gz"
+download="https://www.x.org/releases/individual/lib/libXdamage-$version.tar.gz"
 desc="X11 damaged region extension library"
 requires="libxfixes"
 
diff --git a/xorg/libxdmcp/libxdmcp.SMBuild b/xorg/libxdmcp/libxdmcp.SMBuild
index 71cab4d..eb00233 100755
--- a/xorg/libxdmcp/libxdmcp.SMBuild
+++ b/xorg/libxdmcp/libxdmcp.SMBuild
@@ -2,7 +2,7 @@ app=libxdmcp
 version=1.1.3
 build=1sml
 homepage="https://xorg.freedesktop.org/"
-download="https://www.x.org/releases/individual/lib/libXdmcp-1.1.3.tar.bz2"
+download="https://www.x.org/releases/individual/lib/libXdmcp-$version.tar.bz2"
 desc="X11 Display Manager Control Protocol library"
 requires="xorgproto xorg-macros"
 
diff --git a/xorg/libxext/libxext.SMBuild b/xorg/libxext/libxext.SMBuild
index 00fa7bb..4246b45 100755
--- a/xorg/libxext/libxext.SMBuild
+++ b/xorg/libxext/libxext.SMBuild
@@ -2,7 +2,7 @@ app=libxext
 version=1.3.4
 build=1sml
 homepage="https://xorg.freedesktop.org/"
-download="https://www.x.org/releases/individual/lib/libXext-1.3.4.tar.bz2"
+download="https://www.x.org/releases/individual/lib/libXext-$version.tar.bz2"
 desc="X11 miscellaneous extensions library"
 requires="libx11"
 
diff --git a/xorg/libxfixes/libxfixes.SMBuild b/xorg/libxfixes/libxfixes.SMBuild
index fd59bd6..a367044 100755
--- a/xorg/libxfixes/libxfixes.SMBuild
+++ b/xorg/libxfixes/libxfixes.SMBuild
@@ -2,7 +2,7 @@ app=libxfixes
 version=5.0.3
 build=1sml
 homepage="https://xorg.freedesktop.org/"
-download="https://www.x.org/releases/individual/lib/libXfixes-5.0.3.tar.bz2"
+download="https://www.x.org/releases/individual/lib/libXfixes-$version.tar.bz2"
 desc="X11 miscellaneous 'fixes' extension library"
 requires="libx11"
 
diff --git a/xorg/libxfont2/libxfont2.SMBuild b/xorg/libxfont2/libxfont2.SMBuild
index c647a07..8008972 100755
--- a/xorg/libxfont2/libxfont2.SMBuild
+++ b/xorg/libxfont2/libxfont2.SMBuild
@@ -2,9 +2,9 @@ app=libxfont2
 version=2.0.4
 build=1sml
 homepage="https://xorg.freedesktop.org/"
-download="https://www.x.org/releases/individual/lib/libXfont2-2.0.4.tar.bz2"
+download="https://www.x.org/releases/individual/lib/libXfont2-$version.tar.bz2"
 desc="X11 font rasterisation library"
-requires="xtrans libfontenc freetype "
+requires="xtrans libfontenc freetype"
 
 build() {
   mkandenterbuilddir
diff --git a/xorg/libxft/libxft.SMBuild b/xorg/libxft/libxft.SMBuild
index 8ba77d9..fa51304 100755
--- a/xorg/libxft/libxft.SMBuild
+++ b/xorg/libxft/libxft.SMBuild
@@ -2,7 +2,7 @@ app=libxft
 version=2.3.3
 build=1sml
 homepage="https://xorg.freedesktop.org/"
-download="https://www.x.org/releases/individual/lib/libXft-2.3.3.tar.gz"
+download="https://www.x.org/releases/individual/lib/libXft-$version.tar.gz"
 desc="FreeType-based font drawing library for X"
 requires="fontconfig libxrender"
 
diff --git a/xorg/libxi/libxi.SMBuild b/xorg/libxi/libxi.SMBuild
index 03e7c26..98befeb 100755
--- a/xorg/libxi/libxi.SMBuild
+++ b/xorg/libxi/libxi.SMBuild
@@ -2,7 +2,7 @@ app=libxi
 version=1.7.10
 build=1sml
 homepage="https://xorg.freedesktop.org/"
-download="https://www.x.org/releases/individual/lib/libXi-1.7.10.tar.bz2"
+download="https://www.x.org/releases/individual/lib/libXi-$version.tar.bz2"
 desc="X11 Input extension library"
 requires="xorgproto xorg-macros libxext libxfixes"
 
diff --git a/xorg/libxinerama/libxinerama.SMBuild b/xorg/libxinerama/libxinerama.SMBuild
index e7a3ffb..f1cbabb 100755
--- a/xorg/libxinerama/libxinerama.SMBuild
+++ b/xorg/libxinerama/libxinerama.SMBuild
@@ -2,9 +2,9 @@ app=libxinerama
 version=1.1.4
 build=1sml
 homepage="https://xorg.freedesktop.org/"
-download="https://www.x.org/releases/individual/lib/libXinerama-1.1.4.tar.bz2"
+download="https://www.x.org/releases/individual/lib/libXinerama-$version.tar.bz2"
 desc="X11 Xinerama extension library"
-requires="libxext "
+requires="libxext"
 
 build() {
   mkandenterbuilddir
diff --git a/xorg/libxkbcommon/libxkbcommon.SMBuild b/xorg/libxkbcommon/libxkbcommon.SMBuild
index ed0868f..fdc31aa 100755
--- a/xorg/libxkbcommon/libxkbcommon.SMBuild
+++ b/xorg/libxkbcommon/libxkbcommon.SMBuild
@@ -2,7 +2,7 @@ app=libxkbcommon
 version=0.8.2
 build=1sml
 homepage="https://xkbcommon.org/"
-download="https://xkbcommon.org/download/libxkbcommon-0.8.2.tar.xz"
+download="https://xkbcommon.org/download/libxkbcommon-$version.tar.xz"
 desc="Keymap handling library for toolkits and window systems"
 requires="libxml2 xkeyboard-config libxcb"
 
diff --git a/xorg/libxkbfile/libxkbfile.SMBuild b/xorg/libxkbfile/libxkbfile.SMBuild
index 49ad0e3..8688ca6 100755
--- a/xorg/libxkbfile/libxkbfile.SMBuild
+++ b/xorg/libxkbfile/libxkbfile.SMBuild
@@ -2,7 +2,7 @@ app=libxkbfile
 version=1.1.0
 build=1sml
 homepage="https://xorg.freedesktop.org/"
-download="https://www.x.org/releases/individual/lib/libxkbfile-1.1.0.tar.bz2"
+download="https://www.x.org/releases/individual/lib/libxkbfile-$version.tar.bz2"
 desc="X11 keyboard file manipulation library"
 requires="libx11"
 
diff --git a/xorg/libxklavier/libxklavier.SMBuild b/xorg/libxklavier/libxklavier.SMBuild
index 19b8e91..4db2314 100755
--- a/xorg/libxklavier/libxklavier.SMBuild
+++ b/xorg/libxklavier/libxklavier.SMBuild
@@ -2,7 +2,7 @@ app=libxklavier
 version=5.4
 build=1sml
 homepage="https://www.freedesktop.org/wiki/Software/LibXklavier/"
-download="https://anongit.freedesktop.org/git/libxklavier"
+download="https://github.com/freedesktop/libxklavier/archive/refs/tags/libxklavier-$version.tar.gz"
 desc="High-level API for X Keyboard Extension"
 requires="glib intltool iso-codes libxml2 libxi libxkbfile libxfixes xkeyboard-config"
 
diff --git a/xorg/libxmu/libxmu.SMBuild b/xorg/libxmu/libxmu.SMBuild
index 4e46335..baa9fbe 100755
--- a/xorg/libxmu/libxmu.SMBuild
+++ b/xorg/libxmu/libxmu.SMBuild
@@ -2,7 +2,7 @@ app=libxmu
 version=1.1.3
 build=1sml
 homepage="https://xorg.freedesktop.org/"
-download="https://www.x.org/releases/individual/lib/libXmu-1.1.3.tar.bz2"
+download="https://www.x.org/releases/individual/lib/libXmu-$version.tar.bz2"
 desc="X11 miscellaneous micro-utility library"
 requires="libxext libxt"
 
diff --git a/xorg/libxpm/libxpm.SMBuild b/xorg/libxpm/libxpm.SMBuild
index 8d162e3..e1e66fe 100755
--- a/xorg/libxpm/libxpm.SMBuild
+++ b/xorg/libxpm/libxpm.SMBuild
@@ -2,9 +2,9 @@ app=libxpm
 version=3.5.13
 build=1sml
 homepage="https://xorg.freedesktop.org/"
-download="https://www.x.org/releases/individual/lib/libXpm-3.5.13.tar.bz2"
+download="https://www.x.org/releases/individual/lib/libXpm-$version.tar.bz2"
 desc="X11 pixmap library"
-requires="libxext libxt "
+requires="libxext libxt"
 
 build() {
   mkandenterbuilddir
diff --git a/xorg/libxpresent/libxpresent.SMBuild b/xorg/libxpresent/libxpresent.SMBuild
index a4bb56f..aeecdbc 100755
--- a/xorg/libxpresent/libxpresent.SMBuild
+++ b/xorg/libxpresent/libxpresent.SMBuild
@@ -2,8 +2,9 @@ app=libxpresent
 version=1.0
 build=1sml
 homepage="https://gitlab.freedesktop.org/xorg/lib/libxpresent"
+download="https://gitlab.freedesktop.org/xorg/lib/libxpresent/-/archive/libXpresent-$version.0/libxpresent-libXpresent-$version.0.tar.bz2"
 desc="X Present Extension library"
-requires="libxfixes libxrandr "
+requires="libxfixes libxrandr"
 
 build() {
   mkandenterbuilddir
diff --git a/xorg/libxrandr/libxrandr.SMBuild b/xorg/libxrandr/libxrandr.SMBuild
index 493d223..5a5e058 100755
--- a/xorg/libxrandr/libxrandr.SMBuild
+++ b/xorg/libxrandr/libxrandr.SMBuild
@@ -2,9 +2,9 @@ app=libxrandr
 version=1.5.1
 build=1sml
 homepage="https://xorg.freedesktop.org/"
-download="https://www.x.org/releases/individual/lib/libXrandr-1.5.1.tar.bz2"
+download="https://www.x.org/releases/individual/lib/libXrandr-$version.tar.bz2"
 desc="X11 RandR extension library"
-requires="libxext libxrender "
+requires="libxext libxrender"
 
 build() {
   mkandenterbuilddir
diff --git a/xorg/libxrender/libxrender.SMBuild b/xorg/libxrender/libxrender.SMBuild
index 3bd701a..a8b07b0 100755
--- a/xorg/libxrender/libxrender.SMBuild
+++ b/xorg/libxrender/libxrender.SMBuild
@@ -2,9 +2,9 @@ app=libxrender
 version=0.9.10
 build=1sml
 homepage="https://xorg.freedesktop.org/"
-download="https://www.x.org/releases/individual/lib/libXrender-0.9.10.tar.bz2"
+download="https://www.x.org/releases/individual/lib/libXrender-$version.tar.bz2"
 desc="X Rendering Extension client library"
-requires="libx11 "
+requires="libx11"
 
 build() {
   mkandenterbuilddir
diff --git a/xorg/libxscrnsaver/libxscrnsaver.SMBuild b/xorg/libxscrnsaver/libxscrnsaver.SMBuild
index 6145057..93973a5 100755
--- a/xorg/libxscrnsaver/libxscrnsaver.SMBuild
+++ b/xorg/libxscrnsaver/libxscrnsaver.SMBuild
@@ -2,9 +2,9 @@ app=libxscrnsaver
 version=1.2.3
 build=1sml
 homepage="https://xorg.freedesktop.org/"
-download="https://www.x.org/releases/individual/lib/libXScrnSaver-1.2.3.tar.bz2"
+download="https://www.x.org/releases/individual/lib/libXScrnSaver-$version.tar.bz2"
 desc="Xlib-based X11 Screen Saver extension client library"
-requires="libxcb libxext "
+requires="libxcb libxext"
 
 build() {
   mkandenterbuilddir
diff --git a/xorg/libxshmfence/libxshmfence.SMBuild b/xorg/libxshmfence/libxshmfence.SMBuild
index 80b3e84..6f3d804 100755
--- a/xorg/libxshmfence/libxshmfence.SMBuild
+++ b/xorg/libxshmfence/libxshmfence.SMBuild
@@ -2,7 +2,7 @@ app=libxshmfence
 version=1.3
 build=1sml
 homepage="https://xorg.freedesktop.org/"
-download="https://www.x.org/releases/individual/lib/libxshmfence-1.3.tar.bz2"
+download="https://www.x.org/releases/individual/lib/libxshmfence-$version.tar.bz2"
 desc="a library that exposes a event API on top of Linux futexes"
 requires="musl xorg-macros xorgproto"
 
diff --git a/xorg/libxt/libxt.SMBuild b/xorg/libxt/libxt.SMBuild
index 39eb3e6..11a582a 100755
--- a/xorg/libxt/libxt.SMBuild
+++ b/xorg/libxt/libxt.SMBuild
@@ -2,7 +2,7 @@ app=libxt
 version=1.2.0
 build=1sml
 homepage="https://xorg.freedesktop.org/"
-download="https://www.x.org/releases/individual/lib/libXt-1.2.0.tar.bz2"
+download="https://www.x.org/releases/individual/lib/libXt-$version.tar.bz2"
 desc="X11 toolkit intrinsics library"
 requires="libsm libx11"
 
diff --git a/xorg/libxtst/libxtst.SMBuild b/xorg/libxtst/libxtst.SMBuild
index 2d548c2..f30eccd 100755
--- a/xorg/libxtst/libxtst.SMBuild
+++ b/xorg/libxtst/libxtst.SMBuild
@@ -2,7 +2,7 @@ app=libxtst
 version=1.2.3
 build=1sml
 homepage="https://xorg.freedesktop.org/"
-download="https://www.x.org/releases/individual/lib/libXtst-1.2.3.tar.bz2"
+download="https://www.x.org/releases/individual/lib/libXtst-$version.tar.bz2"
 desc="X11 Testing -- Resource extension library"
 requires="libxext libxfixes libxi"
 
diff --git a/xorg/libxv/libxv.SMBuild b/xorg/libxv/libxv.SMBuild
index 7001311..a60eaa3 100755
--- a/xorg/libxv/libxv.SMBuild
+++ b/xorg/libxv/libxv.SMBuild
@@ -2,7 +2,7 @@ app=libxv
 version=1.0.11
 build=1sml
 homepage="https://xorg.freedesktop.org/"
-download="https://www.x.org/releases/individual/lib/libXv-1.0.11.tar.bz2"
+download="https://www.x.org/releases/individual/lib/libXv-$version.tar.bz2"
 desc="X11 Video extension library"
 requires="libxext"
 
diff --git a/xorg/libxxf86vm/libxxf86vm.SMBuild b/xorg/libxxf86vm/libxxf86vm.SMBuild
index f45f460..b8101a2 100755
--- a/xorg/libxxf86vm/libxxf86vm.SMBuild
+++ b/xorg/libxxf86vm/libxxf86vm.SMBuild
@@ -2,9 +2,9 @@ app=libxxf86vm
 version=1.1.4
 build=1sml
 homepage="https://xorg.freedesktop.org/"
-download="https://www.x.org/releases/individual/lib/libXxf86vm-1.1.4.tar.bz2"
+download="https://www.x.org/releases/individual/lib/libXxf86vm-$version.tar.bz2"
 desc="X11 XFree86 video mode extension library"
-requires="libxext "
+requires="libxext"
 
 build() {
   mkandenterbuilddir
diff --git a/xorg/lndir/lndir.SMBuild b/xorg/lndir/lndir.SMBuild
index 163d3f5..15756f5 100755
--- a/xorg/lndir/lndir.SMBuild
+++ b/xorg/lndir/lndir.SMBuild
@@ -2,9 +2,9 @@ app=lndir
 version=1.0.3
 build=1sml
 homepage="https://gitlab.freedesktop.org/xorg/util/lndir"
-download="https://gitlab.freedesktop.org/xorg/util/lndir/-/archive/lndir-1.0.3/lndir-lndir-1.0.3.tar.bz2"
+download="https://gitlab.freedesktop.org/xorg/util/lndir/-/archive/lndir-$version/lndir-lndir-$version.tar.bz2"
 desc="create a shadow directory of symbolic links to another directory tree"
-requires="musl "
+requires="musl"
 
 build() {
   mkandenterbuilddir
diff --git a/xorg/makedepend/makedepend.SMBuild b/xorg/makedepend/makedepend.SMBuild
index 2bb690d..8ce4f5b 100755
--- a/xorg/makedepend/makedepend.SMBuild
+++ b/xorg/makedepend/makedepend.SMBuild
@@ -2,7 +2,7 @@ app=makedepend
 version=1.0.6
 build=1sml
 homepage="https://gitlab.freedesktop.org/xorg/util/makedepend"
-download="https://gitlab.freedesktop.org/xorg/util/makedepend/-/archive/makedepend-1.0.6/makedepend-makedepend-1.0.6.tar.bz2"
+download="https://gitlab.freedesktop.org/xorg/util/makedepend/-/archive/makedepend-$version/makedepend-makedepend-$version.tar.bz2"
 desc="Utility to parse C source files to make dependency lists for Makefiles"
 requires="musl"
 
diff --git a/xorg/mesa-demos/mesa-demos.SMBuild b/xorg/mesa-demos/mesa-demos.SMBuild
index b8f02a9..249c8fa 100755
--- a/xorg/mesa-demos/mesa-demos.SMBuild
+++ b/xorg/mesa-demos/mesa-demos.SMBuild
@@ -2,7 +2,7 @@ app=mesa-demos
 version=8.4.0
 build=1sml
 homepage="https://www.mesa3d.org/"
-download="https://archive.mesa3d.org//demos/mesa-demos-8.4.0.tar.bz2"
+download="https://archive.mesa3d.org//demos/mesa-demos-$version.tar.bz2"
 desc="Mesa demo applications"
 requires="mesa glew freeglut"
 
diff --git a/xorg/mesa/mesa.SMBuild b/xorg/mesa/mesa.SMBuild
index f362884..092b439 100755
--- a/xorg/mesa/mesa.SMBuild
+++ b/xorg/mesa/mesa.SMBuild
@@ -2,7 +2,7 @@ app=mesa
 version=20.1.4
 build=2sml
 homepage="https://www.mesa3d.org/"
-download="https://archive.mesa3d.org/mesa-20.1.4.tar.xz"
+download="https://archive.mesa3d.org/mesa-$version.tar.xz"
 desc="An open-source implementation of the OpenGL specification"
 requires="gcc-libs  expat libxml2 llvm libdrm libx11 libxrandr libxdamage libxshmfence libxxf86vm libvdpau"
 
diff --git a/xorg/mkfontscale/mkfontscale.SMBuild b/xorg/mkfontscale/mkfontscale.SMBuild
index 2f54769..f7fd104 100755
--- a/xorg/mkfontscale/mkfontscale.SMBuild
+++ b/xorg/mkfontscale/mkfontscale.SMBuild
@@ -2,9 +2,9 @@ app=mkfontscale
 version=1.2.1
 build=1sml
 homepage="https://xorg.freedesktop.org/"
-download="https://xorg.freedesktop.org/archive/individual/app/mkfontscale-1.2.1.tar.bz2"
+download="https://xorg.freedesktop.org/archive/individual/app/mkfontscale-$version.tar.bz2"
 desc="Create an index of scalable font files for X"
-requires="libfontenc freetype "
+requires="libfontenc freetype"
 
 build() {
   mkandenterbuilddir
diff --git a/xorg/mtdev/mtdev.SMBuild b/xorg/mtdev/mtdev.SMBuild
index d052e40..9503fa8 100755
--- a/xorg/mtdev/mtdev.SMBuild
+++ b/xorg/mtdev/mtdev.SMBuild
@@ -2,7 +2,7 @@ app=mtdev
 version=1.1.5
 build=1sml
 homepage="https://bitmath.org/code/mtdev/"
-download="https://bitmath.org/code/mtdev/mtdev-1.1.5.tar.bz2"
+download="https://bitmath.org/code/mtdev/mtdev-$version.tar.bz2"
 desc="Library which transforms all variants of kernel MT events to the slotted type B protocol"
 requires="musl"
 
diff --git a/xorg/numlockx/numlockx.SMBuild b/xorg/numlockx/numlockx.SMBuild
index 524040c..de9dd28 100755
--- a/xorg/numlockx/numlockx.SMBuild
+++ b/xorg/numlockx/numlockx.SMBuild
@@ -2,8 +2,8 @@ app=numlockx
 version=1.2
 build=1sml
 homepage="https://github.com/rg3/numlockx"
-download="https://github.com/rg3/numlockx/archive/refs/tags/1.2.tar.gz"
-requires="libxtst "
+download="https://github.com/rg3/numlockx/archive/refs/tags/$version.tar.gz"
+requires="libxtst"
 desc="Turns on the numlock key in X11"
 
 build() {
diff --git a/xorg/pixman/pixman.SMBuild b/xorg/pixman/pixman.SMBuild
index 8c3ad7e..4a30c59 100755
--- a/xorg/pixman/pixman.SMBuild
+++ b/xorg/pixman/pixman.SMBuild
@@ -2,7 +2,7 @@ app=pixman
 version=0.40.0
 build=1sml
 homepage="https://cgit.freedesktop.org/pixman/"
-download="https://xorg.freedesktop.org/releases/individual/lib/pixman-0.40.0.tar.xz"
+download="https://xorg.freedesktop.org/releases/individual/lib/pixman-$version.tar.xz"
 desc="The pixel-manipulation library for X and cairo"
 requires="libpng"
 
diff --git a/xorg/setxkbmap/setxkbmap.SMBuild b/xorg/setxkbmap/setxkbmap.SMBuild
index ad51ed0..e9e0c7f 100755
--- a/xorg/setxkbmap/setxkbmap.SMBuild
+++ b/xorg/setxkbmap/setxkbmap.SMBuild
@@ -2,7 +2,7 @@ app=setxkbmap
 version=1.3.2
 build=1sml
 homepage="https://xorg.freedesktop.org/"
-download="https://xorg.freedesktop.org/releases/individual/app/setxkbmap-1.3.2.tar.bz2"
+download="https://xorg.freedesktop.org/releases/individual/app/setxkbmap-$version.tar.bz2"
 desc="Set the keyboard using the X Keyboard Extension"
 requires="libxkbfile"
 
diff --git a/xorg/startup-notification/startup-notification.SMBuild b/xorg/startup-notification/startup-notification.SMBuild
index 9ff3979..5efb4a5 100755
--- a/xorg/startup-notification/startup-notification.SMBuild
+++ b/xorg/startup-notification/startup-notification.SMBuild
@@ -2,7 +2,7 @@ app=startup-notification
 version=0.12
 build=1sml
 homepage="https://www.freedesktop.org/"
-download="https://www.freedesktop.org/software/startup-notification/releases/startup-notification-0.12.tar.gz"
+download="https://www.freedesktop.org/software/startup-notification/releases/startup-notification-$version.tar.gz"
 desc="Monitor and display application startup"
 requires="libx11 xcb-util"
 
diff --git a/xorg/terminus-font/terminus-font.SMBuild b/xorg/terminus-font/terminus-font.SMBuild
index d6b0a95..0374ddb 100755
--- a/xorg/terminus-font/terminus-font.SMBuild
+++ b/xorg/terminus-font/terminus-font.SMBuild
@@ -2,7 +2,7 @@ app=terminus-font
 version=4.40
 build=1sml
 homepage="http://terminus-font.sourceforge.net/"
-download="https://sourceforge.net/projects/terminus-font/files/terminus-font-4.40/terminus-font-4.40.tar.gz/download"
+download="https://sourceforge.net/projects/terminus-font/files/terminus-font-$version/terminus-font-$version.tar.gz"
 desc="a clean fixed width bitmap font"
 requires="python3 bdftopcf mkfontscale fontconfig"
 
diff --git a/xorg/ttf-indic-fonts/ttf-indic-fonts.SMBuild b/xorg/ttf-indic-fonts/ttf-indic-fonts.SMBuild
index d51de31..a287d6d 100755
--- a/xorg/ttf-indic-fonts/ttf-indic-fonts.SMBuild
+++ b/xorg/ttf-indic-fonts/ttf-indic-fonts.SMBuild
@@ -2,7 +2,7 @@ app=ttf-indic-fonts
 version=0.5.14
 build=1sml
 homepage=http://archive.ubuntu.com/ubuntu/pool/main/t/ttf-indic-fonts/""
-download="http://archive.ubuntu.com/ubuntu/pool/main/t/ttf-indic-fonts/ttf-indic-fonts_0.5.14ubuntu1.tar.gz"
+download="http://archive.ubuntu.com/ubuntu/pool/main/t/ttf-indic-fonts/ttf-indic-fonts_"$version"ubuntu1.tar.gz"
 desc="TTF fonts for Indic scripts"
 requires="fontconfig mkfontscale "
 
diff --git a/xorg/twm/twm.SMBuild b/xorg/twm/twm.SMBuild
index 85773df..79b2487 100755
--- a/xorg/twm/twm.SMBuild
+++ b/xorg/twm/twm.SMBuild
@@ -2,7 +2,7 @@ app=twm
 version=1.0.10
 build=1sml
 homepage="https://xorg.freedesktop.org"
-download="https://xorg.freedesktop.org/releases/individual/app/twm-1.0.10.tar.bz2"
+download="https://xorg.freedesktop.org/releases/individual/app/twm-$version.tar.bz2"
 desc="standard window manager for the X window system"
 requires="e2fsprogs libxau libxdmcp libxmu "
 
diff --git a/xorg/udisks/udisks.SMBuild b/xorg/udisks/udisks.SMBuild
index b511525..016175c 100755
--- a/xorg/udisks/udisks.SMBuild
+++ b/xorg/udisks/udisks.SMBuild
@@ -2,7 +2,7 @@ app=udisks
 version=2.9.4
 build=1sml
 homepage="http://www.freedesktop.org/wiki/Software/udisks"
-download="https://github.com/storaged-project/udisks/releases/download/udisks-2.9.4/udisks-2.9.4.tar.bz2"
+download="https://github.com/storaged-project/udisks/releases/download/udisks-$version/udisks-$version.tar.bz2"
 desc="Daemon that implements D-Bus interfaces for interacting with storage devices"
 requires="libblockdev libatasmart polkit dbus"
 
diff --git a/xorg/vala/vala.SMBuild b/xorg/vala/vala.SMBuild
index 81f7a2d..48e2038 100755
--- a/xorg/vala/vala.SMBuild
+++ b/xorg/vala/vala.SMBuild
@@ -2,7 +2,7 @@ app=vala
 version=0.46.6
 build=1sml
 homepage="https://wiki.gnome.org/Projects/Vala"
-download="https://gitlab.gnome.org/GNOME/vala/-/archive/0.46.6/vala-0.46.6.tar.bz2"
+download="https://gitlab.gnome.org/GNOME/vala/-/archive/$version/vala-$version.tar.bz2"
 desc="Compiler for the GObject type system"
 requires="libxslt glib libx11 dbus"
 
diff --git a/xorg/xauth/xauth.SMBuild b/xorg/xauth/xauth.SMBuild
index e455385..7d470dc 100755
--- a/xorg/xauth/xauth.SMBuild
+++ b/xorg/xauth/xauth.SMBuild
@@ -2,9 +2,9 @@ app=xauth
 version=1.1
 build=1sml
 homepage="https://xorg.freedesktop.org/"
-download="https://xorg.freedesktop.org/releases/individual/app/xauth-1.1.tar.bz2"
+download="https://xorg.freedesktop.org/releases/individual/app/xauth-$version.tar.bz2"
 desc="X.Org authorization settings program"
-requires="libxau libxmu libx11 "
+requires="libxau libxmu libx11"
 
 build() {
   mkandenterbuilddir
diff --git a/xorg/xbitmaps/xbitmaps.SMBuild b/xorg/xbitmaps/xbitmaps.SMBuild
index 718976f..50384b2 100755
--- a/xorg/xbitmaps/xbitmaps.SMBuild
+++ b/xorg/xbitmaps/xbitmaps.SMBuild
@@ -2,7 +2,7 @@ app=xbitmaps
 version=1.1.2
 build=1sml
 homepage="https://xorg.freedesktop.org/"
-download="https://xorg.freedesktop.org/releases/individual/data/xbitmaps-1.1.2.tar.bz2"
+download="https://xorg.freedesktop.org/releases/individual/data/xbitmaps-$version.tar.bz2"
 requires="xorg-macros"
 desc="X.org Bitmap files"
 
diff --git a/xorg/xcalc/xcalc.SMBuild b/xorg/xcalc/xcalc.SMBuild
index fd3fad4..6c9d695 100755
--- a/xorg/xcalc/xcalc.SMBuild
+++ b/xorg/xcalc/xcalc.SMBuild
@@ -2,7 +2,7 @@ app=xcalc
 version=1.1.0
 build=1sml
 homepage="https://cgit.freedesktop.org/xorg/app/xcalc/"
-download="https://xorg.freedesktop.org/releases/individual/app/xcalc-1.1.0.tar.bz2"
+download="https://xorg.freedesktop.org/releases/individual/app/xcalc-$version.tar.bz2"
 desc="Scientific calculator for X"
 requires="libxaw "
 
diff --git a/xorg/xcb-proto/xcb-proto.SMBuild b/xorg/xcb-proto/xcb-proto.SMBuild
index ceb5be5..8ac0137 100755
--- a/xorg/xcb-proto/xcb-proto.SMBuild
+++ b/xorg/xcb-proto/xcb-proto.SMBuild
@@ -2,7 +2,7 @@ app=xcb-proto
 version=1.14
 build=1sml
 homepage="https://xcb.freedesktop.org/"
-download="https://xorg.freedesktop.org/releases/individual/proto/xcb-proto-1.14.tar.xz"
+download="https://xorg.freedesktop.org/releases/individual/proto/xcb-proto-$version.tar.xz"
 desc="XML-XCB protocol descriptions"
 requires="python3"
 
diff --git a/xorg/xcb-util-cursor/xcb-util-cursor.SMBuild b/xorg/xcb-util-cursor/xcb-util-cursor.SMBuild
index c239e3b..feac779 100755
--- a/xorg/xcb-util-cursor/xcb-util-cursor.SMBuild
+++ b/xorg/xcb-util-cursor/xcb-util-cursor.SMBuild
@@ -2,7 +2,7 @@ app=xcb-util-cursor
 version=0.1.3
 build=1sml
 homepage="https://xcb.freedesktop.org/"
-download="https://xcb.freedesktop.org/dist/xcb-util-cursor-0.1.3.tar.bz2"
+download="https://xcb.freedesktop.org/dist/xcb-util-cursor-$version.tar.bz2"
 desc="XCB cursor library"
 requires="libxcb xcb-util-renderutil xcb-util-image"
 
diff --git a/xorg/xcb-util-image/xcb-util-image.SMBuild b/xorg/xcb-util-image/xcb-util-image.SMBuild
index 9b7b0cc..5c805f8 100755
--- a/xorg/xcb-util-image/xcb-util-image.SMBuild
+++ b/xorg/xcb-util-image/xcb-util-image.SMBuild
@@ -2,7 +2,7 @@ app=xcb-util-image
 version=0.4.0
 build=1sml
 homepage="https://xcb.freedesktop.org/"
-download="https://xcb.freedesktop.org/dist/xcb-util-image-0.4.0.tar.bz2"
+download="https://xcb.freedesktop.org/dist/xcb-util-image-$version.tar.bz2"
 desc="Utility libraries for XC Binding"
 requires="libxcb xcb-util"
 
diff --git a/xorg/xcb-util-keysyms/xcb-util-keysyms.SMBuild b/xorg/xcb-util-keysyms/xcb-util-keysyms.SMBuild
index 351632d..be951a0 100755
--- a/xorg/xcb-util-keysyms/xcb-util-keysyms.SMBuild
+++ b/xorg/xcb-util-keysyms/xcb-util-keysyms.SMBuild
@@ -2,7 +2,7 @@ app=xcb-util-keysyms
 version=0.4.0
 build=1sml
 homepage="https://xcb.freedesktop.org/"
-download="https://xcb.freedesktop.org/dist/xcb-util-keysyms-0.4.0.tar.bz2"
+download="https://xcb.freedesktop.org/dist/xcb-util-keysyms-$version.tar.bz2"
 desc="Utility libraries for XC Binding - Standard X key constants and conversion to/from keycodes"
 requires="libxcb xcb-util"
 
diff --git a/xorg/xcb-util-renderutil/xcb-util-renderutil.SMBuild b/xorg/xcb-util-renderutil/xcb-util-renderutil.SMBuild
index 272adee..44473b1 100755
--- a/xorg/xcb-util-renderutil/xcb-util-renderutil.SMBuild
+++ b/xorg/xcb-util-renderutil/xcb-util-renderutil.SMBuild
@@ -2,7 +2,7 @@ app=xcb-util-renderutil
 version=0.3.9
 build=1sml
 homepage="https://xcb.freedesktop.org/"
-download="https://xcb.freedesktop.org/dist/xcb-util-renderutil-0.3.9.tar.bz2"
+download="https://xcb.freedesktop.org/dist/xcb-util-renderutil-$version.tar.bz2"
 desc="Utility libraries for XC Binding"
 requires="libxcb"
 
diff --git a/xorg/xcb-util-wm/xcb-util-wm.SMBuild b/xorg/xcb-util-wm/xcb-util-wm.SMBuild
index fc5bf14..4a741a0 100755
--- a/xorg/xcb-util-wm/xcb-util-wm.SMBuild
+++ b/xorg/xcb-util-wm/xcb-util-wm.SMBuild
@@ -2,7 +2,7 @@ app=xcb-util-wm
 version=0.4.1
 build=1sml
 homepage="https://xcb.freedesktop.org/"
-download="https://xcb.freedesktop.org/dist/xcb-util-wm-0.4.1.tar.bz2"
+download="https://xcb.freedesktop.org/dist/xcb-util-wm-$version.tar.bz2"
 desc="Utility libraries for XC Binding"
 requires="libxcb"
 
diff --git a/xorg/xcb-util/xcb-util.SMBuild b/xorg/xcb-util/xcb-util.SMBuild
index b318c5f..7a9b2af 100755
--- a/xorg/xcb-util/xcb-util.SMBuild
+++ b/xorg/xcb-util/xcb-util.SMBuild
@@ -2,7 +2,7 @@ app=xcb-util
 version=0.4.0
 build=1sml
 homepage="https://xcb.freedesktop.org/"
-download="https://xcb.freedesktop.org/dist/xcb-util-0.4.0.tar.bz2"
+download="https://xcb.freedesktop.org/dist/xcb-util-$version.tar.bz2"
 desc="Utility libraries for XC Binding"
 requires="gperf libxcb"
 
diff --git a/xorg/xclipboard/xclipboard.SMBuild b/xorg/xclipboard/xclipboard.SMBuild
index c0c2c9e..d0efe6e 100755
--- a/xorg/xclipboard/xclipboard.SMBuild
+++ b/xorg/xclipboard/xclipboard.SMBuild
@@ -2,7 +2,7 @@ app=xclipboard
 version=1.1.3
 build=1sml
 homepage="https://xorg.freedesktop.org/"
-download="https://xorg.freedesktop.org/archive/individual/app/xclipboard-1.1.3.tar.bz2"
+download="https://xorg.freedesktop.org/archive/individual/app/xclipboard-$version.tar.bz2"
 desc="X clipboard manager"
 requires="libxt libxmu libx11 libxaw "
 
diff --git a/xorg/xclock/xclock.SMBuild b/xorg/xclock/xclock.SMBuild
index 78c938c..c9b97ab 100755
--- a/xorg/xclock/xclock.SMBuild
+++ b/xorg/xclock/xclock.SMBuild
@@ -2,7 +2,7 @@ app=xclock
 version=1.0.9
 build=1sml
 homepage="https://xorg.freedesktop.org/"
-download="https://xorg.freedesktop.org/archive/individual/app/xclock-1.0.9.tar.bz2"
+download="https://xorg.freedesktop.org/archive/individual/app/xclock-$version.tar.bz2"
 desc="X clock"
 requires="netbsd-curses expat e2fsprogs freetype fontconfig libxcb libxpm libice libxkbfile libxft libxaw"
 
diff --git a/xorg/xdg-dbus-proxy/xdg-dbus-proxy.SMBuild b/xorg/xdg-dbus-proxy/xdg-dbus-proxy.SMBuild
index 92389d3..0211b76 100755
--- a/xorg/xdg-dbus-proxy/xdg-dbus-proxy.SMBuild
+++ b/xorg/xdg-dbus-proxy/xdg-dbus-proxy.SMBuild
@@ -2,7 +2,7 @@ app=xdg-dbus-proxy
 version=0.1.2
 build=1sml
 homepage="https://github.com/flatpak/xdg-dbus-proxy"
-download="https://github.com/flatpak/xdg-dbus-proxy/archive/refs/tags/0.1.2.tar.gz"
+download="https://github.com/flatpak/xdg-dbus-proxy/archive/refs/tags/$version.tar.gz"
 desc="filtering proxy for D-Bus connections"
 requires="glib util-linux dbus "
 
diff --git a/xorg/xdg-user-dirs/xdg-user-dirs.SMBuild b/xorg/xdg-user-dirs/xdg-user-dirs.SMBuild
index b36d3bc..d412409 100755
--- a/xorg/xdg-user-dirs/xdg-user-dirs.SMBuild
+++ b/xorg/xdg-user-dirs/xdg-user-dirs.SMBuild
@@ -2,7 +2,7 @@ app=xdg-user-dirs
 version=0.17
 build=1sml
 homepage="https://www.freedesktop.org/wiki/Software/xdg-user-dirs"
-download="http://user-dirs.freedesktop.org/releases/xdg-user-dirs-0.17.tar.gz"
+download="http://user-dirs.freedesktop.org/releases/xdg-user-dirs-$version.tar.gz"
 desc="Manage user directories like ~/Desktop and ~/Music"
 requires="musl docbook"
 
diff --git a/xorg/xev/xev.SMBuild b/xorg/xev/xev.SMBuild
index 858d7a6..e311077 100755
--- a/xorg/xev/xev.SMBuild
+++ b/xorg/xev/xev.SMBuild
@@ -2,7 +2,7 @@ app=xev
 version=1.2.3
 build=1sml
 homepage="https://xorg.freedesktop.org/"
-download="https://xorg.freedesktop.org/archive/individual/app/xev-1.2.3.tar.bz2"
+download="https://xorg.freedesktop.org/archive/individual/app/xev-$version.tar.bz2"
 desc="Print contents of X events"
 requires="libxrandr libx11"
 
diff --git a/xorg/xf86-input-evdev/xf86-input-evdev.SMBuild b/xorg/xf86-input-evdev/xf86-input-evdev.SMBuild
index 46cbf04..7a0dc20 100755
--- a/xorg/xf86-input-evdev/xf86-input-evdev.SMBuild
+++ b/xorg/xf86-input-evdev/xf86-input-evdev.SMBuild
@@ -2,9 +2,9 @@ app=xf86-input-evdev
 version=2.10.6
 build=1sml
 homepage="https://xorg.freedesktop.org/"
-download="https://xorg.freedesktop.org/releases/individual/driver/xf86-input-evdev-2.10.6.tar.bz2"
+download="https://xorg.freedesktop.org/releases/individual/driver/xf86-input-evdev-$version.tar.bz2"
 desc="X.org evdev input driver"
-requires="libevdev mtdev xorg-server "
+requires="libevdev mtdev xorg-server"
 
 build() {
   mkandenterbuilddir
diff --git a/xorg/xf86-input-keyboard/xf86-input-keyboard.SMBuild b/xorg/xf86-input-keyboard/xf86-input-keyboard.SMBuild
index ec1630a..64108f6 100755
--- a/xorg/xf86-input-keyboard/xf86-input-keyboard.SMBuild
+++ b/xorg/xf86-input-keyboard/xf86-input-keyboard.SMBuild
@@ -2,9 +2,9 @@ app=xf86-input-keyboard
 version=1.9.0
 build=1sml
 homepage="https://xorg.freedesktop.org/"
-download="https://xorg.freedesktop.org/releases/individual/driver/xf86-input-keyboard-1.9.0.tar.bz2"
+download="https://xorg.freedesktop.org/releases/individual/driver/xf86-input-keyboard-$version.tar.bz2"
 desc="Xorg generic keyboard input driver"
-requires="libevdev mtdev xorg-server "
+requires="libevdev mtdev xorg-server"
 
 build() {
   mkandenterbuilddir
diff --git a/xorg/xf86-input-libinput/xf86-input-libinput.SMBuild b/xorg/xf86-input-libinput/xf86-input-libinput.SMBuild
index 6499291..e3d7f52 100755
--- a/xorg/xf86-input-libinput/xf86-input-libinput.SMBuild
+++ b/xorg/xf86-input-libinput/xf86-input-libinput.SMBuild
@@ -2,9 +2,9 @@ app=xf86-input-libinput
 version=0.30.0
 build=1sml
 homepage="https://xorg.freedesktop.org/"
-download="https://xorg.freedesktop.org/releases/individual/driver/xf86-input-libinput-0.30.0.tar.bz2"
+download="https://xorg.freedesktop.org/releases/individual/driver/xf86-input-libinput-$version.tar.bz2"
 desc="Generic input driver for the X.Org server based on libinput"
-requires="libx11 libxi libinput xorg-server "
+requires="libx11 libxi libinput xorg-server"
 
 build() {
   mkandenterbuilddir
diff --git a/xorg/xf86-input-mouse/xf86-input-mouse.SMBuild b/xorg/xf86-input-mouse/xf86-input-mouse.SMBuild
index aeab614..513f5f1 100755
--- a/xorg/xf86-input-mouse/xf86-input-mouse.SMBuild
+++ b/xorg/xf86-input-mouse/xf86-input-mouse.SMBuild
@@ -2,9 +2,9 @@ app=xf86-input-mouse
 version=1.9.3
 build=1sml
 homepage="https://xorg.freedesktop.org/"
-download="https://xorg.freedesktop.org/releases/individual/driver/xf86-input-mouse-1.9.3.tar.bz2"
+download="https://xorg.freedesktop.org/releases/individual/driver/xf86-input-mouse-$version.tar.bz2"
 desc="Xorg generic mouse input driver"
-requires="libevdev mtdev xorg-server "
+requires="libevdev mtdev xorg-server"
 
 build() {
   mkandenterbuilddir
diff --git a/xorg/xf86-video-ati/xf86-video-ati.SMBuild b/xorg/xf86-video-ati/xf86-video-ati.SMBuild
index 10299bd..c0c434a 100755
--- a/xorg/xf86-video-ati/xf86-video-ati.SMBuild
+++ b/xorg/xf86-video-ati/xf86-video-ati.SMBuild
@@ -2,7 +2,7 @@ app=xf86-video-ati
 version=19.1.0
 build=1sml
 homepage="https://xorg.freedesktop.org/"
-download="https://xorg.freedesktop.org/releases/individual/driver/xf86-video-ati-19.1.0.tar.bz2"
+download="https://xorg.freedesktop.org/releases/individual/driver/xf86-video-ati-$version.tar.bz2"
 desc="X.org ati video driver"
 requires="mesa xorg-server llvm"
 
diff --git a/xorg/xf86-video-dummy/xf86-video-dummy.SMBuild b/xorg/xf86-video-dummy/xf86-video-dummy.SMBuild
index 65f3f86..9ff60cc 100755
--- a/xorg/xf86-video-dummy/xf86-video-dummy.SMBuild
+++ b/xorg/xf86-video-dummy/xf86-video-dummy.SMBuild
@@ -2,7 +2,7 @@ app=xf86-video-dummy
 version=0.3.8
 build=1sml
 homepage="https://xorg.freedesktop.org"
-download="https://xorg.freedesktop.org/releases/individual/driver/xf86-video-dummy-0.3.8.tar.bz2"
+download="https://xorg.freedesktop.org/releases/individual/driver/xf86-video-dummy-$version.tar.bz2"
 desc="dummy driver for Xorg required by VNC programs like x11vnc"
 requires="xorg-server"
 
diff --git a/xorg/xf86-video-fbdev/xf86-video-fbdev.SMBuild b/xorg/xf86-video-fbdev/xf86-video-fbdev.SMBuild
index 21b2d1b..8804f57 100755
--- a/xorg/xf86-video-fbdev/xf86-video-fbdev.SMBuild
+++ b/xorg/xf86-video-fbdev/xf86-video-fbdev.SMBuild
@@ -2,9 +2,9 @@ app=xf86-video-fbdev
 version=0.5.0
 build=1sml
 homepage="https://xorg.freedesktop.org"
-download="https://xorg.freedesktop.org/releases/individual/driver/xf86-video-fbdev-0.5.0.tar.bz2"
+download="https://xorg.freedesktop.org/releases/individual/driver/xf86-video-fbdev-$version.tar.bz2"
 desc="X.org framebuffer video driver"
-requires="xorg-server "
+requires="xorg-server"
 
 build() {
   mkandenterbuilddir
diff --git a/xorg/xf86-video-fbturbo/xf86-video-fbturbo.SMBuild b/xorg/xf86-video-fbturbo/xf86-video-fbturbo.SMBuild
index 42ff603..f26de8d 100755
--- a/xorg/xf86-video-fbturbo/xf86-video-fbturbo.SMBuild
+++ b/xorg/xf86-video-fbturbo/xf86-video-fbturbo.SMBuild
@@ -2,7 +2,7 @@ app=xf86-video-fbturbo
 version=0.4.0
 build=1sml
 homepage="https://github.com/ssvb/xf86-video-fbturbo"
-download="https://github.com/ssvb/xf86-video-fbturbo/archive/refs/tags/0.4.0.tar.gz"
+download="https://github.com/ssvb/xf86-video-fbturbo/archive/refs/tags/$version.tar.gz"
 desc="Xorg video driver for devices with ARM Allwinner SoCs and raspberry pi older models"
 requires="xorg-server"
 
diff --git a/xorg/xf86-video-intel/xf86-video-intel.SMBuild b/xorg/xf86-video-intel/xf86-video-intel.SMBuild
index 99854e8..e8b6a3e 100755
--- a/xorg/xf86-video-intel/xf86-video-intel.SMBuild
+++ b/xorg/xf86-video-intel/xf86-video-intel.SMBuild
@@ -2,7 +2,7 @@ app=xf86-video-intel
 version=2.99.917
 build=1sml
 homepage="https://xorg.freedesktop.org/"
-download="https://xorg.freedesktop.org/releases/individual/driver/xf86-video-intel-2.99.917.tar.bz2"
+download="https://xorg.freedesktop.org/releases/individual/driver/xf86-video-intel-$version.tar.bz2"
 desc="X.org Intel i810/i830/i915/945G/G965+ video drivers"
 requires="pixman libxv libxinerama libxtst libxrandr libxcursor xorg-server"
 sm_noautoconfsite=1
diff --git a/xorg/xf86-video-vesa/xf86-video-vesa.SMBuild b/xorg/xf86-video-vesa/xf86-video-vesa.SMBuild
index 2a1a087..94faf67 100755
--- a/xorg/xf86-video-vesa/xf86-video-vesa.SMBuild
+++ b/xorg/xf86-video-vesa/xf86-video-vesa.SMBuild
@@ -2,7 +2,7 @@ app=xf86-video-vesa
 version=2.4.0
 build=1sml
 homepage="https://xorg.freedesktop.org/"
-download="https://xorg.freedesktop.org/releases/individual/driver/xf86-video-vesa-2.4.0.tar.bz2"
+download="https://xorg.freedesktop.org/releases/individual/driver/xf86-video-vesa-$version.tar.bz2"
 desc="X.org vesa video driver"
 requires="xorg-server"
 
diff --git a/xorg/xfontsel/xfontsel.SMBuild b/xorg/xfontsel/xfontsel.SMBuild
index 8a1391a..0a6506a 100755
--- a/xorg/xfontsel/xfontsel.SMBuild
+++ b/xorg/xfontsel/xfontsel.SMBuild
@@ -2,7 +2,7 @@ app=xfontsel
 version=1.0.6
 build=1sml
 homepage="https://xorg.freedesktop.org/"
-download="https://xorg.freedesktop.org/archive/individual/app/xfontsel-1.0.6.tar.bz2"
+download="https://xorg.freedesktop.org/archive/individual/app/xfontsel-$version.tar.bz2"
 desc="Point and click selection of X11 font names"
 requires="libxaw"
 
diff --git a/xorg/xhost/xhost.SMBuild b/xorg/xhost/xhost.SMBuild
index af59607..55530c1 100755
--- a/xorg/xhost/xhost.SMBuild
+++ b/xorg/xhost/xhost.SMBuild
@@ -2,7 +2,7 @@ app=xhost
 version=1.0.8
 build=1sml
 homepage="https://xorg.freedesktop.org/"
-download="https://xorg.freedesktop.org/archive/individual/app/xhost-1.0.8.tar.bz2"
+download="https://xorg.freedesktop.org/archive/individual/app/xhost-$version.tar.bz2"
 desc="Server access control program for X"
 requires="libxmu libx11"
 
diff --git a/xorg/xinit/xinit.SMBuild b/xorg/xinit/xinit.SMBuild
index 43d4c25..c96f85a 100755
--- a/xorg/xinit/xinit.SMBuild
+++ b/xorg/xinit/xinit.SMBuild
@@ -2,7 +2,7 @@ app=xinit
 version=1.4.1
 build=1sml
 homepage="https://xorg.freedesktop.org/"
-download="https://xorg.freedesktop.org/releases/individual/app/xinit-1.4.1.tar.bz2"
+download="https://xorg.freedesktop.org/releases/individual/app/xinit-$version.tar.bz2"
 desc="X.Org initialisation program"
 requires="libx11 xorg-server xrdb xauth"
 
diff --git a/xorg/xinput/xinput.SMBuild b/xorg/xinput/xinput.SMBuild
index 0649483..df6b37c 100755
--- a/xorg/xinput/xinput.SMBuild
+++ b/xorg/xinput/xinput.SMBuild
@@ -2,7 +2,7 @@ app=xinput
 version=1.6.3
 build=1sml
 homepage="https://xorg.freedesktop.org/"
-download="https://xorg.freedesktop.org/releases/individual/app/xinput-1.6.3.tar.bz2"
+download="https://xorg.freedesktop.org/releases/individual/app/xinput-$version.tar.bz2"
 desc="Small commandline tool to configure devices"
 requires="libxi libxinerama"
 
diff --git a/xorg/xkbcomp/xkbcomp.SMBuild b/xorg/xkbcomp/xkbcomp.SMBuild
index 56f0bc9..7f43c72 100755
--- a/xorg/xkbcomp/xkbcomp.SMBuild
+++ b/xorg/xkbcomp/xkbcomp.SMBuild
@@ -2,7 +2,7 @@ app=xkbcomp
 version=1.4.2
 build=1sml
 homepage="https://xorg.freedesktop.org/"
-download="https://xorg.freedesktop.org/archive/individual/app/xkbcomp-1.4.2.tar.bz2"
+download="https://xorg.freedesktop.org/archive/individual/app/xkbcomp-$version.tar.bz2"
 desc="X Keyboard description compiler"
 requires="libxkbfile"
 
diff --git a/xorg/xkeyboard-config/xkeyboard-config.SMBuild b/xorg/xkeyboard-config/xkeyboard-config.SMBuild
index 58b02eb..73caae3 100755
--- a/xorg/xkeyboard-config/xkeyboard-config.SMBuild
+++ b/xorg/xkeyboard-config/xkeyboard-config.SMBuild
@@ -2,9 +2,9 @@ app=xkeyboard-config
 version=2.30
 build=1sml
 homepage="https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config"
-download="https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/archive/xkeyboard-config-2.30/xkeyboard-config-xkeyboard-config-2.30.tar.bz2"
+download="https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/archive/xkeyboard-config-$version/xkeyboard-config-xkeyboard-config-$version.tar.bz2"
 desc="X keyboard configuration files"
-requires="intltool libxslt xkbcomp "
+requires="intltool libxslt xkbcomp"
 
 build() {
   mkandenterbuilddir
diff --git a/xorg/xmodmap/xmodmap.SMBuild b/xorg/xmodmap/xmodmap.SMBuild
index ea6c212..87bcff8 100755
--- a/xorg/xmodmap/xmodmap.SMBuild
+++ b/xorg/xmodmap/xmodmap.SMBuild
@@ -2,7 +2,7 @@ app=xmodmap
 version=1.0.10
 build=1sml
 homepage="https://xorg.freedesktop.org/"
-download="https://xorg.freedesktop.org/releases/individual/app/xmodmap-1.0.10.tar.bz2"
+download="https://xorg.freedesktop.org/releases/individual/app/xmodmap-$version.tar.bz2"
 desc="Utility for modifying keymaps and button mappings"
 requires="libx11"
 
diff --git a/xorg/xorg-cf-files/xorg-cf-files.SMBuild b/xorg/xorg-cf-files/xorg-cf-files.SMBuild
index 04d4425..6515612 100755
--- a/xorg/xorg-cf-files/xorg-cf-files.SMBuild
+++ b/xorg/xorg-cf-files/xorg-cf-files.SMBuild
@@ -2,7 +2,7 @@ app=xorg-cf-files
 version=1.0.6
 build=1sml
 homepage="https://xorg.freedesktop.org/"
-download="https://www.x.org/releases/individual/util/xorg-cf-files-1.0.6.tar.bz2"
+download="https://www.x.org/releases/individual/util/xorg-cf-files-$version.tar.bz2"
 desc="Default configuration files for Xorg"
 requires="xtrans mesa xorg-server xkeyboard-config libepoxy xcb-util xcb-util-image xcb-util-keysyms xcb-util-wm xcb-util-renderutil pixman libpciaccess"
 
diff --git a/xorg/xorg-fonts/xorg-fonts.SMBuild b/xorg/xorg-fonts/xorg-fonts.SMBuild
index 46def93..c1312b3 100755
--- a/xorg/xorg-fonts/xorg-fonts.SMBuild
+++ b/xorg/xorg-fonts/xorg-fonts.SMBuild
@@ -2,7 +2,7 @@ app=xorg-fonts
 version=1.0
 build=1sml
 homepage="https://xorg.freedesktop.org/"
-desc="font collection that has historically been part of Xorg"
+desc="Font collection that has historically been part of Xorg"
 requires="font-util"
 
 build() {
diff --git a/xorg/xorg-server/xorg-server.SMBuild b/xorg/xorg-server/xorg-server.SMBuild
index 080a596..d5b398f 100755
--- a/xorg/xorg-server/xorg-server.SMBuild
+++ b/xorg/xorg-server/xorg-server.SMBuild
@@ -2,7 +2,7 @@ app=xorg-server
 version=1.20.8
 build=2sml
 homepage="https://www.x.org/wiki/"
-download="https://www.x.org/releases/individual/xserver/xorg-server-1.20.8.tar.gz"
+download="https://www.x.org/releases/individual/xserver/xorg-server-$version.tar.gz"
 requires="eudev libgcrypt xtrans pixman libpciaccess libxv libxkbfile libxfont2 libxtst libxrender libxaw mesa "
 desc="Display server implementing the Xorg protocol"
 
diff --git a/xorg/xorgproto/xorgproto.SMBuild b/xorg/xorgproto/xorgproto.SMBuild
index 5f7921e..cb7690a 100755
--- a/xorg/xorgproto/xorgproto.SMBuild
+++ b/xorg/xorgproto/xorgproto.SMBuild
@@ -2,7 +2,7 @@ app=xorgproto
 version=2020.1
 build=1sml
 homepage="https://xorg.freedesktop.org/"
-download="https://xorg.freedesktop.org/archive/individual/proto/xorgproto-2020.1.tar.bz2"
+download="https://xorg.freedesktop.org/archive/individual/proto/xorgproto-$version.tar.bz2"
 desc="combined X.Org X11 Protocol headers"
 requires="musl"
 
diff --git a/xorg/xrandr/xrandr.SMBuild b/xorg/xrandr/xrandr.SMBuild
index 8d5734b..e6361a3 100755
--- a/xorg/xrandr/xrandr.SMBuild
+++ b/xorg/xrandr/xrandr.SMBuild
@@ -2,7 +2,7 @@ app=xrandr
 version=1.5.1
 build=1sml
 homepage="https://xorg.freedesktop.org/"
-download="https://xorg.freedesktop.org/archive/individual/app/xrandr-1.5.1.tar.xz"
+download="https://xorg.freedesktop.org/archive/individual/app/xrandr-$version.tar.xz"
 desc="Primitive command line interface to RandR extension"
 requires="libxrandr libx11 libxau"
 
diff --git a/xorg/xrdb/xrdb.SMBuild b/xorg/xrdb/xrdb.SMBuild
index 5fd923b..5a7dbd6 100755
--- a/xorg/xrdb/xrdb.SMBuild
+++ b/xorg/xrdb/xrdb.SMBuild
@@ -2,7 +2,7 @@ app=xrdb
 version=1.2.0
 build=1sml
 homepage="https://xorg.freedesktop.org/"
-download="https://xorg.freedesktop.org/archive/individual/app/xrdb-1.2.0.tar.bz2"
+download="https://xorg.freedesktop.org/archive/individual/app/xrdb-$version.tar.bz2"
 desc="X server resource database utility"
 requires="libxmu libx11"
 
diff --git a/xorg/xset/xset.SMBuild b/xorg/xset/xset.SMBuild
index 446f2c8..8f8579b 100755
--- a/xorg/xset/xset.SMBuild
+++ b/xorg/xset/xset.SMBuild
@@ -2,9 +2,9 @@ app=xset
 version=1.2.4
 build=1sml
 homepage="https://xorg.freedesktop.org/"
-download="https://xorg.freedesktop.org/archive/individual/app/xset-1.2.4.tar.bz2"
+download="https://xorg.freedesktop.org/archive/individual/app/xset-$version.tar.bz2"
 desc="User preference utility for X"
-requires="libxmu "
+requires="libxmu"
 
 build() {
   mkandenterbuilddir
diff --git a/xorg/xsetroot/xsetroot.SMBuild b/xorg/xsetroot/xsetroot.SMBuild
index 5cee4c7..a4376b1 100755
--- a/xorg/xsetroot/xsetroot.SMBuild
+++ b/xorg/xsetroot/xsetroot.SMBuild
@@ -2,7 +2,7 @@ app=xsetroot
 version=1.1.2
 build=1sml
 homepage="https://xorg.freedesktop.org/"
-download="https://xorg.freedesktop.org/archive/individual/app/xsetroot-1.1.2.tar.bz2"
+download="https://xorg.freedesktop.org/archive/individual/app/xsetroot-$version.tar.bz2"
 desc="Classic X utility to set your root window background to a given pattern or color"
 requires="libxmu libxcursor libx11"
 
diff --git a/xorg/xtrans/xtrans.SMBuild b/xorg/xtrans/xtrans.SMBuild
index 219ef9f..013d364 100755
--- a/xorg/xtrans/xtrans.SMBuild
+++ b/xorg/xtrans/xtrans.SMBuild
@@ -2,7 +2,7 @@ app=xtrans
 version=1.4.0
 build=1sml
 homepage="https://xorg.freedesktop.org/"
-download="https://xorg.freedesktop.org/releases/individual/lib/xtrans-1.4.0.tar.bz2"
+download="https://xorg.freedesktop.org/releases/individual/lib/xtrans-$version.tar.bz2"
 desc="X transport library"
 requires="libxml2 libxslt xmlto"
 
diff --git a/xorg/xvinfo/xvinfo.SMBuild b/xorg/xvinfo/xvinfo.SMBuild
index 978d234..49fe41a 100755
--- a/xorg/xvinfo/xvinfo.SMBuild
+++ b/xorg/xvinfo/xvinfo.SMBuild
@@ -2,7 +2,7 @@ app=xvinfo
 version=1.1.3
 build=1sml
 homepage="https://xorg.freedesktop.org/"
-download="https://xorg.freedesktop.org/archive/individual/app/xvinfo-1.1.3.tar.gz"
+download="https://xorg.freedesktop.org/archive/individual/app/xvinfo-$version.tar.gz"
 desc="Outputs video adaptors capabilities that are accessible through the X-Video extension"
 requires="libxv"
 
diff --git a/xorg/xwd/xwd.SMBuild b/xorg/xwd/xwd.SMBuild
index b005ce6..a3f892b 100755
--- a/xorg/xwd/xwd.SMBuild
+++ b/xorg/xwd/xwd.SMBuild
@@ -2,9 +2,9 @@ app=xwd
 version=1.0.7
 build=1sml
 homepage="https://xorg.freedesktop.org/"
-download="https://xorg.freedesktop.org/archive/individual/app/xwd-1.0.7.tar.bz2"
+download="https://xorg.freedesktop.org/archive/individual/app/xwd-$version.tar.bz2"
 desc="X Window System image dumping utility"
-requires="libxkbfile libxt "
+requires="libxkbfile libxt"
 
 build() {
   mkandenterbuilddir