diff --git a/base/.buildlist.base b/base/.buildlist.base
index 5321c1c..b46eb03 100644
--- a/base/.buildlist.base
+++ b/base/.buildlist.base
@@ -1,7 +1,5 @@
 initfs
-gcc-libs
 which
-wiringpi
 dcron
 cpio
 gsl
@@ -114,9 +112,9 @@ mlocate
 groff
 mandoc
 man-pages
-pinfo
 haveged
 procps-ng
+libcap
 util-linux
 coreutils
 dosfstools
@@ -131,7 +129,6 @@ libpng
 libexif
 fribidi
 lzo
-libidn
 libidn2
 libpsl
 libnl
@@ -151,7 +148,6 @@ libevent
 texinfo
 cmake
 libjpeg-turbo
-libcap
 libcap-ng
 libvpx
 libogg
@@ -177,8 +173,6 @@ mypaint-brushes
 jbig2dec
 libvncserver
 jansson
-libnxml
-libmrss
 libassuan
 libasr
 fdk-aac
@@ -189,7 +183,6 @@ gstreamer
 icu
 hunspell
 enchant
-htop
 nano
 ncdu
 pwgen
@@ -215,6 +208,7 @@ libseccomp
 scons
 jam
 lm-sensors
+htop
 gdbm
 ruby
 syslinux
@@ -249,11 +243,9 @@ libuv
 zsh
 pm-utils
 boost
-rpi-userland
 slapt-get
 pv
 libgc
-guile
 strace
 gdb
 acpid
@@ -311,9 +303,8 @@ kernel-source
 kernel-headers
 highlight
 llvm
-clang
 rust
-lld
+cbindgen
 sccache
 libplist
 iniparser
@@ -331,3 +322,4 @@ argon2
 qrencode
 libqalculate
 fuse3
+protobuf
diff --git a/extra/.buildlist.extra b/extra/.buildlist.extra
index a7563d1..370185f 100644
--- a/extra/.buildlist.extra
+++ b/extra/.buildlist.extra
@@ -4,7 +4,6 @@ libass
 ffmpeg
 ffmpegthumbnailer
 rdesktop
-mtpaint
 rxvt-unicode
 dmenu
 dwm
@@ -16,26 +15,17 @@ imagemagick
 abiword
 gnumeric
 xarchiver
-gtkterm
 mupdf
 mplayer
 spacefm
 gtypist
 testdisk
-wmstickynotes
 audacious
-ace
 gpaint
-gparted
 iotop
-gftp
 cmus
-gnuchess
-aisleriot
 mtd-utils
 freerdp
-gimp
-gthumb
 mpv
 dia
 v4l-utils
@@ -50,3 +40,4 @@ cmatrix
 vim
 xscreensaver
 wxwidgets
+adafruit-io
diff --git a/extra/gnumeric/doinst.sh b/extra/gnumeric/doinst.sh
deleted file mode 100644
index dbe0651..0000000
--- a/extra/gnumeric/doinst.sh
+++ /dev/null
@@ -1 +0,0 @@
-[ -x /etc/rc.d/rc.gtk ] && /etc/rc.d/rc.gtk
diff --git a/extra/gthumb/gthumb.SMBuild b/extra/gthumb/gthumb.SMBuild
index d21da69..6d651fe 100755
--- a/extra/gthumb/gthumb.SMBuild
+++ b/extra/gthumb/gthumb.SMBuild
@@ -1,10 +1,10 @@
 app=gthumb
-version=3.11.2
+version=3.12.2
 build=1sml
 homepage="https://wiki.gnome.org/Apps/Gthumb"
 download="https://download.gnome.org/sources/gthumb/3.11/gthumb-$version.tar.xz"
 desc="An image viewer and browser"
