diff --git a/setup/build_linux b/setup/build_linux
index 76ae258d..248129bb 100755
--- a/setup/build_linux
+++ b/setup/build_linux
@@ -35,9 +35,9 @@ fi
 function ask() {
   while :; do
     read -p "$1 [Y/N] " -r answer
-    if echo "$answer" | egrep -iq '^(y|yes|sure)$'; then
+    if echo "$answer" | grep -Eiq '^(y|yes|sure)$'; then
       return 0
-    elif echo "$answer" | egrep -iq '^(n|no|nope)$'; then
+    elif echo "$answer" | grep -Eiq '^(n|no|nope)$'; then
       return 1
     fi
   done
@@ -67,7 +67,7 @@ function fix_kit_permissions() {
 function load_settings() {
   dos2unix "$ROOT_DIR/scripts/wk/cfg/main.py"
   while read line; do
-    if echo "$line" | egrep -q "^\w+='"; then
+    if echo "$line" | grep -Eq "^\w+='"; then
       line="$(echo "$line" | sed -r 's/[\r\n]+//')"
       eval "$line"
     fi
@@ -358,8 +358,6 @@ function build_iso() {
     | tee -a "$LOG_DIR/$DATETIME.log"
 
   # Build better ISO
-  rm -r "${ISO_DIR:-safety}/EFI"
-  rm -r "${ISO_DIR:-safety}/loader"
   rsync -aI "$PROFILE_DIR/EFI/" "${ISO_DIR:-safety}/EFI/"
   rsync -aI --ignore-existing "$PROFILE_DIR/syslinux/" "${ISO_DIR:-safety}/syslinux/"
   ## Sketchy bit ##
diff --git a/setup/linux/packages/base b/setup/linux/packages/base
index 57f4d6f9..306bfffd 100644
--- a/setup/linux/packages/base
+++ b/setup/linux/packages/base
@@ -8,6 +8,7 @@ bc
 bind
 bluez
 bluez-utils
+btrfs-progs
 chntpw
 cmatrix
 colordiff
@@ -18,9 +19,13 @@ ddrescue
 device-mapper
 diffutils
 dmidecode
+dmraid
 dos2unix
+dosfstools
 e2fsprogs
 edk2-shell
+exfatprogs
+gptfdisk
 hexedit
 hfsprogs
 htop
@@ -51,11 +56,11 @@ mprime
 mtools
 nano
 ncdu
+nvme-cli
 openssh
 p7zip
 perl
 pipes.sh
-reiserfsprogs
 pv
 python
 python-docopt
@@ -64,6 +69,8 @@ python-mysql-connector
 python-psutil
 python-pytz
 python-requests
+qemu-guest-agent
+reiserfsprogs
 reiserfsprogs
 rfkill
 rng-tools
diff --git a/setup/linux/packages/dependencies b/setup/linux/packages/dependencies
index 9f593119..efcdacfb 100644
--- a/setup/linux/packages/dependencies
+++ b/setup/linux/packages/dependencies
@@ -11,6 +11,7 @@ gtk-doc
 gtk3
 hwloc
 imlib2
+intltool
 iwd
 json-glib
 lhasa
@@ -28,10 +29,11 @@ openssh
 p7zip
 pango
 perl-rename
-reiserfsprogs
 pv
 refind
+reiserfsprogs
 rsync
+scdoc
 startup-notification
 subversion
 syslinux
diff --git a/setup/linux/profile_base/efiboot/loader/entries/01-archiso-x86_64-linux.conf b/setup/linux/profile_base/efiboot/loader/entries/01-archiso-x86_64-linux.conf
index a8401674..05e5c9b9 100644
--- a/setup/linux/profile_base/efiboot/loader/entries/01-archiso-x86_64-linux.conf
+++ b/setup/linux/profile_base/efiboot/loader/entries/01-archiso-x86_64-linux.conf
@@ -1,4 +1,5 @@
-title   Arch Linux (x86_64, UEFI)
+title   %ARCHISO_LABEL%
+sort-key 01
 linux   /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux
 initrd  /%INSTALL_DIR%/boot/intel-ucode.img
 initrd  /%INSTALL_DIR%/boot/amd-ucode.img
diff --git a/setup/linux/profile_base/efiboot/loader/entries/02-archiso-x86_64-ram-linux.conf b/setup/linux/profile_base/efiboot/loader/entries/02-archiso-x86_64-ram-linux.conf
index 7a26cbab..b721e2cc 100644
--- a/setup/linux/profile_base/efiboot/loader/entries/02-archiso-x86_64-ram-linux.conf
+++ b/setup/linux/profile_base/efiboot/loader/entries/02-archiso-x86_64-ram-linux.conf
@@ -1,4 +1,5 @@
-title   Arch Linux (x86_64, UEFI) Copy to RAM
+title   %ARCHISO_LABEL% (Copy to RAM)
+sort-key 02
 linux   /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux
 initrd  /%INSTALL_DIR%/boot/intel-ucode.img
 initrd  /%INSTALL_DIR%/boot/amd-ucode.img
diff --git a/setup/linux/profile_base/profiledef.sh b/setup/linux/profile_base/profiledef.sh
index 2047e0ee..3a4e1386 100644
--- a/setup/linux/profile_base/profiledef.sh
+++ b/setup/linux/profile_base/profiledef.sh
@@ -8,12 +8,13 @@ iso_application="KIT_NAME_FULL Linux Environment"
 iso_version="$(date +%Y-%m-%d)"
 install_dir="arch"
 buildmodes=('iso')
-bootmodes=('bios.syslinux.mbr' 'bios.syslinux.eltorito' 'uefi-x64.systemd-boot.esp' 'uefi-x64.systemd-boot.eltorito')
+bootmodes=('bios.syslinux.mbr' 'bios.syslinux.eltorito')
 arch="x86_64"
 pacman_conf="pacman.conf"
 airootfs_image_type="squashfs"
 airootfs_image_tool_options=('-comp' 'xz' '-Xbcj' 'x86' '-b' '1M' '-Xdict-size' '1M')
 file_permissions=(
+  ["/root"]="0:0:750"
   ["/etc/shadow"]="0:0:400"
   ["/etc/gshadow"]="0:0:400"
   ["/etc/skel/.ssh"]="0:0:700"