diff --git a/arch-pine64-build b/arch-pine64-build
deleted file mode 160000
index 0f25ba2..0000000
--- a/arch-pine64-build
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 0f25ba2925d608e0e6a20d0f4148a3b19c129ae9
diff --git a/build.sh b/build.sh
index 2ee0fa5..7386994 100755
--- a/build.sh
+++ b/build.sh
@@ -18,7 +18,7 @@ date=$(date +%Y%m%d)
 
 error() { echo -e "\e[41m\e[5mERROR:\e[49m\e[25m $1" && exit 1; }
 check_dependency() { [ $(which $1) ] || error "$1 not found. Please make sure it is installed and on your PATH."; }
-usage() { error "$0 [-a ARCHITECTURE] [-d device] [-u ui] [-h hostname] [--osk-sdl] [--noconfirm] [--cachedir directory] [--no-cachedir]"; }
+usage() { error "$0 [-a ARCHITECTURE] [-d device] [-u ui] [-h hostname] [-n username] [-p password] [--osk-sdl] [--noconfirm] [--cachedir directory] [--no-cachedir]"; }
 cleanup() {
     trap '' EXIT
     trap '' INT
@@ -51,6 +51,8 @@ parse_args() {
             -d|--device) device=$2; shift ;;
             -u|--ui) ui=$2; shift ;;
             -h|--hostname) hostname=$2; shift ;;
+            -p|--password) password=$2; shift ;;
+            -n| --username) username=$2; shift ;;
             --noconfirm) NOCONFIRM=1;;
             --osk-sdl) OSK_SDL=1;;
             --cachedir) cachedir=$2; shift ;;
@@ -209,20 +211,20 @@ systemctl disable systemd-resolved
 systemctl enable zramswap
 systemctl enable NetworkManager
 
-usermod -a -G network,video,audio,rfkill,wheel alarm
+usermod -a -G network,video,audio,rfkill,wheel $username
 
 $(echo -e "${postinstall[@]}")
 
-cp -rv /etc/skel/. /home/alarm
-chown -R alarm:alarm /home/alarm
+cp -rv /etc/skel/. /home/$username
+chown -R $username:$username /home/$username
 
 if [ -e /etc/sudoers ]; then
     sed -i 's/# %wheel ALL=(ALL:ALL) ALL/%wheel ALL=(ALL:ALL) ALL/' /etc/sudoers
 fi
 
-cat << FOE | passwd alarm
-123456
-123456
+cat << FOE | passwd $username
+$password
+$password
 
 FOE
 
