diff --git a/extra/abiword/abiword.SMBuild b/extra/abiword/abiword.SMBuild
index d714da2..ce592e1 100755
--- a/extra/abiword/abiword.SMBuild
+++ b/extra/abiword/abiword.SMBuild
@@ -1,7 +1,7 @@
 app=abiword
 version=3.0.4
 build=2sml
-homepage="www.abisource.com"
+homepage="https://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 "
diff --git a/extra/gthumb/gthumb.SMBuild b/extra/gthumb/gthumb.SMBuild
index 4ff899e..bd6ea64 100755
--- a/extra/gthumb/gthumb.SMBuild
+++ b/extra/gthumb/gthumb.SMBuild
@@ -1,8 +1,8 @@
 app=gthumb
-version=3.8.3
+version=3.11.2
 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"
+download="https://download.gnome.org/sources/gthumb/3.11/gthumb-3.11.4.tar.xz"
 desc="An image viewer and browser"
 requires="exiv2 json-glib librsvg libsecret libsoup libwebp dconf gtk2 gsettings-desktop-schemas "
 
@@ -27,5 +27,5 @@ build() {
 }
 
 sha512sums="
-ed8be7421494b1cb1c4ae87d5703ef398e4c887f081a71a5a0dbb3ef4950784c334685a46f68650e4f4f665b3444104133b9b567d0a3842651ba62d27c6f8c2a  gthumb-3.8.3.tar.lz
+062b0be4e21ad1eeca19fbc17f1f505e3be697b50e682af62c786859e0bd9ed267955bad83b9e3fa377e935c25ea8c734812f57b4bd005cf96f7e9b143c39461  gthumb-3.11.2.tar.xz
 "
diff --git a/extra/libass/libass.SMBuild b/extra/libass/libass.SMBuild
index c4d4d5b..9264a42 100755
--- a/extra/libass/libass.SMBuild
+++ b/extra/libass/libass.SMBuild
@@ -1,10 +1,10 @@
 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 "
