diff --git a/xfce/exo/exo.SMBuild b/xfce/exo/exo.SMBuild
index aa88021..f76f08d 100755
--- a/xfce/exo/exo.SMBuild
+++ b/xfce/exo/exo.SMBuild
@@ -1,17 +1,17 @@
-APP=exo
-VERSION=4.16.0
-BUILD=1sml
-HOMEPAGE="https://docs.xfce.org/xfce/exo/start"
-DOWNLOAD="https://archive.xfce.org/xfce/4.16/src/exo-4.16.0.tar.bz2"
-DESC="Extension library for Xfce"
-REQUIRES="gtk3 libxfce4util libxfce4ui"
+app=exo
+version=4.16.0
+build=1sml
+homepage="https://docs.xfce.org/xfce/exo/start"
+download="https://archive.xfce.org/xfce/4.16/src/exo-4.16.0.tar.bz2"
+desc="Extension library for Xfce"
+requires="gtk3 libxfce4util libxfce4ui"
 
 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
-  make install DESTDIR=$PKG
+  make install DESTDIR=$pkg
 
-  cp COPYING* $PKGDOCS/
+  cp COPYING* $pkgdocs/
 
   mkfinalpkg
 }
 
-SHA512SUMS="
+sha512sums="
 10cbdfc2d81290e75c07f851ed562fcff4aea8cb709317bb768387f4a955cd208772927d356e7e3582cc4747f237d1dd34c0de1532bc549bece0306c106f411a  exo-4.16.0.tar.lz
 "
\ No newline at end of file
diff --git a/xfce/faenza-icon-theme/faenza-icon-theme.SMBuild b/xfce/faenza-icon-theme/faenza-icon-theme.SMBuild
index 5028bf9..db21f86 100755
--- a/xfce/faenza-icon-theme/faenza-icon-theme.SMBuild
+++ b/xfce/faenza-icon-theme/faenza-icon-theme.SMBuild
@@ -1,28 +1,28 @@
-APP=faenza-icon-theme
-VERSION=1.3
-BUILD=1sml
-HOMEPAGE="https://gnome-look.org/content/show.php/Faenza?content=128143"
-DOWNLOAD="http://ppa.launchpad.net/tiheum/equinox/ubuntu/pool/main/f/faenza-icon-theme/faenza-icon-theme_1.3.tar.gz"
-DESC="Theme pack for GNOME"
-REQUIRES="gtk2 gtk3"
+app=faenza-icon-theme
+version=1.3
+build=1sml
+homepage="https://gnome-look.org/content/show.php/Faenza?content=128143"
+download="http://ppa.launchpad.net/tiheum/equinox/ubuntu/pool/main/f/faenza-icon-theme/faenza-icon-theme_1.3.tar.gz"
+desc="Theme pack for GNOME"
+requires="gtk2 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
 
-  mkdir -p $PKG/share/icons
-  cp -r Faenza{,-Dark,-Darker,-Darkest,-Ambiance,-Radiance} $PKG/share/icons/
-  cp -r emesene $PKG/share/
+  mkdir -p $pkg/share/icons
+  cp -r Faenza{,-Dark,-Darker,-Darkest,-Ambiance,-Radiance} $pkg/share/icons/
+  cp -r emesene $pkg/share/
 
-  cp debian/copyright $PKGDOCS/
+  cp debian/copyright $pkgdocs/
 
   mkfinalpkg
 }
 
-SHA512SUMS="
+sha512sums="
 742c11438fa3a5044765381c4a2a2f9bef3d997ab3bf9a2c2be8fc25f7a9cf95a25b84e5e0dfeeceaeb4b4c3ed6d98c4be860575cd5bebda59226f26e3ed560b  faenza-icon-theme-1.3.tar.lz
 "
\ No newline at end of file
diff --git a/xfce/garcon/garcon.SMBuild b/xfce/garcon/garcon.SMBuild
index 6e724ed..044bebf 100755
--- a/xfce/garcon/garcon.SMBuild
+++ b/xfce/garcon/garcon.SMBuild
@@ -1,17 +1,17 @@
-APP=garcon
-VERSION=4.16.1
-BUILD=1sml
-HOMEPAGE="https://docs.xfce.org/xfce/garcon/start"
-DOWNLOAD="https://archive.xfce.org/xfce/4.16/src/garcon-0.8.0.tar.bz2"
-DESC="Menu implementation for Xfce"
-REQUIRES="libxfce4ui"
+app=garcon
+version=4.16.1
+build=1sml
+homepage="https://docs.xfce.org/xfce/garcon/start"
+download="https://archive.xfce.org/xfce/4.16/src/garcon-0.8.0.tar.bz2"
+desc="Menu implementation for Xfce"
+requires="libxfce4ui"
 
 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
-  make install DESTDIR=$PKG
+  make install DESTDIR=$pkg
 
-  cp COPYING $PKGDOCS/
+  cp COPYING $pkgdocs/
 
   mkfinalpkg
 }
 
-SHA512SUMS="
+sha512sums="
 8f1b17daa746bbf8eeddc0eb5a17a20f6b987fd4ac30b0de104c22efe91f293292f3d71c548b14e073b616af4bcc68f2dd3bf950786b3ee78ab118d196711fe4  garcon-4.16.1.tar.lz
 "
\ No newline at end of file
diff --git a/xfce/libxfce4ui/libxfce4ui.SMBuild b/xfce/libxfce4ui/libxfce4ui.SMBuild
index 60514a5..a2bab03 100755
--- a/xfce/libxfce4ui/libxfce4ui.SMBuild
+++ b/xfce/libxfce4ui/libxfce4ui.SMBuild
@@ -1,17 +1,17 @@
-APP=libxfce4ui
-VERSION=4.16.0
-BUILD=1sml
-HOMEPAGE="https://docs.xfce.org/xfce/libxfce4ui/start"
-DOWNLOAD="https://archive.xfce.org/xfce/4.16/src/libxfce4ui-4.16.0.tar.bz2"
-DESC="Xfce widget library"
-REQUIRES="libsm libepoxy libxfce4util xfconf gtk3"
+app=libxfce4ui
+version=4.16.0
+build=1sml
+homepage="https://docs.xfce.org/xfce/libxfce4ui/start"
+download="https://archive.xfce.org/xfce/4.16/src/libxfce4ui-4.16.0.tar.bz2"
+desc="Xfce widget library"
+requires="libsm libepoxy libxfce4util xfconf 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
 
   ./configure \
@@ -20,13 +20,13 @@ build() {
     --disable-static 
 
   make
-  make -j1 install DESTDIR=$PKG
+  make -j1 install DESTDIR=$pkg
 
-  cp COPYING $PKGDOCS/
+  cp COPYING $pkgdocs/
 
   mkfinalpkg
 }
 
-SHA512SUMS="
+sha512sums="
 07ce8399ca860d5414f91b0795ba61eff21b6022a9e8c26de77a6c4e6c45371e10318b626a892b7e2998d95c7e92cf32c2cd48fdefc291bb5521fe8a6cf93aed  libxfce4ui-4.16.0.tar.bz2
 "
diff --git a/xfce/libxfce4util/libxfce4util.SMBuild b/xfce/libxfce4util/libxfce4util.SMBuild
index 7c58832..b23e7fb 100755
--- a/xfce/libxfce4util/libxfce4util.SMBuild
+++ b/xfce/libxfce4util/libxfce4util.SMBuild
@@ -1,17 +1,17 @@
-APP=libxfce4util
-VERSION=4.16.0
-BUILD=1sml
-HOMEPAGE="https://www.xfce.org"
-DOWNLOAD="https://archive.xfce.org/xfce/4.16/src/libxfce4util-4.16.0.tar.bz2"
-DESC="Basic non-GUI utility library for Xfce"
-REQUIRES="glib"
+app=libxfce4util
+version=4.16.0
+build=1sml
+homepage="https://www.xfce.org"
+download="https://archive.xfce.org/xfce/4.16/src/libxfce4util-4.16.0.tar.bz2"
+desc="Basic non-GUI utility library for Xfce"
+requires="glib"
 
 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-static 
 
   make
-  make install DESTDIR=$PKG
+  make install DESTDIR=$pkg
 
-  cp COPYING $PKGDOCS/
+  cp COPYING $pkgdocs/
 
   mkfinalpkg
 }
 