diff --git a/ui/all/packages b/ui/all/packages
new file mode 100644
index 0000000..e83722d
--- /dev/null
+++ b/ui/all/packages
@@ -0,0 +1,183 @@
+awesome
+alligator
+angelfish
+ark
+cinnamon
+cinnamon-control-center
+chromium
+colord-kde
+cups
+danctnix-plasma-desktop-settings
+danctnix-usb-tethering
+dbmate
+dhcp
+dolphin
+dolphin-plugins
+elisa
+enlightenment
+fcitx5-material-color
+filelight
+glibc-locales
+gnome-console
+gnome-control-center
+gnome-desk-utility
+gnome-desktop-4
+gnome-shell-extension-dash-to-panel
+gnome-session
+gnome-software
+gst-plugins-bad
+gst-plugins-good
+gwenview
+iio-sensor-proxy
+kalk
+kate
+kdeconnect
+kdegraphics-thumbnailers
+kdenetwork-filesharing
+kdepim-addons
+kdialog
+kio-admin
+kio-extras
+kjournald
+kmail
+kmail-account-wizard
+kmines
+kolourpaint
+konsole
+kpat
+krecorder
+ksystemlog
+kwalletmanager
+kweather
+kvantum-theme-materia
+libdbusmenu-lxqt
+liblxqt
+libmatekbd
+libmatemixer
+libmateweather
+libshumate
+libshumate-docs
+libxfce4ui
+libxfce4util
+libxfce4windowing
+lxqt
+lxqt-about
+lxqt-admin
+lxqt-archiver
+lxqt-build-tools
+lxqt-config
+lxqt-globalkeys
+lxqt-menu-data
+lxqt-notificationd
+lxqt-panel
+lxqt-policykit
+lxqt-powermanagement
+lxqt-qtplugin
+lxqt-runner
+lxqt-session
+lxqt-sudo
+lxterminal
+maliit-keyboard
+materia-gtk-theme
+materia-kde
+mate-applet-dock
+mate-applet-streamer
+mate-applets
+mate-backgrounds
+mate-calc
+mate-common
+mate-control-center
+mate-desktop
+mate-icon-theme
+mate-icon-theme-faenza
+mate-media
+mate-menus
+mate-netbook
+mate-notification-daemon
+mate-panel
+mate-polkit
+mate-power-manager
+mate-screensaver
+mate-sensors-applet
+mate-session-manager
+mate-settings-daemon
+mate-system-monitor
+mate-terminal
+mate-themes
+mate-user-guide
+mate-user-share
+mate-utils
+mbox-importer
+merkuro
+mesa
+mkdocs-material
+networkmanager-openvpn
+nodejs-material-design-icons
+noto-fonts
+noto-fonts-cjk
+noto-fonts-emoji
+okular
+packagekit-qt5
+pantheon
+pim-data-exporter
+pim-sieve-editor
+plasma
+plasma-wayland-session
+python-qt-material
+qml-material
+qt5-virtualkeyboard
+ruby-climate_control
+sddm
+signon-kwallet-extension
+spectacle
+sway
+sweeper
+tmate
+vlc
+xdg-desktop-portal-kde
+xdg-desktop-portal-lxqt
+xdg-user-dirs
+xfce4-appfinder
+xfce4-artwork
+xfce4-battery-plugin
+xfce4-calculator-plugin
+xfce4-clipman-plugin
+xfce4-cpufreq-plugin
+xfce4-cpugraph-plugin
+xfce4-datetime-plugin
+xfce4-dev-tools
+xfce4-dict
+xfce4-diskperf-plugin
+xfce4-docklike-plugin
+xfce4-eyes-plugin
+xfce4-fsguard-plugin
+xfce4-genmon-plugin
+xfce4-mailwatch-plugin
+xfce4-mixer
+xfce4-mount-plugin
+xfce4-mpc-plugin
+xfce4-netload-plugin
+xfce4-notes-plugin
+xfce4-notifyd
+xfce4-panel
+xfce4-panel-profiles
+xfce4-power-manager
+xfce4-pulseaudio-plugin
+xfce4-screensaver
+xfce4-screenshooter
+xfce4-session
+xfce4-settings
+xfce4-smartbookmark-plugin
+xfce4-stopwatch-plugin
+xfce4-systemload-plugin
+xfce4-taskmanager
+xfce4-terminal
+xfce4-time-out-plugin
+xfce4-timer-plugin
+xfce4-verve-plugin
+xfce4-volumed-pulse
+xfce4-wavelan-plugin
+xfce4-weather-plugin
+xfce4-whiskermenu-plugin
+xfce4-windowck-plugin
+xfce4-xkb-plugin
\ No newline at end of file
diff --git a/ui/all/postinstall b/ui/all/postinstall
new file mode 100644
index 0000000..e69de29
diff --git a/ui/awesome/packages b/ui/awesome/packages
new file mode 100644
index 0000000..6ab6ae4
--- /dev/null
+++ b/ui/awesome/packages
@@ -0,0 +1,6 @@
+awesome
+chromium
+cups
+networkmanager-openvpn
+sddm
+vlc
\ No newline at end of file
diff --git a/ui/awesome/postinstall b/ui/awesome/postinstall
new file mode 100644
index 0000000..f644109
--- /dev/null
+++ b/ui/awesome/postinstall
@@ -0,0 +1,2 @@
+systemctl enable cups
+systemctl enable sddm
\ No newline at end of file
diff --git a/ui/cinnamon/packages b/ui/cinnamon/packages
new file mode 100644
index 0000000..f4bf825
--- /dev/null
+++ b/ui/cinnamon/packages
@@ -0,0 +1,8 @@
+chromium
+vlc
+networkmanager-openvpn
+cups
+sddm
+cinnamon
+cinnamon-control-center
+qterminal
\ No newline at end of file
diff --git a/ui/cinnamon/postinstall b/ui/cinnamon/postinstall
new file mode 100644
index 0000000..f644109
--- /dev/null
+++ b/ui/cinnamon/postinstall
@@ -0,0 +1,2 @@
+systemctl enable cups
+systemctl enable sddm
\ No newline at end of file
diff --git a/ui/enlightenment/packages b/ui/enlightenment/packages
new file mode 100644
index 0000000..9230c07
--- /dev/null
+++ b/ui/enlightenment/packages
@@ -0,0 +1,6 @@
+chromium
+vlc
+networkmanager-openvpn
+cups
+sddm
+enlightenment
\ No newline at end of file
diff --git a/ui/enlightenment/postinstall b/ui/enlightenment/postinstall
new file mode 100644
index 0000000..1ad1909
--- /dev/null
+++ b/ui/enlightenment/postinstall
@@ -0,0 +1,2 @@
+systemctl enable cups
+systemctl enable enlightenment
\ No newline at end of file
diff --git a/ui/gnome/packages b/ui/gnome/packages
new file mode 100644
index 0000000..a8221df
--- /dev/null
+++ b/ui/gnome/packages
@@ -0,0 +1,12 @@
+gnome-desktop-4
+gnome-software
+gdm
+gnome-disk-utility
+gnome-console
+gnome-control-center
+gnome-session
+gnome-shell-extension-dash-to-panel
+chromium
+vlc
+networkmanager-openvpn
+cups
\ No newline at end of file
diff --git a/ui/gnome/postinstall b/ui/gnome/postinstall
new file mode 100644
index 0000000..73456ef
--- /dev/null
+++ b/ui/gnome/postinstall
@@ -0,0 +1,2 @@
+systemctl enable cups
+systemctl enable gdm
\ No newline at end of file
diff --git a/ui/lxqt/packages b/ui/lxqt/packages
new file mode 100644
index 0000000..5a8162f
--- /dev/null
+++ b/ui/lxqt/packages
@@ -0,0 +1,27 @@
+lxqt
+chromium
+vlc
+networkmanager-openvpn
+sddm
+cups
+lxqt-openssh-askpass
+lxqt-panel
+lxqt-policykit
+lxqt-powermanagement
+lxqt-about
+lxqt-config
+lxqt-archiver
+xdg-desktop-portal-lxqt
+lxqt-sudo
+lxqt-qtplugin
+lxqt-session
+lxqt-admin
+lxqt-notificationd
+lxqt-runner
+lxqt-globalkeys
+liblxqt
+libdbusmenu-lxqt
+lxqt-themes
+lxqt-menu-data
+lxqt-build-tools
+lxterminal
\ No newline at end of file
diff --git a/ui/lxqt/postinstall b/ui/lxqt/postinstall
new file mode 100644
index 0000000..f644109
--- /dev/null
+++ b/ui/lxqt/postinstall
@@ -0,0 +1,2 @@
+systemctl enable cups
+systemctl enable sddm
\ No newline at end of file
diff --git a/ui/mate/packages b/ui/mate/packages
new file mode 100644
index 0000000..ed1886c
--- /dev/null
+++ b/ui/mate/packages
@@ -0,0 +1,48 @@
+chromium
+vlc
+networkmanager-openvpn
+cups
+sddm
+mate-applet-streamer
+libshumate
+libshumate-docs
+tmate
+mate-control-center
+mate-user-share
+mate-screensaver
+mate-notification-daemon
+mate-sensors-applet
+mate-applets
+mate-utils
+mate-netbook
+mate-media
+mate-power-manager
+mate-panel
+mate-terminal
+mate-menus
+mate-settings-daemon
+mate-session-manager
+mate-polkit
+mate-desktop
+mate-calc
+mate-system-monitor
+dbmate
+libmateweather
+libmatekbd
+libmatemixer
+qml-material
+mkdocs-material
+mate-icon-theme
+mate-themes
+mate-backgrounds
+mate-icon-theme-faenza
+mate-user-guide
+mate-common
+ruby-climate_control
+nodejs-material-design-icons
+fcitx5-material-color
+materia-gtk-theme
+mate-applet-dock
+python-qt-material
+kvantum-theme-materia
+materia-kde
\ No newline at end of file
diff --git a/ui/mate/postinstall b/ui/mate/postinstall
new file mode 100644
index 0000000..f644109
--- /dev/null
+++ b/ui/mate/postinstall
@@ -0,0 +1,2 @@
+systemctl enable cups
+systemctl enable sddm
\ No newline at end of file
diff --git a/ui/pantheon/packages b/ui/pantheon/packages
new file mode 100644
index 0000000..53b89a4
--- /dev/null
+++ b/ui/pantheon/packages
@@ -0,0 +1,7 @@
+pantheon
+chromium
+vlc
+networkmanager-openvpn
+cups
+lightdm
+lightdm-pantheon-greeter
\ No newline at end of file
diff --git a/ui/pantheon/postinstall b/ui/pantheon/postinstall
new file mode 100644
index 0000000..d8ffc0f
--- /dev/null
+++ b/ui/pantheon/postinstall
@@ -0,0 +1,2 @@
+systemctl enable cups
+systemctl enable lightdm
\ No newline at end of file
diff --git a/ui/plasma_desktop/packages b/ui/plasma_desktop/packages
index 861c37b..ddc5273 100644
--- a/ui/plasma_desktop/packages
+++ b/ui/plasma_desktop/packages
@@ -46,6 +46,7 @@ packagekit-qt5
 pim-data-exporter
 pim-sieve-editor
 plasma