+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 and SSA formats'
+requires="glib nasm fribidi fontconfig freetype harfbuzz"
 
 build() {
   mkandenterbuilddir
diff --git a/extra/rdesktop/rdesktop.SMBuild b/extra/rdesktop/rdesktop.SMBuild
index c31a46b..407a046 100755
--- a/extra/rdesktop/rdesktop.SMBuild
+++ b/extra/rdesktop/rdesktop.SMBuild
@@ -1,9 +1,9 @@
 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"
+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() {
diff --git a/extra/scrcpy/scrcpy.SMBuild b/extra/scrcpy/scrcpy.SMBuild
index 7f45e3e..228980a 100755
--- a/extra/scrcpy/scrcpy.SMBuild
+++ b/extra/scrcpy/scrcpy.SMBuild
@@ -1,9 +1,9 @@
 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"
+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() {
diff --git a/extra/sdl/sdl.SMBuild b/extra/sdl/sdl.SMBuild
index 307eef7..2b7f795 100755
--- a/extra/sdl/sdl.SMBuild
+++ b/extra/sdl/sdl.SMBuild
@@ -1,9 +1,9 @@
 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"
+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() {
diff --git a/extra/sdl2/sdl2.SMBuild b/extra/sdl2/sdl2.SMBuild
index 5626a19..2a93424 100755
--- a/extra/sdl2/sdl2.SMBuild
+++ b/extra/sdl2/sdl2.SMBuild
@@ -1,9 +1,9 @@
 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"
+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() {
diff --git a/gtk/gnome-icon-theme/gnome-icon-theme.SMBuild b/gtk/gnome-icon-theme/gnome-icon-theme.SMBuild
index 7e941d0..c1bff7d 100755
--- a/gtk/gnome-icon-theme/gnome-icon-theme.SMBuild
+++ b/gtk/gnome-icon-theme/gnome-icon-theme.SMBuild
@@ -2,7 +2,7 @@ app=gnome-icon-theme
 version=2.32.2
 build=1sml
 homepage="https://git.pktsurf.in/smlinux"
-desc="Fake gnome-icon-theme package only containing pkgconfig file"
+desc="Fake theme package only containing pkgconfig file"
 requires="hicolor-icon-theme"
 
 build() {
diff --git a/gtk/gst-plugins-bad/gst-plugins-bad.SMBuild b/gtk/gst-plugins-bad/gst-plugins-bad.SMBuild
index 3695ae5..494037d 100755
--- a/gtk/gst-plugins-bad/gst-plugins-bad.SMBuild
+++ b/gtk/gst-plugins-bad/gst-plugins-bad.SMBuild
@@ -3,7 +3,7 @@ version=1.16.2
 build=1sml
 homepage="https://gstreamer.freedesktop.org/"
 download="https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.16.2.tar.xz"
-desc="Multimedia graph framework - bad plugins"
+desc="Multimedia graph framework containing restricted plugins"
 requires="alsa-lib libpng libjpeg-turbo libtheora opus glu pango gtk3 gst-plugins-base "
 
 build() {
diff --git a/gtk/gst-plugins-base/gst-plugins-base.SMBuild b/gtk/gst-plugins-base/gst-plugins-base.SMBuild
index dfb58e7..11e8621 100755
--- a/gtk/gst-plugins-base/gst-plugins-base.SMBuild
+++ b/gtk/gst-plugins-base/gst-plugins-base.SMBuild
@@ -1,10 +1,10 @@
 app=gst-plugins-base
 version=1.16.2
 build=1sml
-homepage="https://gstreamer.freedesktop.org/"
-download="https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.16.2.tar.xz"
-desc="Multimedia graph framework - base plugins"
-requires="alsa-lib libpng libjpeg-turbo libtheora opus gstreamer glu pango gtk3 "
+homepage='https://gstreamer.freedesktop.org/'
+download='https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.16.2.tar.xz'
+desc='Multimedia graph framework containing base plugins'
+requires="alsa-lib libpng libjpeg-turbo libtheora opus gstreamer glu pango gtk3"
 
 build() {
   mkandenterbuilddir
diff --git a/gtk/gst-plugins-good/gst-plugins-good.SMBuild b/gtk/gst-plugins-good/gst-plugins-good.SMBuild
index e0c0370..fbc9672 100755
--- a/gtk/gst-plugins-good/gst-plugins-good.SMBuild
+++ b/gtk/gst-plugins-good/gst-plugins-good.SMBuild
@@ -3,7 +3,7 @@ version=1.16.2
 build=1sml
 homepage="https://gstreamer.freedesktop.org/"
 download="https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.16.2.tar.xz"
-desc="Multimedia graph framework - good plugins"
+desc="Multimedia graph framework containing good plugins"
 requires="alsa-lib libpng libjpeg-turbo libtheora opus glu pango gtk3 gst-plugins-base "
 
 build() {
diff --git a/gtk/libsigcpp/libsigcpp.SMBuild b/gtk/libsigcpp/libsigcpp.SMBuild
index fc6464e..c1fda73 100755
--- a/gtk/libsigcpp/libsigcpp.SMBuild
+++ b/gtk/libsigcpp/libsigcpp.SMBuild
@@ -6,7 +6,7 @@ version=2.9.3
 build=1sml
 homepage="https://libsigcplusplus.github.io/libsigcplusplus/"
 download="https://download.gnome.org/sources/libsigc++/2.9/libsigc%2B%2B-2.9.3.tar.xz"
-desc="typesafe callback system for standard C++"
+desc='Typesafe callback system for standard C++'
 requires="gcc-libs"
 
 build() {
diff --git a/gtk/pygobject3/pygobject3.SMBuild b/gtk/pygobject3/pygobject3.SMBuild
index d884279..25b29d4 100755
--- a/gtk/pygobject3/pygobject3.SMBuild
+++ b/gtk/pygobject3/pygobject3.SMBuild
@@ -3,7 +3,7 @@ version=3.38.0
 build=1sml
 homepage="https://wiki.gnome.org/Projects/PyGObject"
 download="https://gitlab.gnome.org/GNOME/pygobject/-/archive/3.38.0/pygobject-3.38.0.tar.bz2"
-desc="Python Bindings for GLib/GObject/GIO/GTK+"
+desc="Python Bindings for GLib, GObject, GIO and GTK+"
 requires="python3 gobject-introspection gtk3 "
 
 build() {
diff --git a/gtk/pygobject3/python-pygobject.CHKSUM512 b/gtk/pygobject3/python-pygobject.CHKSUM512
deleted file mode 100644
index d6c6da4..0000000
--- a/gtk/pygobject3/python-pygobject.CHKSUM512
+++ /dev/null
@@ -1 +0,0 @@
-SHA512 (PyGObject-3.38.0.tar.lz) = dc77c064da2cfb5e196a7993142594c41f11d0505e92eeaa6c56e611faec1ad5d290c390f511a2788b9ffc936f775aff63b3033895d9dd031b7a73381d6d9d4f
diff --git a/gtk/pygobject3/python-pygobject.CHKSUM512.sig b/gtk/pygobject3/python-pygobject.CHKSUM512.sig
deleted file mode 100644
index 0da1f2c..0000000
--- a/gtk/pygobject3/python-pygobject.CHKSUM512.sig
+++ /dev/null
@@ -1,3 +0,0 @@
-untrusted comment: verify with smlinux.pub
-RWR12kEmRnyWatQKBCmLrtToLEdWgShJ3lbnDDtJ7e+gvc9pbqzwkdCLwmBmo5Mp9BX+2ZgoHO7ApqF7E9ZfY3cGK2qyLNg04gU=
-SHA512 (PyGObject-3.38.0.tar.lz) = dc77c064da2cfb5e196a7993142594c41f11d0505e92eeaa6c56e611faec1ad5d290c390f511a2788b9ffc936f775aff63b3033895d9dd031b7a73381d6d9d4f
diff --git a/net/hexchat/hexchat.SMBuild b/net/hexchat/hexchat.SMBuild
index 5afe905..a76548b 100755
--- a/net/hexchat/hexchat.SMBuild
+++ b/net/hexchat/hexchat.SMBuild
@@ -14,6 +14,11 @@ build() {
   cd $app-$version
   fixbuilddirpermissions
 
+  # Since we are using skarnet's toolchain and a custom gcc specs file,
+  # this can cause errors because skarnet's toolchain also looks inside
+  # /usr/local which we only use for occasional builds
+  sed -i 's@Werror=missing-include-dirs @@g' configure
+
   ./configure \
     --prefix="" \
     --sysconfdir=/etc \