-SHA512SUMS="
+sha512sums="
 dce6992c3da73367461d7464794a9b2a5503666113682e07a86e18b1c5383de2b087809448d5729097571f4fda6b4af5f4f4600848514ab2ab4b3f367ca26f5c  libxfce4util-4.16.0.tar.bz2
 "
\ No newline at end of file
diff --git a/xfce/mousepad/mousepad.SMBuild b/xfce/mousepad/mousepad.SMBuild
index 5473806..b8084b8 100755
--- a/xfce/mousepad/mousepad.SMBuild
+++ b/xfce/mousepad/mousepad.SMBuild
@@ -1,30 +1,30 @@
-APP=mousepad
-VERSION=0.5.8
-BUILD=1sml
-HOMEPAGE="https://docs.xfce.org/apps/mousepad/start"
-DOWNLOAD="https://archive.xfce.org/src/apps/mousepad/0.5/mousepad-0.5.8.tar.bz2"
-DESC="Fast, easy-to-use text editor for Xfce"
-REQUIRES="desktop-file-utils gspell"
+app=mousepad
+version=0.5.8
+build=1sml
+homepage="https://docs.xfce.org/apps/mousepad/start"
+download="https://archive.xfce.org/src/apps/mousepad/0.5/mousepad-0.5.8.tar.bz2"
+desc="Fast, easy-to-use text editor for Xfce"
+requires="desktop-file-utils gspell"
 
 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="
 6446927b564fe18c3127835e592d0248efa690c7b8fc2a7da92f237eb16184bd502c446a5b50aed8acd1d8233c22ee7e91c0b9ee512232f7d7a69c72f1dea9e9  mousepad-0.5.8.tar.bz2
 "
diff --git a/xfce/ristretto/ristretto.SMBuild b/xfce/ristretto/ristretto.SMBuild
index bd89e6c..0ed046f 100755
--- a/xfce/ristretto/ristretto.SMBuild
+++ b/xfce/ristretto/ristretto.SMBuild
@@ -1,17 +1,17 @@
-APP=ristretto
-VERSION=0.12.2
-BUILD=1sml
-HOMEPAGE="https://docs.xfce.org/apps/ristretto/start"
-DOWNLOAD="https://archive.xfce.org/src/apps/ristretto/0.12/ristretto-0.12.2.tar.bz2"
-DESC="Lightweight image viewer for Xfce"
-REQUIRES="file libexif libxfce4ui tumbler xfconf"
+app=ristretto
+version=0.12.2
+build=1sml
+homepage="https://docs.xfce.org/apps/ristretto/start"
+download="https://archive.xfce.org/src/apps/ristretto/0.12/ristretto-0.12.2.tar.bz2"
+desc="Lightweight image viewer for Xfce"
+requires="file libexif libxfce4ui tumbler xfconf"
 
 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="
 39fc5868c3858e3667660b6411b3d39c19a2306be3d169e499aa11aff34a24e0ee8e745e15dfe301be48e1c6adce30129ed76270b025f5160cfa773467764379  ristretto-0.12.2.tar.bz2
 "
\ No newline at end of file
diff --git a/xfce/ssb.xfce.SMBuild b/xfce/ssb.xfce.SMBuild
index 63774d1..617a3dd 100755
--- a/xfce/ssb.xfce.SMBuild
+++ b/xfce/ssb.xfce.SMBuild
@@ -8,36 +8,36 @@
 
 # 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"
   exit 1
 fi
 
-#. /etc/bldpkg.conf
+. /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/xfce/thunar-archive-plugin/thunar-archive-plugin.SMBuild b/xfce/thunar-archive-plugin/thunar-archive-plugin.SMBuild
index 3476926..444343a 100755
--- a/xfce/thunar-archive-plugin/thunar-archive-plugin.SMBuild
+++ b/xfce/thunar-archive-plugin/thunar-archive-plugin.SMBuild
@@ -1,17 +1,17 @@
-APP=thunar-archive-plugin
-VERSION=0.4.0
-BUILD=1sml
-HOMEPAGE="https://docs.xfce.org/xfce/thunar/archive"
-DOWNLOAD="https://archive.xfce.org/src/thunar-plugins/thunar-archive-plugin/0.4/thunar-archive-plugin-0.4.0.tar.bz2"
-DESC="Plugin to create and extract archives in Thunar"
-REQUIRES="xfce4-dev-tools thunar"
+app=thunar-archive-plugin
+version=0.4.0
+build=1sml
+homepage="https://docs.xfce.org/xfce/thunar/archive"
+download="https://archive.xfce.org/src/thunar-plugins/thunar-archive-plugin/0.4/thunar-archive-plugin-0.4.0.tar.bz2"
+desc="Plugin to create and extract archives in Thunar"
+requires="xfce4-dev-tools thunar"
 
 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-static \
 
   make
-  make install DESTDIR=$PKG
+  make install DESTDIR=$pkg
 
-  cp COPYING $PKGDOCS/
+  cp COPYING $pkgdocs/
 
   mkfinalpkg
 }
 
-SHA512SUMS="
+sha512sums="
 6590d8765ac6eab14fae7758e4c47c66b52e79e2e4b01a86d25bd35492590925ca35e4bbade8a9d8f0c73386eaeda6863e2a7a39a2df2904404f7e2bfdd91a44  thunar-archive-plugin-0.4.0.tar.bz2
 "
\ No newline at end of file
diff --git a/xfce/thunar-volman/thunar-volman.SMBuild b/xfce/thunar-volman/thunar-volman.SMBuild
index e344790..fdedf6d 100755
--- a/xfce/thunar-volman/thunar-volman.SMBuild
+++ b/xfce/thunar-volman/thunar-volman.SMBuild
@@ -1,17 +1,17 @@
-APP=thunar-volman
-VERSION=4.16.0
-BUILD=1sml
-HOMEPAGE="https://docs.xfce.org/xfce/thunar/thunar-volman"
-DOWNLOAD="https://archive.xfce.org/xfce/4.16/src/thunar-volman-4.16.0.tar.bz2"
-DESC="Plugin to auto-manage removable devices in Thunar"
-REQUIRES="libxfce4ui thunar"
+app=thunar-volman
+version=4.16.0
+build=1sml
+homepage="https://docs.xfce.org/xfce/thunar/thunar-volman"
+download="https://archive.xfce.org/xfce/4.16/src/thunar-volman-4.16.0.tar.bz2"
+desc="Plugin to auto-manage removable devices in Thunar"
+requires="libxfce4ui thunar"
 
 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-static 
 
   make
-  make install DESTDIR=$PKG
+  make install DESTDIR=$pkg
 
-  cp COPYING $PKGDOCS/
+  cp COPYING $pkgdocs/
 
   mkfinalpkg
 }
 
-SHA512SUMS="
+sha512sums="
 33b7561e55491b793aa634dfa0b108788286e6b7a2f60a781b8ba10f73de74630520736ae99c4db66ae2da562a82bb1a6bdacd8307d6d452f26e647da6471af8  thunar-volman-4.16.0.tar.bz2
 "
\ No newline at end of file
diff --git a/xfce/thunar/thunar.SMBuild b/xfce/thunar/thunar.SMBuild
index e673d2b..e5066e4 100755
--- a/xfce/thunar/thunar.SMBuild
+++ b/xfce/thunar/thunar.SMBuild
@@ -1,17 +1,17 @@
-APP=thunar
-VERSION=4.16.2
-BUILD=1sml
-HOMEPAGE="https://docs.xfce.org/xfce/thunar/start"
-DOWNLOAD="https://archive.xfce.org/xfce/4.16/src/thunar-4.16.0.tar.bz2"
-DESC="Modern file manager for Xfce Desktop Environment"
-REQUIRES="desktop-file-utils libexif libgudev libpng pcre libnotify libxfce4util libxfce4ui exo tumbler gobject-introspection"
+app=thunar
+version=4.16.2
+build=1sml
+homepage="https://docs.xfce.org/xfce/thunar/start"
+download="https://archive.xfce.org/xfce/4.16/src/thunar-4.16.0.tar.bz2"
+desc="Modern file manager for Xfce Desktop Environment"
+requires="desktop-file-utils libexif libgudev libpng pcre libnotify libxfce4util libxfce4ui exo tumbler gobject-introspection"
 
 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 \
@@ -23,13 +23,13 @@ build() {
     --enable-pcre 
 
   make
-  make install DESTDIR=$PKG
+  make install DESTDIR=$pkg
 
-  cp COPYING* $PKGDOCS/
+  cp COPYING* $pkgdocs/
 
   mkfinalpkg
 }
 