+plasma-wayland-session
 qt5-virtualkeyboard
 sddm
 signon-kwallet-extension
diff --git a/ui/sway/packages b/ui/sway/packages
new file mode 100644
index 0000000..8d0fc39
--- /dev/null
+++ b/ui/sway/packages
@@ -0,0 +1,6 @@
+chromium
+vlc
+networkmanager-openvpn
+sway
+sddm
+cups
\ No newline at end of file
diff --git a/ui/sway/postinstall b/ui/sway/postinstall
new file mode 100644
index 0000000..f644109
--- /dev/null
+++ b/ui/sway/postinstall
@@ -0,0 +1,2 @@
+systemctl enable cups
+systemctl enable sddm
\ No newline at end of file
diff --git a/ui/xfce4/packages b/ui/xfce4/packages
new file mode 100644
index 0000000..12b14f0
--- /dev/null
+++ b/ui/xfce4/packages
@@ -0,0 +1,56 @@
+chromium
+vlc
+networkmanager-openvpn
+sddm
+cups
+xfce4-dict
+xfce4-volumed-pulse
+xfce4-battery-plugin
+xfce4-whiskermenu-plugin
+xfce4-power-manager
+xfce4-docklike-plugin
+xfce4-weather-plugin
+xfce4-timer-plugin
+xfce4-stopwatch-plugin
+xfce4-calculator-plugin
+xfce4-mailwatch-plugin
+xfce4-generic-slider
+xfce4-windowck-plugin
+xfce4-mixer
+xfce4-indicator-plugin
+xfce4-systemload-plugin
+xfce4-pulseaudio-plugin
+xfce4-screenshooter
+xfce4-xkb-plugin
+xfce4-mount-plugin
+xfce4-netload-plugin
+xfce4-mpc-plugin
+xfce4-diskperf-plugin
+xfce4-cpugraph-plugin
+xfce4-places-plugin
+xfce4-wavelan-plugin
+xfce4-sensors-plugin
+xfce4-smartbookmark-plugin
+xfce4-time-out-plugin
+xfce4-notifyd
+xfce4-verve-plugin
+xfce4-notes-plugin
+xfce4-cpufreq-plugin
+xfce4-eyes-plugin
+xfce4-genmon-plugin
+xfce4-fsguard-plugin
+xfce4-clipman-plugin
+xfce4-panel
+xfce4-terminal
+xfce4-appfinder
+xfce4-settings
+xfce4-screensaver
+xfce4-taskmanager
+xfce4-session
+libxfce4ui
+libxfce4util
+xfce4-dev-tools
+libxfce4windowing
+xfce4-datetime-plugin
+xfce4-artwork
+xfce4-panel-profiles
\ No newline at end of file
diff --git a/ui/xfce4/postinstall b/ui/xfce4/postinstall
new file mode 100644
index 0000000..f644109
--- /dev/null
+++ b/ui/xfce4/postinstall
@@ -0,0 +1,2 @@
+systemctl enable cups
+systemctl enable sddm
\ No newline at end of file