diff --git a/extra/abiword/abiword.SMBuild b/extra/abiword/abiword.SMBuild
index 5ec6bcb..7984b78 100755
--- a/extra/abiword/abiword.SMBuild
+++ b/extra/abiword/abiword.SMBuild
@@ -1,17 +1,17 @@
-APP=abiword
-VERSION=3.0.4
-BUILD=2sml
-HOMEPAGE="www.abisource.com"
-DOWNLOAD="https://www.abisource.com/downloads/abiword/3.0.4/source/abiword-3.0.4.tar.gz"
-DESC="Opensource full-featured word processor"
-REQUIRES="desktop-file-utils enchant libical goffice libgsf librsvg libsoup wv gtk3 "
+app=abiword
+version=3.0.4
+build=2sml
+homepage="www.abisource.com"
+download="https://www.abisource.com/downloads/abiword/3.0.4/source/abiword-3.0.4.tar.gz"
+desc="Opensource full-featured word processor"
+requires="desktop-file-utils enchant libical goffice libgsf librsvg libsoup wv gtk3 "
 
 build() {
   mkandenterbuilddir
-  rm -rf $APP-$VERSION
+  rm -rf $app-$version
 
-  tar xf $SRCDIR/$APP-$VERSION.tar.?z*
-  cd $APP-$VERSION
+  tar xf $srcdir/$app-$version.tar.?z*
+  cd $app-$version
   fixbuilddirpermissions
 
 _plugins="applix babelfish bmp clarisworks collab docbook eml epub \
@@ -20,8 +20,8 @@ _plugins="applix babelfish bmp clarisworks collab docbook eml epub \
 	 passepartout pdb pdf presentation s5 sdw t602 urldict wikipedia wml \
 	 xslfo"
 
-  patch -p1 < $SRCDIR/enchant_checker.cpp.patch
-  patch -p1 < $SRCDIR/unixmouse.diff
+  patch -p1 < $srcdir/enchant_checker.cpp.patch
+  patch -p1 < $srcdir/unixmouse.diff
 
   ./configure \
     --prefix="" \
@@ -31,14 +31,14 @@ _plugins="applix babelfish bmp clarisworks collab docbook eml epub \
     --enable-plugins="$_plugins"
 
   make
-  make install DESTDIR=$PKG
+  make install DESTDIR=$pkg
 
-  cp COPY* $PKGDOCS/
+  cp COPY* $pkgdocs/
 
   mkfinalpkg
 }
 
-SHA512SUMS="
+sha512sums="
 d0a7fd6873862e4da9cd4ecc384b9cc8ec8f2bbf23bdec8c4c56fed16ca274fbecedf11dc80c6d835eaad8b316b143e3cb3adea162fc74984fa4725c906c5821  abiword-3.0.4.tar.lz
 0163d3275a7f260431885d9ea20bcb0c2cd52e19a062141422187f4df2f51c9613a90f1b7151fd50e2c1b7f511b767f1a2082c30792e59939ab0f3cf1c8aca65  enchant_checker.cpp.patch
 b8634c410485b2a5c8495bf5bcbdda027aca2e7028efc6ea06763d1df121409434cab53f370b55d409fb99e6dbb72819b99cb596ee735fe97aa235d0ed7b0124  unixmouse.diff