-SHA512SUMS="
+sha512sums="
 761bc2b2106db523b5b56b9f330a42e487aeccd144d2118956a67d6935ee6d795edf543a815c3e035dd7cc4b0965679811d39d9c5e6b6f7ca84eb362f22561e0  thunar-4.16.2.tar.bz2
 "
diff --git a/xfce/tumbler/tumbler.SMBuild b/xfce/tumbler/tumbler.SMBuild
index ee3013c..7819ca8 100755
--- a/xfce/tumbler/tumbler.SMBuild
+++ b/xfce/tumbler/tumbler.SMBuild
@@ -1,17 +1,17 @@
-APP=tumbler
-VERSION=4.16.0
-BUILD=1sml
-HOMEPAGE="https://docs.xfce.org/xfce/tumbler/start"
-DOWNLOAD="https://archive.xfce.org/xfce/4.16/src/tumbler-4.16.0.tar.bz2"
-DESC="Thumbnail generator"
-REQUIRES="glib gobject-introspection"
+app=tumbler
+version=4.16.0
+build=1sml
+homepage="https://docs.xfce.org/xfce/tumbler/start"
+download="https://archive.xfce.org/xfce/4.16/src/tumbler-4.16.0.tar.bz2"
+desc="Thumbnail generator"
+requires="glib gobject-introspection"
 
 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
-  make install DESTDIR=$PKG
+  make install DESTDIR=$pkg
 
-  cp COPYING $PKGDOCS/
+  cp COPYING $pkgdocs/
 
   mkfinalpkg
 }
 
-SHA512SUMS="
+sha512sums="
 e243b79e4bd953c266146905b3717be2ef8b518f4cf1a7d70be8f32056abf4ca4cc113edef2690db19559f1af1c8ed45241bdf7028e5304322371cf399bd9eb7  tumbler-4.16.0.tar.lz
 "
\ No newline at end of file
diff --git a/xfce/upower/upower.SMBuild b/xfce/upower/upower.SMBuild
index 4f8c747..03f6f53 100755
--- a/xfce/upower/upower.SMBuild
+++ b/xfce/upower/upower.SMBuild
@@ -1,17 +1,17 @@
-APP=upower
-VERSION=0.99.11
-BUILD=1sml
-HOMEPAGE="http://upower.freedesktop.org"
-DOWNLOAD="https://upower.freedesktop.org/releases/upower-0.99.11.tar.xz"
-DESC="Abstraction layer for enumerating power devices"
-REQUIRES="pcre glib util-linux netbsd-curses libffi eudev libusb dbus"
+app=upower
+version=0.99.11
+build=1sml
+homepage="http://upower.freedesktop.org"
+download="https://upower.freedesktop.org/releases/upower-0.99.11.tar.xz"
+desc="Abstraction layer for enumerating power devices"
+requires="pcre glib util-linux netbsd-curses libffi eudev libusb dbus"
 
 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-static
 
   make
-  make install DESTDIR=$PKG
+  make install DESTDIR=$pkg
 
-  cp COPYING $PKGDOCS/
+  cp COPYING $pkgdocs/
 
   mkfinalpkg
 }
 
-SHA512SUMS="
+sha512sums="
 1f61e3d47ee62e34a7be15cc7144ee5f684eb204859bbd98c4b697e25ce3a6b7a100cb2354518190ebcaffb2f96d4ffb6464309654c16aea9dc1db727b982aca  upower-0.99.11.tar.lz
 "
\ No newline at end of file
diff --git a/xfce/vte5/vte5.SMBuild b/xfce/vte5/vte5.SMBuild
index fc98aa8..47aa652 100755
--- a/xfce/vte5/vte5.SMBuild
+++ b/xfce/vte5/vte5.SMBuild
@@ -1,17 +1,17 @@
-APP=vte5
-VERSION=0.50.4
-BUILD=1sml
-HOMEPAGE="https://wiki.gnome.org/Apps/Terminal/VTE"
-DOWNLOAD="https://gitlab.gnome.org/GNOME/vte/-/archive/0.50.4/vte-0.50.4.tar.bz2"
-DESC="GTK+ terminal widget library for use in writing terminal emulators"
-REQUIRES="gtk3"
+app=vte5
+version=0.50.4
+build=1sml
+homepage="https://wiki.gnome.org/Apps/Terminal/VTE"
+download="https://gitlab.gnome.org/GNOME/vte/-/archive/0.50.4/vte-0.50.4.tar.bz2"
+desc="GTK+ terminal widget library for use in writing terminal emulators"
+requires="gtk3"
 
 build() {
   mkandenterbuilddir
-  rm -rf vte-$VERSION
+  rm -rf vte-$version
 
-  tar xf $SRCDIR/vte-$VERSION.tar.?z*
-  cd vte-$VERSION
+  tar xf $srcdir/vte-$version.tar.?z*
+  cd vte-$version
   fixbuilddirpermissions
 
   ./configure \
@@ -22,13 +22,13 @@ build() {
     --disable-static
 
   make
-  make install DESTDIR=$PKG
+  make install DESTDIR=$pkg
 
-  cp COPYING $PKGDOCS/
+  cp COPYING $pkgdocs/
 
   mkfinalpkg
 }
 
-SHA512SUMS="
+sha512sums="
 7a3fa071559e35151bc72b7f349401844be63b5314aba663591796d694c76e2e84c6bc5f3f14cdccd864546515156c9683be66151c2c6b80ef45921d49f73b27  vte-0.50.4.tar.lz
 "
\ No newline at end of file
diff --git a/xfce/xfce4-appfinder/xfce4-appfinder.SMBuild b/xfce/xfce4-appfinder/xfce4-appfinder.SMBuild
index 58985e4..e93257e 100755
--- a/xfce/xfce4-appfinder/xfce4-appfinder.SMBuild
+++ b/xfce/xfce4-appfinder/xfce4-appfinder.SMBuild
@@ -1,17 +1,17 @@
-APP=xfce4-appfinder
-VERSION=4.16.1
-BUILD=1sml
-HOMEPAGE="https://docs.xfce.org/xfce/xfce4-appfinder/start"
-DOWNLOAD="https://archive.xfce.org/xfce/4.16/src/xfce4-appfinder-4.16.0.tar.bz2"
-DESC="Application finding widget for Xfce"
-REQUIRES="garcon libxfce4ui xfconf"
+app=xfce4-appfinder
+version=4.16.1
+build=1sml
+homepage="https://docs.xfce.org/xfce/xfce4-appfinder/start"
+download="https://archive.xfce.org/xfce/4.16/src/xfce4-appfinder-4.16.0.tar.bz2"
+desc="Application finding widget for Xfce"
+requires="garcon libxfce4ui xfconf"
 
 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-static 
 
   make
-  make install DESTDIR=$PKG
+  make install DESTDIR=$pkg
 
-  cp COPYING $PKGDOCS/
+  cp COPYING $pkgdocs/
 
   mkfinalpkg
 }
 
-SHA512SUMS="
+sha512sums="
 5a28d93675af7d77de3050e7df9e064a0fd94d579d7e617878329d4385b42594afd8de96740cb91de38ffcc22bda71e4f90b61ff401980a5582bf09b2a19870c  xfce4-appfinder-4.16.1.tar.bz2
 "
\ No newline at end of file
diff --git a/xfce/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin.SMBuild b/xfce/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin.SMBuild
index 8f89009..0c2b5b5 100755
--- a/xfce/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin.SMBuild
+++ b/xfce/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin.SMBuild
@@ -1,17 +1,17 @@
-APP=xfce4-cpugraph-plugin
-VERSION=1.2.6
-BUILD=1sml
-HOMEPAGE="https://docs.xfce.org/panel-plugins/xfce4-cpugraph-plugin"
-DOWNLOAD="https://archive.xfce.org/src/panel-plugins/xfce4-cpugraph-plugin/1.2/xfce4-cpugraph-plugin-1.2.6.tar.bz2"
-DESC="Xfce Panel plugin to show graphically show CPU load"
-REQUIRES="xfce4-panel"
+app=xfce4-cpugraph-plugin
+version=1.2.6
+build=1sml
+homepage="https://docs.xfce.org/panel-plugins/xfce4-cpugraph-plugin"
+download="https://archive.xfce.org/src/panel-plugins/xfce4-cpugraph-plugin/1.2/xfce4-cpugraph-plugin-1.2.6.tar.bz2"
+desc="Xfce Panel plugin to show graphically show CPU load"
+requires="xfce4-panel"
 
 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-static
 
   make
