diff --git a/mkimage.sh b/mkimage.sh
index 93187dfb913527fdbbb1ed0f92f32c24b0e756a6..4bd6f140b5907910a996d2d80b755d71de279643 100755
--- a/mkimage.sh
+++ b/mkimage.sh
@@ -5,9 +5,13 @@ set -e
 
 sudo apt install parted multistrap udisks2 gcc-aarch64-linux-gnu
 
-./mkkernel.sh 
+# build the linux kernel
+./mkkernel.sh
+# build u-boot
 ./mkuboot.sh
+# build the debian userland and configure it
 sudo ./mkuserland.sh
+# chroot into the userland and build custom packages (mesa, xserver...)
 sudo ./mkuserland2.sh
 
 mkdir -p target
diff --git a/mkuserland.sh b/mkuserland.sh
index deb75051dbe2d0de0af560159ff851b1a746387a..48cd4e258c494068cffc891054ec11032a6a05a4 100755
--- a/mkuserland.sh
+++ b/mkuserland.sh
@@ -2,6 +2,9 @@
 
 # run this as root!
 
+ETC=./template-etc
+SKEL=./template-skel
+
 rm -rf ./target-userland
 mkdir ./target-userland
 
@@ -9,31 +12,33 @@ set -e
 
 # create debian userland
 /usr/sbin/multistrap -d target-userland -f multistrap.conf
+
+# populate /etc
 cp target-userland/usr/share/base-passwd/group.master target-userland/etc/group
-cp etc-templates/passwd target-userland/etc/passwd
-cp etc-templates/inittab target-userland/etc
-cp etc-templates/shadow target-userland/etc
-cp etc-templates/fstab target-userland/etc
-cp etc-templates/hosts target-userland/etc
-cp etc-templates/ld.so.conf target-userland/etc # or our libraries won't be picked up
-cp etc-templates/resolv.conf target-userland/etc
+cp $ETC/passwd target-userland/etc/passwd
+cp $ETC/inittab target-userland/etc
+cp $ETC/shadow target-userland/etc
+cp $ETC/fstab target-userland/etc
+cp $ETC/hosts target-userland/etc
+cp $ETC/ld.so.conf target-userland/etc # or our libraries won't be picked up
+cp $ETC/resolv.conf target-userland/etc
 mkdir -p target-userland/etc/dhcp
-cp etc-templates/dhclient.conf target-userland/etc/dhcp
-cp etc-templates/network-interfaces target-userland/etc/network/interfaces
-cp etc-templates/motd* target-userland/etc
-cp etc-templates/reform* target-userland/etc
-cp etc-templates/hostname target-userland/etc
-cp etc-templates/common-* target-userland/etc/pam.d
-cp -RavT target-scripts target-userland/root/
-cp -RavT target-scripts target-userland/etc/skel/
+cp $ETC/dhclient.conf target-userland/etc/dhcp
+cp $ETC/network-interfaces target-userland/etc/network/interfaces
+cp $ETC/motd* target-userland/etc
+cp $ETC/reform* target-userland/etc
+cp $ETC/hostname target-userland/etc
+cp $ETC/common-* target-userland/etc/pam.d
 
-#cp etc-templates/xorg.conf target-userland/etc/X11
+# populate root user and skel
+cp -RavT $SKEL target-userland/root/
+cp -RavT $SKEL target-userland/etc/skel/
 
 # install custom kernel
 # mkkernel.sh needs to run before. this creates Image and imx8mq-mnt-reform2.dtb.
 
-cp linux/arch/arm64/boot/Image target-userland
-cp linux/arch/arm64/boot/dts/freescale/imx8mq-mnt-reform2.dtb target-userland
+cp linux/arch/arm64/boot/Image target-userland/
+cp linux/arch/arm64/boot/dts/freescale/imx8mq-mnt-reform2.dtb target-userland/
 
 # install some kernel modules for dynamically loaded drivers
 mkdir -p target-userland/lib/modules
@@ -47,15 +52,15 @@ cp linux/drivers/gpu/drm/imx/dcss/imx-dcss.ko target-userland/lib/modules/
 mkdir -p target-userland/var/local/log
 
 mkdir -p target-userland/etc/systemd/system
-cp target-scripts/reform-display.service target-userland/etc/systemd/system/
-cp target-scripts/toggle-display.sh target-userland/lib/modules/
+cp $ETC/reform-display.service target-userland/etc/systemd/system/
+cp $ETC/reform-toggle-display.sh target-userland/lib/modules/
 
 mkdir -p target-userland/etc/systemd/network
-cp etc-templates/eth.network target-userland/etc/systemd/network/
+cp $ETC/eth.network target-userland/etc/systemd/network/
 
 # default audio settings, or PCM will be muted
 mkdir -p target-userland/var/lib/alsa
-cp etc-templates/asound.state target-userland/var/lib/alsa/
+cp $ETC/asound.state target-userland/var/lib/alsa/
 
 mknod target-userland/dev/random c 1 8
 mknod target-userland/dev/urandom c 1 9
@@ -83,5 +88,5 @@ EOF
 
 # force pulseaudio to 48kHz
 mkdir -p target-userland/etc/pulseaudio
-cp etc-templates/daemon.conf target-userland/etc/pulseaudio/
+cp $ETC/daemon.conf target-userland/etc/pulseaudio/
 