diff --git a/extra/ace/ace.SMBuild b/extra/ace/ace.SMBuild
index 1b6d01e..b6fd29f 100755
--- a/extra/ace/ace.SMBuild
+++ b/extra/ace/ace.SMBuild
@@ -1,38 +1,39 @@
-APP=ace
-VERSION=1.4
-BUILD=1sml
-HOMEPAGE="https://www.delorie.com/store/ace/"
-DOWNLOAD="https://www.delorie.com/store/ace/ace-1.4.tar.gz"
-DESC="A set of Xorg solitaire games"
+app=ace
+version=1.4
+build=1sml
+homepage="https://www.delorie.com/store/ace/"
+download="https://www.delorie.com/store/ace/ace-1.4.tar.gz"
+desc="A set of Xorg solitaire games"
+requires="guile"
 
 build() {
   mkandenterbuilddir
-  rm -rf $APP-$VERSION
+  rm -rf $app-$version
 
-  tar xf $SRCDIR/$APP-$VERSION.tar.?z*
-  cd $APP-$VERSION
+  tar xf $srcdir/$app-$version.tar.?z*
+  cd $app-$version
   fixbuilddirpermissions
 
-  patch -p1 < $SRCDIR/ace14_fixes.patch
+  patch -p1 < $srcdir/ace14_fixes.patch
 
   LDFLAGS="-lpng -lz -lm" \
   ./configure \
     --prefix="" \
     --disable-static \
-    $BUILDDIST
+    $builddist
 
   make
-  make install DESTDIR=$PKG
+  make install DESTDIR=$pkg
 
-  cp COPYING $PKGDOCS/
+  cp COPYING $pkgdocs/
 
-  mkdir -p $PKG/share/applications
-  cp $SRCDIR/*.desktop $PKG/share/applications/
+  mkdir -p $pkg/share/applications
+  cp $srcdir/*.desktop $pkg/share/applications/
 
   mkfinalpkg
 }
 
-SHA512SUMS="
+sha512sums="
 3be9ac04faa48e1464f1877553ff2717829ae5aa0398dd99d044fbf4a55f5a62e4443a3fc71f9a5f7ceb7a1bd02c126098b2f2b9f70c1315e86e465d3e556bec  ace-1.4.tar.lz
 16fa23cd3d30c8044ba35244f75d7d234eb7f4baaf0904ccd3412d0cd084315fb0691f0ea4da1084482bd47875a21cc423b29f83f501c93249430f89c01c6a2d  ace14_fixes.patch
 "
diff --git a/extra/aisleriot/aisleriot.SMBuild b/extra/aisleriot/aisleriot.SMBuild
index 572da51..469d648 100755
--- a/extra/aisleriot/aisleriot.SMBuild
+++ b/extra/aisleriot/aisleriot.SMBuild
@@ -1,20 +1,20 @@
-APP=aisleriot
-VERSION=3.22.9
-BUILD=1sml
-HOMEPAGE="https://wiki.gnome.org/Apps/Aisleriot"
-DOWNLOAD="https://gitlab.gnome.org/GNOME/aisleriot/-/archive/3.22.9/aisleriot-3.22.9.tar.bz2"
-DESC="Card games collection written in guile"
-REQUIRES="guile gtk3 libcanberra librsvg "
+app=aisleriot
+version=3.22.9
+build=1sml
+homepage="https://wiki.gnome.org/Apps/Aisleriot"
+download="https://gitlab.gnome.org/GNOME/aisleriot/-/archive/3.22.9/aisleriot-3.22.9.tar.bz2"
+desc="Card games collection written in guile"
+requires="guile gtk3 libcanberra librsvg "
 
 build() {
   mkandenterbuilddir
-  rm -rf $APP-$VERSION
+  rm -rf $app-$version
 
-  tar xf $SRCDIR/$APP-$VERSION.tar.?z* 
-  cd $APP-$VERSION 
+  tar xf $srcdir/$app-$version.tar.?z* 
+  cd $app-$version 
   fixbuilddirpermissions
 
-  patch -p1  < $SRCDIR/guile3.diff
+  patch -p1  < $srcdir/guile3.diff
 
   CONFIG_SHELL=bash \
   ./configure \
@@ -27,14 +27,14 @@ build() {
     --with-platform=gtk-only
 
   make
-  make install DESTDIR=$PKG 
+  make install DESTDIR=$pkg 
 
-  cp COPYING* $PKGDOCS/
+  cp COPYING* $pkgdocs/
 
   mkfinalpkg
 }
 
-SHA512SUMS="
+sha512sums="
 a93779fea92542caa29117bd76c3df524924fa8a0aae0ae2b4d831c311acbaa6c061cbb98e269937b694e99c98226d58e84ce266fe34cf4261602f4bb4e7906e  aisleriot-3.22.9.tar.xz
 637410e68bfaea366830d9d6e9ef3b2f03153b8406a209163c694d0a0e26b1f4bd87cfe1868c2ad25913ca73bdf75fbb1a00e001a053bfee286521c9e5d8feef  guile3.diff
 "
\ No newline at end of file
diff --git a/extra/audacious/audacious.SMBuild b/extra/audacious/audacious.SMBuild
index 5a0ab12..abeccac 100755
--- a/extra/audacious/audacious.SMBuild
+++ b/extra/audacious/audacious.SMBuild
@@ -1,17 +1,17 @@
-APP=audacious
-VERSION=4.0.2
-BUILD=1sml
-HOMEPAGE="http://www.audacious-media-player.org"
-DOWNLOAD=""
-DESC="Lightweight, advanced audio player focused on audio quality"
-REQUIRES="desktop-file-utils unzip hicolor-icon-theme gtk2 "
+app=audacious
+version=4.0.2
+build=1sml
+homepage="http://www.audacious-media-player.org"
+download=""
+desc="Lightweight, advanced audio player focused on audio quality"
+requires="desktop-file-utils unzip hicolor-icon-theme gtk2 "
 
 build() {
   mkandenterbuilddir
-  rm -rf $APP-$VERSION
+  rm -rf $app-$version
 
-  tar xf $SRCDIR/$APP-$VERSION.tar.?z*
-  cd $APP-$VERSION
+  tar xf $srcdir/$app-$version.tar.?z*
+  cd $app-$version
   fixbuilddirpermissions
 
   ./configure \
@@ -21,13 +21,13 @@ build() {
     --disable-qt
 
   make
-  make install DESTDIR=$PKG
+  make install DESTDIR=$pkg
 
-  cp COPYING $PKGDOCS/
+  cp COPYING $pkgdocs/
 
   mkfinalpkg
 }
 
-SHA512SUMS="
+sha512sums="
 74f65d4e7975357f1492a4169f2c5d710d71f0021851853f47acbd8ea8da9678fca8f0363eeb97072be73129e4676bf76c9adb8fa6db7dbcd0f9ca4113265702  audacious-4.0.2.tar.lz
 "
diff --git a/extra/blueman/blueman.SMBuild b/extra/blueman/blueman.SMBuild
index 437a602..af1d809 100755
--- a/extra/blueman/blueman.SMBuild
+++ b/extra/blueman/blueman.SMBuild
@@ -1,17 +1,17 @@
-APP=blueman
-VERSION=2.1.4
-BUILD=1sml
-HOMEPAGE="https://github.com/blueman-project/blueman"
-DOWNLOAD="https://github.com/blueman-project/blueman/archive/refs/tags/2.1.4.tar.gz"
-DESC="Graphical GTK+ Bluetooth Manager"
-REQUIRES="py3cairo pygobject3 cython"
+app=blueman
+version=2.1.4
+build=1sml
+homepage="https://github.com/blueman-project/blueman"
+download="https://github.com/blueman-project/blueman/archive/refs/tags/2.1.4.tar.gz"
+desc="Graphical GTK+ Bluetooth Manager"
+requires="py3cairo pygobject3 cython"
 
 build() {
   mkandenterbuilddir
-  rm -rf $APP-$VERSION
+  rm -rf $app-$version
 
-  tar xf $SRCDIR/$APP-$VERSION.tar.?z*
-  cd $APP-$VERSION
+  tar xf $srcdir/$app-$version.tar.?z*
+  cd $app-$version
   fixbuilddirpermissions
 
   ./configure \
@@ -25,15 +25,15 @@ build() {
     --disable-pulseaudio
 
   make
-  make install DESTDIR=$PKG 
+  make install DESTDIR=$pkg 
 
-  cp COPYING $PKGDOCS/
+  cp COPYING $pkgdocs/
 
-  rm -rfv $PKG/usr
+  rm -rfv $pkg/usr
 
   mkfinalpkg
 }
 
-SHA512SUMS="
+sha512sums="
 b8b54942092c1984cfac0cf73e2ac23f7693cb3ee0aa4cfaab1fa0282de4afd539f6860d5541523b542956b2efa31da3ec012dcc39d92fd699d0b8479df641ff  blueman-2.1.4.tar.xz
 "
diff --git a/extra/bluez/bluez.SMBuild b/extra/bluez/bluez.SMBuild
index 7722fa9..1ae1ca6 100755
--- a/extra/bluez/bluez.SMBuild
+++ b/extra/bluez/bluez.SMBuild
@@ -1,21 +1,21 @@
-APP=bluez
-VERSION=5.40
-BUILD=1sml
-HOMEPAGE="http://www.bluez.org"
-DOWNLOAD=""
-DESC="Bluetooth libraries and utilities"
-REQUIRES="libical alsa-lib json-c glib eudev dbus icu"
+app=bluez
+version=5.40
+build=1sml
+homepage="http://www.bluez.org"
+download=""
+desc="Bluetooth libraries and utilities"
+requires="libical alsa-lib json-c glib eudev dbus icu"
 
 build() {
   mkandenterbuilddir
-  rm -rf $APP-$VERSION
+  rm -rf $app-$version
 
-  tar xf $SRCDIR/$APP-$VERSION.tar.?z*
-  cd $APP-$VERSION
+  tar xf $srcdir/$app-$version.tar.?z*
+  cd $app-$version
   fixbuilddirpermissions
 
-  patch -p1 < $SRCDIR/bluez-5.30-obexd_without_systemd-1.patch
-  [ "$ARCH" = "aarch64" ] && patch -p1 < $SRCDIR/bluez-5.40-rpi-fixes.patch
+  patch -p1 < $srcdir/bluez-5.30-obexd_without_systemd-1.patch
+  [ "$ARCH" = "aarch64" ] && patch -p1 < $srcdir/bluez-5.40-rpi-fixes.patch
 
   sed -i -e 's|-lreadline|\0 -lncursesw|g' Makefile.{in,tools}
   autoreconf -vif
@@ -30,36 +30,36 @@ build() {
     --enable-deprecated 
 
   make 
-  make install DESTDIR=$PKG
+  make install DESTDIR=$pkg
 
-  cp COPYING* $PKGDOCS/
+  cp COPYING* $pkgdocs/
 
   # Use reset=1 for the btusb module, which supposedly fixes reconnect problems:
-  install -Dm 644 $SRCDIR/btusb.conf $PKG/etc/modprobe.d/btusb.conf
+  install -Dm 644 $srcdir/btusb.conf $pkg/etc/modprobe.d/btusb.conf
 
   # Install the configuration files
-  mkdir -p $PKG/etc/bluetooth $PKG/etc/default
-  cat src/main.conf > $PKG/etc/bluetooth/main.conf.new
-  cat profiles/input/input.conf > $PKG/etc/bluetooth/input.conf.new
-  cat profiles/network/network.conf > $PKG/etc/bluetooth/network.conf.new
-  cat profiles/proximity/proximity.conf > $PKG/etc/bluetooth/proximity.conf.new
+  mkdir -p $pkg/etc/bluetooth $pkg/etc/default
+  cat src/main.conf > $pkg/etc/bluetooth/main.conf.new
+  cat profiles/input/input.conf > $pkg/etc/bluetooth/input.conf.new
+  cat profiles/network/network.conf > $pkg/etc/bluetooth/network.conf.new
+  cat profiles/proximity/proximity.conf > $pkg/etc/bluetooth/proximity.conf.new
   
-  cat $SRCDIR/uart.conf > $PKG/etc/bluetooth/uart.conf.new
-  cat $SRCDIR/defaultconfig > $PKG/etc/default/bluetooth.new
+  cat $srcdir/uart.conf > $pkg/etc/bluetooth/uart.conf.new
+  cat $srcdir/defaultconfig > $pkg/etc/default/bluetooth.new
 
   if [ "$ARCH" = "aarch64" ]; then
-    cat $SRCDIR/uart.conf.pi3 > $PKG/etc/bluetooth/uart.conf.pi3.new
-    cat $SRCDIR/uart.conf.pi4 > $PKG/etc/bluetooth/uart.conf.pi4.new
-    install -Dm 644 $SRCDIR/100-bluetooth.rules $PKG/etc/udev/rules.d/100-bluetooth.rules
-    install -Dm 755 $SRCDIR/btuart $PKG/bin/btuart
+    cat $srcdir/uart.conf.pi3 > $pkg/etc/bluetooth/uart.conf.pi3.new
+    cat $srcdir/uart.conf.pi4 > $pkg/etc/bluetooth/uart.conf.pi4.new
+    install -Dm 644 $srcdir/100-bluetooth.rules $pkg/etc/udev/rules.d/100-bluetooth.rules
+    install -Dm 755 $srcdir/btuart $pkg/bin/btuart
   fi
 
-  install -Dm 755 $SRCDIR/rc.bluetooth $PKG/etc/rc.d/rc.bluetooth.new
+  install -Dm 755 $srcdir/rc.bluetooth $pkg/etc/rc.d/rc.bluetooth.new
  
   mkfinalpkg
 }
 
-SHA512SUMS="
+sha512sums="
 9f392eaabaef1104d09c8820350cb1c2e7fb09c13cfaa68742459c26d35e00a4aa860963dec345e1b48deba591f1ecebfa5131c7689b30129fd9f28dc4e5405e  bluez-5.40.tar.lz
 41ce7ccf78cca97563f0ef31e01dac6eb4484c24fe57be360b5e8de8c5bff5845e9d395766f891bd3f123788344456c88c9fc00cd1bb7c6a1dca89d09f19172b  bluez-5.30-obexd_without_systemd-1.patch
 bd6004cf97ade648fcaecc4c363e4d4c6ce2ac8ff66c66d66ec1b1ba445806e2163a765d04b70be97454b1e9cdfee26879bda34a7a197195c11834e1456e98b8  bluez-5.40-rpi-fixes.patch
diff --git a/extra/calcurse/calcurse.SMBuild b/extra/calcurse/calcurse.SMBuild
index f936e4e..47b5fdd 100755
--- a/extra/calcurse/calcurse.SMBuild
+++ b/extra/calcurse/calcurse.SMBuild
@@ -1,30 +1,30 @@
-APP=calcurse
-VERSION=4.0.0
-BUILD=1sml
-HOMEPAGE="https://calcurse.org/"
-DOWNLOAD="https://calcurse.org/files/calcurse-4.0.0.tar.gz"
-DESC="text-based calendar and scheduling application"
-REQUIRES="netbsd-curses"
+app=calcurse
+version=4.0.0
+build=1sml
+homepage="https://calcurse.org/"
+download="https://calcurse.org/files/calcurse-4.0.0.tar.gz"
+desc="text-based calendar and scheduling application"
+requires="netbsd-curses"
 
 build() {
   mkandenterbuilddir
-  rm -rf $APP-$VERSION
+  rm -rf $app-$version
 
-  tar xf $SRCDIR/$APP-$VERSION.tar.?z*
-  cd $APP-$VERSION
+  tar xf $srcdir/$app-$version.tar.?z*
+  cd $app-$version
   fixbuilddirpermissions
 
   ./configure \
     --prefix="" 
 
   make
-  make install DESTDIR=$PKG
+  make install DESTDIR=$pkg
 
-  cp COPYING $PKGDOCS/
+  cp COPYING $pkgdocs/
 
   mkfinalpkg
 }
 
-SHA512SUMS="
+sha512sums="
 a34b78437398160124d59e706aab2ff460fb726ad208ff05e8a2c404a21d9ab8b460aff9499eba239ccf82cf93dd0cf96d52ef22f597272e6d85c2ec6d5e3a3d  calcurse-4.0.0.tar.lz
 "
diff --git a/extra/cmatrix/cmatrix.SMBuild b/extra/cmatrix/cmatrix.SMBuild
index f1b4b89..a267707 100755
--- a/extra/cmatrix/cmatrix.SMBuild
+++ b/extra/cmatrix/cmatrix.SMBuild
@@ -1,17 +1,17 @@
-APP=cmatrix
-VERSION=2.0
-BUILD=1sml
-HOMEPAGE="https://github.com/abishekvashok/cmatrix"
-DOWNLOAD="https://github.com/abishekvashok/cmatrix/archive/refs/tags/v2.0.tar.gz"
-DESC="Terminal application that emulates The Matrix movie scroll lines on the screen"
-REQUIRES="netbsd-curses"
+app=cmatrix
+version=2.0
+build=1sml
+homepage="https://github.com/abishekvashok/cmatrix"
+download="https://github.com/abishekvashok/cmatrix/archive/refs/tags/v2.0.tar.gz"
+desc="Terminal application that emulates The Matrix movie scroll lines on the screen"
+requires="netbsd-curses"
 
 build() {
   mkandenterbuilddir
-  rm -rf $APP-$VERSION
+  rm -rf $app-$version
 
-  tar xf $SRCDIR/$APP-$VERSION.tar.?z*
-  cd $APP-$VERSION
+  tar xf $srcdir/$app-$version.tar.?z*
+  cd $app-$version
   fixbuilddirpermissions
 
   autoreconf -vif
@@ -21,13 +21,13 @@ build() {
     --sysconfdir=/etc
 
   make 
-  make install DESTDIR=$PKG
+  make install DESTDIR=$pkg
 
-  cp COPYING $PKGDOCS/
+  cp COPYING $pkgdocs/
 
   mkfinalpkg
 }
 
-SHA512SUMS="
+sha512sums="
 1aeecd8e8abb6f87fc54f88a8c25478f69d42d450af782e73c0fca7f051669a415c0505ca61c904f960b46bbddf98cfb3dd1f9b18917b0b39e95d8c899889530  cmatrix-2.0.tar.gz
 "
diff --git a/extra/cmus/cmus.SMBuild b/extra/cmus/cmus.SMBuild
index 2349633..e74014f 100755
--- a/extra/cmus/cmus.SMBuild
+++ b/extra/cmus/cmus.SMBuild
@@ -1,32 +1,32 @@
-APP=cmus
-VERSION=2.8.0
-BUILD=1sml
-HOMEPAGE="https://cmus.github.io/"
-DOWNLOAD="https://github.com/cmus/cmus/archive/v2.8.0.tar.gz"
-DESC="Fast text-mode music player"
-REQUIRES="faad2 flac libao libsamplerate ffmpeg"
+app=cmus
+version=2.8.0
+build=1sml
+homepage="https://cmus.github.io/"
+download="https://github.com/cmus/cmus/archive/v2.8.0.tar.gz"
+desc="Fast text-mode music player"
+requires="faad2 flac libao libsamplerate ffmpeg"
 
 build() {
   mkandenterbuilddir
-  rm -rf $APP-$VERSION
+  rm -rf $app-$version
 
-  tar xf $SRCDIR/$APP-$VERSION.tar.?z* 
-  cd $APP-$VERSION 
+  tar xf $srcdir/$app-$version.tar.?z* 
+  cd $app-$version 
   fixbuilddirpermissions
 
   ./configure \
     prefix="" \
-    exampledir="/doc/$APP-$VERSION/examples" \
+    exampledir="/doc/$app-$version/examples" \
   DEBUG=0
 
   make
-  make install DESTDIR=$PKG 
+  make install DESTDIR=$pkg 
 
-  cp COPYING $PKGDOCS/
+  cp COPYING $pkgdocs/
 
   mkfinalpkg
 }
 
-SHA512SUMS="
+sha512sums="
 471ca1a87792c5a63f56815b24c6d6d3237dc4ce18485dbada9010fa281c0d49b6282fb04e9274dd8ecfd2ade94e5fc6688701aa4479cb43e93d07f720e67785  cmus-2.8.0.tar.lz
 "
diff --git a/extra/dia/dia.SMBuild b/extra/dia/dia.SMBuild
index 4e5ba5e..c633350 100755
--- a/extra/dia/dia.SMBuild
+++ b/extra/dia/dia.SMBuild
@@ -1,22 +1,22 @@
-APP=dia
-VERSION=0.97.3
-BUILD=1sml
-HOMEPAGE="https://wiki.gnome.org/Apps/Dia"
-DOWNLOAD="https://download.gnome.org/sources/dia/0.97/dia-0.97.3.tar.xz"
-DESC="Diagram creation app written in GTK2"
-REQUIRES="gtk2"
+app=dia
+version=0.97.3
+build=1sml
+homepage="https://wiki.gnome.org/Apps/Dia"
+download="https://download.gnome.org/sources/dia/0.97/dia-0.97.3.tar.xz"
+desc="Diagram creation app written in GTK2"
+requires="gtk2"
 
 build() {
   mkandenterbuilddir
-  rm -rf $APP-$VERSION
+  rm -rf $app-$version
 
-  tar xf $SRCDIR/$APP-$VERSION.tar.?z**
-  cd $APP-$VERSION 
+  tar xf $srcdir/$app-$version.tar.?z**
+  cd $app-$version 
   fixbuilddirpermissions
 
-  patch -p1 < $SRCDIR/CVE-2019-19451.patch
-  patch -p1 < $SRCDIR/dia-unregister-import.patch
-  patch -p1 < $SRCDIR/isinf.patch
+  patch -p1 < $srcdir/CVE-2019-19451.patch
+  patch -p1 < $srcdir/dia-unregister-import.patch
+  patch -p1 < $srcdir/isinf.patch
 
   ./configure \
     --prefix="" \
@@ -26,14 +26,14 @@ build() {
     --disable-nls
 
   make || true
-  make install DESTDIR=$PKG || true
+  make install DESTDIR=$pkg || true
 
-  cp COPYING $PKGDOCS
+  cp COPYING $pkgdocs
 
   mkfinalpkg
 }
 
-SHA512SUMS="
+sha512sums="
 3f798a1ad88cc73be0f3da1981d8766c9d03e2765904c7b883a06d88beca952b7a3b87e8d4a26556d07c8a4afc89c8c4dd8e8fe96ebc2787fe97203ec6cb389b  dia-0.97.3.tar.lz
 c78b78bd4ce7bfab9babfc887fb98571849246d1ca78e6c69a4413c7881d30358e1287bd9b0d9ba50cbcc540cf5f0e28333b31f467dbe5579ad5c97148b3b512  CVE-2019-19451.patch
 24267507ff08ac589ec1015e55637586a9fd97802893a77849d1e7bce67135fbd3d55611e2c80be1d5f87b92406c95cd5fe484175037297ebe1dbc8eb509a7d4  dia-unregister-import.patch
diff --git a/extra/dmenu/dmenu.SMBuild b/extra/dmenu/dmenu.SMBuild
index ba3b77f..75a7dc4 100755
--- a/extra/dmenu/dmenu.SMBuild
+++ b/extra/dmenu/dmenu.SMBuild
@@ -1,27 +1,27 @@
-APP=dmenu
-VERSION=4.5
-BUILD=1sml
-HOMEPAGE="http://tools.suckless.org/dmenu"
-DOWNLOAD="https://dl.suckless.org/tools/dmenu-4.5.tar.gz"
-DESC="Dynamic menu for X"
-REQUIRES="libxext libxinerama"
+app=dmenu
+version=4.5
+build=1sml
+homepage="http://tools.suckless.org/dmenu"
+download="https://dl.suckless.org/tools/dmenu-4.5.tar.gz"
+desc="Dynamic menu for X"
+requires="libxext libxinerama"
 
 build() {
   mkandenterbuilddir
-  rm -rf $APP-$VERSION
+  rm -rf $app-$version
 
-  tar xf $SRCDIR/$APP-$VERSION.tar.?z*
-  cd $APP-$VERSION
+  tar xf $srcdir/$app-$version.tar.?z*
+  cd $app-$version
   fixbuilddirpermissions
 
   make
-  make install PREFIX="/" MANPREFIX=/share/man DESTDIR=$PKG
+  make install PREFIX="/" MANPREFIX=/share/man DESTDIR=$pkg
 
-  cp LICENSE $PKGDOCS/
+  cp LICENSE $pkgdocs/
 
   mkfinalpkg
 }
 
-SHA512SUMS="
+sha512sums="
 3a3acd9072b7e558e0f8b3bc69e4a63e9ac6918bac6b4c408c489ebc5c66542c5d29f249a06250f2e4cd9df81a4059aeef43153e793653f27a800193f4714b88  dmenu-4.5.tar.lz
 "
diff --git a/extra/dwm/dwm.SMBuild b/extra/dwm/dwm.SMBuild
index 56c9498..1777297 100755
--- a/extra/dwm/dwm.SMBuild
+++ b/extra/dwm/dwm.SMBuild
@@ -1,27 +1,27 @@
-APP=dwm
-VERSION=6.0
-BUILD=1sml
-HOMEPAGE="https://dwm.suckless.org"
-DOWNLOAD="https://dl.suckless.org/dwm/dwm-6.0.tar.gz"
-DESC="Suckless dynamic window manager"
-REQUIRES="libxinerama libxext"
+app=dwm
+version=6.0
+build=1sml
+homepage="https://dwm.suckless.org"
+download="https://dl.suckless.org/dwm/dwm-6.0.tar.gz"
+desc="Suckless dynamic window manager"
+requires="libxinerama libxext"
 
 build() {
   mkandenterbuilddir
-  rm -rf $APP-$VERSION
+  rm -rf $app-$version
 
-  tar xf $SRCDIR/$APP-$VERSION.tar.?z*
-  cd $APP-$VERSION
+  tar xf $srcdir/$app-$version.tar.?z*
+  cd $app-$version
   fixbuilddirpermissions
 
   make
-  make install PREFIX="/" MANPREFIX=/share/man DESTDIR=$PKG 
+  make install PREFIX="/" MANPREFIX=/share/man DESTDIR=$pkg 
 
-  cp LICENSE $PKGDOCS/
+  cp LICENSE $pkgdocs/
 
   mkfinalpkg
 }
 
-SHA512SUMS="
+sha512sums="
 4db1c21d87b030236c381209ed56eedd15f47faf225a33ffa240f82612b9e0ec0287fa3c7c3e446704416032ae7c52559b482db9f60500ec0d6f5ad88328066a  dwm-6.0.tar.lz
 "
diff --git a/extra/fceux/fceux.SMBuild b/extra/fceux/fceux.SMBuild
index 3185c7f..7430f10 100755
--- a/extra/fceux/fceux.SMBuild
+++ b/extra/fceux/fceux.SMBuild
@@ -1,17 +1,17 @@
-APP=fceux
-VERSION=2.2.3
-BUILD=1sml
-HOMEPAGE="https://github.com/TASEmulators/fceux"
-DOWNLOAD="https://github.com/TASEmulators/fceux/archive/refs/tags/fceux-2.2.3.tar.gz"
-DESC="An 8-bit NES emulator based on FCE Ultra"
-REQUIRES="libgd gtk2"
+app=fceux
+version=2.2.3
+build=1sml
+homepage="https://github.com/TASEmulators/fceux"
+download="https://github.com/TASEmulators/fceux/archive/refs/tags/fceux-2.2.3.tar.gz"
+desc="An 8-bit NES emulator based on FCE Ultra"
+requires="libgd gtk2"
 
 build() {
   mkandenterbuilddir
-  rm -rf $APP-$VERSION
+  rm -rf $app-$version
 
-  tar xf $SRCDIR/$APP-$VERSION.tar.?z*
-  cd $APP-$VERSION
+  tar xf $srcdir/$app-$version.tar.?z*
+  cd $app-$version
   fixbuilddirpermissions
 
   # cc/gcc should either be in /bin or /usr/bin else the SCostruct file in 
@@ -19,26 +19,26 @@ build() {
   # though zlib is there. 
   # g++ is needed in /bin or /usr/bin else midway compile will fail.
 
-  patch -p1 < $SRCDIR/ioapi.patch
-  patch -p1 < $SRCDIR/scons-python3.patch
+  patch -p1 < $srcdir/ioapi.patch
+  patch -p1 < $srcdir/scons-python3.patch
 
   sed -i \
    -e "s|symbols', 1|symbols', 0|" \
    -e "s|release', 0|release', 1|" \
    SConstruct
 
-  scons install -i --prefix=$PKG
+  scons install -i --prefix=$pkg
 
   # Delete low res icon and replace below, also delete unneeded .dll files
-  #rm -f $PKG/usr/share/pixmaps/fceux.png
-  #rm -f $PKG/usr/share/$PRGNAME/*.dll
+  #rm -f $pkg/usr/share/pixmaps/fceux.png
+  #rm -f $pkg/usr/share/$PRGNAME/*.dll
 
-  cp COPYING $PKGDOCS/
+  cp COPYING $pkgdocs/
 
   mkfinalpkg
 }
 
-SHA512SUMS="
+sha512sums="
 cd8053f0cef3df30e3d009bf0a53ef59d9fa2b342d03300a75caafb0591e62a6bfbc6c12b3efe72e0aba050dc58e401daf54298328979e5b1b9552a91b1d1459  fceux-2.2.3.tar.lz
 799b42272c637c90e7389b7907e9d36956a0640366d80ea71a4416237178461f4f39b863c230f878b0adfa7ceec4ed2379b58e07dcecd2c49269739e3e158c03  ioapi.patch
 2c2cf6d7eac03a4cf7f66118e0f8af9562eb5497c2e3159952eced1edee5f38c983ede704536eade645f5c028635b8ff0ceca8769dcf0d50b3159a1666660ae0  scons-python3.patch
diff --git a/extra/feh/feh.SMBuild b/extra/feh/feh.SMBuild
index 4fee76b..25506a2 100755
--- a/extra/feh/feh.SMBuild
+++ b/extra/feh/feh.SMBuild
@@ -1,33 +1,33 @@
-APP=feh
-VERSION=3.1.1
-BUILD=1sml
-HOMEPAGE="https://feh.finalrewind.org"
-HOMEPAGE="https://feh.finalrewind.org/feh-3.1.1.tar.bz2"
-DESC="Fast and lightweight image viewer for X"
-REQUIRES="curl imlib2 libexif libxinerama libxt "
+app=feh
+version=3.1.1
+build=1sml
+homepage="https://feh.finalrewind.org"
+homepage="https://feh.finalrewind.org/feh-3.1.1.tar.bz2"
+desc="Fast and lightweight image viewer for X"
+requires="curl imlib2 libexif libxinerama libxt "
 
 build() {
   mkandenterbuilddir
-  rm -rf $APP-$VERSION
+  rm -rf $app-$version
 
-  tar xf $SRCDIR/$APP-$VERSION.tar.?z*
-  cd $APP-$VERSION
+  tar xf $srcdir/$app-$version.tar.?z*
+  cd $app-$version
   fixbuilddirpermissions
 
   CFLAGS="$CFLAGS -D_GNU_SOURCE -include string.h" \
   make PREFIX="/" \
   exif=1 help=1
 
-  make install DESTDIR=$PKG PREFIX="/" \
-   man_dir=$PKG/share/man \
-   doc_dir=$PKG/doc/$APP-$VERSION \
-   example_dir=$PKG/doc/$APP-$VERSION/examples
+  make install DESTDIR=$pkg PREFIX="/" \
+   man_dir=$pkg/share/man \
+   doc_dir=$pkg/doc/$app-$version \
+   example_dir=$pkg/doc/$app-$version/examples
 
-  cp COPYING $PKGDOCS/
+  cp COPYING $pkgdocs/
 
   mkfinalpkg
 }
 
-SHA512SUMS="
+sha512sums="
 b1a20463c9c54212f51af0af98d762dc1d1c774105c69b9c21a04b3835b817af47a5efd1c2ff741cc596c53844d09c20c979d606a82a1915aa4ad2cdf2a3fca4  feh-3.1.1.tar.lz
 "
diff --git a/extra/ffmpeg/ffmpeg.SMBuild b/extra/ffmpeg/ffmpeg.SMBuild
index f79a4d6..3940852 100755
--- a/extra/ffmpeg/ffmpeg.SMBuild
+++ b/extra/ffmpeg/ffmpeg.SMBuild
@@ -1,17 +1,17 @@
-APP=ffmpeg
-VERSION=4.3
-BUILD=1sml
-HOMEPAGE="https://ffmpeg.org/"
-DOWNLOAD="https://ffmpeg.org/releases/ffmpeg-4.3.tar.xz"
-DESC="Software to record, convert and stream audio and video"
-REQUIRES="libass libdrm freetype fribidi libmodplug opus lame mpg123 soxr libtheora libvorbis libvpx libxml2 libwebp wavpack sdl2 twolame librsvg libcdio openjpeg"
+app=ffmpeg
+version=4.3
+build=1sml
+homepage="https://ffmpeg.org/"
+download="https://ffmpeg.org/releases/ffmpeg-4.3.tar.xz"
+desc="Software to record, convert and stream audio and video"
+requires="libass libdrm freetype fribidi libmodplug opus lame mpg123 soxr libtheora libvorbis libvpx libxml2 libwebp wavpack sdl2 twolame librsvg libcdio openjpeg"
 
 build() {
   mkandenterbuilddir
-  rm -rf $APP-$VERSION
+  rm -rf $app-$version
 
-  tar xf $SRCDIR/$APP-$VERSION.tar.?z*
-  cd $APP-$VERSION 
+  tar xf $srcdir/$app-$version.tar.?z*
+  cd $app-$version 
   fixbuilddirpermissions
 
   ./configure \
@@ -53,13 +53,13 @@ build() {
   
   # For some reason ffmpeg's make does not pick up MAKEFLAGS from the env
   make $MAKEFLAGS
-  make install DESTDIR=$PKG 
+  make install DESTDIR=$pkg 
 
-  cp LICENSE.md COPYING* $PKGDOCS/
+  cp LICENSE.md COPYING* $pkgdocs/
  
   mkfinalpkg
 }
 
-SHA512SUMS="
+sha512sums="
 12cc3a9337f6d9e1c7a63120f3fd8a92e5ac6031e9ba8893dc6b4b799befed08d54983b088e711705629b9a8fea9c6ada4887e845b1d0166e78a778b239af896  ffmpeg-4.3.tar.lz
 "
diff --git a/extra/ffmpegthumbnailer/ffmpegthumbnailer.SMBuild b/extra/ffmpegthumbnailer/ffmpegthumbnailer.SMBuild
index 17ef88c..c33b459 100755
--- a/extra/ffmpegthumbnailer/ffmpegthumbnailer.SMBuild
+++ b/extra/ffmpegthumbnailer/ffmpegthumbnailer.SMBuild
@@ -1,17 +1,17 @@
-APP=ffmpegthumbnailer
-VERSION=2.2.2
-BUILD=1sml
-HOMEPAGE="https://github.com/dirkvdb/ffmpegthumbnailer/"
-DOWNLOAD="https://github.com/dirkvdb/ffmpegthumbnailer/archive/refs/tags/2.2.2.tar.gz"
-DESC="Utility to create video thumbnails for file managers"
-REQUIRES="cmake libpng libjpeg-turbo ffmpeg"
+app=ffmpegthumbnailer
+version=2.2.2
+build=1sml
+homepage="https://github.com/dirkvdb/ffmpegthumbnailer/"
+download="https://github.com/dirkvdb/ffmpegthumbnailer/archive/refs/tags/2.2.2.tar.gz"
+desc="Utility to create video thumbnails for file managers"
+requires="cmake libpng libjpeg-turbo ffmpeg"
 
 build() {
   mkandenterbuilddir
-  rm -rf $APP-$VERSION
+  rm -rf $app-$version
 
-  tar xf $SRCDIR/$APP-$VERSION.tar.?z*
-  cd $APP-$VERSION
+  tar xf $srcdir/$app-$version.tar.?z*
+  cd $app-$version
   fixbuilddirpermissions
   
   mkdir -p smbuild && cd smbuild
@@ -24,13 +24,13 @@ build() {
     -DENABLE_THUMBNAILER=True
 
   make
-  make install DESTDIR=$PKG
+  make install DESTDIR=$pkg
 
-  cp ../COPYING $PKGDOCS/
+  cp ../COPYING $pkgdocs/
 
   mkfinalpkg
 }
 
-SHA512SUMS="
+sha512sums="
 cbfb8ce4eebb0331260b060592322566075862182bc6f4b7410e686b4260395ea64ab341330212bcd08b1889f4fc9da13bf50b45ce800466d5d1e05a08cc722e  ffmpegthumbnailer-2.2.2.tar.lz
 "
diff --git a/extra/florence/florence.SMBuild b/extra/florence/florence.SMBuild
index 6707b02..1c92993 100755
--- a/extra/florence/florence.SMBuild
+++ b/extra/florence/florence.SMBuild
@@ -1,17 +1,17 @@
-APP=florence
-VERSION=0.6.3
-BUILD=1sml
-HOMEPAGE="http://florence.sourceforge.net/"
-DOWNLOAD="https://downloads.sourceforge.net/project/florence/florence/0.6.3/florence-0.6.3.tar.bz2"
-DESC="Virtual keyboard for X"
-REQUIRES="glib libxext librsvg libxml2 dbus gtk3 zlib pango cairo gdk-pixbuf gstreamer"
+app=florence
+version=0.6.3
+build=1sml
+homepage="http://florence.sourceforge.net/"
+download="https://downloads.sourceforge.net/project/florence/florence/0.6.3/florence-0.6.3.tar.bz2"
+desc="Virtual keyboard for X"
+requires="glib libxext librsvg libxml2 dbus gtk3 zlib pango cairo gdk-pixbuf gstreamer"
 
 build() {
   mkandenterbuilddir
-  rm -rf $APP-$VERSION
+  rm -rf $app-$version
 
-  tar xf $SRCDIR/$APP-$VERSION.tar.?z*
-  cd $APP-$VERSION
+  tar xf $srcdir/$app-$version.tar.?z*
+  cd $app-$version
   fixbuilddirpermissions
 
   ./configure \
@@ -20,13 +20,13 @@ build() {
     --disable-static
 
   make || true
-  make install DESTDIR=$PKG 
+  make install DESTDIR=$pkg 
 
-  cp COPYING* $PKGDOCS/
+  cp COPYING* $pkgdocs/
 
   mkfinalpkg
 }
 
-SHA512SUMS="
+sha512sums="
 947ef1d5670ceb5b3050311ca15143335abd49660c3f058ac441d153d49a25bc003f6d0f2610c2199048bec7000f8e19ae27f486cfb233471db05e664b3569ef  florence-0.6.3.tar.lz
 "
diff --git a/extra/freerdp/freerdp.SMBuild b/extra/freerdp/freerdp.SMBuild
index b39fa84..b4cd5ff 100755
--- a/extra/freerdp/freerdp.SMBuild
+++ b/extra/freerdp/freerdp.SMBuild
@@ -1,17 +1,17 @@
-APP=freerdp
-VERSION=2.2.0
-BUILD=1sml
-HOMEPAGE="https://www.freerdp.com"
-DOWNLOAD="https://pub.freerdp.com/releases/freerdp-2.2.0.tar.gz"
-DESC="Free implementation of the RDP protocol"
-REQUIRES=""
+app=freerdp
+version=2.2.0
+build=1sml
+homepage="https://www.freerdp.com"
+download="https://pub.freerdp.com/releases/freerdp-2.2.0.tar.gz"
+desc="Free implementation of the RDP protocol"
+requires="libusb alsa-lib ffmpeg gdk-pixbuf graphite2"
 
 build() {
   mkandenterbuilddir
-  rm -rf FreeRDP-$VERSION
+  rm -rf FreeRDP-$version
 
-  tar xf $SRCDIR/FreeRDP-$VERSION.tar.?z*
-  cd FreeRDP-$VERSION 
+  tar xf $srcdir/FreeRDP-$version.tar.?z*
+  cd FreeRDP-$version 
   fixbuilddirpermissions
 
   mkdir -p smbuild && cd smbuild
@@ -36,13 +36,13 @@ build() {
     -Wno-dev 
 
   make
-  make install DESTDIR=$PKG 
+  make install DESTDIR=$pkg 
 
-  cp ../LICENSE $PKGDOCS/
+  cp ../LICENSE $pkgdocs/
 
   mkfinalpkg
 }
 
-SHA512SUMS="
+sha512sums="
 e14185db3f9e9900427c3149eef872ab9939ac33e307f7e7c73323e463f05b87f9ee8e6157a38a6dcb3d859039dd220b42b4a470c2d8b6c58045092960102135  FreeRDP-2.2.0.tar.lz
 "
diff --git a/extra/galculator/galculator.SMBuild b/extra/galculator/galculator.SMBuild
index d352313..fc1b88b 100755
--- a/extra/galculator/galculator.SMBuild
+++ b/extra/galculator/galculator.SMBuild
@@ -1,33 +1,33 @@
-APP=galculator
-VERSION=2.1.4
-BUILD=1sml
-HOMEPAGE="http://galculator.mnim.org/"
-DOWNLOAD="http://galculator.mnim.org/downloads/galculator-2.1.4.tar.bz2"
-DESC="GTK calculator for GNOME"
-REQUIRES="intltool gtk2 graphite2"
+app=galculator
+version=2.1.4
+build=1sml
+homepage="http://galculator.mnim.org/"
+download="http://galculator.mnim.org/downloads/galculator-2.1.4.tar.bz2"
+desc="GTK calculator for GNOME"
+requires="intltool gtk2 graphite2"
 
 build() {
   mkandenterbuilddir
-  rm -rf $APP-$VERSION
+  rm -rf $app-$version
 
-  tar xf $SRCDIR/$APP-$VERSION.tar.?z*
-  cd $APP-$VERSION
+  tar xf $srcdir/$app-$version.tar.?z*
+  cd $app-$version
   fixbuilddirpermissions
 
   ./configure \
     --prefix="" \
     --disable-gtk3 \
     --disable-nls \
-    $BUILDDIST
+    $builddist
 
   make
-  make install DESTDIR=$PKG
+  make install DESTDIR=$pkg
 
-  cp COPYING $PKGDOCS/
+  cp COPYING $pkgdocs/
 
   mkfinalpkg
 }
 
-SHA512SUMS="
+sha512sums="
 909efb8cd5bc9fd4997a9025106656ce13b83b1dbfa039822f01421c6cfe46b57dbf683743a5d60be606fa1d80cf9bdf86ad37bb676592d0c637e964058a0904  galculator-2.1.4.tar.lz
 "
diff --git a/extra/gftp/gftp.SMBuild b/extra/gftp/gftp.SMBuild
index cc0dab3..3f1f3ab 100755
--- a/extra/gftp/gftp.SMBuild
+++ b/extra/gftp/gftp.SMBuild
@@ -1,38 +1,38 @@
-APP=gftp
-VERSION=2.0.19
-BUILD=1sml
-HOMEPAGE="https://github.com/masneyb/gftp"
-DOWNLOAD="https://github.com/masneyb/gftp/archive/refs/tags/2.0.19.tar.gz"
-DESC="Multi-threaded GTK FTP client for X"
-REQUIRES="openssl gtk2"
+app=gftp
+version=2.0.19
+build=1sml
+homepage="https://github.com/masneyb/gftp"
+download="https://github.com/masneyb/gftp/archive/refs/tags/2.0.19.tar.gz"
+desc="Multi-threaded GTK FTP client for X"
+requires="openssl gtk2"
 
 build() {
   mkandenterbuilddir
-  rm -rf $APP-$VERSION
+  rm -rf $app-$version
 
-  tar xf $SRCDIR/$APP-$VERSION.tar.?z*
-  cd $APP-$VERSION 
+  tar xf $srcdir/$app-$version.tar.?z*
+  cd $app-$version 
   fixbuilddirpermissions
 
-  patch -p1 < $SRCDIR/gftp.glibc-2.30.diff
-  patch -p1 < $SRCDIR/gftp.expand.path.sigsegv.diff
-  patch -p1 < $SRCDIR/gftp.desktop.diff
-  patch -p1 < $SRCDIR/fsplib.h.patch 
+  patch -p1 < $srcdir/gftp.glibc-2.30.diff
+  patch -p1 < $srcdir/gftp.expand.path.sigsegv.diff
+  patch -p1 < $srcdir/gftp.desktop.diff
+  patch -p1 < $srcdir/fsplib.h.patch 
 
   ./configure \
     --prefix="" \
     --sysconfdir=/etc \
-    $BUILDDIST
+    $builddist
 
   make
-  make install DESTDIR=$PKG
+  make install DESTDIR=$pkg
 
-  cp COPYING $PKGDOCS/
+  cp COPYING $pkgdocs/
 
   mkfinalpkg
 }
 
-SHA512SUMS="
+sha512sums="
 5331b62a6e10bcc7cd7e12143ea8d0b0de517c77ba676d8981a9c1419e026dda7ce9d7155730e37deecb62ef96bff8db09a756b39bfcd4772bde72a88e6440b4  gftp-2.0.19.tar.lz
 1e3a84244920eeeed3a35d7d80bc66cdf5226e56e9a8b2d069f2d9d94ee2b2013823dbc0a7ed24f8a06193b81ae876001c06575d627f68ffc1ea58298b22e9ce  fsplib.h.patch
 0315ca0bcf5cecb6059481a4260dc17ea885b66460da4b6c9ec545c1f7a7ca095f2de8d628ad89de6d4b74b5eedf44d469c101f54bdafabb627995d40e0838af  gftp.desktop.diff
diff --git a/extra/gimp/gimp.SMBuild b/extra/gimp/gimp.SMBuild
index 9662937..0a3ed59 100755
--- a/extra/gimp/gimp.SMBuild
+++ b/extra/gimp/gimp.SMBuild
@@ -1,17 +1,17 @@
-APP=gimp
-VERSION=2.8.22
-BUILD=1sml
-HOMEPAGE="https://www.gimp.org/"
-DOWNLOAD="https://download.gimp.org/mirror/pub/gimp/v2.8/gimp-2.8.22.tar.bz2"
-DESC="The GNU Image Manipulation Program"
-REQUIRES="libexif alsa-lib curl libgudev babl gtk2 dbus-glib gegl glib-networking hicolor-icon-theme lcms2 libwebp openjpeg"
+app=gimp
+version=2.8.22
+build=1sml
+homepage="https://www.gimp.org/"
+download="https://download.gimp.org/mirror/pub/gimp/v2.8/gimp-2.8.22.tar.bz2"
+desc="The GNU Image Manipulation Program"
+requires="libexif alsa-lib curl libgudev babl gtk2 dbus-glib gegl glib-networking hicolor-icon-theme lcms2 libwebp openjpeg"
 
 build() {
   mkandenterbuilddir
-  rm -rf $APP-$VERSION
+  rm -rf $app-$version
 
-  tar xf $SRCDIR/$APP-$VERSION.tar.?z*
-  cd $APP-$VERSION
+  tar xf $srcdir/$app-$version.tar.?z*
+  cd $app-$version
   fixbuilddirpermissions
 
   # We might have an issue with pagecurl causing gimp to segfault
@@ -20,7 +20,7 @@ build() {
 
   # credits: sabotage linux
 
-  patch -p1 < $SRCDIR/gimp-toolbox-wilber.patch
+  patch -p1 < $srcdir/gimp-toolbox-wilber.patch
   sed -i 's@^[[:space:]]*-I$(includedir)@@' $(find . -name Makefile.in)
   sed -i 's@^libgimpui = .*$@libgimpui = $(top_builddir)/libgimp/libgimpui-$(GIMP_API_VERSION).la $(top_builddir)/libgimpmodule/libgimpmodule-$(GIMP_API_VERSION).la@' $(find plug-ins/ -name Makefile.in)
   printf '#!/bin/sh\necho -lfreetype -I/usr/include/freetype2\n' > freetype-config
@@ -45,14 +45,14 @@ build() {
   done    
 
   make
-  make install DESTDIR=$PKG
+  make install DESTDIR=$pkg
 
-  cp COPYING $PKGDOCS/
+  cp COPYING $pkgdocs/
 
   mkfinalpkg
 }
 
-SHA512SUMS="
+sha512sums="
 b54b7c2788ce4f55887d7c4dbdd4879754b313cab813e1e5cda28419f41e16ed0eafb112763bc865a989634b290d6317b85bf70108977f9819f475f8f36dbc85  gimp-2.8.22.tar.lz
 c1cea444156555bfe0c5d3a20733e04fb15a4ddaf0fd3f6f814d12bef554f3598ef9a27cd171df70e069e57f8d4fe661d8ef1691fef2ff7e44937cbb46e579b7  gimp-toolbox-wilber.patch
 "
diff --git a/extra/gnuchess/gnuchess.SMBuild b/extra/gnuchess/gnuchess.SMBuild
index bc33af5..b4f08b1 100755
--- a/extra/gnuchess/gnuchess.SMBuild
+++ b/extra/gnuchess/gnuchess.SMBuild
@@ -1,19 +1,19 @@
-APP=gnuchess
-VERSION=6.2.6
+app=gnuchess
+version=6.2.6
 JENGVER=11.2
 XBOARDVER=4.9.1
-BUILD=1sml
-HOMEPAGE="https://www.gnu.org/software/chess/"
-DOWNLOAD="http://ftp.gnu.org/gnu/chess/gnuchess-6.2.6.tar.gz"
-DESC="GPL licensed chess engines and graphical frontends"
-REQUIRES="gcc-libs gdbm gtk2 graphite2 libpng netbsd-curses gobject-introspection"
+build=1sml
+homepage="https://www.gnu.org/software/chess/"
+download="http://ftp.gnu.org/gnu/chess/gnuchess-6.2.6.tar.gz"
+desc="GPL licensed chess engines and graphical frontends"
+requires="gcc-libs gdbm gtk2 graphite2 libpng netbsd-curses gobject-introspection"
 
 build() {
   mkandenterbuilddir
-  rm -rf gnuchess-$VERSION
+  rm -rf gnuchess-$version
 
-  tar xf $SRCDIR/gnuchess-$VERSION.tar.?z* 
-  cd gnuchess-$VERSION 
+  tar xf $srcdir/gnuchess-$version.tar.?z* 
+  cd gnuchess-$version 
   fixbuilddirpermissions
 
   ./configure \
@@ -21,14 +21,14 @@ build() {
     --sysconfdir=/etc 
 
   make
-  make install DESTDIR=$PKG 
+  make install DESTDIR=$pkg 
 
-  cp COPYING $PKGDOCS/COPYING.gnuchess
+  cp COPYING $pkgdocs/COPYING.gnuchess
 
   mkandenterbuilddir
   rm -rf Sjeng-Free-$JENGVER
 
-  tar xf $SRCDIR/Sjeng-Free-$JENGVER.tar.?z*
+  tar xf $srcdir/Sjeng-Free-$JENGVER.tar.?z*
   cd Sjeng-Free-$JENGVER
   fixbuilddirpermissions
 
@@ -36,15 +36,15 @@ build() {
     --prefix=""
 
   make
-  make install DESTDIR=$PKG
+  make install DESTDIR=$pkg
 
   mkandenterbuilddir
   rm -rf xboard-$XBOARDVER
-  tar xf $SRCDIR/xboard-$XBOARDVER.tar.?z*
+  tar xf $srcdir/xboard-$XBOARDVER.tar.?z*
   cd xboard-$XBOARDVER
   fixbuilddirpermissions
 
-  patch -p1 < $SRCDIR/xboard.conf.diff
+  patch -p1 < $srcdir/xboard.conf.diff
 
   ./configure \
     --prefix="" \
@@ -53,19 +53,19 @@ build() {
     --enable-zippy
 
   make 
-  make install DESTDIR=$PKG
-  install -c cmail $PKG/bin/cmail
-  install -Dm 644 $SRCDIR/chess.png $PKG/share/pixmaps/chess.png
+  make install DESTDIR=$pkg
+  install -c cmail $pkg/bin/cmail
+  install -Dm 644 $srcdir/chess.png $pkg/share/pixmaps/chess.png
 
-  cp COPYING $PKGDOCS/COPYING.xboard
-  cp COPYRIGHT $PKGDOCS/COPYRIGHT.xboard
+  cp COPYING $pkgdocs/COPYING.xboard
+  cp COPYRIGHT $pkgdocs/COPYRIGHT.xboard
 
-  mv $PKG/etc/xboard.conf $PKG/etc/xboard.conf.new
+  mv $pkg/etc/xboard.conf $pkg/etc/xboard.conf.new
 
   mkfinalpkg
 }
 
-SHA512SUMS="
+sha512sums="
 2a42baee5c64a8083e587fa0c748beac5a08906e95d46c7343955b336124f1fb560e8284a36d595839a190e9f784fe1f9d1cf7e79601373bbec05c4433108471  Sjeng-Free-11.2.tar.lz
 d6adb251eeea0f1f962955dee1f0125e3e76893f6a6c30e774bd496515334572c8e906ac8cad140e1950fcc40cfe88ac05fbae8b08595acd7b86722e486ebae9  gnuchess-6.2.6.tar.lz
 0ef5a24e19693ea768c01ae5891f7fb3f37ae6bdbee853f002f1ed5f9a4141452b8d32c49dfef69d591bc95aff8ce9e6a718aae16ba9ce50da7b43752ff9fcbf  xboard-4.9.1.tar.lz
diff --git a/extra/gnumeric/gnumeric.SMBuild b/extra/gnumeric/gnumeric.SMBuild
index 9be7e25..fb943c6 100755
--- a/extra/gnumeric/gnumeric.SMBuild
+++ b/extra/gnumeric/gnumeric.SMBuild
@@ -1,17 +1,17 @@
-APP=gnumeric
-VERSION=1.12.46
-BUILD=1sml
-HOMEPAGE="http://projects.gnome.org/gnumeric/"
-DOWNLOAD="https://download.gnome.org/sources/gnumeric/1.12/gnumeric-1.12.46.tar.xz"
-DESC="Spreadsheet application for GNOME"
-REQUIRES="perl intltool python3 gobject-introspection goffice "
+app=gnumeric
+version=1.12.46
+build=1sml
+homepage="http://projects.gnome.org/gnumeric/"
+download="https://download.gnome.org/sources/gnumeric/1.12/gnumeric-1.12.46.tar.xz"
+desc="Spreadsheet application for GNOME"
+requires="perl intltool python3 gobject-introspection goffice "
 
 build() {
   mkandenterbuilddir
-  rm -rf $APP-$VERSION
+  rm -rf $app-$version
 
-  tar xf $SRCDIR/$APP-$VERSION.tar.?z*
-  cd $APP-$VERSION
+  tar xf $srcdir/$app-$version.tar.?z*
+  cd $app-$version
   fixbuilddirpermissions
 
   ./configure \
@@ -21,13 +21,13 @@ build() {
     --disable-silent-rules 
 
   make
-  make install DESTDIR=$PKG
+  make install DESTDIR=$pkg
 
-  cp COPYING* $PKGDOCS/
+  cp COPYING* $pkgdocs/
   
   mkfinalpkg
 }
 
-SHA512SUMS="
+sha512sums="
 30f3cf05bac4b77e1dfd5f48dc29d7da3b6a70f10e41d5ea0410cf74a9d18dc639da60abc0e5db9efca643dadb8696d2a3779fcf80003c8ac927c4c9e8f21bd7  gnumeric-1.12.46.tar.lz
 "
diff --git a/extra/gpaint/gpaint.SMBuild b/extra/gpaint/gpaint.SMBuild
index 0888ae6..ee95175 100755
--- a/extra/gpaint/gpaint.SMBuild
+++ b/extra/gpaint/gpaint.SMBuild
@@ -1,17 +1,17 @@
-APP=gpaint
-VERSION=0.3.2
-BUILD=1sml
-HOMEPAGE="https://www.gnu.org/software/gpaint/"
-DOWNLOAD="ftp://alpha.gnu.org/gnu/gpaint/gpaint-2-0.3.2.tar.gz"
-DESC="Simple and lightweight alternative to MS-paint written in GTK2"
-REQUIRES="gtk2 "
+app=gpaint
+version=0.3.2
+build=1sml
+homepage="https://www.gnu.org/software/gpaint/"
+download="ftp://alpha.gnu.org/gnu/gpaint/gpaint-2-0.3.2.tar.gz"
+desc="Simple and lightweight alternative to MS-paint written in GTK2"
+requires="gtk2 "
 
 build() {
   mkandenterbuilddir
-  rm -rf $APP-$VERSION
+  rm -rf $app-$version
 
-  tar xf $SRCDIR/$APP-$VERSION.tar.?z*
-  cd $APP-$VERSION
+  tar xf $srcdir/$app-$version.tar.?z*
+  cd $app-$version
   fixbuilddirpermissions
 
   sed -i 's/GTK_RESPONSE_DISCARD/GTK_RESPONSE_NO/' src/drawing.c
@@ -22,15 +22,15 @@ build() {
     --disable-nls 
 
   make
-  make install DESTDIR=$PKG
+  make install DESTDIR=$pkg
 
-  cp COPYING $PKGDOCS/
+  cp COPYING $pkgdocs/
 
-  mv $PKG/bin/gpaint-2 $PKG/bin/gpaint
+  mv $pkg/bin/gpaint-2 $pkg/bin/gpaint
   
   mkfinalpkg
 }
 
-SHA512SUMS="
+sha512sums="
 6e8de4793e6e74676efbf190b117af0de1af8320c60ae160092c9d0fb7977215979abf607ffb172b2cb99eb50dece481d008bb42c0062d65023915290c26c397  gpaint-0.3.2.tar.lz
 "
diff --git a/extra/gparted/gparted.SMBuild b/extra/gparted/gparted.SMBuild
index 51d2fa3..6f13eb8 100755
--- a/extra/gparted/gparted.SMBuild
+++ b/extra/gparted/gparted.SMBuild
@@ -1,17 +1,17 @@
-APP=gparted
-VERSION=1.1.0
-BUILD=1sml
-HOMEPAGE="http://gparted.org"
-DOWNLOAD="https://sourceforge.net/projects/gparted/files/gparted/gparted-1.1.0/gparted-1.1.0.tar.gz"
-DESC="Graphical partition editor written in GTK3"
-REQUIRES="pkgconf lvm dosfstools e2fsprogs mtools ntfs-3g itstool intltool parted gtkmm3 "
+app=gparted
+version=1.1.0
+build=1sml
+homepage="http://gparted.org"
+download="https://sourceforge.net/projects/gparted/files/gparted/gparted-1.1.0/gparted-1.1.0.tar.gz"
+desc="Graphical partition editor written in GTK3"
+requires="pkgconf lvm dosfstools e2fsprogs mtools ntfs-3g itstool intltool parted gtkmm3 "
 
 build() {
   mkandenterbuilddir
-  rm -rf $APP-$VERSION
+  rm -rf $app-$version
 
-  tar xf $SRCDIR/$APP-$VERSION.tar.?z*
-  cd $APP-$VERSION
+  tar xf $srcdir/$app-$version.tar.?z*
+  cd $app-$version
   fixbuilddirpermissions
 
   ./configure \
@@ -21,13 +21,13 @@ build() {
     --disable-doc
 
   make
-  make install DESTDIR=$PKG
+  make install DESTDIR=$pkg
 
-  cp COPYING $PKGDOCS/
+  cp COPYING $pkgdocs/
 
   mkfinalpkg
 }
 
-SHA512SUMS="
+sha512sums="
 b5f0d8d216f663f686d41347dc9dd1dbe370e25d2e9f321e6a109630aa9ba2a20ffb19dbccf5af1b701fb65d15c297033894583661bd66e88b8cbe84dd793453  gparted-1.1.0.tar.lz
 "
diff --git a/extra/gthumb/gthumb.SMBuild b/extra/gthumb/gthumb.SMBuild
index 240b828..4ff899e 100755
--- a/extra/gthumb/gthumb.SMBuild
+++ b/extra/gthumb/gthumb.SMBuild
@@ -1,17 +1,17 @@
-APP=gthumb
-VERSION=3.8.3
-BUILD=1sml
-HOMEPAGE="https://wiki.gnome.org/Apps/Gthumb"
-DOWNLOAD="https://gitlab.gnome.org/GNOME/gthumb/-/archive/3.8.3/gthumb-3.8.3.tar.bz2"
-DESC="An image viewer and browser"
-REQUIRES="exiv2 json-glib librsvg libsecret libsoup libwebp dconf gtk2 gsettings-desktop-schemas "
+app=gthumb
+version=3.8.3
+build=1sml
+homepage="https://wiki.gnome.org/Apps/Gthumb"
+download="https://gitlab.gnome.org/GNOME/gthumb/-/archive/3.8.3/gthumb-3.8.3.tar.bz2"
+desc="An image viewer and browser"
+requires="exiv2 json-glib librsvg libsecret libsoup libwebp dconf gtk2 gsettings-desktop-schemas "
 
 build() {
   mkandenterbuilddir
-  rm -rf $APP-$VERSION
+  rm -rf $app-$version
 
-  tar xf $SRCDIR/$APP-$VERSION.tar.?z*
-  cd $APP-$VERSION 
+  tar xf $srcdir/$app-$version.tar.?z*
+  cd $app-$version 
   fixbuilddirpermissions
 
   mkdir smbuild && cd smbuild
@@ -19,13 +19,13 @@ build() {
     --prefix="/"
 
   ninja
-  DESTDIR="$PKG" ninja install
+  DESTDIR="$pkg" ninja install
 
-  cp ../COPYING $PKGDOCS
+  cp ../COPYING $pkgdocs
   
   mkfinalpkg
 }
 
-SHA512SUMS="
+sha512sums="
 ed8be7421494b1cb1c4ae87d5703ef398e4c887f081a71a5a0dbb3ef4950784c334685a46f68650e4f4f665b3444104133b9b567d0a3842651ba62d27c6f8c2a  gthumb-3.8.3.tar.lz
 "
diff --git a/extra/gtkterm/gtkterm.SMBuild b/extra/gtkterm/gtkterm.SMBuild
index 73c1dfb..7396efa 100755
--- a/extra/gtkterm/gtkterm.SMBuild
+++ b/extra/gtkterm/gtkterm.SMBuild
@@ -1,17 +1,17 @@
-APP=gtkterm
-VERSION=0.99.7
-BUILD=1sml
-HOMEPAGE="https://github.com/Jeija/gtkterm"
-DOWNLOAD="https://github.com/Jeija/gtkterm/archive/refs/tags/0.99.7.tar.gz"
-DESC="Lightweight GTK2 serial port terminal emulator "
-REQUIRES="vte gtk2"
+app=gtkterm
+version=0.99.7
+build=1sml
+homepage="https://github.com/Jeija/gtkterm"
+download="https://github.com/Jeija/gtkterm/archive/refs/tags/0.99.7.tar.gz"
+desc="Lightweight GTK2 serial port terminal emulator "
+requires="vte gtk2"
 
 build() {
   mkandenterbuilddir
-  rm -rf "$APP-$VERSION-rc1"
+  rm -rf "$app-$version-rc1"
 
-  tar xf $SRCDIR/$APP-$VERSION-rc1.tar.?z*
-  cd "$APP-$VERSION-rc1"
+  tar xf $srcdir/$app-$version-rc1.tar.?z*
+  cd "$app-$version-rc1"
   fixbuilddirpermissions
 
   ./configure \
@@ -19,13 +19,13 @@ build() {
     --disable-nls 
 
   make
-  make install DESTDIR=$PKG
+  make install DESTDIR=$pkg
 
-  cp COPYING $PKGDOCS/
+  cp COPYING $pkgdocs/
 
   mkfinalpkg
 }
 
-SHA512SUMS="
+sha512sums="
 990407ae5882031cfbfa1a0291fcbc78616293fe8625813c2cb783958188c949e659f077e2239a3d309707abb0e5b812a2d399decbef7e0343cba78e61032125  gtkterm-0.99.7-rc1.tar.lz
 "
diff --git a/extra/gtypist/gtypist.SMBuild b/extra/gtypist/gtypist.SMBuild
index 86e6760..fe3c35d 100755
--- a/extra/gtypist/gtypist.SMBuild
+++ b/extra/gtypist/gtypist.SMBuild
@@ -1,20 +1,20 @@
-APP=gtypist
-VERSION=2.9.5
-BUILD=1sml
-HOMEPAGE="https://www.gnu.org/savannah-checkouts/gnu/gtypist/gtypist.html"
-DOWNLOAD="http://ftp.gnu.org/gnu/gtypist/gtypist-2.9.tar.xz"
-DESC="Terminal-based universal typing tutor"
-REQUIRES="netbsd-curses"
+app=gtypist
+version=2.9.5
+build=1sml
+homepage="https://www.gnu.org/savannah-checkouts/gnu/gtypist/gtypist.html"
+download="http://ftp.gnu.org/gnu/gtypist/gtypist-2.9.tar.xz"
+desc="Terminal-based universal typing tutor"
+requires="netbsd-curses"
 
 build() {
   mkandenterbuilddir
-  rm -rf $APP-$VERSION
+  rm -rf $app-$version
 
-  tar xf $SRCDIR/$APP-$VERSION.tar.?z*
-  cd $APP-$VERSION
+  tar xf $srcdir/$app-$version.tar.?z*
+  cd $app-$version
   fixbuilddirpermissions
 
-  patch -p1 < $SRCDIR/ncurses.patch
+  patch -p1 < $srcdir/ncurses.patch
   autoreconf -vif
 
   CFLAGS="$CFLAGS -D_GNU_SOURCE" \
@@ -24,14 +24,14 @@ build() {
     --sysconfdir=/etc 
 
   make
-  make install DESTDIR=$PKG
+  make install DESTDIR=$pkg
 
-  cp COPYING $PKGDOCS/
+  cp COPYING $pkgdocs/
 
   mkfinalpkg
 }
 
-SHA512SUMS="
+sha512sums="
 397b2e7570f1702b1e355cf2e6ce8b0a78aa0f7e2493dcf0a39a07e1dc9e4c2bf01d16759dfcfffef3bb505b73435b6e4fb8e2565a20b7180a1867d4d3d68346  gtypist-2.9.5.tar.lz
 84a29d4008f13ee0dc434b551b6846d94373679fa718d54a0cf52aeeaba8f1485e40d55f66c336bb33e23f1f939ea1711190c2a16903671febcdb191b4ffb94c  ncurses.patch
 "
\ No newline at end of file
diff --git a/extra/heimdall/heimdall.SMBuild b/extra/heimdall/heimdall.SMBuild
index a699fc9..6090fd2 100755
--- a/extra/heimdall/heimdall.SMBuild
+++ b/extra/heimdall/heimdall.SMBuild
@@ -1,17 +1,17 @@
-APP=heimdall
-VERSION=1.4.2
-BUILD=1sml
-HOMEPAGE="https://www.glassechidna.com.au/products/heimdall/"
-DOWNLOAD="https://github.com/Benjamin-Dobell/Heimdall/archive/refs/tags/v1.4.2.tar.gz"
-DESC="Cross-platform open-source tool suite to flash ROMs onto Samsung mobile devices"
-REQUIRES="gcc-libs libusb eudev"
+app=heimdall
+version=1.4.2
+build=1sml
+homepage="https://www.glassechidna.com.au/products/heimdall/"
+download="https://github.com/Benjamin-Dobell/Heimdall/archive/refs/tags/v1.4.2.tar.gz"
+desc="Cross-platform open-source tool suite to flash ROMs onto Samsung mobile devices"
+requires="gcc-libs libusb eudev"
 
 build() {
   mkandenterbuilddir
-  rm -rf Heimdall-$VERSION
+  rm -rf Heimdall-$version
 
-  tar xf $SRCDIR/Heimdall-$VERSION.tar.?z*
-  cd Heimdall-$VERSION
+  tar xf $srcdir/Heimdall-$version.tar.?z*
+  cd Heimdall-$version
   fixbuilddirpermissions
 
   mkdir -p smbuild && cd smbuild 
@@ -21,13 +21,13 @@ build() {
 
   make
 
-  install -Dm 0755 bin/heimdall $PKG/bin/heimdall
-  install -Dm 0644 ../heimdall/60-heimdall.rules $PKG/lib/udev/rules.d/60-heimdall.rules
-  cp ../LICENSE $PKGDOCS/
+  install -Dm 0755 bin/heimdall $pkg/bin/heimdall
+  install -Dm 0644 ../heimdall/60-heimdall.rules $pkg/lib/udev/rules.d/60-heimdall.rules
+  cp ../LICENSE $pkgdocs/
 
   mkfinalpkg
 }
 
-SHA512SUMS="
+sha512sums="
 fc461d5281a3e8a6188ec5ba845d6e719285c91e2874fbbc62b6c54a8494c84fa1b93c15c2684ed936061c861b9a892aaca0a69efe692534e4f09da13077472d  Heimdall-1.4.2.tar.lz
 "
diff --git a/extra/imagemagick/imagemagick.SMBuild b/extra/imagemagick/imagemagick.SMBuild
index b74d3ab..8f3092c 100755
--- a/extra/imagemagick/imagemagick.SMBuild
+++ b/extra/imagemagick/imagemagick.SMBuild
@@ -1,17 +1,17 @@
-APP=imagemagick
-VERSION=7.0.8
-BUILD=1sml
-HOMEPAGE="http://www.imagemagick.org/"
-DOWNLOAD=""
-DESC="Robust collection of image processing tools"
-REQUIRES="libtool libxml2 libpng fftw fontconfig libxext lcms2 glu pango libraqm librsvg libwebp openjpeg "
+app=imagemagick
+version=7.0.8
+build=1sml
+homepage="http://www.imagemagick.org/"
+download=""
+desc="Robust collection of image processing tools"
+requires="libtool libxml2 libpng fftw fontconfig libxext lcms2 glu pango libraqm librsvg libwebp openjpeg "
 
 build() {
   mkandenterbuilddir
-  rm -rf ImageMagick-$VERSION-14
+  rm -rf ImageMagick-$version-14
 
-  tar xf $SRCDIR/ImageMagick-$VERSION-14.tar.?z*
-  cd ImageMagick-$VERSION-14
+  tar xf $srcdir/ImageMagick-$version-14.tar.?z*
+  cd ImageMagick-$version-14
   fixbuilddirpermissions
 
   ./configure \
@@ -25,13 +25,13 @@ build() {
     --enable-shared
 
   make
-  make install DESTDIR=$PKG
+  make install DESTDIR=$pkg
 
-  cp LICENSE $PKGDOCS/
+  cp LICENSE $pkgdocs/
 
   mkfinalpkg
 }
 
-SHA512SUMS="
+sha512sums="
 a86a745a1b693ed825bd167e8c2f9333e188c903cd0beb3295aba537aab022de50fe7b1d92756ea32ed19684806e694c8e3dd3f5cc79fb653338220739aad260  ImageMagick-7.0.8-14.tar.lz
 "
diff --git a/extra/iotop/iotop.SMBuild b/extra/iotop/iotop.SMBuild
index 3f2bf60..f8ab494 100755
--- a/extra/iotop/iotop.SMBuild
+++ b/extra/iotop/iotop.SMBuild
@@ -1,30 +1,30 @@
-APP=iotop
-VERSION=0.6
-BUILD=2sml
-HOMEPAGE="http://guichaz.free.fr/iotop"
-DOWNLOAD="http://guichaz.free.fr/iotop/files/iotop-0.6.tar.gz"
-DESC="Top-like I/O monitor written in python"
-REQUIRES="python3"
+app=iotop
+version=0.6
+build=2sml
+homepage="http://guichaz.free.fr/iotop"
+download="http://guichaz.free.fr/iotop/files/iotop-0.6.tar.gz"
+desc="Top-like I/O monitor written in python"
+requires="python3"
 
 build() {
   mkandenterbuilddir
-  rm -rf $APP-$VERSION
+  rm -rf $app-$version
 
-  tar xf $SRCDIR/$APP-$VERSION.tar.?z*
-  cd $APP-$VERSION 
+  tar xf $srcdir/$app-$version.tar.?z*
+  cd $app-$version 
   fixbuilddirpermissions
 
-  patch -p1 < $SRCDIR/fix-python.patch
+  patch -p1 < $srcdir/fix-python.patch
 
   python3 setup.py build
-  python3 setup.py install --prefix="" --root=$PKG
+  python3 setup.py install --prefix="" --root=$pkg
 
-  cp COPYING $PKGDOCS/
+  cp COPYING $pkgdocs/
 
   mkfinalpkg
 }
 
-SHA512SUMS="
+sha512sums="
 27d2525fa88d11f14ba477a570cdf5ef09b591846c31bc7a3970b92f22aa687e1182f1e08bbdddf400f17b10425d6426969be2846210b4714a922d1a92fb2fe6  iotop-0.6.tar.lz
 e4c5aee993e7971dd731202f69e2c0a704833dce26c09329e9d7fa8d5f37c9584082a165ceaab8a07aa2421f0debf9af16f41f6b657d841ae6cc7bb2e7fb8d79  fix-proc-status-read.patch
 df5b09b20dc5ca3a8e73f39089f8ef2dbc5060b35178067a41ab1fd075922a860458611d5b0e7beb7aca8c9c5853998aeb7529dbccff9ef39daf17cd997cd698  fix-python.patch
diff --git a/extra/libass/libass.SMBuild b/extra/libass/libass.SMBuild
index 7dc3043..c4d4d5b 100755
--- a/extra/libass/libass.SMBuild
+++ b/extra/libass/libass.SMBuild
@@ -1,17 +1,17 @@
-APP=libass
-VERSION=0.14.0
-BUILD=1sml
-HOMEPAGE="http://code.google.com/p/libass/"
-DOWNLOAD="https://github.com/libass/libass/archive/refs/tags/0.14.0.tar.gz"
-DESC="Subtitle renderer for the ASS/SSA formats"
-REQUIRES="glib nasm fribidi fontconfig freetype harfbuzz "
+app=libass
+version=0.14.0
+build=1sml
+homepage="http://code.google.com/p/libass/"
+download="https://github.com/libass/libass/archive/refs/tags/0.14.0.tar.gz"
+desc="Subtitle renderer for the ASS/SSA formats"
+requires="glib nasm fribidi fontconfig freetype harfbuzz "
 
 build() {
   mkandenterbuilddir
-  rm -rf $APP-$VERSION
+  rm -rf $app-$version
 
-  tar xf $SRCDIR/$APP-$VERSION.tar.?z*
-  cd $APP-$VERSION
+  tar xf $srcdir/$app-$version.tar.?z*
+  cd $app-$version
   fixbuilddirpermissions
 
   ./configure \
@@ -22,13 +22,13 @@ build() {
     --disable-silent-rules 
 
   make
-  make install DESTDIR=$PKG
+  make install DESTDIR=$pkg
 
-  cp COPYING $PKGDOCS/
+  cp COPYING $pkgdocs/
 
   mkfinalpkg
 }
 
-SHA512SUMS="
+sha512sums="
 1876292d06d2f68938f1b4140dad4871fa2614fd84ac9cfb35bbdeb26130c3db96a345572f1f236c2ab2a902b0f2f288d4bdc60d1443ce80ccce43f51e6ae102  libass-0.14.0.tar.lz
 "
diff --git a/extra/micro-tetris/micro-tetris.SMBuild b/extra/micro-tetris/micro-tetris.SMBuild
index 8523fed..3e9c071 100755
--- a/extra/micro-tetris/micro-tetris.SMBuild
+++ b/extra/micro-tetris/micro-tetris.SMBuild
@@ -1,27 +1,27 @@
-APP=micro-tetris
-VERSION=1.4.0
-BUILD=1sml
-HOMEPAGE="https://github.com/troglobit/tetris/archive/refs/tags/1.4.0.tar.gz"
-DOWNLOAD="https://github.com/troglobit/tetris/"
-DESC="Small Tetris implementations utilising ANSI escape sequences"
-REQUIRES="musl "
+app=micro-tetris
+version=1.4.0
+build=1sml
+homepage="https://github.com/troglobit/tetris/archive/refs/tags/1.4.0.tar.gz"
+download="https://github.com/troglobit/tetris/"
+desc="Small Tetris implementations utilising ANSI escape sequences"
+requires="musl "
 
 build() {
   mkandenterbuilddir
-  rm -rf tetris-$VERSION
+  rm -rf tetris-$version
 
-  tar xf $SRCDIR/tetris-$VERSION.tar.?z**
-  cd tetris-$VERSION 
+  tar xf $srcdir/tetris-$version.tar.?z**
+  cd tetris-$version 
   fixbuilddirpermissions
 
   make
-  make install DESTDIR=$PKG 
+  make install DESTDIR=$pkg 
 
-  cp LICENSE $PKGDOCS/
+  cp LICENSE $pkgdocs/
 
   mkfinalpkg
 }
 
-SHA512SUMS="
+sha512sums="
 034e85028ab71e050de14775da2538ed6f2e27db9ae095c32982d5d32effdf17643f68cb43d72ef176855c909f264e45b9b6ae05c39bfd240ae08277f4523c78  tetris-1.4.0.tar.gz
 "
\ No newline at end of file
diff --git a/extra/mplayer/mplayer.SMBuild b/extra/mplayer/mplayer.SMBuild
index f611beb..0d37719 100755
--- a/extra/mplayer/mplayer.SMBuild
+++ b/extra/mplayer/mplayer.SMBuild
@@ -1,17 +1,17 @@
-APP=mplayer
-VERSION=20180720
-BUILD=1sml
-HOMEPAGE="http://www.mplayerhq.hu/"
-DOWNLOAD=""
-DESC="The Linux movie player with support for several dozen formats"
-REQUIRES="libpng zlib gnutls libjpeg-turbo giflib alsa-lib libcdio-paranoia freetype fontconfig fribidi bzip2 lzo libvorbis libtheora lame libass libogg mpg123 faad2 ffmpeg opus opusfile libxext libx11 libxv libvdpau libxinerama sdl mesa libopenal x264 gtk2 libidn libtasn1 nettle gmp expat e2fsprogs harfbuzz pcre libxcb libxdamage libdrm libffi libxrender libxscrnsaver"
+app=mplayer
+version=20180720
+build=1sml
+homepage="http://www.mplayerhq.hu/"
+download=""
+desc="The Linux movie player with support for several dozen formats"
+requires="libpng zlib gnutls libjpeg-turbo giflib alsa-lib libcdio-paranoia freetype fontconfig fribidi bzip2 lzo libvorbis libtheora lame libass libogg mpg123 faad2 ffmpeg opus opusfile libxext libx11 libxv libvdpau libxinerama sdl mesa libopenal x264 gtk2 libidn libtasn1 nettle gmp expat e2fsprogs harfbuzz pcre libxcb libxdamage libdrm libffi libxrender libxscrnsaver"
 
 build() {
   mkandenterbuilddir
-  rm -rf MPlayer-$VERSION
+  rm -rf MPlayer-$version
 
-  tar xf $SRCDIR/MPlayer-$VERSION.tar.?z
-  cd MPlayer-$VERSION
+  tar xf $srcdir/MPlayer-$version.tar.?z
+  cd MPlayer-$version
   fixbuilddirpermissions
 
   ./configure \
@@ -25,13 +25,13 @@ build() {
     --disable-ossaudio
 
   make
-  make install DESTDIR=$PKG
+  make install DESTDIR=$pkg
   
-  cp Copyright LICENSE $PKGDOCS/
+  cp Copyright LICENSE $pkgdocs/
 
   mkfinalpkg
 }
 
-SHA512SUMS="
+sha512sums="
 6d081ff29d4f6cbeef7692561b9eb4a1776efa74692a8b9338affac44d997d45e822a16a69e5abbcae46ef4a4b1f896f9f56b70eb90a53d82790c9c853e8496e  MPlayer-20180720.tar.xz
 "
diff --git a/extra/mpv/mpv.SMBuild b/extra/mpv/mpv.SMBuild
index 3454ea8..99f42fc 100755
--- a/extra/mpv/mpv.SMBuild
+++ b/extra/mpv/mpv.SMBuild
@@ -1,20 +1,20 @@
-APP=mpv
-VERSION=0.32.0
-BUILD=1sml
-HOMEPAGE="http://mpv.io"
-DOWNLOAD="https://github.com/mpv-player/mpv/archive/refs/tags/v0.32.0.tar.gz"
-DESC="a movie player based on MPlayer and mplayer2"
-REQUIRES="ffmpeg gtk2 gdk-pixbuf harfbuzz"
+app=mpv
+version=0.32.0
+build=1sml
+homepage="http://mpv.io"
+download="https://github.com/mpv-player/mpv/archive/refs/tags/v0.32.0.tar.gz"
+desc="a movie player based on MPlayer and mplayer2"
+requires="ffmpeg gtk2 gdk-pixbuf harfbuzz"
 
 build() {
   mkandenterbuilddir
-  rm -rf $APP-$VERSION
+  rm -rf $app-$version
 
-  tar xf $SRCDIR/$APP-$VERSION.tar.?z*
-  cd $APP-$VERSION 
+  tar xf $srcdir/$app-$version.tar.?z*
+  cd $app-$version 
   fixbuilddirpermissions
 
-  zcat $SRCDIR/waf-2.0.9.gz > waf 
+  zcat $srcdir/waf-2.0.9.gz > waf 
   chmod +x waf
 
   CXXFLAGS+=" -fPIC"
@@ -24,13 +24,13 @@ build() {
     --enable-egl-x11 
 
   ./waf build $MAKEFLAGS 
-  ./waf --destdir="$PKG" install 
+  ./waf --destdir="$pkg" install 
 
-  cp LICENSE* $PKGDOCS/
+  cp LICENSE* $pkgdocs/
 
   mkfinalpkg
 }
 
-SHA512SUMS="
+sha512sums="
 8d0fdf6dd757a9d8650ff7747fb4c2cac3f91f0f1b4bf77879e3e564be4440db3b6dc37f0ebe3921dc517a93eaa9e1ce72c222e43dfd1cfbadfe9d4b7b26bffa  mpv-0.32.0.tar.lz
 "
diff --git a/extra/mtd-utils/mtd-utils.SMBuild b/extra/mtd-utils/mtd-utils.SMBuild
index 8e86a6c..d059d27 100755
--- a/extra/mtd-utils/mtd-utils.SMBuild
+++ b/extra/mtd-utils/mtd-utils.SMBuild
@@ -1,42 +1,43 @@
-APP=mtd-utils
-VERSION=2.1.1
-NANDVERSION=1.5.2
-BUILD=1sml
-HOMEPAGE="http://www.linux-mtd.infradead.org/"
-DOWNLOAD=""
-DESC="A collection of utiltiies for dealing with memory technology and NAND devices"
-REQUIRES="lzo util-linux "
+app=mtd-utils
+version=2.1.1
+nandversion=1.5.2
+build=1sml
+homepage="http://www.linux-mtd.infradead.org/"
+download=""
+desc="A collection of utiltiies for dealing with memory technology and NAND devices"
+requires="lzo util-linux "
 
 build() {
   mkandenterbuilddir
-  rm -rf $APP-$VERSION
+  rm -rf $app-$version
 
-  tar xf $SRCDIR/$APP-$VERSION.tar.?z*
-  cd $APP-$VERSION 
+  tar xf $srcdir/$app-$version.tar.?z*
+  cd $app-$version 
   fixbuilddirpermissions
 
   ./configure \
     --prefix="" \
     --sysconfdir=/etc \
+    --sbindir=/bin \
     --without-zstd
 
   make
-  make install DESTDIR=$PKG 
+  make install DESTDIR=$pkg 
 
-  cp COPYING $PKGDOCS/
+  cp COPYING $pkgdocs/
 
-  tar xf $SRCDIR/nand-utils-$NANDVERSION.tar.?z*
-  cd nand-utils-$NANDVERSION
+  tar xf $srcdir/nand-utils-$nandversion.tar.?z*
+  cd nand-utils-$nandversion
 
   make 
-  make install SBINDIR="/bin" MANDIR="/share/man" DESTDIR=$PKG
+  make install SBINDIR="/bin" MANDIR="/share/man" DESTDIR=$pkg
 
-  cp COPYING $PKGDOCS/COPYING.nand-utils
+  cp COPYING $pkgdocs/COPYING.nand-utils
 
   mkfinalpkg
 }
   
-SHA512SUMS="
+sha512sums="
 615b27f6c4c9f392715060467b5728aeb1e774256e661e2b84126464e69a5e1140646e2cf9d6e42d6279c6396c1b2204f545023e5be09d02afb1587d62c4399e  mtd-utils-2.1.1.tar.bz2
 d8b28e9efbc8e3cae19db109491ec88a9b6fc3696b4aedd3b16a0352e9c640c711cf245995f3ffad1d75799b4f438ac23d276022a94948fa632c351f1d2b5af9  nand-utils-1.5.2.tar.gz
 "
diff --git a/extra/mtpaint/mtpaint.SMBuild b/extra/mtpaint/mtpaint.SMBuild
index df7c2dd..e2113ca 100755
--- a/extra/mtpaint/mtpaint.SMBuild
+++ b/extra/mtpaint/mtpaint.SMBuild
@@ -1,17 +1,17 @@
-APP=mtpaint
-VERSION=3.40
-BUILD=1sml
-HOMEPAGE="http://mtpaint.sourceforge.net/"
-DOWNLOAD="https://sourceforge.net/projects/mtpaint/files/mtpaint/3.40/mtpaint-3.40.tar.bz2"
-DESC="Paint program in GTK2"
-REQUIRES="giflib openjpeg gtk2 lcms2"
+app=mtpaint
+version=3.40
+build=1sml
+homepage="http://mtpaint.sourceforge.net/"
+download="https://sourceforge.net/projects/mtpaint/files/mtpaint/3.40/mtpaint-3.40.tar.bz2"
+desc="Paint program in GTK2"
+requires="giflib openjpeg gtk2 lcms2"
 
 build() {
   mkandenterbuilddir
-  rm -rf $APP-$VERSION
+  rm -rf $app-$version
 
-  tar xf $SRCDIR/$APP-$VERSION.tar.?z*
-  cd $APP-$VERSION
+  tar xf $srcdir/$app-$version.tar.?z*
+  cd $app-$version
   fixbuilddirpermissions
 
 
@@ -30,14 +30,14 @@ build() {
     --prefix="" 
 
   make
-  make install DESTDIR=$PKG
+  make install DESTDIR=$pkg
 
-  install -Dm 644 doc/mtpaint.1 $PKG/share/man/man1/mtpaint.1
-  cp COPYING $PKGDOCS/
+  install -Dm 644 doc/mtpaint.1 $pkg/share/man/man1/mtpaint.1
+  cp COPYING $pkgdocs/
 
   mkfinalpkg
 }
 
-SHA512SUMS="
+sha512sums="
 abcf74b11403019f6f3c563b0d3de9dd27eb9fb7c0a279ad5b866eea6074538dcf1d3900fca3cc782a922fbf79cd1b625337328a53704167eb77055c7a8f509e  mtpaint-3.40.tar.lz
 "
diff --git a/extra/mupdf/mupdf.SMBuild b/extra/mupdf/mupdf.SMBuild
index dad5390..da48698 100755
--- a/extra/mupdf/mupdf.SMBuild
+++ b/extra/mupdf/mupdf.SMBuild
@@ -1,21 +1,21 @@
-APP=mupdf
-VERSION=1.17.0
-BUILD=1sml
-HOMEPAGE="https://mupdf.com/"
-DOWNLOAD="https://mupdf.com/downloads/archive/mupdf-1.17.0-source.tar.xz"
-DESC="Lightweight PDF, CBZ, and XPS viewer and toolkit"
-REQUIRES="desktop-file-utils openssl jbig2dec libjpeg-turbo freetype libxext glu freeglut mesa harfbuzz"
+app=mupdf
+version=1.17.0
+build=1sml
+homepage="https://mupdf.com/"
+download="https://mupdf.com/downloads/archive/mupdf-1.17.0-source.tar.xz"
+desc="Lightweight PDF, CBZ, and XPS viewer and toolkit"
+requires="desktop-file-utils openssl jbig2dec libjpeg-turbo freetype libxext glu freeglut mesa harfbuzz"
 
 build() {
   mkandenterbuilddir
-  rm -rf $APP-$VERSION-source
+  rm -rf $app-$version-source
 
-  tar xf $SRCDIR/$APP-$VERSION-source.tar.?z*
-  cd $APP-$VERSION-source
+  tar xf $srcdir/$app-$version-source.tar.?z*
+  cd $app-$version-source
   fixbuilddirpermissions
 
-  patch -p1 < $SRCDIR/shared-lib.patch
-  patch -p1 < $SRCDIR/fix-big-endian.patch
+  patch -p1 < $srcdir/shared-lib.patch
+  patch -p1 < $srcdir/fix-big-endian.patch
 
   # We use system libraries, not the ones that come with the mupdf source
   for library in curl freeglut freetype harfbuzz jbig2dec \
@@ -25,26 +25,26 @@ build() {
 
   make USE_SYSTEM_LIBS=yes prefix="/" CURL_LIBS="-lcurl -lpthread" \
     build=release libs apps
-  make USE_SYSTEM_LIBS=yes prefix="/" DESTDIR="$PKG" install
+  make USE_SYSTEM_LIBS=yes prefix="/" DESTDIR="$pkg" install
 
   # .desktop taken from debian and modified:
-  install -Dm 644 $SRCDIR/$APP.desktop $PKG/share/applications/$APP.desktop
+  install -Dm 644 $srcdir/$app.desktop $pkg/share/applications/$app.desktop
 
   # Icon converted from platform/x11/mupdf.ico, with icotool
-  install -Dm 644 $SRCDIR/$APP.png $PKG/share/pixmaps/$APP.png
+  install -Dm 644 $srcdir/$app.png $pkg/share/pixmaps/$app.png
 
   ( 
-    cd $PKG/lib
+    cd $pkg/lib
     ln -s libmupdf.so.0 libmupdf.so 
     ln -s libmupdf-third.so.0 libmupdf-third.so
   )
 
-  mv $PKG/share/doc/$APP/COPYING $PKGDOCS/
+  mv $pkg/share/doc/$app/COPYING $pkgdocs/
   
   mkfinalpkg
 }
 
-SHA512SUMS="
+sha512sums="
 39188e6ce3eaefb525b2c32767c4bf52ed881b41889edef086aa64bfe1c38e6f3cb853450c8284d175ef8854f32e9bc67415a692048ead26cf31c35645f9e0e5  mupdf-1.17.0-source.tar.xz
 486d09df319050ddb33dbd1e2e0638a7bc6a3e188032a35b81119c45b0de911629b827b21aa47cde6669b66d73fb22cff54d190a8449151fdc27eace71beefbd  fix-big-endian.patch
 212ea566b6f1d60a1087054a8eb29d0d9ca08eef237219151fc4fe8880461cd86fcb03b0266a7347015af458b557dfd914e827f5ff8fee78e9e50c7f358fc8e0  shared-lib.patch
diff --git a/extra/rdesktop/rdesktop.SMBuild b/extra/rdesktop/rdesktop.SMBuild
index 588a051..c31a46b 100755
--- a/extra/rdesktop/rdesktop.SMBuild
+++ b/extra/rdesktop/rdesktop.SMBuild
@@ -1,17 +1,17 @@
-APP=rdesktop
-VERSION=1.9.0
-BUILD=1sml
-HOMEPAGE="http://www.rdesktop.org"
-DOWNLOAD="https://github.com/rdesktop/rdesktop/releases/download/v1.9.0/rdesktop-1.9.0.tar.gz"
-DESC="Remote Desktop Protocol (RDP) client to connect to Microsoft RDP Servers"
-REQUIRES="zlib nettle alsa-lib libao libsamplerate libxcursor xrandr libxrandr"
+app=rdesktop
+version=1.9.0
+build=1sml
+homepage="http://www.rdesktop.org"
+download="https://github.com/rdesktop/rdesktop/releases/download/v1.9.0/rdesktop-1.9.0.tar.gz"
+desc="Remote Desktop Protocol (RDP) client to connect to Microsoft RDP Servers"
+requires="zlib nettle alsa-lib libao libsamplerate libxcursor xrandr libxrandr"
 
 build() {
   mkandenterbuilddir
-  rm -rf $APP-$VERSION
+  rm -rf $app-$version
 
-  tar xf $SRCDIR/$APP-$VERSION.tar.?z*
-  cd $APP-$VERSION
+  tar xf $srcdir/$app-$version.tar.?z*
+  cd $app-$version
   fixbuilddirpermissions
 
   ./bootstrap
@@ -19,16 +19,16 @@ build() {
     --prefix="" \
     --disable-credssp \
     --disable-smartcard \
-    $BUILDDIST
+    $builddist
 
   make
-  make install DESTDIR=$PKG
+  make install DESTDIR=$pkg
 
-  cp COPYING $PKGDOCS/
+  cp COPYING $pkgdocs/
 
   mkfinalpkg
 }
 
-SHA512SUMS="
+sha512sums="
 e16b5cf61a70b14458eb870f772bc7635857f3822fde5ab288ceb30e178494120fcceac97f7d23fb771260eccf1985386d4702611cd150cfb8a4cac7859a2620  rdesktop-1.9.0.tar.lz
 "
diff --git a/extra/rxvt-unicode/rxvt-unicode.SMBuild b/extra/rxvt-unicode/rxvt-unicode.SMBuild
index f4a0c05..94e91f0 100755
--- a/extra/rxvt-unicode/rxvt-unicode.SMBuild
+++ b/extra/rxvt-unicode/rxvt-unicode.SMBuild
@@ -1,17 +1,17 @@
-APP=rxvt-unicode
-VERSION=9.22
-BUILD=1sml
-HOMEPAGE="http://software.schmorp.de/pkg/rxvt-unicode.html"
-DOWNLOAD="http://dist.schmorp.de/rxvt-unicode/Attic/rxvt-unicode-9.22.tar.bz2"
-DESC="Enhanced version of rxvt terminal emulator with full support for unicode and XFT"
-REQUIRES="gcc-libs netbsd-curses glib perl libxft startup-notification"
+app=rxvt-unicode
+version=9.22
+build=1sml
+homepage="http://software.schmorp.de/pkg/rxvt-unicode.html"
+download="http://dist.schmorp.de/rxvt-unicode/Attic/rxvt-unicode-9.22.tar.bz2"
+desc="Enhanced version of rxvt terminal emulator with full support for unicode and XFT"
+requires="gcc-libs netbsd-curses glib perl libxft startup-notification"
 
 build() {
   mkandenterbuilddir
-  rm -rf $APP-$VERSION
+  rm -rf $app-$version
 
-  tar xf $SRCDIR/$APP-$VERSION.tar.?z*
-  cd $APP-$VERSION
+  tar xf $srcdir/$app-$version.tar.?z*
+  cd $app-$version
   fixbuilddirpermissions
 
   ./configure \
@@ -38,13 +38,13 @@ build() {
     --disable-lastlog 
 
   make
-  make install DESTDIR=$PKG
+  make install DESTDIR=$pkg
 
-  cp COPYING $PKGDOCS/
+  cp COPYING $pkgdocs/
 
   mkfinalpkg
 }
 
-SHA512SUMS="
+sha512sums="
 1316746ba1771dd6e6c306832227227ab6685aad1a3e246d4059fd60ecf36089aeee12a8d28a376e70ccc148b7e6457bcded6dad4531bbed6af3ab8c6805ec03  rxvt-unicode-9.22.tar.lz
 "
diff --git a/extra/scrcpy/scrcpy.SMBuild b/extra/scrcpy/scrcpy.SMBuild
index 09b7b49..7f45e3e 100755
--- a/extra/scrcpy/scrcpy.SMBuild
+++ b/extra/scrcpy/scrcpy.SMBuild
@@ -1,34 +1,34 @@
-APP=scrcpy
-VERSION=1.16
-BUILD=1sml
-HOMEPAGE="https://github.com/Genymobile/scrcpy"
-DOWNLOAD="https://github.com/Genymobile/scrcpy/archive/refs/tags/v1.16.tar.gz"
-DESC="Lightweight display and control utility to interact with Android 5.1+ devices over USB or TCP/IP"
-REQUIRES="meson sdl2 ffmpeg"
+app=scrcpy
+version=1.16
+build=1sml
+homepage="https://github.com/Genymobile/scrcpy"
+download="https://github.com/Genymobile/scrcpy/archive/refs/tags/v1.16.tar.gz"
+desc="Lightweight display and control utility to interact with Android 5.1+ devices over USB or TCP/IP"
+requires="meson sdl2 ffmpeg"
 
 build() {
   mkandenterbuilddir
-  rm -rf $APP-$VERSION
+  rm -rf $app-$version
 
-  tar xf $SRCDIR/$APP-$VERSION.tar.?z*
-  cd $APP-$VERSION
+  tar xf $srcdir/$app-$version.tar.?z*
+  cd $app-$version
   fixbuilddirpermissions
 
   mkdir -p build/server && cd build
-  cp $SRCDIR/scrcpy-server-v"$VERSION".zip server/scrcpy-server
+  cp $srcdir/scrcpy-server-v"$version".zip server/scrcpy-server
   meson .. \
     --prefix="/" \
     --buildtype release 
 
   ninja
-  DESTDIR="$PKG" ninja install
+  DESTDIR="$pkg" ninja install
 
-  cp ../LICENSE $PKGDOCS/
+  cp ../LICENSE $pkgdocs/
 
   mkfinalpkg
 }
 
-SHA512SUMS="
+sha512sums="
 e50903e3be3f822e2bf8c873b636aef87e83122d65f48159345dab36cc352f56b019aa528181458f2b1a3043938ce96e0a35ba51c12a5e2bec8bdaedfb20914c  scrcpy-1.16.tar.gz
 52d4fbf48a91e61abff5e0bbc510c83fb4c1238a2791f888baf9fb04f04c5c19dfc82525c717fc1b92bd86fb2152cb29f6932784e1e2115329288ec97d8594fc  scrcpy-server-v1.16.zip
 "
diff --git a/extra/sdl/sdl.SMBuild b/extra/sdl/sdl.SMBuild
index c645470..5b0a9e8 100755
--- a/extra/sdl/sdl.SMBuild
+++ b/extra/sdl/sdl.SMBuild
@@ -1,21 +1,21 @@
-APP=sdl
-VERSION=1.2.15
-BUILD=1sml
-HOMEPAGE="https://www.libsdl.org"
-DOWNLOAD="https://www.libsdl.org/release/SDL-1.2.5.tar.gz"
-DESC="C Library providing low-level I/O access to hardware devices via OpenGL and 2D framebuffer"
-REQUIRES="alsa-lib libx11 libxext libxrender glu mesa"
+app=sdl
+version=1.2.15
+build=1sml
+homepage="https://www.libsdl.org"
+download="https://www.libsdl.org/release/SDL-1.2.5.tar.gz"
+desc="C Library providing low-level I/O access to hardware devices via OpenGL and 2D framebuffer"
+requires="alsa-lib libx11 libxext libxrender glu mesa"
 
 build() {
   mkandenterbuilddir
-  rm -rf SDL-$VERSION
+  rm -rf SDL-$version
 
-  tar xf $SRCDIR/SDL-$VERSION.tar.?z*
-  cd SDL-$VERSION
+  tar xf $srcdir/SDL-$version.tar.?z*
+  cd SDL-$version
   fixbuilddirpermissions
 
-  patch -p1 < $SRCDIR/grabnotviewable.patch
-  patch -p1 < $SRCDIR/xdata32.patch
+  patch -p1 < $srcdir/grabnotviewable.patch
+  patch -p1 < $srcdir/xdata32.patch
 
   ./configure \
     --prefix="" \
@@ -30,18 +30,18 @@ build() {
     --disable-rpath \
     --disable-static \
     --disable-pulseaudio \
-    $BUILDDIST
+    $builddist
 
   make
-  make install DESTDIR=$PKG
+  make install DESTDIR=$pkg
 
-  cp COPYING $PKGDOCS/
+  cp COPYING $pkgdocs/
   removestaticlibs
   
   mkfinalpkg
 }
 
-SHA512SUMS="
+sha512sums="
 750c7ddcb72218e3b67d4149281d24da50f4633e47f73ad54d0d9e0e8f717784c982babe481d0017835c276a5b8f2159ef0d765835e051aa335d672cb2c40c20  SDL-1.2.15.tar.lz
 20049408d4c00d895c39a7901d889d1874ebcd382e93b2e8df38bd3726e2236f4e9a980720724cf176a35d05fb0db5dbcabd42089423adeb404f2dba16d52b7b  grabnotviewable.patch
 ae7cdb61930199a7989e1690be37133eddeb8d446fef3fb5bbe0008d5e3b30abb28f4cc8ffea5d7a186ec242f158ed06dbd2b9ea98ca3e3caeed5ab12bac6875  xdata32.patch
diff --git a/extra/sdl2/sdl2.SMBuild b/extra/sdl2/sdl2.SMBuild
index 7ae3464..e186448 100755
--- a/extra/sdl2/sdl2.SMBuild
+++ b/extra/sdl2/sdl2.SMBuild
@@ -1,20 +1,20 @@
-APP=sdl2
-VERSION=2.0.8
-BUILD=1sml
-HOMEPAGE="https://www.sdl.org"
-DOWNLOAD="https://www.libsdl.org/release/SDL2-2.0.8.tar.gz"
-DESC="C Library providing low-level I/O access to hardware devices via OpenGL and 2D framebuffer"
-REQUIRES="alsa-lib libx11 libxcursor libxext libxrender libxinerama mesa"
+app=sdl2
+version=2.0.8
+build=1sml
+homepage="https://www.sdl.org"
+download="https://www.libsdl.org/release/SDL2-2.0.8.tar.gz"
+desc="C Library providing low-level I/O access to hardware devices via OpenGL and 2D framebuffer"
+requires="alsa-lib libx11 libxcursor libxext libxrender libxinerama mesa"
 
 build() {
   mkandenterbuilddir
-  rm -rf SDL2-$VERSION
+  rm -rf SDL2-$version
 
-  tar xf $SRCDIR/SDL2-$VERSION.tar.?z*
-  cd SDL2-$VERSION
+  tar xf $srcdir/SDL2-$version.tar.?z*
+  cd SDL2-$version
   fixbuilddirpermissions
 
-  patch -p1 < $SRCDIR/khronos.patch
+  patch -p1 < $srcdir/khronos.patch
 
   mkdir -p smbuild && cd smbuild
   cmake .. \
@@ -25,15 +25,15 @@ build() {
     -DPULSEAUDIO=OFF 
 
   make
-  make install DESTDIR=$PKG
+  make install DESTDIR=$pkg
 
-  cp ../COPYING.txt $PKGDOCS/
+  cp ../COPYING.txt $pkgdocs/
   removestaticlibs
 
   mkfinalpkg  
 }
 
-SHA512SUMS="
+sha512sums="
 673c6058b8692a36b4a3594456b10ef6051efe79e4fb644421fc5c76b11fd68b895840a2c8b72413418c378733e2993d33f19767d0d7ed101eda6310bd70c869  SDL2-2.0.8.tar.gz
 76c93659a122def05f341ba30507b546b201c84823236ca731ac801f092e769574e8f051770a76050a77ac846ed851abab604e0a6d578b382f4792ab47aa60ed  khronos.patch
 "
diff --git a/extra/slock/slock.SMBuild b/extra/slock/slock.SMBuild
index 5ce25ed..8ec0a6c 100755
--- a/extra/slock/slock.SMBuild
+++ b/extra/slock/slock.SMBuild
@@ -1,29 +1,29 @@
-APP=slock
-VERSION=1.4
-BUILD=1sml
-HOMEPAGE="https://tools.suckless.org/slock/"
-DOWNLOAD="https://dl.suckless.org/tools/slock-1.4.tar.gz"
-DESC="Simple X display locker"
-REQUIRES="libxext"
+app=slock
+version=1.4
+build=1sml
+homepage="https://tools.suckless.org/slock/"
+download="https://dl.suckless.org/tools/slock-1.4.tar.gz"
+desc="Simple X display locker"
+requires="libxext"
 
 build() {
   mkandenterbuilddir
-  rm -rf $APP-$VERSION
+  rm -rf $app-$version
 
-  tar xf $SRCDIR/$APP-$VERSION.tar.?z*
-  cd $APP-$VERSION
+  tar xf $srcdir/$app-$version.tar.?z*
+  cd $app-$version
   fixbuilddirpermissions
 
   sed -i "s@-Wall -Os@$CFLAGS@g" config.mk
 
   make 
-  make install PREFIX="/" DESTDIR=$PKG 
+  make install PREFIX="/" DESTDIR=$pkg 
 
-  cp LICENSE $PKGDOCS/
+  cp LICENSE $pkgdocs/
 
   mkfinalpkg
 }
 
-SHA512SUMS="
+sha512sums="
 74b69dd493266fdfca5257dd7ff0ba6cd50efd30febc4f8576c1f92e15a5225a933784a7dae8e0b0be72e4258d747c396c46a214675f1c6efdebe5bb453226b1  slock-1.4.tar.lz
 "
diff --git a/extra/spacefm/spacefm.SMBuild b/extra/spacefm/spacefm.SMBuild
index a4e4c00..5b7ae33 100755
--- a/extra/spacefm/spacefm.SMBuild
+++ b/extra/spacefm/spacefm.SMBuild
@@ -1,35 +1,35 @@
-APP=spacefm
-VERSION=1.0.6
-BUILD=1sml
-HOMEPAGE="https://ignorantguru.github.io/spacefm/"
-DOWNLOAD="https://github.com/IgnorantGuru/spacefm/archive/refs/tags/1.0.6.tar.gz"
-DESC="Multi-panel tabbed file manager"
-REQUIRES="gcc-libs zlib netbsd-curses libidn libtasn1 gmp libjpeg-turbo gnutls eudev nettle openssl gtk2 ffmpeg"
+app=spacefm
+version=1.0.6
+build=1sml
+homepage="https://ignorantguru.github.io/spacefm/"
+download="https://github.com/IgnorantGuru/spacefm/archive/refs/tags/1.0.6.tar.gz"
+desc="Multi-panel tabbed file manager"
+requires="gcc-libs zlib netbsd-curses libidn libtasn1 gmp libjpeg-turbo gnutls eudev nettle openssl gtk2 ffmpeg"
 
 build() {
   mkandenterbuilddir
-  rm -rf $APP-$VERSION
+  rm -rf $app-$version
 
-  tar xf $SRCDIR/$APP-$VERSION.tar.?z*
-  cd $APP-$VERSION
+  tar xf $srcdir/$app-$version.tar.?z*
+  cd $app-$version
   fixbuilddirpermissions
 
-  patch -p1 < $SRCDIR/spacefm-include-sysmacros.patch
+  patch -p1 < $srcdir/spacefm-include-sysmacros.patch
 
   ./configure \
     --prefix="" \
     --sysconfdir=/etc \
-    $BUILDDIST
+    $builddist
 
   make
-  make install DESTDIR=$PKG
+  make install DESTDIR=$pkg
 
-  cp COPYING* $PKGDOCS/
+  cp COPYING* $pkgdocs/
 
   mkfinalpkg
 }
 
-SHA512SUMS="
+sha512sums="
 03cbb9bdcaa955ed3645c65a0b6f0d59e7279590dedabe68a833437d5ba4ae5e100894cb74bca1713233aa2767b53d35d45b97f4bd350d238a2bdc8959be7fc5  spacefm-1.0.6.tar.lz
 d7b33441700141dc956df54f03393c02783fc5188b82883401d4781c52fb383089af5ed3b3645b686078a6ac06d3b3e269f7ee5ab3f4d1416ebb0141fbaa7b7e  spacefm-include-sysmacros.patch
 "
diff --git a/extra/ssb.extra.SMBuild b/extra/ssb.extra.SMBuild
index c07372d..c599230 100755
--- a/extra/ssb.extra.SMBuild
+++ b/extra/ssb.extra.SMBuild
@@ -8,7 +8,7 @@
 
 # Prevent users from directly executing this section autobuild file. The whole build 
 # process has to be initiated from the main autobuild file.
-if [ -z "$SM_AUTOBUILD" ] ; then
+if [ -z "$autobuild" ] ; then
   echo "Please invoke the main ssb.SMBuild file rather than this section build file because"
   echo "it has the required functions that are exported to this section build file during"
   echo "the build process"
@@ -17,27 +17,27 @@ fi
 
 . /etc/bldpkg.conf
 
-if [ -n "$SM_AUTOBUILDTEMP" ] ; then
-  SM_AUTOBUILDTEMP="$(echo $SM_AUTOBUILDTEMP)"
-  export SM_AUTOBUILDTEMP
+if [ -n "$autobuildtemp" ] ; then
+  autobuildtemp="$(echo $autobuildtemp)"
+  export autobuildtemp
 fi
 
-SM_COLOURS=0
-export SM_COLOURS
+colours=0
+export colours
 
 # Make sure we are in the right directory (you can never trust users..)
 cd $( cd ${BASH_SOURCE%/*} ; pwd )
 
 # Section name.
 # This should not need to be changed unless the auto detection fails.
-SECTION="$( basename $( pwd ) )"
-export SECTION
+section="$( basename $( pwd ) )"
+export section
 
-if [ ! -f .buildlist."$SECTION" ]; then
+if [ ! -f .buildlist."$section" ]; then
 	echo ""
 	echo "**********************************************************************"
 	echo "The buildlist either doesn't exist, or is of a different architecture."
-	echo "** .buildlist.$SECTION is needed **"
+	echo "** .buildlist.$section is needed **"
 	echo "Exiting!"
 	echo "**********************************************************************"
 	exit 1
@@ -46,15 +46,15 @@ fi
 # Packages to build.
 # The package list is read in from .buildlist in the current directory, with
 # any comments and blank lines removed.
-PACKAGES="$( egrep -v "^#|^$" .buildlist."$SECTION" | cut -d'#' -f1 )"
+packages="$( egrep -v "^#|^$" .buildlist."$section" | cut -d'#' -f1 )"
 
 function list_packages() {
-  local PACKAGE
+  local package
   echo "The following packages are built in this section, listed in processing order:"
 
-  ( for PACKAGE in $PACKAGES 
+  ( for package in $packages
     do
-      echo -n "$PACKAGE, "
+      echo -n "$package, "
     done ) | sed -e 's/, $//' | fmt -w 74 | sed -e 's/^/    /g'
 }
 
@@ -74,49 +74,49 @@ function find_package_files() {
 }
 
 # Environment.
-PACKAGESDIR=${PACKAGESDIR:-/$ARCH}
-export PACKAGESDIR
+packagesdir=${packagesdir:-/$arch}
+export packagesdir
 
 # Option defaults.
-NOPATCHESDIR=0
-NOINSTALL=0
+nopatchesdir=0
+noinstall=0
 
 # This check compares a list of source directories with the list of the
 # packages in the build list and warns of any missing package names 
 # in either of the two.
 
-DIRTEMPFILE=$(mktemp $SM_PARENTTMP/DIRECTORYNAMES."$SECTION".XXXXXX)
-DIRFILETEMPPATH="$DIRTEMPFILE"
-DIRLIST=$(find . -type d -maxdepth 1 -mindepth 1 | sed 's@./@@' | sort > $DIRFILETEMPPATH)
+dirtempfile=$(mktemp $parenttmp/DIRECTORYNAMES."$section".XXXXXX)
+dirfiletemppath="$dirtempfile"
+dirlist=$(find . -type d -maxdepth 1 -mindepth 1 | sed 's@./@@' | sort > $dirfiletemppath)
 
-PACKTEMPFILE=$(mktemp $SM_PARENTTMP/BUILDFILENAMES."$SECTION".XXXXXX)
-PACKFILETEMPPATH="$PACKTEMPFILE"
-sort .buildlist.$SECTION > $PACKFILETEMPPATH
+packtempfile=$(mktemp $parenttmp/BUILDFILENAMES."$section".XXXXXX)
+packfiletemppath="$packtempfile"
+sort .buildlist.$section > $packfiletemppath
   
-DIRECTORYCOUNT="$( wc -l < $DIRTEMPFILE )"
-BUILDLISTCOUNT="$( wc -l < $PACKTEMPFILE )"
+directorycount="$( wc -l < $dirtempfile )"
+buildlistcount="$( wc -l < $packtempfile )"
 
 # Get number of total packages
-TOTALPKGNUMBER="$(wc -l < .buildlist.$SECTION)"
-export TOTALPKGNUMBER
+totalpkgnumber="$(wc -l < .buildlist.$section)"
+export totalpkgnumber
 
-if diff -u "$DIRFILETEMPPATH" "$PACKFILETEMPPATH" > /dev/null 2>&1 ; then
-  DIFFSTATUS="0"
+if diff -u "$dirfiletemppath" "$packfiletemppath" > /dev/null 2>&1 ; then
+  diffstatus="0"
 else
-  DIFFSTATUS="1"
+  diffstatus="1"
 fi
 
-if [ "$DIFFSTATUS" != "0" ]; then 
+if [ "$diffstatus" != "0" ]; then 
   echo "*********************************************************************"
-  echo "** Warning: In section '"$SECTION"', the number of packages in the"
-  echo "** hidden file '.buildlist."$SECTION"' is different to the number of"
+  echo "** Warning: In section '"$section"', the number of packages in the"
+  echo "** hidden file '.buildlist."$section"' is different to the number of"
   echo "** package directories. Some packages may not have been added to"
   echo "** this file/section directory. They are listed below:"
   echo ""
 
-  diff -u "$DIRFILETEMPPATH" "$PACKFILETEMPPATH" || true
+  diff -u "$dirfiletemppath" "$packfiletemppath" || true
   echo ""
-  diff -u "$PACKFILETEMPPATH" "$DIRFILETEMPPATH" || true
+  diff -u "$packfiletemppath" "$dirfiletemppath" || true
 
   echo ""
   echo "** Building anyways :-) "
@@ -124,7 +124,7 @@ if [ "$DIFFSTATUS" != "0" ]; then
   sleep 2
 
 fi
-rm -f $PACKFILETEMPPATH $DIRFILETEMPPATH
+rm -f $packfiletemppath $dirfiletemppath
 
 # Parse command line arguments.
 while [ $# -gt 0 ]; do
@@ -143,44 +143,44 @@ while [ $# -gt 0 ]; do
 done
 
 # Temporary space, package and log file storage.
-mkdir -p $PKGDEST $LOGSDIR/$SECTION
+mkdir -p $pkgdest $logsdir/$section
 
       echo "*********************************************************************"
-      echo "** Building section '$SECTION'..."
+      echo "** Building section '$section'..."
       echo "*********************************************************************"
 
 # Process packages.
-( for PACKAGE in $PACKAGES 
+( for package in $packages
   do
     # Build defaults.
-    SKIP_BUILD=0
-    SUBDIR=$PACKAGESDIR/$SECTION
+    skip_build=0
+    subdir=$packagesdir/$section
 
       echo "*********************************************************************"
-      echo "*** Processing package '$PACKAGE'..."
+      echo "*** Processing package '$package'..."
       echo "*********************************************************************"
 
     # Sanity checks.
-    [ ! -e "$PACKAGE/$PACKAGE.SMBuild" ] && {
+    [ ! -e "$package/$package.SMBuild" ] && {
       echo "*********************************************************************"
-      echo "*** Error: '$PACKAGE.SMBuild' not found."
+      echo "*** Error: '$package.SMBuild' not found."
       echo "*********************************************************************"
       exit 1
     }
-    [ ! -x "$PACKAGE/$PACKAGE.SMBuild" ] && {
+    [ ! -x "$package/$package.SMBuild" ] && {
       echo "*********************************************************************"
-      echo "*** Error: '$PACKAGE.SMBuild' is not executable."
+      echo "*** Error: '$package.SMBuild' is not executable."
       echo "*********************************************************************"
       exit 1
     }
 
     # Get package version and build numbers from the package SMBuild.
-    source "$PACKAGE/$PACKAGE.SMBuild"
+    source "$package/$package.SMBuild"
 
     # Check that we got a version and build.
-    [ -z "$VERSION" ] || [ -z "$BUILD" ] && {
+    [ -z "$version" ] || [ -z "$build" ] && {
       echo "*********************************************************************"
-      echo "*** Error: failed to get VERSION or BUILD from '$PACKAGE.SMBuild'"
+      echo "*** Error: failed to get version or build from '$package.SMBuild'"
       echo "*********************************************************************"
       exit 1
     }
@@ -188,77 +188,77 @@ mkdir -p $PKGDEST $LOGSDIR/$SECTION
     # Check if the package should be rebuilt, and where it should be put.
     # The assumption is to always rebuild and put packages in the main
     # directory, unless modified by the checks below.
-    if find_package_files "$PKGDEST/$SUBDIR" "${PACKAGE//+/\+}" \
-      "" "" "" "\.$PKGEXT" >/dev/null
+    if find_package_files "$pkgdest/$subdir" "${package//+/\+}" \
+      "" "" "" "\.$pkgext" >/dev/null
     then
-      if find_package_files "$PKGDEST/$SUBDIR" "${PACKAGE//+/\+}" \
-        "${VERSION//-/_}" "" "$BUILD" "\.$PKGEXT" >/dev/null
+      if find_package_files "$pkgdest/$subdir" "${package//+/\+}" \
+        "${version//-/_}" "" "$build" "\.$pkgext" >/dev/null
       then
         # Package with same version/build was found in the main directory.
-        SKIP_BUILD=1
+        skip_build=1
       fi
     fi
 
     # Build package if required.
-    if [ "$SKIP_BUILD" = "0" ]; then
+    if [ "$skip_build" = "0" ]; then
       echo "*********************************************************************"
-      echo "*** Building package '$PACKAGE'..."
+      echo "*** Building package '$package'..."
       echo "*********************************************************************"
       # Get the current package number from the build list
-      CURRENTPKGNUMBER="$(grep -wn "$PACKAGE" .buildlist.$SECTION | cut -d: -f 1)"
-      export CURRENTPKGNUMBER
-      mkdir -p $PKGDEST/$SUBDIR
-      ( cd $PACKAGE && export PKGDEST=$PKGDEST/$SUBDIR &&
+      currentpkgnumber="$(grep -wn "$package" .buildlist.$section | cut -d: -f 1)"
+      export currentpkgnumber
+      mkdir -p $pkgdest/$subdir
+      ( cd $package && export pkgdest=$pkgdest/$subdir &&
         bldpkg 2>&1 ) | \
-        tee $LOGSDIR/$SECTION/$PACKAGE-$SECTION-$HOSTTYPE.log.txt
+        tee $logsdir/$section/$package-$section-$HOSTTYPE.log.txt
       # Unset $CURRENTPKGNUMBER. We don't want issues when a new one comes in
-      ERR=${PIPESTATUS[0]}
-      if [ "$ERR" != "0" ] ; then 
-        unset CURRENTPKGNUMBER
-        echo "*** Error: '$PACKAGE' build failed."
-        exit $ERR
+      err=${PIPESTATUS[0]}
+      if [ "$err" != "0" ] ; then 
+        unset currentpkgnumber
+        echo "*** Error: '$package' build failed."
+        exit $err
       else
-        unset CURRENTPKGNUMBER
-        mv $LOGSDIR/$SECTION/$PACKAGE-$SECTION-$HOSTTYPE.log.txt \
-          $LOGSDIR/$SECTION/$PACKAGE-$VERSION-$BUILD-$SECTION-$HOSTTYPE.log.txt
-        rm -f $SM_PARENTTMP/$PACKAGE.{APP,VERSION,BUILD}
+        unset currentpkgnumber
+        mv $logsdir/$section/$package-$section-$HOSTTYPE.log.txt \
+          $logsdir/$section/$package-$version-$build-$section-$HOSTTYPE.log.txt
+        rm -f $parenttmp/$package.{app,version,build}
       fi
     else
       echo "*********************************************************************"
-      echo "*** Skipping build of '$PACKAGE' - package up to date."
+      echo "*** Skipping build of '$package' - package up to date."
       echo "*********************************************************************"
 
     fi
 
-    if [ "$NOINSTALL" = "0" ]; then
+    if [ "$noinstall" = "0" ]; then
       echo
       echo "*********************************************************************"
-      echo "*** Installing '$PACKAGE'..."
+      echo "*** Installing '$package'..."
       echo "*********************************************************************"
-      upgradepkg --install-new $( find_package_files "$PKGDEST/$SUBDIR" \
-        "${PACKAGE//+/\+}" "${VERSION//-/_}" "" "$BUILD" "\.$PKGEXT" ) || {
+      upgradepkg --install-new $( find_package_files "$pkgdest/$subdir" \
+        "${package//+/\+}" "${version//-/_}" "" "$build" "\.$pkgext" ) || {
         echo
         echo "*********************************************************************"
-        echo "*** Error: failed to install '$PACKAGE'."
+        echo "*** Error: failed to install '$package'."
         echo "*********************************************************************"
         exit 1
       }
     else
       echo
       echo "*********************************************************************"
-      echo "*** Warning: not installing '$PACKAGE'."
+      echo "*** Warning: not installing '$package'."
       echo "*********************************************************************"
     fi
   done
 
   echo "*********************************************************************"
-  echo "** Finished building section '$SECTION'."
-  echo "** SMLinux packages are in '$PKGDEST/$ARCH/$SECTION'."
-  echo "** Section build logs are in '$LOGSDIR/$SECTION'."
+  echo "** Finished building section '$section'."
+  echo "** SMLinux packages are in '$pkgdest/$arch/$section'."
+  echo "** Section build logs are in '$logsdir/$section'."
   echo "*********************************************************************"
   echo "** Section build time was $( runtime $SECONDS )"
   echo "*********************************************************************"
-) 2>&1 | tee $LOGSDIR/$SECTION-$ARCH.log.txt
+) 2>&1 | tee $logsdir/$section-$arch.log.txt
 
 # Return the exit status from the sub-shell, not the tee command.
 exit ${PIPESTATUS[0]}
diff --git a/extra/testdisk/testdisk.SMBuild b/extra/testdisk/testdisk.SMBuild
index 73df031..e514a3c 100755
--- a/extra/testdisk/testdisk.SMBuild
+++ b/extra/testdisk/testdisk.SMBuild
@@ -1,16 +1,16 @@
-APP=testdisk
-VERSION=7.1
-BUILD=1sml
-HOMEPAGE="https://www.cgsecurity.org/wiki/TestDisk"
-DESC="Data recovery software to recover lost files and partitions"
-REQUIRES="util-linux ntfs-3g"
+app=testdisk
+version=7.1
+build=1sml
+homepage="https://www.cgsecurity.org/wiki/TestDisk"
+desc="Data recovery software to recover lost files and partitions"
+requires="util-linux ntfs-3g"
 
 build() {
   mkandenterbuilddir
-  rm -rf $APP-$VERSION-WIP
+  rm -rf $app-$version-WIP
 
-  tar xf $SRCDIR/$APP-$VERSION-WIP.tar.?z*
-  cd $APP-$VERSION-WIP
+  tar xf $srcdir/$app-$version-WIP.tar.?z*
+  cd $app-$version-WIP
   fixbuilddirpermissions
 
   LIBS="-lncurses -lterminfo" \
@@ -18,13 +18,13 @@ build() {
     --prefix="" \
 
   make
-  make install DESTDIR=$PKG
+  make install DESTDIR=$pkg
 
-  cp COPYING $PKGDOCS/
+  cp COPYING $pkgdocs/
 
   mkfinalpkg
 }
 
-SHA512SUMS="
+sha512sums="
 11ac3c2be8d32c8e648476cb97b15e492b73ea46cb1dc7c225db0e1766490ebed735e85f775a0dc0f2def24b272f7ac62b6c894caaf6bfc6421d003c94e71000  testdisk-7.1-WIP.tar.lz
 "
diff --git a/extra/tmux/tmux.SMBuild b/extra/tmux/tmux.SMBuild
index e527de5..836af21 100755
--- a/extra/tmux/tmux.SMBuild
+++ b/extra/tmux/tmux.SMBuild
@@ -1,17 +1,17 @@
-APP=tmux
-VERSION=2.8
-BUILD=1sml
-HOMEPAGE="https://github.com/tmux/tmux"
-DOWNLOAD="https://github.com/tmux/tmux/archive/refs/tags/2.8.tar.gz"
-DESC="terminal multiplexer, alternative to GNU screen"
-REQUIRES="netbsd-curses libevent"
+app=tmux
+version=2.8
+build=1sml
+homepage="https://github.com/tmux/tmux"
+download="https://github.com/tmux/tmux/archive/refs/tags/2.8.tar.gz"
+desc="terminal multiplexer, alternative to GNU screen"
+requires="netbsd-curses libevent"
 
 build() {
   mkandenterbuilddir
-  rm -rf $APP-$VERSION
+  rm -rf $app-$version
 
-  tar xf $SRCDIR/$APP-$VERSION.tar.?z*
-  cd $APP-$VERSION
+  tar xf $srcdir/$app-$version.tar.?z*
+  cd $app-$version
   fixbuilddirpermissions
 
   ./configure \
@@ -19,13 +19,13 @@ build() {
     --sysconfdir=/etc 
 
   make
-  make install DESTDIR=$PKG
+  make install DESTDIR=$pkg
 
-  cp COPYING README TODO $PKGDOCS/
+  cp COPYING README TODO $pkgdocs/
 
   mkfinalpkg
 }
 
-SHA512SUMS="
+sha512sums="
 0efe5498f63a234995c02b56b5bb15c439d1ca7a0312b6e3ab12fe538b012bca8e06374fc09bb83e54c78ff10264c5a971a9ca10e7153998bf29703809e1521b  tmux-2.8.tar.lz
 "
diff --git a/extra/v4l-utils/v4l-utils.SMBuild b/extra/v4l-utils/v4l-utils.SMBuild
index 5a07267..b708786 100755
--- a/extra/v4l-utils/v4l-utils.SMBuild
+++ b/extra/v4l-utils/v4l-utils.SMBuild
@@ -1,38 +1,39 @@
-APP=v4l-utils
-VERSION=1.20.0
-BUILD=1sml
-HOMEPAGE="http://linuxtv.org"
-DOWNLOAD="https://linuxtv.org/downloads/v4l-utils/v4l-utils-1.20.0.tar.bz2"
-DESC="libraries and utilities for writing video applications"
-REQUIRES="gcc-libs argp-standalone hicolor-icon-theme libjpeg-turbo sdl2"
+app=v4l-utils
+version=1.20.0
+build=1sml
+homepage="http://linuxtv.org"
+download="https://linuxtv.org/downloads/v4l-utils/v4l-utils-1.20.0.tar.bz2"
+desc="libraries and utilities for writing video applications"
+requires="gcc-libs argp-standalone hicolor-icon-theme libjpeg-turbo sdl2"
 
 build() {
   mkandenterbuilddir
-  rm -rf $APP-$VERSION
+  rm -rf $app-$version
 
-  tar xf $SRCDIR/$APP-$VERSION.tar.?z*
-  cd $APP-$VERSION 
+  tar xf $srcdir/$app-$version.tar.?z*
+  cd $app-$version 
   fixbuilddirpermissions
 
-  patch -p1 < $SRCDIR/getsubopt.patch
-  patch -p1 < $SRCDIR/types.patch
+  patch -p1 < $srcdir/getsubopt.patch
+  patch -p1 < $srcdir/types.patch
 
   CFLAGS="$CFLAGS -D__off_t=off_t" \
   LIBS="-largp" \
   ./configure \
     --prefix="" \
     --sysconfdir=/etc \
+    --sbindir=/bin \
     --disable-static
 
   make
-  make -j1 install DESTDIR=$PKG 
+  make -j1 install DESTDIR=$pkg 
 
-  cp COPYING* $PKGDOCS/
+  cp COPYING* $pkgdocs/
 
   mkfinalpkg
 }
 
-SHA512SUMS="
+sha512sums="
 179ca8dbbf7af5fa4870b70f17645d7834fe6ba52670ae6b58473efa257db0cd812ce14f16574cc4491c0bcb218835e4c29f1354882a151687eecec97852fc63  v4l-utils-1.20.0.tar.bz2
 3e51af7a77a8f06e1278022362347808b233cf021a277ce9cd66a9553e754bf91b3923c32ab17a86b11f4ef2555a5f1d544d0fc22e82a2997e34060dd561f760  getsubopt.patch
 358611fbae8348f17bf49c08820b4641deb1f7282ce2c1e20b8fdf0a85cd73ca4b46f6668c2a7328b5261e401c12f471170a9a1f3fc2982b6897ff11386c06c6  types.patch
diff --git a/extra/wmstickynotes/wmstickynotes.SMBuild b/extra/wmstickynotes/wmstickynotes.SMBuild
index 688f3de..81f401b 100755
--- a/extra/wmstickynotes/wmstickynotes.SMBuild
+++ b/extra/wmstickynotes/wmstickynotes.SMBuild
@@ -1,17 +1,17 @@
-APP=wmstickynotes
-VERSION=0.7
-BUILD=1sml
-HOMEPAGE="https://sourceforge.net/projects/wmstickynotes/"
-DOWNLOAD="http://sourceforge.net/projects/wmstickynotes/files/wmstickynotes/wmstickynotes-0.7.tar.gz"
-DESC="Window maker docking app that resembles sticky notes"
-REQUIRES="gtk2"
+app=wmstickynotes
+version=0.7
+build=1sml
+homepage="https://sourceforge.net/projects/wmstickynotes/"
+download="http://sourceforge.net/projects/wmstickynotes/files/wmstickynotes/wmstickynotes-0.7.tar.gz"
+desc="Window maker docking app that resembles sticky notes"
+requires="gtk2"
 
 build() {
   mkandenterbuilddir
-  rm -rf $APP-$VERSION
+  rm -rf $app-$version
 
-  tar xf $SRCDIR/$APP-$VERSION.tar.?z*
-  cd $APP-$VERSION
+  tar xf $srcdir/$app-$version.tar.?z*
+  cd $app-$version
   fixbuilddirpermissions
 
   ./configure \
@@ -19,13 +19,13 @@ build() {
     --sysconfdir=/etc 
 
   make
-  make install DESTDIR=$PKG
+  make install DESTDIR=$pkg
 
-  cp COPYING $PKGDOCS/
+  cp COPYING $pkgdocs/
 
   mkfinalpkg
 }
 
-SHA512SUMS="
+sha512sums="
 5e54543d056916848f968e8a768d00a913d8c27af248db6fc2eb5431ea15615bf001eb90552fc0bf1208bc5c3779ac30efddbd5bae3598e557df83789758dcd7  wmstickynotes-0.7.tar.lz
 "
diff --git a/extra/xarchiver/xarchiver.SMBuild b/extra/xarchiver/xarchiver.SMBuild
index 6d323db..4a266d3 100755
--- a/extra/xarchiver/xarchiver.SMBuild
+++ b/extra/xarchiver/xarchiver.SMBuild
@@ -1,15 +1,16 @@
-APP=xarchiver
-VERSION=0.5.4.14
-BUILD=1sml
-HOMEPAGE="http://xarchiver.sourceforge.net/"
-DESC="Archive manager for X with support for most common archive formats"
+app=xarchiver
+version=0.5.4.14
+build=1sml
+homepage="http://xarchiver.sourceforge.net/"
+desc="Archive manager for X with support for most common archive formats"
+requires="gdk-pixbuf"
 
 build() {
   mkandenterbuilddir
-  rm -rf $APP-$VERSION
+  rm -rf $app-$version
 
-  tar xf $SRCDIR/$APP-$VERSION.tar.?z*
-  cd $APP-$VERSION
+  tar xf $srcdir/$app-$version.tar.?z*
+  cd $app-$version
   fixbuilddirpermissions
 
   ./configure \
@@ -18,13 +19,13 @@ build() {
     --enable-gtk2 
 
   make
-  make install DESTDIR=$PKG
+  make install DESTDIR=$pkg
 
-  cp COPYING $PKGDOCS/
+  cp COPYING $pkgdocs/
 
   mkfinalpkg
 }
 
-SHA512SUMS="
+sha512sums="
 3c22fa31c875d9f04d5990d7a1c4ca857832b913479ca1dfabde222a9d1ba7d9904ff4b68145b8ab6d9973c02635c0635a72e999b95f10b851734d87adbffa22  xarchiver-0.5.4.14.tar.lz
 "