-  make install DESTDIR=$PKG
+  make install DESTDIR=$pkg
 
-  cp COPYING $PKGDOCS/
+  cp COPYING $pkgdocs/
 
   mkfinalpkg
 }
 
-SHA512SUMS="
+sha512sums="
 6205a0a7616b0dc5de3cdeb79a5148ee775b426a16b52c491129f74104ab224ec3b29b042a3c8ee05b77cc8775c83d75a8312b96a71504cde50dc257e8354857  xfce4-cpugraph-plugin-1.2.6.tar.bz2
 "
\ No newline at end of file
diff --git a/xfce/xfce4-datetime-plugin/xfce4-datetime-plugin.SMBuild b/xfce/xfce4-datetime-plugin/xfce4-datetime-plugin.SMBuild
index e8116fd..a1d5364 100755
--- a/xfce/xfce4-datetime-plugin/xfce4-datetime-plugin.SMBuild
+++ b/xfce/xfce4-datetime-plugin/xfce4-datetime-plugin.SMBuild
@@ -1,17 +1,17 @@
-APP=xfce4-datetime-plugin
-VERSION=0.8.1
-BUILD=1sml
-HOMEPAGE="https://docs.xfce.org/panel-plugins/xfce4-datetime-plugin"
-DOWNLOAD="https://archive.xfce.org/src/panel-plugins/xfce4-datetime-plugin/0.8/xfce4-datetime-plugin-0.8.1.tar.bz2"
-DESC="Xfce panel plugin to show date and time"
-REQUIRES="xfce4-panel"
+app=xfce4-datetime-plugin
+version=0.8.1
+build=1sml
+homepage="https://docs.xfce.org/panel-plugins/xfce4-datetime-plugin"
+download="https://archive.xfce.org/src/panel-plugins/xfce4-datetime-plugin/0.8/xfce4-datetime-plugin-0.8.1.tar.bz2"
+desc="Xfce panel plugin to show date and time"
+requires="xfce4-panel"
 
 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-static
 
   make
-  make install DESTDIR=$PKG
+  make install DESTDIR=$pkg
 
-  cp COPYING $PKGDOCS/
+  cp COPYING $pkgdocs/
 
   mkfinalpkg
 }
 
-SHA512SUMS="
+sha512sums="
 2671b3732e9bfca68543ababa69dd16d988ba0acf0f0c8d2eba539143f8764f561053c69de3f89441e32c3098d135ee0cdf630aed5a4db16316455bdfc98120a  xfce4-datetime-plugin-0.8.1.tar.bz2
 "
\ No newline at end of file
diff --git a/xfce/xfce4-dev-tools/xfce4-dev-tools.SMBuild b/xfce/xfce4-dev-tools/xfce4-dev-tools.SMBuild
index aed0f9f..b2bb71b 100755
--- a/xfce/xfce4-dev-tools/xfce4-dev-tools.SMBuild
+++ b/xfce/xfce4-dev-tools/xfce4-dev-tools.SMBuild
@@ -1,17 +1,17 @@
-APP=xfce4-dev-tools
-VERSION=4.16.0
-BUILD=1sml
-HOMEPAGE="https://docs.xfce.org/xfce/xfce4-dev-tools/start"
-DOWNLOAD="https://archive.xfce.org/xfce/4.16/src/xfce4-dev-tools-4.16.0.tar.bz2"
-DESC="XFCE developer tools and macros"
-REQUIRES="musl"
+app=xfce4-dev-tools
+version=4.16.0
+build=1sml
+homepage="https://docs.xfce.org/xfce/xfce4-dev-tools/start"
+download="https://archive.xfce.org/xfce/4.16/src/xfce4-dev-tools-4.16.0.tar.bz2"
+desc="XFCE developer tools and macros"
+requires="musl"
 
 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
-  make install DESTDIR=$PKG
+  make install DESTDIR=$pkg
 
-  cp COPYING $PKGDOCS/
+  cp COPYING $pkgdocs/
 
   mkfinalpkg
 }
 
-SHA512SUMS="
+sha512sums="
 54d9b45535c174ab0d13a3061ba2ff247c788a1190a6622b0adb4242d12e1fe42715256a18168d42fd5e425bbc7e9e81de30aa507da04f3e8d9b6f1ae5a5a7a7  xfce4-dev-tools-4.16.0.tar.bz2
 "
\ No newline at end of file
diff --git a/xfce/xfce4-dict/xfce4-dict.SMBuild b/xfce/xfce4-dict/xfce4-dict.SMBuild
index 503d580..72bbd00 100755
--- a/xfce/xfce4-dict/xfce4-dict.SMBuild
+++ b/xfce/xfce4-dict/xfce4-dict.SMBuild
@@ -1,17 +1,17 @@
-APP=xfce4-dict
-VERSION=0.8.4
-BUILD=1sml
-HOMEPAGE="https://docs.xfce.org/apps/xfce4-dict/start"
-DOWNLOAD="https://archive.xfce.org/src/apps/xfce4-dict/0.8/xfce4-dict-0.8.4.tar.bz2"
-DESC="Dictionary plugin for Xfce panel"
-REQUIRES="librsvg xfce4-panel"
+app=xfce4-dict
+version=0.8.4
+build=1sml
+homepage="https://docs.xfce.org/apps/xfce4-dict/start"
+download="https://archive.xfce.org/src/apps/xfce4-dict/0.8/xfce4-dict-0.8.4.tar.bz2"
+desc="Dictionary plugin for Xfce panel"
+requires="librsvg xfce4-panel"
 
 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() {
     --localstatedir=/var
 
   make
-  make install DESTDIR=$PKG
+  make install DESTDIR=$pkg
 
-  cp COPYING $PKGDOCS/
+  cp COPYING $pkgdocs/
 
   mkfinalpkg
 }
 
-SHA512SUMS="
+sha512sums="
 f662b94671f2179cc93010e9ff6ad7f3425cfafeb8d7c635fefb8e816d78273f0135d6c7ff3ed143e5e01985eb4275ac89827d197ed059fbfa79df69b327f253  xfce4-dict-0.8.4.tar.bz2
 "
diff --git a/xfce/xfce4-diskperf-plugin/xfce4-diskperf-plugin.SMBuild b/xfce/xfce4-diskperf-plugin/xfce4-diskperf-plugin.SMBuild
index 7b19ccd..dffda1c 100755
--- a/xfce/xfce4-diskperf-plugin/xfce4-diskperf-plugin.SMBuild
+++ b/xfce/xfce4-diskperf-plugin/xfce4-diskperf-plugin.SMBuild
@@ -1,17 +1,17 @@
-APP=xfce4-diskperf-plugin
-VERSION=2.6.3
-BUILD=1sml
-HOMEPAGE="https://docs.xfce.org/panel-plugins/xfce4-diskperf-plugin"
-DOWNLOAD="https://archive.xfce.org/src/panel-plugins/xfce4-diskperf-plugin/2.6/xfce4-diskperf-plugin-2.6.3.tar.bz2"
-DESC="Xfce panel plugin to show disk and partition performance"
-REQUIRES="xfce4-panel"
+app=xfce4-diskperf-plugin
+version=2.6.3
+build=1sml
+homepage="https://docs.xfce.org/panel-plugins/xfce4-diskperf-plugin"
+download="https://archive.xfce.org/src/panel-plugins/xfce4-diskperf-plugin/2.6/xfce4-diskperf-plugin-2.6.3.tar.bz2"
+desc="Xfce panel plugin to show disk and partition performance"
+requires="xfce4-panel"
 
 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-static
 
   make
-  make install DESTDIR=$PKG
+  make install DESTDIR=$pkg
 
-  cp COPYING $PKGDOCS/
+  cp COPYING $pkgdocs/
 
   mkfinalpkg
 }
  
-SHA512SUMS="
+sha512sums="
 fb7ffeaca14f67bb8a2423529f7040d3e51a0184a552f4636acfb4aec914da5fef95db2c710cad8cb1a3b96ef9abc308ad072b03f6e2ccc49793c0edb73dc116  xfce4-diskperf-plugin-2.6.3.tar.bz2
 "