-requires="exiv2 json-glib librsvg libsecret libsoup libwebp dconf gtk2 gsettings-desktop-schemas "
+requires="exiv2 json-glib librsvg libsecret libsoup libwebp dconf gtk2 gsettings-desktop-schemas"
 
 build() {
   mkandenterbuilddir
@@ -27,5 +27,5 @@ build() {
 }
 
 sha512sums="
-af2a21cb4f11c8aafa5e87057b8e96f6dfd95149741401c9a61ff7f94a6f4c9a454c6a7800bf6a8052e4c9ff57adfcfe6355a388ce7743b44e917d8559307daf  gthumb-3.11.2.tar.lz
-"
+2591f1ebaaa7978afca6db30f99fff5a83949d94fcba8b49db142b97c89c84da9e6edd987a72ca01f6cbfa65be7b4bc75a339dce016fca341c4345c607ca5a93  gthumb-3.12.2.tar.lz
+"
\ No newline at end of file
diff --git a/extra/gtkterm/gtkterm.SMBuild b/retired/gtkterm/gtkterm.SMBuild
similarity index 100%
rename from extra/gtkterm/gtkterm.SMBuild
rename to retired/gtkterm/gtkterm.SMBuild
diff --git a/base/guile/guile.SMBuild b/retired/guile/guile.SMBuild
similarity index 97%
rename from base/guile/guile.SMBuild
rename to retired/guile/guile.SMBuild
index c2c166c..4f6082f 100755
--- a/base/guile/guile.SMBuild
+++ b/retired/guile/guile.SMBuild
@@ -6,14 +6,16 @@ download="https://ftp.gnu.org/gnu/guile/guile-$version.tar.xz"
 desc="GNU extension language library"
 requires="libtool netbsd-curses libunistring libffi gmp libgc"
 
-build() {
+prepbuilddir() {
   mkandenterbuilddir
   rm -rf $app-$version
 
   tar xf $srcdir/$app-$version.tar.?z*
   cd $app-$version 
   fixbuilddirpermissions
+}
 
+build() {
   ./configure \
     --prefix="" \
     --disable-error-on-warning \
diff --git a/base/libidn/libidn.SMBuild b/retired/libidn/libidn.SMBuild
similarity index 96%
rename from base/libidn/libidn.SMBuild
rename to retired/libidn/libidn.SMBuild
index cb7651a..e391578 100755
--- a/base/libidn/libidn.SMBuild
+++ b/retired/libidn/libidn.SMBuild
@@ -5,14 +5,16 @@ homepage="https://www.gnu.org/software/libidn/"
 desc="GNU Internationalized Domain Name library"
 requires="musl"
 
-build() {
+prepbuilddir() {
   mkandenterbuilddir
   rm -rf $app-$version
 
   tar xf $srcdir/$app-$version.tar.?z*
   cd $app-$version
   fixbuilddirpermissions
+}
 
+build() {
   ./configure \
     --prefix="" \
     --disable-static 
diff --git a/base/libmrss/libmrss.SMBuild b/retired/libmrss/libmrss.SMBuild
similarity index 97%
rename from base/libmrss/libmrss.SMBuild
rename to retired/libmrss/libmrss.SMBuild
index 7e53f25..954f8a6 100755
--- a/base/libmrss/libmrss.SMBuild
+++ b/retired/libmrss/libmrss.SMBuild
@@ -5,14 +5,16 @@ homepage="https://github.com/bakulf/libmrss"
 desc="C Library for parsing, writing and creating RSS files"
 requires="libnxml"
 
-build() {
+prepbuilddir() {
   mkandenterbuilddir
   rm -rf $app-$version
 
   tar xf $srcdir/$app-$version.tar.?z*
   cd $app-$version
   fixbuilddirpermissions
+}
 
+build() {
   ./configure \
     --prefix="" \
     --disable-static \
diff --git a/base/libnxml/libnxml.SMBuild b/retired/libnxml/libnxml.SMBuild
similarity index 97%
rename from base/libnxml/libnxml.SMBuild
rename to retired/libnxml/libnxml.SMBuild
index 8a3c442..dcccc33 100755
--- a/base/libnxml/libnxml.SMBuild
+++ b/retired/libnxml/libnxml.SMBuild
@@ -5,14 +5,16 @@ homepage="https://github.com/bakulf/libnxml"
 desc="C library for parsing XML 1.0 and 1.1 files or streams"
 requires="zlib curl nghttp2 libidn2 libssh2 openssl brotli libunistring"
 
-build() {
+prepbuilddir() {
   mkandenterbuilddir
   rm -rf $app-$version
 
   tar xf $srcdir/$app-$version.tar.?z*
   cd $app-$version
   fixbuilddirpermissions
+}
 
+build() {
   ./configure \
     --prefix="" \
     --disable-static \
diff --git a/extra/mtpaint/mtpaint.SMBuild b/retired/mtpaint/mtpaint.SMBuild
similarity index 100%
rename from extra/mtpaint/mtpaint.SMBuild
rename to retired/mtpaint/mtpaint.SMBuild