diff --git a/etc-templates/asound.state b/template-etc/asound.state
similarity index 100%
rename from etc-templates/asound.state
rename to template-etc/asound.state
diff --git a/etc-templates/common-account b/template-etc/common-account
similarity index 100%
rename from etc-templates/common-account
rename to template-etc/common-account
diff --git a/etc-templates/common-auth b/template-etc/common-auth
similarity index 100%
rename from etc-templates/common-auth
rename to template-etc/common-auth
diff --git a/etc-templates/common-password b/template-etc/common-password
similarity index 100%
rename from etc-templates/common-password
rename to template-etc/common-password
diff --git a/etc-templates/common-session b/template-etc/common-session
similarity index 100%
rename from etc-templates/common-session
rename to template-etc/common-session
diff --git a/etc-templates/common-session-noninteractive b/template-etc/common-session-noninteractive
similarity index 100%
rename from etc-templates/common-session-noninteractive
rename to template-etc/common-session-noninteractive
diff --git a/etc-templates/daemon.conf b/template-etc/daemon.conf
similarity index 100%
rename from etc-templates/daemon.conf
rename to template-etc/daemon.conf
diff --git a/etc-templates/dhclient.conf b/template-etc/dhclient.conf
similarity index 100%
rename from etc-templates/dhclient.conf
rename to template-etc/dhclient.conf
diff --git a/etc-templates/eth.network b/template-etc/eth.network
similarity index 100%
rename from etc-templates/eth.network
rename to template-etc/eth.network
diff --git a/etc-templates/fstab b/template-etc/fstab
similarity index 100%
rename from etc-templates/fstab
rename to template-etc/fstab
diff --git a/etc-templates/gshadow b/template-etc/gshadow
similarity index 100%
rename from etc-templates/gshadow
rename to template-etc/gshadow
diff --git a/etc-templates/hostname b/template-etc/hostname
similarity index 100%
rename from etc-templates/hostname
rename to template-etc/hostname
diff --git a/etc-templates/hosts b/template-etc/hosts
similarity index 100%
rename from etc-templates/hosts
rename to template-etc/hosts
diff --git a/etc-templates/inittab b/template-etc/inittab
similarity index 100%
rename from etc-templates/inittab
rename to template-etc/inittab
diff --git a/etc-templates/ld.so.conf b/template-etc/ld.so.conf
similarity index 100%
rename from etc-templates/ld.so.conf
rename to template-etc/ld.so.conf
diff --git a/etc-templates/locale b/template-etc/locale
similarity index 100%
rename from etc-templates/locale
rename to template-etc/locale
diff --git a/etc-templates/motd b/template-etc/motd
similarity index 100%
rename from etc-templates/motd
rename to template-etc/motd
diff --git a/etc-templates/motd-reform b/template-etc/motd-reform
similarity index 100%
rename from etc-templates/motd-reform
rename to template-etc/motd-reform
diff --git a/etc-templates/network-interfaces b/template-etc/network-interfaces
similarity index 100%
rename from etc-templates/network-interfaces
rename to template-etc/network-interfaces
diff --git a/etc-templates/passwd b/template-etc/passwd
similarity index 100%
rename from etc-templates/passwd
rename to template-etc/passwd
diff --git a/etc-templates/reform-desktop-help b/template-etc/reform-desktop-help
similarity index 100%
rename from etc-templates/reform-desktop-help
rename to template-etc/reform-desktop-help
diff --git a/etc-templates/reform-display.service b/template-etc/reform-display.service
similarity index 100%
rename from etc-templates/reform-display.service
rename to template-etc/reform-display.service
diff --git a/etc-templates/reform-help b/template-etc/reform-help
similarity index 100%
rename from etc-templates/reform-help
rename to template-etc/reform-help
diff --git a/etc-templates/reform-root-help b/template-etc/reform-root-help
similarity index 100%
rename from etc-templates/reform-root-help
rename to template-etc/reform-root-help
diff --git a/etc-templates/reform-toggle-display.sh b/template-etc/reform-toggle-display.sh
similarity index 100%
rename from etc-templates/reform-toggle-display.sh
rename to template-etc/reform-toggle-display.sh
diff --git a/etc-templates/resolv.conf b/template-etc/resolv.conf
similarity index 100%
rename from etc-templates/resolv.conf
rename to template-etc/resolv.conf
diff --git a/etc-templates/shadow b/template-etc/shadow
similarity index 100%
rename from etc-templates/shadow
rename to template-etc/shadow
diff --git a/etc-templates/xorg.conf b/template-etc/xorg.conf
similarity index 100%
rename from etc-templates/xorg.conf
rename to template-etc/xorg.conf
diff --git a/target-scripts/.bash_profile b/template-skel/.bash_profile
similarity index 100%
rename from target-scripts/.bash_profile
rename to template-skel/.bash_profile
diff --git a/target-scripts/.config/sway/config b/template-skel/.config/sway/config
similarity index 100%
rename from target-scripts/.config/sway/config
rename to template-skel/.config/sway/config
diff --git a/target-scripts/.config/waybar/config b/template-skel/.config/waybar/config
similarity index 100%
rename from target-scripts/.config/waybar/config
rename to template-skel/.config/waybar/config
diff --git a/target-scripts/.config/waybar/style.css b/template-skel/.config/waybar/style.css
similarity index 100%
rename from target-scripts/.config/waybar/style.css
rename to template-skel/.config/waybar/style.css
diff --git a/target-scripts/.config/xfce4/terminal/terminalrc b/template-skel/.config/xfce4/terminal/terminalrc
similarity index 100%
rename from target-scripts/.config/xfce4/terminal/terminalrc
rename to template-skel/.config/xfce4/terminal/terminalrc
diff --git a/target-scripts/.ircrc b/template-skel/.ircrc
similarity index 100%
rename from target-scripts/.ircrc
rename to template-skel/.ircrc
diff --git a/target-scripts/.local/share/fonts/Inter (OTF)/.uuid b/template-skel/.local/share/fonts/Inter (OTF)/.uuid
similarity index 100%
rename from target-scripts/.local/share/fonts/Inter (OTF)/.uuid
rename to template-skel/.local/share/fonts/Inter (OTF)/.uuid
diff --git a/target-scripts/.local/share/fonts/Inter (OTF)/Inter-Black.otf b/template-skel/.local/share/fonts/Inter (OTF)/Inter-Black.otf
similarity index 100%
rename from target-scripts/.local/share/fonts/Inter (OTF)/Inter-Black.otf
rename to template-skel/.local/share/fonts/Inter (OTF)/Inter-Black.otf
diff --git a/target-scripts/.local/share/fonts/Inter (OTF)/Inter-BlackItalic.otf b/template-skel/.local/share/fonts/Inter (OTF)/Inter-BlackItalic.otf
similarity index 100%
rename from target-scripts/.local/share/fonts/Inter (OTF)/Inter-BlackItalic.otf
rename to template-skel/.local/share/fonts/Inter (OTF)/Inter-BlackItalic.otf
diff --git a/target-scripts/.local/share/fonts/Inter (OTF)/Inter-Bold.otf b/template-skel/.local/share/fonts/Inter (OTF)/Inter-Bold.otf
similarity index 100%
rename from target-scripts/.local/share/fonts/Inter (OTF)/Inter-Bold.otf
rename to template-skel/.local/share/fonts/Inter (OTF)/Inter-Bold.otf
diff --git a/target-scripts/.local/share/fonts/Inter (OTF)/Inter-BoldItalic.otf b/template-skel/.local/share/fonts/Inter (OTF)/Inter-BoldItalic.otf
similarity index 100%
rename from target-scripts/.local/share/fonts/Inter (OTF)/Inter-BoldItalic.otf
rename to template-skel/.local/share/fonts/Inter (OTF)/Inter-BoldItalic.otf
diff --git a/target-scripts/.local/share/fonts/Inter (OTF)/Inter-ExtraBold.otf b/template-skel/.local/share/fonts/Inter (OTF)/Inter-ExtraBold.otf
similarity index 100%
rename from target-scripts/.local/share/fonts/Inter (OTF)/Inter-ExtraBold.otf
rename to template-skel/.local/share/fonts/Inter (OTF)/Inter-ExtraBold.otf
diff --git a/target-scripts/.local/share/fonts/Inter (OTF)/Inter-ExtraBoldItalic.otf b/template-skel/.local/share/fonts/Inter (OTF)/Inter-ExtraBoldItalic.otf
similarity index 100%
rename from target-scripts/.local/share/fonts/Inter (OTF)/Inter-ExtraBoldItalic.otf
rename to template-skel/.local/share/fonts/Inter (OTF)/Inter-ExtraBoldItalic.otf
diff --git a/target-scripts/.local/share/fonts/Inter (OTF)/Inter-ExtraLight-BETA.otf b/template-skel/.local/share/fonts/Inter (OTF)/Inter-ExtraLight-BETA.otf
similarity index 100%
rename from target-scripts/.local/share/fonts/Inter (OTF)/Inter-ExtraLight-BETA.otf
rename to template-skel/.local/share/fonts/Inter (OTF)/Inter-ExtraLight-BETA.otf
diff --git a/target-scripts/.local/share/fonts/Inter (OTF)/Inter-ExtraLightItalic-BETA.otf b/template-skel/.local/share/fonts/Inter (OTF)/Inter-ExtraLightItalic-BETA.otf
similarity index 100%
rename from target-scripts/.local/share/fonts/Inter (OTF)/Inter-ExtraLightItalic-BETA.otf
rename to template-skel/.local/share/fonts/Inter (OTF)/Inter-ExtraLightItalic-BETA.otf
diff --git a/target-scripts/.local/share/fonts/Inter (OTF)/Inter-Italic.otf b/template-skel/.local/share/fonts/Inter (OTF)/Inter-Italic.otf
similarity index 100%
rename from target-scripts/.local/share/fonts/Inter (OTF)/Inter-Italic.otf
rename to template-skel/.local/share/fonts/Inter (OTF)/Inter-Italic.otf
diff --git a/target-scripts/.local/share/fonts/Inter (OTF)/Inter-Light-BETA.otf b/template-skel/.local/share/fonts/Inter (OTF)/Inter-Light-BETA.otf
similarity index 100%
rename from target-scripts/.local/share/fonts/Inter (OTF)/Inter-Light-BETA.otf
rename to template-skel/.local/share/fonts/Inter (OTF)/Inter-Light-BETA.otf
diff --git a/target-scripts/.local/share/fonts/Inter (OTF)/Inter-LightItalic-BETA.otf b/template-skel/.local/share/fonts/Inter (OTF)/Inter-LightItalic-BETA.otf
similarity index 100%
rename from target-scripts/.local/share/fonts/Inter (OTF)/Inter-LightItalic-BETA.otf
rename to template-skel/.local/share/fonts/Inter (OTF)/Inter-LightItalic-BETA.otf
diff --git a/target-scripts/.local/share/fonts/Inter (OTF)/Inter-Medium.otf b/template-skel/.local/share/fonts/Inter (OTF)/Inter-Medium.otf
similarity index 100%
rename from target-scripts/.local/share/fonts/Inter (OTF)/Inter-Medium.otf
rename to template-skel/.local/share/fonts/Inter (OTF)/Inter-Medium.otf
diff --git a/target-scripts/.local/share/fonts/Inter (OTF)/Inter-MediumItalic.otf b/template-skel/.local/share/fonts/Inter (OTF)/Inter-MediumItalic.otf
similarity index 100%
rename from target-scripts/.local/share/fonts/Inter (OTF)/Inter-MediumItalic.otf
rename to template-skel/.local/share/fonts/Inter (OTF)/Inter-MediumItalic.otf
diff --git a/target-scripts/.local/share/fonts/Inter (OTF)/Inter-Regular.otf b/template-skel/.local/share/fonts/Inter (OTF)/Inter-Regular.otf
similarity index 100%
rename from target-scripts/.local/share/fonts/Inter (OTF)/Inter-Regular.otf
rename to template-skel/.local/share/fonts/Inter (OTF)/Inter-Regular.otf
diff --git a/target-scripts/.local/share/fonts/Inter (OTF)/Inter-SemiBold.otf b/template-skel/.local/share/fonts/Inter (OTF)/Inter-SemiBold.otf
similarity index 100%
rename from target-scripts/.local/share/fonts/Inter (OTF)/Inter-SemiBold.otf
rename to template-skel/.local/share/fonts/Inter (OTF)/Inter-SemiBold.otf
diff --git a/target-scripts/.local/share/fonts/Inter (OTF)/Inter-SemiBoldItalic.otf b/template-skel/.local/share/fonts/Inter (OTF)/Inter-SemiBoldItalic.otf
similarity index 100%
rename from target-scripts/.local/share/fonts/Inter (OTF)/Inter-SemiBoldItalic.otf
rename to template-skel/.local/share/fonts/Inter (OTF)/Inter-SemiBoldItalic.otf
diff --git a/target-scripts/.local/share/fonts/Inter (OTF)/Inter-Thin-BETA.otf b/template-skel/.local/share/fonts/Inter (OTF)/Inter-Thin-BETA.otf
similarity index 100%
rename from target-scripts/.local/share/fonts/Inter (OTF)/Inter-Thin-BETA.otf
rename to template-skel/.local/share/fonts/Inter (OTF)/Inter-Thin-BETA.otf
diff --git a/target-scripts/.local/share/fonts/Inter (OTF)/Inter-ThinItalic-BETA.otf b/template-skel/.local/share/fonts/Inter (OTF)/Inter-ThinItalic-BETA.otf
similarity index 100%
rename from target-scripts/.local/share/fonts/Inter (OTF)/Inter-ThinItalic-BETA.otf
rename to template-skel/.local/share/fonts/Inter (OTF)/Inter-ThinItalic-BETA.otf
diff --git a/target-scripts/.local/share/fonts/Inter (TTF)/.uuid b/template-skel/.local/share/fonts/Inter (TTF)/.uuid
similarity index 100%
rename from target-scripts/.local/share/fonts/Inter (TTF)/.uuid
rename to template-skel/.local/share/fonts/Inter (TTF)/.uuid
diff --git a/target-scripts/.local/share/fonts/Inter (TTF)/Inter-Black.ttf b/template-skel/.local/share/fonts/Inter (TTF)/Inter-Black.ttf
similarity index 100%
rename from target-scripts/.local/share/fonts/Inter (TTF)/Inter-Black.ttf
rename to template-skel/.local/share/fonts/Inter (TTF)/Inter-Black.ttf
diff --git a/target-scripts/.local/share/fonts/Inter (TTF)/Inter-BlackItalic.ttf b/template-skel/.local/share/fonts/Inter (TTF)/Inter-BlackItalic.ttf
similarity index 100%
rename from target-scripts/.local/share/fonts/Inter (TTF)/Inter-BlackItalic.ttf
rename to template-skel/.local/share/fonts/Inter (TTF)/Inter-BlackItalic.ttf
diff --git a/target-scripts/.local/share/fonts/Inter (TTF)/Inter-Bold.ttf b/template-skel/.local/share/fonts/Inter (TTF)/Inter-Bold.ttf
similarity index 100%
rename from target-scripts/.local/share/fonts/Inter (TTF)/Inter-Bold.ttf
rename to template-skel/.local/share/fonts/Inter (TTF)/Inter-Bold.ttf
diff --git a/target-scripts/.local/share/fonts/Inter (TTF)/Inter-BoldItalic.ttf b/template-skel/.local/share/fonts/Inter (TTF)/Inter-BoldItalic.ttf
similarity index 100%
rename from target-scripts/.local/share/fonts/Inter (TTF)/Inter-BoldItalic.ttf
rename to template-skel/.local/share/fonts/Inter (TTF)/Inter-BoldItalic.ttf
diff --git a/target-scripts/.local/share/fonts/Inter (TTF)/Inter-ExtraBold.ttf b/template-skel/.local/share/fonts/Inter (TTF)/Inter-ExtraBold.ttf
similarity index 100%
rename from target-scripts/.local/share/fonts/Inter (TTF)/Inter-ExtraBold.ttf
rename to template-skel/.local/share/fonts/Inter (TTF)/Inter-ExtraBold.ttf
diff --git a/target-scripts/.local/share/fonts/Inter (TTF)/Inter-ExtraBoldItalic.ttf b/template-skel/.local/share/fonts/Inter (TTF)/Inter-ExtraBoldItalic.ttf
similarity index 100%
rename from target-scripts/.local/share/fonts/Inter (TTF)/Inter-ExtraBoldItalic.ttf
rename to template-skel/.local/share/fonts/Inter (TTF)/Inter-ExtraBoldItalic.ttf
diff --git a/target-scripts/.local/share/fonts/Inter (TTF)/Inter-ExtraLight-BETA.ttf b/template-skel/.local/share/fonts/Inter (TTF)/Inter-ExtraLight-BETA.ttf
similarity index 100%
rename from target-scripts/.local/share/fonts/Inter (TTF)/Inter-ExtraLight-BETA.ttf
rename to template-skel/.local/share/fonts/Inter (TTF)/Inter-ExtraLight-BETA.ttf
diff --git a/target-scripts/.local/share/fonts/Inter (TTF)/Inter-ExtraLightItalic-BETA.ttf b/template-skel/.local/share/fonts/Inter (TTF)/Inter-ExtraLightItalic-BETA.ttf
similarity index 100%
rename from target-scripts/.local/share/fonts/Inter (TTF)/Inter-ExtraLightItalic-BETA.ttf
rename to template-skel/.local/share/fonts/Inter (TTF)/Inter-ExtraLightItalic-BETA.ttf
diff --git a/target-scripts/.local/share/fonts/Inter (TTF)/Inter-Italic.ttf b/template-skel/.local/share/fonts/Inter (TTF)/Inter-Italic.ttf
similarity index 100%
rename from target-scripts/.local/share/fonts/Inter (TTF)/Inter-Italic.ttf
rename to template-skel/.local/share/fonts/Inter (TTF)/Inter-Italic.ttf
diff --git a/target-scripts/.local/share/fonts/Inter (TTF)/Inter-Light-BETA.ttf b/template-skel/.local/share/fonts/Inter (TTF)/Inter-Light-BETA.ttf
similarity index 100%
rename from target-scripts/.local/share/fonts/Inter (TTF)/Inter-Light-BETA.ttf
rename to template-skel/.local/share/fonts/Inter (TTF)/Inter-Light-BETA.ttf
diff --git a/target-scripts/.local/share/fonts/Inter (TTF)/Inter-LightItalic-BETA.ttf b/template-skel/.local/share/fonts/Inter (TTF)/Inter-LightItalic-BETA.ttf
similarity index 100%
rename from target-scripts/.local/share/fonts/Inter (TTF)/Inter-LightItalic-BETA.ttf
rename to template-skel/.local/share/fonts/Inter (TTF)/Inter-LightItalic-BETA.ttf
diff --git a/target-scripts/.local/share/fonts/Inter (TTF)/Inter-Medium.ttf b/template-skel/.local/share/fonts/Inter (TTF)/Inter-Medium.ttf
similarity index 100%
rename from target-scripts/.local/share/fonts/Inter (TTF)/Inter-Medium.ttf
rename to template-skel/.local/share/fonts/Inter (TTF)/Inter-Medium.ttf
diff --git a/target-scripts/.local/share/fonts/Inter (TTF)/Inter-MediumItalic.ttf b/template-skel/.local/share/fonts/Inter (TTF)/Inter-MediumItalic.ttf
similarity index 100%
rename from target-scripts/.local/share/fonts/Inter (TTF)/Inter-MediumItalic.ttf
rename to template-skel/.local/share/fonts/Inter (TTF)/Inter-MediumItalic.ttf
diff --git a/target-scripts/.local/share/fonts/Inter (TTF)/Inter-Regular.ttf b/template-skel/.local/share/fonts/Inter (TTF)/Inter-Regular.ttf
similarity index 100%
rename from target-scripts/.local/share/fonts/Inter (TTF)/Inter-Regular.ttf
rename to template-skel/.local/share/fonts/Inter (TTF)/Inter-Regular.ttf
diff --git a/target-scripts/.local/share/fonts/Inter (TTF)/Inter-SemiBold.ttf b/template-skel/.local/share/fonts/Inter (TTF)/Inter-SemiBold.ttf
similarity index 100%
rename from target-scripts/.local/share/fonts/Inter (TTF)/Inter-SemiBold.ttf
rename to template-skel/.local/share/fonts/Inter (TTF)/Inter-SemiBold.ttf
diff --git a/target-scripts/.local/share/fonts/Inter (TTF)/Inter-SemiBoldItalic.ttf b/template-skel/.local/share/fonts/Inter (TTF)/Inter-SemiBoldItalic.ttf
similarity index 100%
rename from target-scripts/.local/share/fonts/Inter (TTF)/Inter-SemiBoldItalic.ttf
rename to template-skel/.local/share/fonts/Inter (TTF)/Inter-SemiBoldItalic.ttf
diff --git a/target-scripts/.local/share/fonts/Inter (TTF)/Inter-Thin-BETA.ttf b/template-skel/.local/share/fonts/Inter (TTF)/Inter-Thin-BETA.ttf
similarity index 100%
rename from target-scripts/.local/share/fonts/Inter (TTF)/Inter-Thin-BETA.ttf
rename to template-skel/.local/share/fonts/Inter (TTF)/Inter-Thin-BETA.ttf
diff --git a/target-scripts/.local/share/fonts/Inter (TTF)/Inter-ThinItalic-BETA.ttf b/template-skel/.local/share/fonts/Inter (TTF)/Inter-ThinItalic-BETA.ttf
similarity index 100%
rename from target-scripts/.local/share/fonts/Inter (TTF)/Inter-ThinItalic-BETA.ttf
rename to template-skel/.local/share/fonts/Inter (TTF)/Inter-ThinItalic-BETA.ttf
diff --git a/target-scripts/.local/share/fonts/Iosevka-Term/.uuid b/template-skel/.local/share/fonts/Iosevka-Term/.uuid
similarity index 100%
rename from target-scripts/.local/share/fonts/Iosevka-Term/.uuid
rename to template-skel/.local/share/fonts/Iosevka-Term/.uuid
diff --git a/target-scripts/.local/share/fonts/Iosevka-Term/iosevka-term-bold.ttf b/template-skel/.local/share/fonts/Iosevka-Term/iosevka-term-bold.ttf
similarity index 100%
rename from target-scripts/.local/share/fonts/Iosevka-Term/iosevka-term-bold.ttf
rename to template-skel/.local/share/fonts/Iosevka-Term/iosevka-term-bold.ttf
diff --git a/target-scripts/.local/share/fonts/Iosevka-Term/iosevka-term-bolditalic.ttf b/template-skel/.local/share/fonts/Iosevka-Term/iosevka-term-bolditalic.ttf
similarity index 100%
rename from target-scripts/.local/share/fonts/Iosevka-Term/iosevka-term-bolditalic.ttf
rename to template-skel/.local/share/fonts/Iosevka-Term/iosevka-term-bolditalic.ttf
diff --git a/target-scripts/.local/share/fonts/Iosevka-Term/iosevka-term-boldoblique.ttf b/template-skel/.local/share/fonts/Iosevka-Term/iosevka-term-boldoblique.ttf
similarity index 100%
rename from target-scripts/.local/share/fonts/Iosevka-Term/iosevka-term-boldoblique.ttf
rename to template-skel/.local/share/fonts/Iosevka-Term/iosevka-term-boldoblique.ttf
diff --git a/target-scripts/.local/share/fonts/Iosevka-Term/iosevka-term-extrabold.ttf b/template-skel/.local/share/fonts/Iosevka-Term/iosevka-term-extrabold.ttf
similarity index 100%
rename from target-scripts/.local/share/fonts/Iosevka-Term/iosevka-term-extrabold.ttf
rename to template-skel/.local/share/fonts/Iosevka-Term/iosevka-term-extrabold.ttf
diff --git a/target-scripts/.local/share/fonts/Iosevka-Term/iosevka-term-extrabolditalic.ttf b/template-skel/.local/share/fonts/Iosevka-Term/iosevka-term-extrabolditalic.ttf
similarity index 100%
rename from target-scripts/.local/share/fonts/Iosevka-Term/iosevka-term-extrabolditalic.ttf
rename to template-skel/.local/share/fonts/Iosevka-Term/iosevka-term-extrabolditalic.ttf
diff --git a/target-scripts/.local/share/fonts/Iosevka-Term/iosevka-term-extraboldoblique.ttf b/template-skel/.local/share/fonts/Iosevka-Term/iosevka-term-extraboldoblique.ttf
similarity index 100%
rename from target-scripts/.local/share/fonts/Iosevka-Term/iosevka-term-extraboldoblique.ttf
rename to template-skel/.local/share/fonts/Iosevka-Term/iosevka-term-extraboldoblique.ttf
diff --git a/target-scripts/.local/share/fonts/Iosevka-Term/iosevka-term-extralight.ttf b/template-skel/.local/share/fonts/Iosevka-Term/iosevka-term-extralight.ttf
similarity index 100%
rename from target-scripts/.local/share/fonts/Iosevka-Term/iosevka-term-extralight.ttf
rename to template-skel/.local/share/fonts/Iosevka-Term/iosevka-term-extralight.ttf
diff --git a/target-scripts/.local/share/fonts/Iosevka-Term/iosevka-term-extralightitalic.ttf b/template-skel/.local/share/fonts/Iosevka-Term/iosevka-term-extralightitalic.ttf
similarity index 100%
rename from target-scripts/.local/share/fonts/Iosevka-Term/iosevka-term-extralightitalic.ttf
rename to template-skel/.local/share/fonts/Iosevka-Term/iosevka-term-extralightitalic.ttf
diff --git a/target-scripts/.local/share/fonts/Iosevka-Term/iosevka-term-extralightoblique.ttf b/template-skel/.local/share/fonts/Iosevka-Term/iosevka-term-extralightoblique.ttf
similarity index 100%
rename from target-scripts/.local/share/fonts/Iosevka-Term/iosevka-term-extralightoblique.ttf
rename to template-skel/.local/share/fonts/Iosevka-Term/iosevka-term-extralightoblique.ttf
diff --git a/target-scripts/.local/share/fonts/Iosevka-Term/iosevka-term-heavy.ttf b/template-skel/.local/share/fonts/Iosevka-Term/iosevka-term-heavy.ttf
similarity index 100%
rename from target-scripts/.local/share/fonts/Iosevka-Term/iosevka-term-heavy.ttf
rename to template-skel/.local/share/fonts/Iosevka-Term/iosevka-term-heavy.ttf
diff --git a/target-scripts/.local/share/fonts/Iosevka-Term/iosevka-term-heavyitalic.ttf b/template-skel/.local/share/fonts/Iosevka-Term/iosevka-term-heavyitalic.ttf
similarity index 100%
rename from target-scripts/.local/share/fonts/Iosevka-Term/iosevka-term-heavyitalic.ttf
rename to template-skel/.local/share/fonts/Iosevka-Term/iosevka-term-heavyitalic.ttf
diff --git a/target-scripts/.local/share/fonts/Iosevka-Term/iosevka-term-heavyoblique.ttf b/template-skel/.local/share/fonts/Iosevka-Term/iosevka-term-heavyoblique.ttf
similarity index 100%
rename from target-scripts/.local/share/fonts/Iosevka-Term/iosevka-term-heavyoblique.ttf
rename to template-skel/.local/share/fonts/Iosevka-Term/iosevka-term-heavyoblique.ttf
diff --git a/target-scripts/.local/share/fonts/Iosevka-Term/iosevka-term-italic.ttf b/template-skel/.local/share/fonts/Iosevka-Term/iosevka-term-italic.ttf
similarity index 100%
rename from target-scripts/.local/share/fonts/Iosevka-Term/iosevka-term-italic.ttf
rename to template-skel/.local/share/fonts/Iosevka-Term/iosevka-term-italic.ttf
diff --git a/target-scripts/.local/share/fonts/Iosevka-Term/iosevka-term-light.ttf b/template-skel/.local/share/fonts/Iosevka-Term/iosevka-term-light.ttf
similarity index 100%
rename from target-scripts/.local/share/fonts/Iosevka-Term/iosevka-term-light.ttf
rename to template-skel/.local/share/fonts/Iosevka-Term/iosevka-term-light.ttf
diff --git a/target-scripts/.local/share/fonts/Iosevka-Term/iosevka-term-lightitalic.ttf b/template-skel/.local/share/fonts/Iosevka-Term/iosevka-term-lightitalic.ttf
similarity index 100%
rename from target-scripts/.local/share/fonts/Iosevka-Term/iosevka-term-lightitalic.ttf
rename to template-skel/.local/share/fonts/Iosevka-Term/iosevka-term-lightitalic.ttf
diff --git a/target-scripts/.local/share/fonts/Iosevka-Term/iosevka-term-lightoblique.ttf b/template-skel/.local/share/fonts/Iosevka-Term/iosevka-term-lightoblique.ttf
similarity index 100%
rename from target-scripts/.local/share/fonts/Iosevka-Term/iosevka-term-lightoblique.ttf
rename to template-skel/.local/share/fonts/Iosevka-Term/iosevka-term-lightoblique.ttf
diff --git a/target-scripts/.local/share/fonts/Iosevka-Term/iosevka-term-medium.ttf b/template-skel/.local/share/fonts/Iosevka-Term/iosevka-term-medium.ttf
similarity index 100%
rename from target-scripts/.local/share/fonts/Iosevka-Term/iosevka-term-medium.ttf
rename to template-skel/.local/share/fonts/Iosevka-Term/iosevka-term-medium.ttf
diff --git a/target-scripts/.local/share/fonts/Iosevka-Term/iosevka-term-mediumitalic.ttf b/template-skel/.local/share/fonts/Iosevka-Term/iosevka-term-mediumitalic.ttf
similarity index 100%
rename from target-scripts/.local/share/fonts/Iosevka-Term/iosevka-term-mediumitalic.ttf
rename to template-skel/.local/share/fonts/Iosevka-Term/iosevka-term-mediumitalic.ttf
diff --git a/target-scripts/.local/share/fonts/Iosevka-Term/iosevka-term-mediumoblique.ttf b/template-skel/.local/share/fonts/Iosevka-Term/iosevka-term-mediumoblique.ttf
similarity index 100%
rename from target-scripts/.local/share/fonts/Iosevka-Term/iosevka-term-mediumoblique.ttf
rename to template-skel/.local/share/fonts/Iosevka-Term/iosevka-term-mediumoblique.ttf
diff --git a/target-scripts/.local/share/fonts/Iosevka-Term/iosevka-term-oblique.ttf b/template-skel/.local/share/fonts/Iosevka-Term/iosevka-term-oblique.ttf
similarity index 100%
rename from target-scripts/.local/share/fonts/Iosevka-Term/iosevka-term-oblique.ttf
rename to template-skel/.local/share/fonts/Iosevka-Term/iosevka-term-oblique.ttf
diff --git a/target-scripts/.local/share/fonts/Iosevka-Term/iosevka-term-regular.ttf b/template-skel/.local/share/fonts/Iosevka-Term/iosevka-term-regular.ttf
similarity index 100%
rename from target-scripts/.local/share/fonts/Iosevka-Term/iosevka-term-regular.ttf
rename to template-skel/.local/share/fonts/Iosevka-Term/iosevka-term-regular.ttf
diff --git a/target-scripts/.local/share/fonts/Iosevka-Term/iosevka-term-semibold.ttf b/template-skel/.local/share/fonts/Iosevka-Term/iosevka-term-semibold.ttf
similarity index 100%
rename from target-scripts/.local/share/fonts/Iosevka-Term/iosevka-term-semibold.ttf
rename to template-skel/.local/share/fonts/Iosevka-Term/iosevka-term-semibold.ttf
diff --git a/target-scripts/.local/share/fonts/Iosevka-Term/iosevka-term-semibolditalic.ttf b/template-skel/.local/share/fonts/Iosevka-Term/iosevka-term-semibolditalic.ttf
similarity index 100%
rename from target-scripts/.local/share/fonts/Iosevka-Term/iosevka-term-semibolditalic.ttf
rename to template-skel/.local/share/fonts/Iosevka-Term/iosevka-term-semibolditalic.ttf
diff --git a/target-scripts/.local/share/fonts/Iosevka-Term/iosevka-term-semiboldoblique.ttf b/template-skel/.local/share/fonts/Iosevka-Term/iosevka-term-semiboldoblique.ttf
similarity index 100%
rename from target-scripts/.local/share/fonts/Iosevka-Term/iosevka-term-semiboldoblique.ttf
rename to template-skel/.local/share/fonts/Iosevka-Term/iosevka-term-semiboldoblique.ttf
diff --git a/target-scripts/.local/share/fonts/Iosevka-Term/iosevka-term-thin.ttf b/template-skel/.local/share/fonts/Iosevka-Term/iosevka-term-thin.ttf
similarity index 100%
rename from target-scripts/.local/share/fonts/Iosevka-Term/iosevka-term-thin.ttf
rename to template-skel/.local/share/fonts/Iosevka-Term/iosevka-term-thin.ttf
diff --git a/target-scripts/.local/share/fonts/Iosevka-Term/iosevka-term-thinitalic.ttf b/template-skel/.local/share/fonts/Iosevka-Term/iosevka-term-thinitalic.ttf
similarity index 100%
rename from target-scripts/.local/share/fonts/Iosevka-Term/iosevka-term-thinitalic.ttf
rename to template-skel/.local/share/fonts/Iosevka-Term/iosevka-term-thinitalic.ttf
diff --git a/target-scripts/.local/share/fonts/Iosevka-Term/iosevka-term-thinoblique.ttf b/template-skel/.local/share/fonts/Iosevka-Term/iosevka-term-thinoblique.ttf
similarity index 100%
rename from target-scripts/.local/share/fonts/Iosevka-Term/iosevka-term-thinoblique.ttf
rename to template-skel/.local/share/fonts/Iosevka-Term/iosevka-term-thinoblique.ttf
diff --git a/target-scripts/.local/share/rofi/themes/base16-atelier-cave.rasi b/template-skel/.local/share/rofi/themes/base16-atelier-cave.rasi
similarity index 100%
rename from target-scripts/.local/share/rofi/themes/base16-atelier-cave.rasi
rename to template-skel/.local/share/rofi/themes/base16-atelier-cave.rasi
diff --git a/target-scripts/bin/compstat b/template-skel/bin/compstat
similarity index 100%
rename from target-scripts/bin/compstat
rename to template-skel/bin/compstat
diff --git a/target-scripts/bin/compstat.sh b/template-skel/bin/compstat.sh
similarity index 100%
rename from target-scripts/bin/compstat.sh
rename to template-skel/bin/compstat.sh
diff --git a/target-scripts/bin/connman-gtk.sh b/template-skel/bin/connman-gtk.sh
similarity index 100%
rename from target-scripts/bin/connman-gtk.sh
rename to template-skel/bin/connman-gtk.sh
diff --git a/target-scripts/bin/manual b/template-skel/bin/manual
similarity index 100%
rename from target-scripts/bin/manual
rename to template-skel/bin/manual
diff --git a/target-scripts/bin/pavucontrol.sh b/template-skel/bin/pavucontrol.sh
similarity index 100%
rename from target-scripts/bin/pavucontrol.sh
rename to template-skel/bin/pavucontrol.sh
diff --git a/target-scripts/bin/reform-chat b/template-skel/bin/reform-chat
similarity index 100%
rename from target-scripts/bin/reform-chat
rename to template-skel/bin/reform-chat
diff --git a/target-scripts/bin/reform-desktop-help b/template-skel/bin/reform-desktop-help
similarity index 100%
rename from target-scripts/bin/reform-desktop-help
rename to template-skel/bin/reform-desktop-help
diff --git a/target-scripts/bin/reform-help b/template-skel/bin/reform-help
similarity index 100%
rename from target-scripts/bin/reform-help
rename to template-skel/bin/reform-help
diff --git a/target-scripts/setup b/template-skel/setup
similarity index 100%
rename from target-scripts/setup
rename to template-skel/setup