\ No newline at end of file
diff --git a/xfce/xfce4-fsguard-plugin/xfce4-fsguard-plugin.SMBuild b/xfce/xfce4-fsguard-plugin/xfce4-fsguard-plugin.SMBuild
index a82d4aa..cab3459 100755
--- a/xfce/xfce4-fsguard-plugin/xfce4-fsguard-plugin.SMBuild
+++ b/xfce/xfce4-fsguard-plugin/xfce4-fsguard-plugin.SMBuild
@@ -1,17 +1,17 @@
-APP=xfce4-fsguard-plugin
-VERSION=1.1.2
-BUILD=1sml
-HOMEPAGE="https://docs.xfce.org/panel-plugins/xfce4-fsguard-plugin/start"
-DOWNLOAD="https://archive.xfce.org/src/panel-plugins/xfce4-fsguard-plugin/1.1/xfce4-fsguard-plugin-1.1.2.tar.bz2"
-DESC="File system usage plugin for Xfce panel"
-REQUIRES="xfce4-panel"
+app=xfce4-fsguard-plugin
+version=1.1.2
+build=1sml
+homepage="https://docs.xfce.org/panel-plugins/xfce4-fsguard-plugin/start"
+download="https://archive.xfce.org/src/panel-plugins/xfce4-fsguard-plugin/1.1/xfce4-fsguard-plugin-1.1.2.tar.bz2"
+desc="File system usage plugin for Xfce panel"
+requires="xfce4-panel"
 
 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() {
     --localstatedir=/var
 
   make
-  make install DESTDIR=$PKG
+  make install DESTDIR=$pkg
 
-  cp COPYING $PKGDOCS/
+  cp COPYING $pkgdocs/
 
   mkfinalpkg
 }
 
-SHA512SUMS="
+sha512sums="
 ff42f3d92292357f432a69fc401dec474b1eadabbcd7602f4453f7567faaa623d3672664c3a2baa98ea4e522c6a607b5a40327c5fea33b2d8535f15a4d511ebb  xfce4-fsguard-plugin-1.1.2.tar.bz2
 "
\ No newline at end of file
diff --git a/xfce/xfce4-netload-plugin/xfce4-netload-plugin.SMBuild b/xfce/xfce4-netload-plugin/xfce4-netload-plugin.SMBuild
index 3bb59ba..0e76527 100755
--- a/xfce/xfce4-netload-plugin/xfce4-netload-plugin.SMBuild
+++ b/xfce/xfce4-netload-plugin/xfce4-netload-plugin.SMBuild
@@ -1,17 +1,17 @@
-APP=xfce4-netload-plugin
-VERSION=1.4.0
-BUILD=1sml
-HOMEPAGE="https://docs.xfce.org/panel-plugins/xfce4-netload-plugin"
-DOWNLOAD="https://archive.xfce.org/src/panel-plugins/xfce4-netload-plugin/1.4/xfce4-netload-plugin-1.4.0.tar.bz2"
-DESC="Network load plugin for Xfce panel"
-REQUIRES="xfce4-panel"
+app=xfce4-netload-plugin
+version=1.4.0
+build=1sml
+homepage="https://docs.xfce.org/panel-plugins/xfce4-netload-plugin"
+download="https://archive.xfce.org/src/panel-plugins/xfce4-netload-plugin/1.4/xfce4-netload-plugin-1.4.0.tar.bz2"
+desc="Network load plugin for Xfce panel"
+requires="xfce4-panel"
 
 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,11 +20,11 @@ build() {
     --localstatedir=/var
 
   make
-  make install DESTDIR=$PKG
+  make install DESTDIR=$pkg
 
   mkfinalpkg
 }
 
-SHA512SUMS="
+sha512sums="
 b9740251a81382f25ed3c89f10e842ef5432e36696df304a2b038d4a0a0a8c49d9988fff5274f3421870afe4f8cca1755222d6e7c514cea51e6eea7235a00382  xfce4-netload-plugin-1.4.0.tar.bz2
 "
\ No newline at end of file
diff --git a/xfce/xfce4-notifyd/xfce4-notifyd.SMBuild b/xfce/xfce4-notifyd/xfce4-notifyd.SMBuild
index cacb155..b23c1bb 100755
--- a/xfce/xfce4-notifyd/xfce4-notifyd.SMBuild
+++ b/xfce/xfce4-notifyd/xfce4-notifyd.SMBuild
@@ -1,17 +1,17 @@
-APP=xfce4-notifyd
-VERSION=0.6.2
-BUILD=1sml
-HOMEPAGE="https://docs.xfce.org/apps/notifyd/start"
-DOWNLOAD="https://archive.xfce.org/src/apps/xfce4-notifyd/0.6/xfce4-notifyd-0.6.2.tar.bz2"
-DESC="Notification daemon for the Xfce desktop"
-REQUIRES="libnotify libxfce4ui"
+app=xfce4-notifyd
+version=0.6.2
+build=1sml
+homepage="https://docs.xfce.org/apps/notifyd/start"
+download="https://archive.xfce.org/src/apps/xfce4-notifyd/0.6/xfce4-notifyd-0.6.2.tar.bz2"
+desc="Notification daemon for the Xfce desktop"
+requires="libnotify libxfce4ui"
 
 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 -e "s/^systemd_user_in_files =.*/systemd_user_in_files =/"  -i Makefile.in
@@ -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="
 13fdbcd5031ad44a89327eb65356a4d2c45315e0c8c507e457eee4cc95898794679163de9603a2059d9aaf20d62df317f8a09e0353f6adb526970a21d580b325  xfce4-notifyd-0.6.2.tar.bz2
 "
diff --git a/xfce/xfce4-panel/xfce4-panel.SMBuild b/xfce/xfce4-panel/xfce4-panel.SMBuild
index 8219121..f387a20 100755
--- a/xfce/xfce4-panel/xfce4-panel.SMBuild
+++ b/xfce/xfce4-panel/xfce4-panel.SMBuild
@@ -1,17 +1,17 @@
-APP=xfce4-panel
-VERSION=4.16.1
-BUILD=1sml
-HOMEPAGE="https://docs.xfce.org/xfce/xfce4-panel/start"
-DOWNLOAD="https://archive.xfce.org/xfce/4.16/src/xfce4-panel-4.16.0.tar.bz2"
-DESC="Panel for the Xfce Desktop Environment"
-REQUIRES="desktop-file-utils exo garcon libxfce4ui xfconf"
+app=xfce4-panel
+version=4.16.1
+build=1sml
+homepage="https://docs.xfce.org/xfce/xfce4-panel/start"
+download="https://archive.xfce.org/xfce/4.16/src/xfce4-panel-4.16.0.tar.bz2"
+desc="Panel for the Xfce Desktop Environment"
+requires="desktop-file-utils exo garcon libxfce4ui xfconf"
 
 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-static 
 
   make
-  make install DESTDIR=$PKG
+  make install DESTDIR=$pkg
 
-  cp COPYING* $PKGDOCS/
+  cp COPYING* $pkgdocs/
 
   mkfinalpkg
 }
 
-SHA512SUMS="
+sha512sums="
 ec55a9812d61db755ea56a87ea1b709af2870703fc0e5a45797406f2f4c78e8afecd6e1bc081f3618a81030c9c0595ae8edbb29731d4bef3750e202bbf35e99c  xfce4-panel-4.16.1.tar.bz2
 "
\ No newline at end of file
diff --git a/xfce/xfce4-power-manager/xfce4-power-manager.SMBuild b/xfce/xfce4-power-manager/xfce4-power-manager.SMBuild
index 39fab28..378b66e 100755
--- a/xfce/xfce4-power-manager/xfce4-power-manager.SMBuild
+++ b/xfce/xfce4-power-manager/xfce4-power-manager.SMBuild
@@ -1,17 +1,17 @@
-APP=xfce4-power-manager
-VERSION=4.16.0
-BUILD=1sml
-HOMEPAGE="https://docs.xfce.org/xfce/xfce4-power-manager/start"
-DOWNLOAD="https://archive.xfce.org/xfce/4.16/src/xfce4-power-manager-4.16.0.tar.bz2"
-DESC="Power manager for Xfce"
-REQUIRES="upower libnotify libxfce4ui xfce4-panel xfce4-notifyd"
+app=xfce4-power-manager
+version=4.16.0
+build=1sml
+homepage="https://docs.xfce.org/xfce/xfce4-power-manager/start"
+download="https://archive.xfce.org/xfce/4.16/src/xfce4-power-manager-4.16.0.tar.bz2"
+desc="Power manager for Xfce"
+requires="upower libnotify libxfce4ui xfce4-panel xfce4-notifyd"
 
 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-network-manager 
 
   make
