diff --git a/_unmaintained/lua/lua/SlackBuild b/_unmaintained/lua/lua/SlackBuild
deleted file mode 100755
index 72057b07..00000000
--- a/_unmaintained/lua/lua/SlackBuild
+++ /dev/null
@@ -1,171 +0,0 @@
-#!/bin/bash
-
-# Slackware build script for lua53
-
-# Copyright 2018 Azure Zanculmarktum <zanculmarktum@gmail.com>
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-# Some of the codes were taken from development/lua/lua.SlackBuild
-
-CWD=${CWD:-$(pwd)}
-PRGNAM=$(basename $CWD)
-VERSION=${VERSION:-5.3.6}
-BUILD=${BUILD:-1}
-TAG=${TAG:-gwh}
-
-if [ -z "$ARCH" ]; then
-case "$( uname -m )" in
-  i?86) ARCH=i586 ;;
-  arm*) ARCH=arm ;;
-  *) ARCH=$( uname -m ) ;;
-esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-REPOSITORY=${REPOSITORY:-/var/cache/SlackBuilds.gwh/$PRGNAM}
-
-mkdir -p $REPOSITORY
-
-if [ "$ARCH" = "i586" ]; then
-    SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-    LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-    SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-    LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-    SLKCFLAGS="-O2 -fPIC"
-    LIBDIRSUFFIX="64"
-elif [ "$ARCH" = "aarch64" ]; then
-    SLKCFLAGS="-O2 -fPIC"
-    LIBDIRSUFFIX="64"
-else
-    SLKCFLAGS="-O2 -fPIC"
-    LIBDIRSUFFIX="64"
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf lua-$VERSION
-
-[ ! -e $REPOSITORY/lua-$VERSION.tar.gz ] && wget -c https://www.lua.org/ftp/lua-$VERSION.tar.gz -O  $REPOSITORY/lua-$VERSION.tar.gz
-
-tar xvf $REPOSITORY/lua-$VERSION.tar.gz
-cd lua-$VERSION
-chown -R root:root .
-find -L . \
-     \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-     -o -perm 511 \) -exec chmod 755 {} \; -o \
-     \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-     -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-eval $(sed -ne '/^\(V\|R\)= /s, ,,p' Makefile)
-
-sed -i \
-    -e '/^INSTALL_TOP= /s,\(/usr\).*,\$(DESTDIR)\1,' \
-    -e '/^INSTALL_LIB= /s,lib,&'"${LIBDIRSUFFIX}"',' \
-    -e '/^INSTALL_CMOD= /s,lib,&'"${LIBDIRSUFFIX}"',' \
-    Makefile
-
-sed -i \
-    -e '/^CFLAGS= /s,-O2,'"$SLKCFLAGS"',' \
-    -e '/-DLUA_USE_LINUX.*-Wl,-E -ldl -lreadline/s|-lreadline|& -lncurses|' \
-    src/Makefile
-
-sed -i \
-    -e '/^#define LUA_ROOT/s,".*,"/usr/",' \
-    -e '/^#define LUA_CDIR/s,"lib,&'"${LIBDIRSUFFIX}"',' \
-    src/luaconf.h
-
-make linux
-make install DESTDIR=$PKG
-
-# Now let's build the shared library
-mkdir -p shared
-cd shared
-ar -x $PKG/usr/lib${LIBDIRSUFFIX}/liblua.a
-gcc -ldl -lreadline -lncurses -lm -shared *.o -o liblua.so.$R
-cp -a liblua.so.$R $PKG/usr/lib${LIBDIRSUFFIX}
-( cd $PKG/usr/lib${LIBDIRSUFFIX}
-  ln -s liblua.so.$R liblua.so.$V
-  ln -s liblua.so.$R liblua.so.${V%??}
-  ln -s liblua.so.$R liblua.so
-  ln -s liblua.so.$R liblua$(echo $R | cut -d. -f1,2).so
-  ln -s liblua.so.$R liblua$(echo $R | cut -d. -f1).so
-  ln -s liblua.so.$R liblua$R.so
-)
-cd - >/dev/null
-
-mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig
-cd $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig
-sed \
-  -e '/^V= /s, .*, '"$V"',' \
-  -e '/^R= /s, .*, '"$R"',' \
-  -e '/^prefix= /s,\(/usr\).*,\1,' \
-  -e '/^INSTALL_LIB= /s,lib,&'"${LIBDIRSUFFIX}"',' \
-  -e '/^INSTALL_CMOD= /s,lib,&'"${LIBDIRSUFFIX}"',' \
-  -e '/^libdir=/s,/lib,&'"${LIBDIRSUFFIX}"',' \
-  $CWD/lua.pc.in > lua.pc
-
-ln -s lua.pc lua-$V.pc
-ln -s lua.pc lua${V%.?}${V#?.}.pc
-cd - >/dev/null
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-
-mkdir -p $PKG/usr/doc/$PRGNAM
-cp -a README doc/* $PKG/usr/doc/$PRGNAM
-cat $CWD/SlackBuild > $PKG/usr/doc/$PRGNAM/SlackBuild
-
-mkdir -p $PKG/install
-cat <<EOF > $PKG/install/slack-desc
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
-   |-----handy-ruler------------------------------------------------------|
-lua: lua (a powerful, fast, light-weight, embeddable scripting language)
-lua:
-lua: Lua combines simple procedural syntax with powerful data description
-lua: constructs based on associative arrays and extensible semantics.
-lua: Lua is dynamically typed, runs by interpreting bytecode for a
-lua: register-based virtual machine, and has automatic memory management
-lua: with incremental garbage collection, making it ideal for
-lua: configuration, scripting, and rapid prototyping.
-lua:
-lua:
-lua:
-EOF
-
-cd $PKG
-/sbin/makepkg --linkadd y --chown n --prepend $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/_unmaintained/lua/lua/lua.pc.in b/_unmaintained/lua/lua/lua.pc.in
deleted file mode 100644
index 579bce3d..00000000
--- a/_unmaintained/lua/lua/lua.pc.in
+++ /dev/null
@@ -1,31 +0,0 @@
-# lua.pc -- pkg-config data for Lua
-
-# vars from install Makefile
-
-# grep '^V=' ../Makefile
-V= 5.1
-# grep '^R=' ../Makefile
-R= 5.1.5
-
-# grep '^INSTALL_.*=' ../Makefile | sed 's/INSTALL_TOP/prefix/'
-prefix= /usr/local
-INSTALL_BIN= ${prefix}/bin
-INSTALL_INC= ${prefix}/include
-INSTALL_LIB= ${prefix}/lib
-INSTALL_MAN= ${prefix}/man/man1
-INSTALL_LMOD= ${prefix}/share/lua/${V}
-INSTALL_CMOD= ${prefix}/lib/lua/${V}
-
-# canonical vars
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
-
-Name: Lua
-Description: An Extensible Extension Language
-Version: ${R}
-Requires: 
-Libs: -L${libdir} -llua${V} -lm
-Cflags: -I${includedir}
-
-# (end of lua.pc)
diff --git a/_unmaintained/wayland/autotiling/SlackBuild b/_unmaintained/xap/autotiling/SlackBuild
similarity index 100%
rename from _unmaintained/wayland/autotiling/SlackBuild
rename to _unmaintained/xap/autotiling/SlackBuild
diff --git a/_unmaintained/wayland/cage/SlackBuild b/_unmaintained/xap/cage/SlackBuild
similarity index 100%
rename from _unmaintained/wayland/cage/SlackBuild
rename to _unmaintained/xap/cage/SlackBuild
diff --git a/_unmaintained/wayland/dwl/SlackBuild b/_unmaintained/xap/dwl/SlackBuild
similarity index 100%
rename from _unmaintained/wayland/dwl/SlackBuild
rename to _unmaintained/xap/dwl/SlackBuild
diff --git a/_unmaintained/wayland/dwl/dwl.desktop b/_unmaintained/xap/dwl/dwl.desktop
similarity index 100%
rename from _unmaintained/wayland/dwl/dwl.desktop
rename to _unmaintained/xap/dwl/dwl.desktop
diff --git a/_unmaintained/wayland/dwl/patches/use_foot_instead_of_alacritty.patch_sample b/_unmaintained/xap/dwl/patches/use_foot_instead_of_alacritty.patch_sample
similarity index 100%
rename from _unmaintained/wayland/dwl/patches/use_foot_instead_of_alacritty.patch_sample
rename to _unmaintained/xap/dwl/patches/use_foot_instead_of_alacritty.patch_sample
diff --git a/_unmaintained/wayland/dwl/sbo-patches/autostart.patch b/_unmaintained/xap/dwl/sbo-patches/autostart.patch
similarity index 100%
rename from _unmaintained/wayland/dwl/sbo-patches/autostart.patch
rename to _unmaintained/xap/dwl/sbo-patches/autostart.patch
diff --git a/_unmaintained/wayland/dwl/sbo-patches/dwl.desktop b/_unmaintained/xap/dwl/sbo-patches/dwl.desktop
similarity index 100%
rename from _unmaintained/wayland/dwl/sbo-patches/dwl.desktop
rename to _unmaintained/xap/dwl/sbo-patches/dwl.desktop
diff --git a/_unmaintained/wayland/dwl/sbo-patches/use-XWayland.patch b/_unmaintained/xap/dwl/sbo-patches/use-XWayland.patch
similarity index 100%
rename from _unmaintained/wayland/dwl/sbo-patches/use-XWayland.patch
rename to _unmaintained/xap/dwl/sbo-patches/use-XWayland.patch
diff --git a/_unmaintained/wayland/dwl/sbo-patches/use-winkey.patch b/_unmaintained/xap/dwl/sbo-patches/use-winkey.patch
similarity index 100%
rename from _unmaintained/wayland/dwl/sbo-patches/use-winkey.patch
rename to _unmaintained/xap/dwl/sbo-patches/use-winkey.patch
diff --git a/_unmaintained/wayland/hikari/SlackBuild b/_unmaintained/xap/hikari/SlackBuild
similarity index 100%
rename from _unmaintained/wayland/hikari/SlackBuild
rename to _unmaintained/xap/hikari/SlackBuild
diff --git a/_unmaintained/wayland/imv/SlackBuild b/_unmaintained/xap/imv/SlackBuild
similarity index 100%
rename from _unmaintained/wayland/imv/SlackBuild
rename to _unmaintained/xap/imv/SlackBuild
diff --git a/_unmaintained/wayland/japokwm/SlackBuild b/_unmaintained/xap/japokwm/SlackBuild
similarity index 100%
rename from _unmaintained/wayland/japokwm/SlackBuild
rename to _unmaintained/xap/japokwm/SlackBuild
diff --git a/_unmaintained/wayland/labwc/SlackBuild b/_unmaintained/xap/labwc/SlackBuild
similarity index 100%
rename from _unmaintained/wayland/labwc/SlackBuild
rename to _unmaintained/xap/labwc/SlackBuild
diff --git a/_unmaintained/wayland/mako/SlackBuild b/_unmaintained/xap/mako/SlackBuild
similarity index 100%
rename from _unmaintained/wayland/mako/SlackBuild
rename to _unmaintained/xap/mako/SlackBuild
diff --git a/_unmaintained/wayland/nwg-panel/SlackBuild b/_unmaintained/xap/nwg-panel/SlackBuild
similarity index 100%
rename from _unmaintained/wayland/nwg-panel/SlackBuild
rename to _unmaintained/xap/nwg-panel/SlackBuild
diff --git a/_unmaintained/wayland/persway/SlackBuild b/_unmaintained/xap/persway/SlackBuild
similarity index 100%
rename from _unmaintained/wayland/persway/SlackBuild
rename to _unmaintained/xap/persway/SlackBuild
diff --git a/_unmaintained/wayland/river/SlackBuild b/_unmaintained/xap/river/SlackBuild
similarity index 100%
rename from _unmaintained/wayland/river/SlackBuild
rename to _unmaintained/xap/river/SlackBuild
diff --git a/_unmaintained/wayland/salut/SlackBuild b/_unmaintained/xap/salut/SlackBuild
similarity index 100%
rename from _unmaintained/wayland/salut/SlackBuild
rename to _unmaintained/xap/salut/SlackBuild
diff --git a/_unmaintained/wayland/sfwbar/SlackBuild b/_unmaintained/xap/sfwbar/SlackBuild
similarity index 100%
rename from _unmaintained/wayland/sfwbar/SlackBuild
rename to _unmaintained/xap/sfwbar/SlackBuild
diff --git a/_unmaintained/wayland/swayr/SlackBuild b/_unmaintained/xap/swayr/SlackBuild
similarity index 100%
rename from _unmaintained/wayland/swayr/SlackBuild
rename to _unmaintained/xap/swayr/SlackBuild
diff --git a/_unmaintained/wayland/swww/SlackBuild b/_unmaintained/xap/swww/SlackBuild
similarity index 100%
rename from _unmaintained/wayland/swww/SlackBuild
rename to _unmaintained/xap/swww/SlackBuild
diff --git a/_unmaintained/wayland/vivarium/SlackBuild b/_unmaintained/xap/vivarium/SlackBuild
similarity index 100%
rename from _unmaintained/wayland/vivarium/SlackBuild
rename to _unmaintained/xap/vivarium/SlackBuild
diff --git a/_unmaintained/wayland/waybar/SlackBuild b/_unmaintained/xap/waybar/SlackBuild
similarity index 100%
rename from _unmaintained/wayland/waybar/SlackBuild
rename to _unmaintained/xap/waybar/SlackBuild
diff --git a/_unmaintained/wayland/wlopm/SlackBuild b/_unmaintained/xap/wlopm/SlackBuild
similarity index 100%
rename from _unmaintained/wayland/wlopm/SlackBuild
rename to _unmaintained/xap/wlopm/SlackBuild
diff --git a/_unmaintained/wayland/wmenu/SlackBuild b/_unmaintained/xap/wmenu/SlackBuild
similarity index 100%
rename from _unmaintained/wayland/wmenu/SlackBuild
rename to _unmaintained/xap/wmenu/SlackBuild
diff --git a/_unmaintained/wayland/wofi/SlackBuild b/_unmaintained/xap/wofi/SlackBuild
similarity index 100%
rename from _unmaintained/wayland/wofi/SlackBuild
rename to _unmaintained/xap/wofi/SlackBuild
diff --git a/lua/luarocks/SlackBuild b/d/luarocks/SlackBuild
similarity index 100%
rename from lua/luarocks/SlackBuild
rename to d/luarocks/SlackBuild
diff --git a/lua/lgi/SlackBuild b/l/lgi/SlackBuild
similarity index 100%
rename from lua/lgi/SlackBuild
rename to l/lgi/SlackBuild
diff --git a/what-s_installed-everywhere.sh b/what-s_installed-everywhere.sh
index 965b3018..c31f9ab4 100755
--- a/what-s_installed-everywhere.sh
+++ b/what-s_installed-everywhere.sh
@@ -32,7 +32,7 @@ PKG_KO="|          "
 counter=0
 echo "| tibou    | titplume | tibonom  | gwenhael | NB |"
 echo "|----------+----------+----------+----------+----+-----"
-for cat in a ap d l lua n wayland xap y; do
+for cat in a ap d fonts l n xap y; do
     cd $cat
     for p in $(ls -1); do
         if echo -n $PKGs_tibou | grep -q " $(echo $p | tr -d /) "; then
diff --git a/what-s_installed.sh b/what-s_installed.sh
index cf0ce3d7..223574e5 100755
--- a/what-s_installed.sh
+++ b/what-s_installed.sh
@@ -4,7 +4,7 @@ cd $(dirname $0) || exit 1
 
 PKGs=$(ls /var/lib/pkgtools/packages/ | sed 's|^\(.*\)-.*-.*-.*$|\1|')
 
-for cat in a ap d l lua n wayland xap y; do
+for cat in a ap d fonts l n xap y; do
     cd $cat
     for p in $(ls -1); do
         echo $PKGs | grep -q " $(echo $p | tr -d /) " && echo -n "✓: " || echo -n "❌: "
diff --git a/lua/awesome/SlackBuild b/xap/awesome/SlackBuild
similarity index 100%
rename from lua/awesome/SlackBuild
rename to xap/awesome/SlackBuild
diff --git a/lua/awesome/xinitrc.awesome b/xap/awesome/xinitrc.awesome
similarity index 100%
rename from lua/awesome/xinitrc.awesome
rename to xap/awesome/xinitrc.awesome
diff --git a/wayland/foot/SlackBuild b/xap/foot/SlackBuild
similarity index 100%
rename from wayland/foot/SlackBuild
rename to xap/foot/SlackBuild
diff --git a/wayland/fuzzel/SlackBuild b/xap/fuzzel/SlackBuild
similarity index 100%
rename from wayland/fuzzel/SlackBuild
rename to xap/fuzzel/SlackBuild
diff --git a/wayland/kanshi/SlackBuild b/xap/kanshi/SlackBuild
similarity index 100%
rename from wayland/kanshi/SlackBuild
rename to xap/kanshi/SlackBuild
diff --git a/wayland/lswt/SlackBuild b/xap/lswt/SlackBuild
similarity index 100%
rename from wayland/lswt/SlackBuild
rename to xap/lswt/SlackBuild
diff --git a/wayland/nwg-look/SlackBuild b/xap/nwg-look/SlackBuild
similarity index 100%
rename from wayland/nwg-look/SlackBuild
rename to xap/nwg-look/SlackBuild
diff --git a/wayland/sway/SlackBuild b/xap/sway/SlackBuild
similarity index 100%
rename from wayland/sway/SlackBuild
rename to xap/sway/SlackBuild
diff --git a/wayland/sway/patches/a_0fc5d7aed84415a77b718ca9dc3c0b3ad2c05b02.patch b/xap/sway/patches/a_0fc5d7aed84415a77b718ca9dc3c0b3ad2c05b02.patch
similarity index 100%
rename from wayland/sway/patches/a_0fc5d7aed84415a77b718ca9dc3c0b3ad2c05b02.patch
rename to xap/sway/patches/a_0fc5d7aed84415a77b718ca9dc3c0b3ad2c05b02.patch
diff --git a/wayland/sway/patches/b_03c14421354e54332e12f78d029dcaa9919fd161.patch b/xap/sway/patches/b_03c14421354e54332e12f78d029dcaa9919fd161.patch
similarity index 100%
rename from wayland/sway/patches/b_03c14421354e54332e12f78d029dcaa9919fd161.patch
rename to xap/sway/patches/b_03c14421354e54332e12f78d029dcaa9919fd161.patch
diff --git a/wayland/swaybg/SlackBuild b/xap/swaybg/SlackBuild
similarity index 100%
rename from wayland/swaybg/SlackBuild
rename to xap/swaybg/SlackBuild
diff --git a/wayland/swayidle/SlackBuild b/xap/swayidle/SlackBuild
similarity index 100%
rename from wayland/swayidle/SlackBuild
rename to xap/swayidle/SlackBuild
diff --git a/wayland/swaylock/SlackBuild b/xap/swaylock/SlackBuild
similarity index 100%
rename from wayland/swaylock/SlackBuild
rename to xap/swaylock/SlackBuild
diff --git a/wayland/wlr-randr/SlackBuild b/xap/wlr-randr/SlackBuild
similarity index 100%
rename from wayland/wlr-randr/SlackBuild
rename to xap/wlr-randr/SlackBuild
diff --git a/wayland/wlroots/SlackBuild b/xap/wlroots/SlackBuild
similarity index 100%
rename from wayland/wlroots/SlackBuild
rename to xap/wlroots/SlackBuild