-  make install DESTDIR=$PKG 
+  make install DESTDIR=$pkg 
 
-  cp COPYING $PKGDOCS/
+  cp COPYING $pkgdocs/
 
   mkfinalpkg
 }
 
-SHA512SUMS="
+sha512sums="
 1c6ecfb7696bc13c9b11fdfb4ad4e3278de2350bbc59c84c933b28c07c1a0c55b9954794e1f57e4407d2b54ffaace9ea5baed829bf0683332cf9d12bff7e71ec  xfce4-power-manager-4.16.0.tar.bz2
 "
diff --git a/xfce/xfce4-screenshooter/xfce4-screenshooter.SMBuild b/xfce/xfce4-screenshooter/xfce4-screenshooter.SMBuild
index e516b37..9158ddc 100755
--- a/xfce/xfce4-screenshooter/xfce4-screenshooter.SMBuild
+++ b/xfce/xfce4-screenshooter/xfce4-screenshooter.SMBuild
@@ -1,17 +1,17 @@
-APP=xfce4-screenshooter
-VERSION=1.9.8
-BUILD=1sml
-HOMEPAGE="https://docs.xfce.org/apps/screenshooter/start"
-DOWNLOAD="https://archive.xfce.org/src/apps/xfce4-screenshooter/1.9/xfce4-screenshooter-1.9.9.tar.bz2"
-DESC="Program to take screenshots in Xfce"
-REQUIRES="libsoup xfce4-panel"
+app=xfce4-screenshooter
+version=1.9.8
+build=1sml
+homepage="https://docs.xfce.org/apps/screenshooter/start"
+download="https://archive.xfce.org/src/apps/xfce4-screenshooter/1.9/xfce4-screenshooter-1.9.9.tar.bz2"
+desc="Program to take screenshots in Xfce"
+requires="libsoup xfce4-panel"
 
 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-static 
 
   make
-  make install DESTDIR=$PKG
+  make install DESTDIR=$pkg
  
-  cp COPYING $PKGDOCS/
+  cp COPYING $pkgdocs/
 
   mkfinalpkg
 }
 
-SHA512SUMS="
+sha512sums="
 325697cf37075c313956621707ec9ae40a51ec85dfa65d73ccb8695a0b2d14cff0d62a9a30114b60b0404bd9ba25728bc4c350d3c2a65def6afa4a382883746a  xfce4-screenshooter-1.9.8.tar.bz2
 "
\ No newline at end of file
diff --git a/xfce/xfce4-session/xfce4-session.SMBuild b/xfce/xfce4-session/xfce4-session.SMBuild
index 5e3c8ad..d1f53c0 100755
--- a/xfce/xfce4-session/xfce4-session.SMBuild
+++ b/xfce/xfce4-session/xfce4-session.SMBuild
@@ -1,21 +1,21 @@
-APP=xfce4-session
-VERSION=4.16.0
-BUILD=1sml
-HOMEPAGE="https://docs.xfce.org/xfce/xfce4-session/start"
-DOWNLOAD="https://archive.xfce.org/xfce/4.16/src/xfce4-session-4.16.0.tar.bz2"
-DESC="Xfce Session Manager"
-REQUIRES="libsm xinit xrdb libxfce4ui"
+app=xfce4-session
+version=4.16.0
+build=1sml
+homepage="https://docs.xfce.org/xfce/xfce4-session/start"
+download="https://archive.xfce.org/xfce/4.16/src/xfce4-session-4.16.0.tar.bz2"
+desc="Xfce Session Manager"
+requires="libsm xinit xrdb libxfce4ui"
 
 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="" \
+    --prefix="/" \
     --sysconfdir=/etc \
     --localstatedir=/var \
     --disable-static \
@@ -23,11 +23,11 @@ build() {
     --disable-legacy-sm
 
   make
-  make install DESTDIR=$PKG
+  make install XSESSION_PREFIX="/" DESTDIR=$pkg
 
   mkfinalpkg
 }
 
-SHA512SUMS="
+sha512sums="
 fd74b24d0c2762b5a99883b62ca9447c3683e42e9e39193d0f60e02b8c1ad77a3dfff4df6f3b3c345d8ea3d4c4ef93485e9b5586862bab85d4b37110d3400fad  xfce4-session-4.16.0.tar.bz2
-"
\ No newline at end of file
+"
diff --git a/xfce/xfce4-settings/xfce4-settings.SMBuild b/xfce/xfce4-settings/xfce4-settings.SMBuild
index a94d60b..cc22697 100755
--- a/xfce/xfce4-settings/xfce4-settings.SMBuild
+++ b/xfce/xfce4-settings/xfce4-settings.SMBuild
@@ -1,20 +1,20 @@
-APP=xfce4-settings
-VERSION=4.16.0
-BUILD=1sml
-HOMEPAGE="https://docs.xfce.org/xfce/xfce4-settings/start"
-DOWNLOAD="https://archive.xfce.org/xfce/4.16/src/xfce4-settings-4.16.0.tar.bz2"
-DESC="Settings Manager for Xfce"
-REQUIRES="libnotify exo garcon libxfce4ui xfconf"
+app=xfce4-settings
+version=4.16.0
+build=1sml
+homepage="https://docs.xfce.org/xfce/xfce4-settings/start"
+download="https://archive.xfce.org/xfce/4.16/src/xfce4-settings-4.16.0.tar.bz2"
+desc="Settings Manager for Xfce"
+requires="libnotify exo garcon libxfce4ui xfconf"
 
 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/default-xsettings-xml.patch
+  patch -p1 < $srcdir/default-xsettings-xml.patch
 
   ./configure \
     --prefix="" \
@@ -26,14 +26,14 @@ build() {
     --disable-upower-glib 
 
   make
-  make install DESTDIR=$PKG
+  make install DESTDIR=$pkg
 
-  cp COPYING $PKGDOCS/
+  cp COPYING $pkgdocs/
 
   mkfinalpkg
 }
 
-SHA512SUMS="
+sha512sums="
 38c06e4d4c0963019c20a3afadb0dc1bde8d1b477bcff2d0253e29beb5e4a8b5ae9d058b544cec6fe2bfc2c1d44f74283c94538eda25436d58db0754f112a238  xfce4-settings-4.16.0.tar.bz2
 09fe6b214dbf5638d9ba47e40f67a22a1d96d61031b3c9e6e971cefc8b0f511ed37bdc90c1a906f26522ebb04a6c458b82f4e23ed84cb90772445be961b244c3  default-xsettings-xml.patch
 "
\ No newline at end of file
diff --git a/xfce/xfce4-systemload-plugin/xfce4-systemload-plugin.SMBuild b/xfce/xfce4-systemload-plugin/xfce4-systemload-plugin.SMBuild
index faa8d6d..71a4d28 100755
--- a/xfce/xfce4-systemload-plugin/xfce4-systemload-plugin.SMBuild
+++ b/xfce/xfce4-systemload-plugin/xfce4-systemload-plugin.SMBuild
@@ -1,17 +1,17 @@
-APP=xfce4-systemload-plugin
-VERSION=1.3.1
-BUILD=1sml
-HOMEPAGE="https://docs.xfce.org/panel-plugins/xfce4-systemload-plugin"
-DOWNLOAD="https://archive.xfce.org/src/panel-plugins/xfce4-systemload-plugin/1.3/xfce4-systemload-plugin-1.3.1.tar.bz2"
-DESC="System load plugin for the Xfce panel"
-REQUIRES="xfce4-panel"
+app=xfce4-systemload-plugin
+version=1.3.1
+build=1sml
+homepage="https://docs.xfce.org/panel-plugins/xfce4-systemload-plugin"
+download="https://archive.xfce.org/src/panel-plugins/xfce4-systemload-plugin/1.3/xfce4-systemload-plugin-1.3.1.tar.bz2"
+desc="System load plugin for the Xfce panel"
+requires="xfce4-panel"
 
 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-static
 
   make
-  make install DESTDIR=$PKG
+  make install DESTDIR=$pkg
 
-  cp COPYING $PKGDOCS/
+  cp COPYING $pkgdocs/
 
   mkfinalpkg
 }
 
-SHA512SUMS="
+sha512sums="
 2b2285c5960a5728dd7818f90605848e462fe5fef8643ff5be64b7087225399395ace5ec8013f6795d410b0acf79ec77c14e2ed0e56007cfe6f13133ba708876  xfce4-systemload-plugin-1.3.1.tar.bz2
 "
\ No newline at end of file
diff --git a/xfce/xfce4-taskmanager/xfce4-taskmanager.SMBuild b/xfce/xfce4-taskmanager/xfce4-taskmanager.SMBuild
index c4b4659..b8eefc3 100755
--- a/xfce/xfce4-taskmanager/xfce4-taskmanager.SMBuild
+++ b/xfce/xfce4-taskmanager/xfce4-taskmanager.SMBuild
@@ -1,17 +1,17 @@
-APP=xfce4-taskmanager
-VERSION=1.5.2
-BUILD=1sml
-HOMEPAGE="https://docs.xfce.org/apps/xfce4-taskmanager"
-DOWNLOAD="https://archive.xfce.org/src/apps/xfce4-taskmanager/1.5/xfce4-taskmanager-1.5.2.tar.bz2"
-DESC="Task manager for Xfce Desktop Environment"
-REQUIRES="libwnck3 libxmu"
+app=xfce4-taskmanager
+version=1.5.2
+build=1sml
+homepage="https://docs.xfce.org/apps/xfce4-taskmanager"
+download="https://archive.xfce.org/src/apps/xfce4-taskmanager/1.5/xfce4-taskmanager-1.5.2.tar.bz2"
+desc="Task manager for Xfce Desktop Environment"
+requires="libwnck3 libxmu"
 
 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() {
     --localstatedir=/var
 
   make
-  make install DESTDIR=$PKG
+  make install DESTDIR=$pkg
  
-  cp COPYING $PKGDOCS/
+  cp COPYING $pkgdocs/
 
   mkfinalpkg
 }
 
-SHA512SUMS="
+sha512sums="
 81074da8bf84a0fa9cecd2ab4d5672cb100e4c58ee66bdbaddcb5f6ac2886f615f4bed281920ed71e84fc94f8cd96577a3634b152d393a26f7cb4f62703d9683  xfce4-taskmanager-1.5.2.tar.bz2
 "
diff --git a/xfce/xfce4-terminal/xfce4-terminal.SMBuild b/xfce/xfce4-terminal/xfce4-terminal.SMBuild
index 3a7fda3..caa3b75 100755
--- a/xfce/xfce4-terminal/xfce4-terminal.SMBuild
+++ b/xfce/xfce4-terminal/xfce4-terminal.SMBuild
@@ -1,17 +1,17 @@
-APP=xfce4-terminal
-VERSION=0.8.10
-BUILD=1sml
-HOMEPAGE="https://docs.xfce.org/apps/terminal/start"
-DOWNLOAD="https://archive.xfce.org/src/apps/xfce4-terminal/0.8/xfce4-terminal-0.8.10.tar.bz2"
-DESC="Modern terminal emulator for the Xfce Desktop Environment"
-REQUIRES="libxfce4ui vte5"
+app=xfce4-terminal
+version=0.8.10
+build=1sml
+homepage="https://docs.xfce.org/apps/terminal/start"
+download="https://archive.xfce.org/src/apps/xfce4-terminal/0.8/xfce4-terminal-0.8.10.tar.bz2"
+desc="Modern terminal emulator for the Xfce Desktop Environment"
+requires="libxfce4ui vte5"
 
 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() {
     --localstatedir=/var
 
   make
-  make install DESTDIR=$PKG
+  make install DESTDIR=$pkg
 
-  cp COPYING $PKGDOCS/
+  cp COPYING $pkgdocs/
 
   mkfinalpkg
 }
 
-SHA512SUMS="
+sha512sums="
 92310837445adf3b611c069d28abea05650b93d54500c0436fb90e0a9be8846122d6ca69f8e6f89a11f2067dc4bfae5557bb11af48d62135b2e5eb395ccdb0f4  xfce4-terminal-0.8.10.tar.bz2
 "
\ No newline at end of file
diff --git a/xfce/xfce4-wavelan-plugin/xfce4-wavelan-plugin.SMBuild b/xfce/xfce4-wavelan-plugin/xfce4-wavelan-plugin.SMBuild
index a776d49..ec630b4 100755
--- a/xfce/xfce4-wavelan-plugin/xfce4-wavelan-plugin.SMBuild
+++ b/xfce/xfce4-wavelan-plugin/xfce4-wavelan-plugin.SMBuild
@@ -1,17 +1,17 @@
-APP=xfce4-wavelan-plugin
-VERSION=0.6.2
-BUILD=1sml
-HOMEPAGE="https://docs.xfce.org/panel-plugins/xfce4-wavelan-plugin"
-DOWNLOAD="https://archive.xfce.org/src/panel-plugins/xfce4-wavelan-plugin/0.6/xfce4-wavelan-plugin-0.6.2.tar.bz2"
-DESC="Xfce panel plugin to display wifi connectivity monitor"
-REQUIRES="xfce4-panel"
+app=xfce4-wavelan-plugin
+version=0.6.2
+build=1sml
+homepage="https://docs.xfce.org/panel-plugins/xfce4-wavelan-plugin"
+download="https://archive.xfce.org/src/panel-plugins/xfce4-wavelan-plugin/0.6/xfce4-wavelan-plugin-0.6.2.tar.bz2"
+desc="Xfce panel plugin to display wifi connectivity monitor"
+requires="xfce4-panel"
 
 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-static
 
   make
-  make install DESTDIR=$PKG
+  make install DESTDIR=$pkg
 
-  cp COPYING $PKGDOCS/
+  cp COPYING $pkgdocs/
 
   mkfinalpkg
 }
 
-SHA512SUMS="
+sha512sums="
 90e0d5f2e9add1f177f0f69e537ccdeeaf518a122feb776cb8bce139b9af6ea7d248e758ae381b69041bbdefe2d38f2162d08b25fd246d98c3a028d743892123  xfce4-wavelan-plugin-0.6.2.tar.bz2
 "
\ No newline at end of file
diff --git a/xfce/xfce4-weather-plugin/xfce4-weather-plugin.SMBuild b/xfce/xfce4-weather-plugin/xfce4-weather-plugin.SMBuild
index a0ef862..77c400a 100755
--- a/xfce/xfce4-weather-plugin/xfce4-weather-plugin.SMBuild
+++ b/xfce/xfce4-weather-plugin/xfce4-weather-plugin.SMBuild
@@ -1,17 +1,17 @@
-APP=xfce4-weather-plugin
-VERSION=0.11.0
-BUILD=1sml
-HOMEPAGE="https://docs.xfce.org/panel-plugins/xfce4-weather-plugin"
-DOWNLOAD="https://archive.xfce.org/src/panel-plugins/xfce4-weather-plugin/0.11/xfce4-weather-plugin-0.11.0.tar.bz2"
-DESC="Weather plugin for Xfce panel"
-REQUIRES="libsoup libxml2 xfce4-panel"
+app=xfce4-weather-plugin
+version=0.11.0
+build=1sml
+homepage="https://docs.xfce.org/panel-plugins/xfce4-weather-plugin"
+download="https://archive.xfce.org/src/panel-plugins/xfce4-weather-plugin/0.11/xfce4-weather-plugin-0.11.0.tar.bz2"
+desc="Weather plugin for Xfce panel"
+requires="libsoup libxml2 xfce4-panel"
 
 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,12 +21,12 @@ build() {
     --disable-static
 
   make
-  make install DESTDIR=$PKG
+  make install DESTDIR=$pkg
 
-  cp COPYING $PKGDOCS/
+  cp COPYING $pkgdocs/
 
   mkfinalpkg
 }
-SHA512SUMS="
+sha512sums="
 f4534d47f825358752ec6252fd0fc49a44ac682e4cdce960d744cd343f5f670473fa4175c59849282352dc75ca9b22b83d7ace68cedfc7dc89bcb21be24ccf86  xfce4-weather-plugin-0.11.0.tar.bz2
 "
\ No newline at end of file
diff --git a/xfce/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin.SMBuild b/xfce/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin.SMBuild
index 929cafc..b906223 100755
--- a/xfce/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin.SMBuild
+++ b/xfce/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin.SMBuild
@@ -1,31 +1,32 @@
-APP=xfce4-whiskermenu-plugin
-VERSION=2.7.1
-BUILD=1sml
-HOMEPAGE="https://gottcode.org/xfce4-whiskermenu-plugin/"
-DOWNLOAD="https://gottcode.org/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.7.1-src.tar.bz2"
-DESC="Alternate application launcher for Xfce"
-REQUIRES="gtk3 garcon xfce4-panel"
+app=xfce4-whiskermenu-plugin
+version=2.7.1
+build=1sml
+homepage="https://gottcode.org/xfce4-whiskermenu-plugin/"
+download="https://gottcode.org/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.7.1-src.tar.bz2"
+desc="Alternate application launcher for Xfce"
+requires="gtk3 garcon xfce4-panel"
 
 build() {
   mkandenterbuilddir
-  rm -rf $APP-$VERSION
+  rm -rf $app-$version
 
-  tar xf $SRCDIR/$APP-$VERSION-src.tar.?z*
-  cd $APP-$VERSION
+  tar xf $srcdir/$app-$version-src.tar.?z*
+  cd $app-$version
   fixbuilddirpermissions
 
   mkdir -p smbuild && cd smbuild
   cmake .. \
-    -DCMAKE_INSTALL_PREFIX="" 
+    -DCMAKE_INSTALL_PREFIX="" \
+    -DCMAKE_INSTALL_LIBDIR=lib
 
   make
-  make install DESTDIR=$PKG 
+  make install DESTDIR=$pkg 
 
-  cp ../COPYING $PKGDOCS/
+  cp ../COPYING $pkgdocs/
 
   mkfinalpkg
 }
 
-SHA512SUMS="
+sha512sums="
 40a1124ad8bcb51a21cab20cde8079fdce31d57ade3da787235554391e5eb9ec747c646f46f84f9ecadacf124446bf80a7aec8138415b68ed064e02371aa7c0a  xfce4-whiskermenu-plugin-2.7.1-src.tar.bz2
 "
diff --git a/xfce/xfconf/xfconf.SMBuild b/xfce/xfconf/xfconf.SMBuild
index 295df52..c4ba275 100755
--- a/xfce/xfconf/xfconf.SMBuild
+++ b/xfce/xfconf/xfconf.SMBuild
@@ -1,17 +1,17 @@
-APP=xfconf
-VERSION=4.16.0
-BUILD=1sml
-HOMEPAGE="https://docs.xfce.org/xfce/xfconf/start"
-DOWNLOAD="https://archive.xfce.org/xfce/4.16/src/xfconf-4.16.0.tar.bz2"
-DESC="Xfce configuration storage system"
-REQUIRES="libxfce4util gobject-introspection"
+app=xfconf
+version=4.16.0
+build=1sml
+homepage="https://docs.xfce.org/xfce/xfconf/start"
+download="https://archive.xfce.org/xfce/4.16/src/xfconf-4.16.0.tar.bz2"
+desc="Xfce configuration storage system"
+requires="libxfce4util gobject-introspection"
 
 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-nls 
 
   make
-  make install DESTDIR=$PKG
+  make install DESTDIR=$pkg
 
-  cp COPYING $PKGDOCS/
+  cp COPYING $pkgdocs/
 
   mkfinalpkg
 }
 
-SHA512SUMS="
+sha512sums="
 d2e6b272243d6eda71f42cb3df18cb9c0745a1864718639e9aa494902dfe5b4989b2761fee2195456e5725cad0f744978f9c95c6f01e48aa016a919ce3468344  xfconf-4.16.0.tar.bz2
 "
\ No newline at end of file
diff --git a/xfce/xfdesktop/xfdesktop.SMBuild b/xfce/xfdesktop/xfdesktop.SMBuild
index f910976..b3bf69f 100755
--- a/xfce/xfdesktop/xfdesktop.SMBuild
+++ b/xfce/xfdesktop/xfdesktop.SMBuild
@@ -1,17 +1,17 @@
-APP=xfdesktop
-VERSION=4.16.0
-BUILD=1sml
-HOMEPAGE="https://docs.xfce.org/xfce/xfdesktop/start"
-DOWNLOAD="https://archive.xfce.org/xfce/4.16/src/xfdesktop-4.16.0.tar.bz2"
-DESC="Xfce Desktop Manager"
-REQUIRES="exo garcon libxfce4ui thunar"
+app=xfdesktop
+version=4.16.0
+build=1sml
+homepage="https://docs.xfce.org/xfce/xfdesktop/start"
+download="https://archive.xfce.org/xfce/4.16/src/xfdesktop-4.16.0.tar.bz2"
+desc="Xfce Desktop Manager"
+requires="exo garcon libxfce4ui thunar"
 
 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() {
     --enable-notifications 
 
   make
-  make install DESTDIR=$PKG
+  make install DESTDIR=$pkg
 
-  cp COPYING $PKGDOCS/
+  cp COPYING $pkgdocs/
 
   mkfinalpkg
 }
 
-SHA512SUMS="
+sha512sums="
 e62e5fb12997c3138fa36aed06388b921f5223ec09afbd22b622ef39bc421773acbf73606ffc3b38b5a01845678847cda43d193c8457608715cf750acd466129  xfdesktop-4.16.0.tar.bz2
 "
\ No newline at end of file
diff --git a/xfce/xfwm4-themes/xfwm4-themes.SMBuild b/xfce/xfwm4-themes/xfwm4-themes.SMBuild
index 6ce399c..24ebc63 100755
--- a/xfce/xfwm4-themes/xfwm4-themes.SMBuild
+++ b/xfce/xfwm4-themes/xfwm4-themes.SMBuild
@@ -1,17 +1,17 @@
-APP=xfwm4-themes
-VERSION=4.10.0
-BUILD=1sml
-HOMEPAGE="https://www.xfce.org"
-DOWNLOAD="https://archive.xfce.org/src/art/xfwm4-themes/4.10/xfwm4-themes-4.10.0.tar.bz2"
-DESC="Collection of Xfce Window Manager Themes"
-REQUIRES="xfwm4"
+app=xfwm4-themes
+version=4.10.0
+build=1sml
+homepage="https://www.xfce.org"
+download="https://archive.xfce.org/src/art/xfwm4-themes/4.10/xfwm4-themes-4.10.0.tar.bz2"
+desc="Collection of Xfce Window Manager Themes"
+requires="xfwm4"
 
 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() {
     --libexecdir=/lib 
 
   make
-  make install DESTDIR=$PKG 
+  make install DESTDIR=$pkg 
 
-  cp COPYING $PKGDOCS/
+  cp COPYING $pkgdocs/
 
   mkfinalpkg
 }
 
-SHA512SUMS="
+sha512sums="
 5c77e9f1b4b1051f86696605d2fcc8ba6abbc667fc2ae48c5eb1235d62fb99e5171a7c8b9b662147e86b1f508fd8d723f931bd211e41675ab390ec0d7a5e1305  xfwm4-themes-4.10.0.tar.bz2
 "
\ No newline at end of file
diff --git a/xfce/xfwm4/xfwm4.SMBuild b/xfce/xfwm4/xfwm4.SMBuild
index b7380e4..3b604f9 100755
--- a/xfce/xfwm4/xfwm4.SMBuild
+++ b/xfce/xfwm4/xfwm4.SMBuild
@@ -1,17 +1,17 @@
-APP=xfwm4
-VERSION=4.16.1
-BUILD=1sml
-HOMEPAGE="https://docs.xfce.org/xfce/xfwm4/start"
-DOWNLOAD="https://archive.xfce.org/src/xfce/xfwm4/4.16/xfwm4-4.16.1.tar.bz2"
-DESC="Xfce Window Manager"
-REQUIRES="libepoxy libxpresent libxfce4ui xfconf"
+app=xfwm4
+version=4.16.1
+build=1sml
+homepage="https://docs.xfce.org/xfce/xfwm4/start"
+download="https://archive.xfce.org/src/xfce/xfwm4/4.16/xfwm4-4.16.1.tar.bz2"
+desc="Xfce Window Manager"
+requires="libepoxy libxpresent libxfce4ui xfconf"
 
 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
 
   # Results in faster window draw and less CPU on the pi 
@@ -31,13 +31,13 @@ build() {
     $compositingflag 
 
   make
-  make install DESTDIR=$PKG
+  make install DESTDIR=$pkg
 
-  cp COPYING $PKGDOCS/
+  cp COPYING $pkgdocs/
 
   mkfinalpkg
 }
 
-SHA512SUMS="
+sha512sums="
 f0d5d00e58202457d0d7d5f9772e7b2aa3f3339850065609baab7d379248a628d147464cc605698970134b87d58b7867b8c09d0a3a45ab84b2f3aa95be26f0b9  xfwm4-4.16.1.tar.bz2
 "
\ No newline at end of file