OSDN Git Service

Fix: missing boot partition type being passed to part_auto()
[pacbang-linux/installer-arch.git] / archlabs-installer
index 5f98a90..0814f01 100755 (executable)
 # This program is free software, provided under the GNU GPL
 # Written by Nathaniel Maia for use in Archlabs
 # Some ideas and code reworked from other resources
-# AIF, Cnichi, Calamares, Arch Wiki.. Credit where credit is due
+# AIF, Calamares, and the Arch Wiki.. Credit where credit is due
+
+# check for syntax errors
+# set -n
+
+VER=2.1.5
+
+# default values {
+
+: ${DIST=ArchLabs}                 # distro name if not set
+MNT=/mnt                           # installation root mountpoint
+ANS=/tmp/ans                       # dialog answer output file
+FONT=ter-i16n                      # font used for the linux console
+HOOKS=shutdown                     # additional mkinitcpio HOOKS
+SEL=0                              # currently selected menu item
+SYS=Unknown                        # bios type, to be determined: UEFI/BIOS
+ERR=/tmp/errlog                    # stderr log used internally by errshow()
+DBG=/tmp/debuglog                  # debug log file when passed -d
+RUN=/run/archiso/bootmnt/arch/boot # path for live system /boot
+VM="$(dmesg | grep -i hypervisor)" # system running in a virtual machine
+EXMNTS=""                          # extra partitions that were mounted, used to verify mountpoint and show user
+FORMATTED=""                       # partitions that have been formatted, allows skipping the format step
+USER_CMD=""                        # optional command(s) entered by the user to run in the chroot
+export DIALOGOPTS="--cr-wrap"      # dialog environment variable to hold default options, see `man dialog`
+
+BASE_PKGS="base xorg xorg-drivers sudo git gvfs gtk3 libmad libmatroska tumbler "
+BASE_PKGS+="playerctl pulseaudio pulseaudio-alsa pavucontrol pamixer scrot xdg-user-dirs "
+BASE_PKGS+="ffmpeg gstreamer gst-libav gst-plugins-base gst-plugins-good bash-completion xterm"
+
+AL_BASE_PKGS="archlabs-keyring archlabs-icons archlabs-fonts archlabs-themes "
+AL_BASE_PKGS+="archlabs-baph archlabs-wallpapers archlabs-scripts archlabs-skel-base"
+
+WM_BASE_PKGS="arandr nitrogen polkit-gnome network-manager-applet "
+WM_BASE_PKGS+="volumeicon xclip exo laptop-detect xdotool compton wmctrl feh "
+WM_BASE_PKGS+="gnome-keyring dunst gsimplecal xfce4-power-manager xfce4-settings"
 
-
-# linux distributor, if unset will be ArchLabs
-# this can be set in the environment prior to install, eg.
-#
-# $ DIST="My Distro" archlabs-installer
-#
-# will result in "My Distro Linux" used where needed
-: ${DIST="ArchLabs"}
-
-
-VER="2.0.61"     # installer version
-MNT="/mnt"       # install mountpoint
-ANS="/tmp/ans"   # dialog answer file
-
-# ------------------------------------------------------ #
-# When manually mounting your partitions, you need
-# to set these values to avoid using the mount menu.
-# ------------------------------------------------------ #
-
-# root partition, eg. /dev/sda2
-ROOT_PART=''
-
-# boot partition, required on UEFI eg. /dev/sda1
-BOOT_PART=''
-
-# boot device, used for some bootloaders eg. /dev/sda
-BOOT_DEV=''
-
-# bootloader to use, can be:
-#    UEFI: grub, syslinux, efistub, systemd-boot, refind-efi
-#    BIOS: grub, syslinux
-BOOTLDR=''
-
-# directory to mount the boot partition (if any) for most bootloaders
-# this will need to be 'boot' however a popular one for grub is 'boot/efi'
-BOOTDIR='boot'
-
-# ------------------------------------------------------ #
-
-# bulk default values {
-
-# these values will be selected during the install, it is not recommended
-# to edit them here unless you know what you're doing.
-
-UCODE=''          # cpu microcode (if any), can be: amd-ucode, intel-ucode
-KERNEL=''         # linux kernel, can be: linux, linux-lts, linux-zen, or linux-hardened
-MYSHELL=''        # full path for the shell, eg. /usr/bin/zsh
-
-SWAP_PART=''      # swap partition or file path
-SWAP_SIZE=''      # swap size, only used when creating a swapfile
-
-EXMNT=''          # holder for additional partitions while mounting
-EXMNTS=''         # when an extra partition is mounted append it's info
-
-FONT="ter-i16n"   # font used for the linux console
-HOOKS="shutdown"  # list of additional HOOKS to add in /etc/mkinitcpio.conf
-
-LOGIN_TYPE=''     # login manager can be: lightdm, xinit, ly
-LOGIN_WM=''       # default login session to be placed in ~/.xinitrc
-LOGINRC=''        # login shell rc file, eg. .zprofile, .bash_profile, .profile
-
-INSTALL_WMS=''    # space separated list of chosen wm/de
-
-WM_PKGS=''        # list of packages added during wm/de choice (not user edited)
-PACKAGES=''       # list of all packages to install including WM_PKGS (not user edited)
-USER_PKGS=''      # packages selected by the user during install
-
-NEWUSER=''        # username for the new user
-USER_PASS=''      # new user's password
-ROOT_PASS=''      # root password
-
-LUKS=''           # empty when not using encryption
-LUKS_DEV=''       # boot parameter string for LUKS
-LUKS_PART=''      # partition used for encryption
-LUKS_PASS=''      # encryption password
-LUKS_UUID=''      # encrypted partition UUID
-LUKS_NAME=''      # name used for encryption
-
-LVM=''            # empty when not using lvm
-LVM_PARTS=''      # partitions used for volume group
-VGROUP_MB=0       # available space in volume group
-
-WARN=''           # issued mounting/partitioning warning
-SEP_BOOT=''       # separate boot partition for BIOS
-AUTOLOGIN=''      # enable autologin for xinit
-CONFIG_DONE=''    # basic configuration is finished
-
-FORMATTED=''      # partitions we formatted and should allow skipping
-AUTO_ROOT_PART='' # root value from auto partition
-AUTO_BOOT_PART='' # boot value from auto partition
-
-# archlabs base
-AL_BASE_PKGS="archlabs-skel-base archlabs-fonts archlabs-themes archlabs-dARK archlabs-icons archlabs-wallpapers archlabs-scripts"
-
-# baseline (usually installed in the background)
-BASE_PKGS="base-devel xorg xorg-drivers sudo git gvfs gtk3 gtk-engines gtk-engine-murrine pavucontrol tumbler xdg-user-dirs "
-BASE_PKGS+="playerctl ffmpeg gstreamer libmad libmatroska gst-libav gst-plugins-base gst-plugins-good scrot bash-completion"
-
-# extras for window managers
-WM_BASE_PKGS="arandr archlabs-networkmanager-dmenu nitrogen polkit-gnome volumeicon xclip exo laptop-detect "
-WM_BASE_PKGS+="xdotool compton wmctrl gnome-keyring dunst feh gsimplecal xfce4-power-manager xfce4-settings"
-
-
-SEL=0                                 # currently selected menu item
-ERR="/tmp/errlog"                     # error log used internally
-DBG="/tmp/debuglog"                   # debug log when passed -d
-RUN="/run/archiso/bootmnt/arch/boot"  # path for live system /boot
-VM="$(dmesg | grep -i "hypervisor")"  # system running in a virtual machine
-SYS='Unknown'                         # bios type to be determined: UEFI/BIOS
-
-export DIALOGOPTS="--cr-wrap"   # see `man dialog`
-
-# }
-
-# giant ugly variable container :P {
-
-# system RAM in MB
 SYS_MEM="$(awk '/MemTotal/ {print int($2 / 1024) "M"}' /proc/meminfo)"
-
-# locales from /etc/locale.gen
 LOCALES="$(awk '/\.UTF-8/ {gsub(/# .*|#/, ""); if ($1) {print $1 " - "}}' /etc/locale.gen)"
-
-# console keyboard mappings
 CMAPS="$(find /usr/share/kbd/keymaps -name '*.map.gz' | awk '{gsub(/\.map\.gz|.*\//, ""); print $1 " - "}' | sort)"
 
-# terminal size
 [[ $LINES ]] || LINES=$(tput lines)
 [[ $COLUMNS ]] || COLUMNS=$(tput cols)
 
-# associative arrays
-# {
+# }
 
 # commands used to install each bootloader, however most get modified during runtime {
 declare -A BCMDS=(
-[refind-efi]='refind-install'                    # minor modification
-[grub]='grub-install --recheck --force'          # heavily modified
-[syslinux]='syslinux-install_update -i -a -m'    # modified on UEFI
-[efistub]='efibootmgr -v -d /dev/sda -p 1 -c -l' # heavily modified
-[systemd-boot]='bootctl --path=/boot install'    # not modified
+[refind-efi]='refind-install'
+[grub]='grub-install --recheck --force' [syslinux]='syslinux-install_update -i -a -m'
+[efistub]='efibootmgr -v -d /dev/sda -p 1 -c -l' [systemd-boot]='bootctl --path=/boot install'
 ) # }
 
 # executable name for each wm/de used in ~/.xinitrc {
 declare -A WM_SESSIONS=(
-[dwm]='dwm'
-[i3-gaps]='i3'
-[bspwm]='bspwm'
-[awesome]='awesome'
-[plasma]='startkde'
-[xfce4]='startxfce4'
-[gnome]='gnome-session'
-[fluxbox]='startfluxbox'
-[openbox]='openbox-session'
-[cinnamon]='cinnamon-session'
+[dwm]='dwm' [jwm]='jwm' [i3-gaps]='i3' [bspwm]='bspwm' [awesome]='awesome' [plasma]='startkde' [xfce4]='startxfce4'
+[gnome]='gnome-session' [fluxbox]='startfluxbox' [openbox]='openbox-session' [cinnamon]='cinnamon-session'
 ) # }
 
 # packages installed for each wm/de, most are depends of the skel packages {
 declare -A WM_EXT=(
-[dwm]=''                                    # NA
-[gnome]=''                                  # NA
-[cinnamon]='gnome-terminal'                 # doesn't install a terminal on it's own
-[plasma]='kdebase-meta'                     # base plasma application set
-[awesome]='archlabs-skel-awesome'           # see deps of archlabs-skel-awesome
-[bspwm]='archlabs-skel-bspwm'               # see deps of archlabs-skel-bspwm
-[fluxbox]='archlabs-skel-fluxbox'           # see deps of archlabs-skel-fluxbox
-[i3-gaps]='archlabs-skel-i3-gaps'           # see deps of archlabs-skel-i3-gaps
-[openbox]='archlabs-skel-openbox'           # see deps of archlabs-skel-openbox
-[xfce4]='archlabs-skel-xfce4 xfce4-goodies' # see deps of archlabs-skel-xfce4
+[dwm]='' [jwm]='' [gnome]='' [cinnamon]='gnome-terminal' [plasma]='kdebase-meta'
+[awesome]='archlabs-skel-awesome' [bspwm]='archlabs-skel-bspwm' [fluxbox]='archlabs-skel-fluxbox'
+[i3-gaps]='archlabs-skel-i3-gaps' [openbox]='archlabs-skel-openbox' [xfce4]='archlabs-skel-xfce4 xfce4-goodies'
 ) # }
 
 # files offered for editing after install is complete {
 declare -A EDIT_FILES=(
 [login]='' # login is populated once we know the username and shell
-[fstab]='/etc/fstab'
-[sudoers]='/etc/sudoers'
-[crypttab]='/etc/crypttab'
-[pacman]='/etc/pacman.conf'
-[console]='/etc/vconsole.conf'
-[mkinitcpio]='/etc/mkinitcpio.conf'
-[hostname]='/etc/hostname /etc/hosts'
-[bootloader]="/boot/loader/entries/$DIST.conf"
-[locale]='/etc/locale.conf /etc/default/locale'
-[keyboard]='/etc/X11/xorg.conf.d/00-keyboard.conf /etc/default/keyboard'
+[fstab]='/etc/fstab' [sudoers]='/etc/sudoers' [crypttab]='/etc/crypttab' [pacman]='/etc/pacman.conf'
+[console]='/etc/vconsole.conf' [mkinitcpio]='/etc/mkinitcpio.conf' [hostname]='/etc/hostname /etc/hosts'
+[bootloader]="/boot/loader/entries/$DIST.conf"  # ** based on bootloader
+[locale]='/etc/locale.conf /etc/default/locale' [keyboard]='/etc/X11/xorg.conf.d/00-keyboard.conf /etc/default/keyboard'
 ) # }
 
-# mkfs command and flags for filesystem formatting {
-declare -A FS_CMDS=(
-[f2fs]='mkfs.f2fs'
-[jfs]='mkfs.jfs -q'
-[xfs]='mkfs.xfs -f'
-[ntfs]='mkfs.ntfs -q'
-[ext2]='mkfs.ext2 -q'
-[ext3]='mkfs.ext3 -q'
-[ext4]='mkfs.ext4 -q'
-[vfat]='mkfs.vfat -F32'
-[nilfs2]='mkfs.nilfs2 -q'
-[reiserfs]='mkfs.reiserfs -q'
+# mkfs command flags for filesystem formatting {
+declare -A FS_CMD_FLAGS=(
+[f2fs]='' [jfs]='-q' [xfs]='-f' [ntfs]='-q' [ext2]='-q' [ext3]='-q' [ext4]='-q' [vfat]='-F32' [nilfs2]='-q' [reiserfs]='-q'
 ) # }
 
 # mount options for each filesystem {
 declare -A FS_OPTS=(
-[vfat]=''  # NA
-[ntfs]=''  # NA
-[ext2]=''  # NA
-[ext3]=''  # NA
+[vfat]='' [ntfs]='' [ext2]='' [ext3]=''  # NA
 [jfs]='discard errors=continue errors=panic nointegrity'
 [reiserfs]='acl nolog notail replayonly user_xattr off'
 [ext4]='discard dealloc nofail noacl relatime noatime nobarrier nodelalloc'
@@ -219,10 +95,7 @@ declare -A FS_OPTS=(
 
 # packages installed for each login option {
 declare -A LOGIN_PKGS=(
-[xinit]='xorg-xinit'
-[ly]='archlabs-ly'
-[gdm]='gdm'
-[sddm]='sddm'
+[xinit]='xorg-xinit' [ly]='archlabs-ly' [gdm]='gdm' [sddm]='sddm'
 [lightdm]='lightdm lightdm-gtk-greeter lightdm-gtk-greeter-settings accountsservice'
 ) # }
 
@@ -230,34 +103,23 @@ declare -A LOGIN_PKGS=(
 # if a package requires additional packages that aren't already dependencies
 # they can be added here eg. [package]="extra"
 declare -A PKG_EXT=(
-[vlc]='qt4'
-[mpd]='mpc'
-[mupdf]='mupdf-tools'
-[qt5ct]='qt5-styleplugins'
-[vlc]='qt5ct qt5-styleplugins'
-[zathura]='zathura-pdf-poppler'
-[noto-fonts]='noto-fonts-emoji'
-[cairo-dock]='cairo-dock-plug-ins'
-[qutebrowser]='qt5ct qt5-styleplugins'
-[qbittorrent]='qt5ct qt5-styleplugins'
-[transmission-qt]='qt5ct qt5-styleplugins'
-[bluez]='bluez-libs bluez-utils bluez-tools bluez-plugins bluez-hid2hci'
-[kdenlive]='kdebase-meta dvdauthor frei0r-plugins breeze breeze-gtk qt5ct qt5-styleplugins'
+[vlc]='qt4' [mpd]='mpc' [mupdf]='mupdf-tools'
+[rxvt-unicode]='urxvt-perls' [zathura]='zathura-pdf-poppler' [noto-fonts]='noto-fonts-emoji' [cairo-dock]='cairo-dock-plug-ins' [qt5ct]='qt5-styleplugins'
+[vlc]='qt5ct qt5-styleplugins' [qutebrowser]='qt5ct qt5-styleplugins' [qbittorrent]='qt5ct qt5-styleplugins' [transmission-qt]='qt5ct qt5-styleplugins'
+[bluez]='bluez-libs bluez-utils bluez-tools bluez-plugins bluez-hid2hci' [kdenlive]='kdebase-meta dvdauthor frei0r-plugins breeze breeze-gtk qt5ct qt5-styleplugins'
 ) # }
 
-# }
-
-# dialog text variables
-# {
-
+# dialog text variables {
 # Basics (somewhat in order)
+_welcome="\nThis will help you get $DIST installed and setup on your system.\n\nIf you are unsure about a section the default option will be listed or\nthe first selected item will be the default.\n\n\nMenu Navigation:\n\n - Select items with the arrow keys or the option number.\n - Use [Space] to toggle check boxes and [Enter] to accept.\n - Switch between fields using [Tab] or the arrow keys.\n - Use [Page Up] and [Page Down] to jump whole pages\n - Press the highlighted key of an option to select it.\n"
 _keymap="\nPick which keymap to use for the system from the list below\n\nThis is used once a graphical environment is running (Xorg).\n\nSystem default: us"
 _vconsole="\nSelect the console keymap, the console is the tty shell you reach before starting a graphical environment (Xorg).\n\nIts keymap is seperate from the one used by the graphical environments, though many do use the same such as 'us' English.\n\nSystem default: us"
+_prep="\nThis is the installer main menu, once a step is complete you will return here.\n\nOn successful completion of a step the cursor will be advanced to the next step\nOn failure the cursor will be placed on the step required to advance (when possible).\n\nSteps beginning with an asterix (*) are required.\n\nOnce you're happy with the choices and the required steps are complete, selecting the final step will begin the install."
 _device="\nSelect a device to use from the list below.\n\nDevices (/dev) are the available drives on the system. /sda, /sdb, /sdc ..."
 _resize="\nSelect a new filesystem size in MB, a new partition will be created from the free space but will be left unformatted.\nThe lowest size is just enough to fit the currently in use space on the partition while the default is set to split the free space evenly.\n\nUse Tab or the arrow keys move the cursor between the buttons and the value, when the cursor is on the value, you can edit it by:\n\n - left/right cursor movement to select a digit to modify\n - +/-  characters to increment/decrement the digit by one\n - 0 through 9 to set the digit to the given value\n\nSome keys are also recognized in all cursor positions:\n\n - Home/End set the value to its maximum or minimum\n - Pageup/Pagedown increment the value so that the slider moves by one column."
 _mount="\nUse [Space] to toggle mount options from below, press [Enter] when done to confirm selection.\n\nNot selecting any and confirming will run an automatic mount."
 _warn="\nIMPORTANT:\n\nChoose carefully when editing, formatting, and mounting partitions or your DATA MAY BE LOST.\n\nTo mount a partition without formatting it, select 'skip' when prompted to choose a filesystem during the mounting stage.\nThis can only be used for partitions that already contain a filesystem and cannot be the root (/) partition, it needs to be formatted before install.\n"
-_part="\nFull device auto partitioning is available for beginners otherwise cfdisk is recommended.\n\n  - All systems will require a root partition (8G or greater).\n  - UEFI (and BIOS using LUKS without LVM) require a separate boot partition (100-512M)."
+_part="\nFull device auto partitioning is available for beginners otherwise cfdisk is recommended.\n\n  - All systems will require a root partition (8G or greater).\n  - UEFI or BIOS using LUKS without LVM require a separate boot partition (100-512M)."
 _uefi="\nSelect the EFI boot partition (/boot), required for UEFI boot.\n\nIt's usually the first partition on the device, 100-512M, and will be formatted as vfat/fat32 if not already."
 _bios="\nDo you want to use a separate boot partition? (optional)\n\nIt's usually the first partition on the device, 100-512M, and will be formatted as ext3/4 if not already."
 _biosluks="\nSelect the boot partition (/boot), required for LUKS.\n\nIt's usually the first partition on the device, 100-512M, and will be formatted as ext3/4 if not already."
@@ -274,7 +136,8 @@ _sessions="\nUse [Space] to toggle available sessions, use [Enter] to accept the
 _login="\nSelect which of your session choices to use for the initial login.\n\nYou can be change this later by editing your ~/.xinitrc"
 _autologin="\nDo you want autologin enabled for USER?\n\nIf so the following two files will be created (disable autologin by removing them):\n\n - /home/USER/RC (run startx when logging in on tty1)\n - /etc/systemd/system/getty@tty1.service.d/autologin.conf (login USER without password)\n"
 _packages="\nUse [Space] to move a package into the selected area and press [Enter] to accept the selection.\n\nPackages may be installed by your DE/WM (if any), or for the packages you select."
-_edit="\nBefore exiting you can select configuration files to review/change.\n\nIf you need to make other changes with the drives still mounted, use Ctrl-z to pause the installer, when finished type 'fg' and [Enter] or Ctrl-z again to resume the installer, if you want to avoid the automatic reboot using Ctrl-c will cleanly exit."
+_usercmd="\nEnter command to be run in the newly installed system (chroot) below.\n\nAn example use case would be installing packages or editing files not offered in the menus.\n\nBecause the command will be run in a chroot not every command will function correctly, additionally the command will not be sanity checked, it's your system so exercise caution.\n\nMore than one command may be run using standard bash syntax.\n"
+_edit="\nBefore exiting you can select configuration files to review/change.\n\nIf you need to make other changes with the drives still mounted, use Ctrl-z to pause the installer, when finished type 'fg' and [Enter] to resume the installer, if you want to avoid the automatic reboot using Ctrl-c will cleanly exit."
 
 # LUKS
 _luksnew="Basic LUKS Encryption"
@@ -305,8 +168,6 @@ _lvmerrlvsize="\nInvalid value Entered.\n\nMust be a numeric value with 'M' (meg
 
 # }
 
-# }
-
 ###############################################################################
 # selection menus
 # main is the entry point which calls functions including outside of its block
@@ -315,21 +176,22 @@ _lvmerrlvsize="\nInvalid value Entered.\n\nMust be a numeric value with 'M' (meg
 
 main()
 {
-       (( SEL < 12 )) && (( SEL++ ))
+       (( SEL < 13 )) && (( SEL++ ))
        tput civis
        dialog --backtitle "$DIST Installer - $SYS - v$VER" --title " Prepare " --default-item $SEL --cancel-label 'Exit' --menu "$_prep" 0 0 0 \
-               1 "Device tree (optional)" \
-               2 "Partitioning (optional)" \
-               3 "LUKS setup (optional)" \
-               4 "LVM setup (optional)" \
-               5 "Mount partitions" \
-               6 "System bootloader" \
-               7 "User and password" \
-               8 "System configuration" \
-               9 "Select WM/DE (optional)" \
-               10 "Select Packages (optional)" \
-               11 "View configuration (optional)" \
-               12 "Start the installation" 2>"$ANS"
+               1 "Show device tree" \
+               2 "Partitioning" \
+               3 "LUKS encryption" \
+               4 "Logical volume management" \
+               5 "* Mount partitions" \
+               6 "* Select bootloader" \
+               7 "* Username and password" \
+               8 "* System configuration" \
+               9 "Select window manager or desktop" \
+               10 "Select additional packages" \
+               11 "Run a command on the installed system" \
+               12 "View configuration and command selections" \
+               13 "* Confirm choices and start the installation" 2> "$ANS"
 
        read -r SEL < "$ANS"
        [[ -z $WARN && $SEL =~ (2|5) ]] && { msg "Data Warning" "$_warn"; WARN=true; }
@@ -344,8 +206,9 @@ main()
                8) prechecks 2 && { select_config || (( SEL-- )); } ;;
                9) prechecks 3 && { select_sessions || (( SEL-- )); } ;;
                10) prechecks 3 && { select_packages || (( SEL-- )); } ;;
-               11) prechecks 3 && select_show ;;
-               12) prechecks 3 && install_main ;;
+               11) prechecks 3 && select_usercmd ;;
+               12) prechecks 3 && select_show ;;
+               13) prechecks 3 && install_main ;;
                *) yesno "Exit" "\nUnmount partitions (if any) and exit the installer?\n" && die 0
        esac
 }
@@ -370,23 +233,21 @@ select_boot()
 select_show()
 {
        local pkgs="${USER_PKGS//  / } ${PACKAGES//  / }"
-       [[ $BOOT_PART ]] && local mnt="/$BOOTDIR"
        [[ $INSTALL_WMS == *dwm* ]] && pkgs="dwm st dmenu $pkgs"
        pkgs="${pkgs//  / }" pkgs="${pkgs# }"
        msg "Show Configuration" "
 ---------- PARTITION CONFIGURATION ------------
 
-  Root:  ${ROOT_PART:-none}
-  Boot:  ${BOOT_PART:-${BOOT_DEV:-none}}
-  Mount: ${mnt:-none}
-  Swap:  ${SWAP_PART:-none}
-  Size:  ${SWAP_SIZE:-none}
-  Extra: ${EXMNTS:-${EXMNT:-none}}
-  Hooks: ${HOOKS:-none}
-
-  LVM:   ${LVM:-none}
-  LUKS:  ${LUKS:-none}
+  Root Part:      $ROOT_PART
+  Boot Part:      ${BOOT_PART:-none}
+  Boot Device:    ${BOOT_DEV:-none}
+  Swap Part/File: ${SWAP_PART:-none}
+  Swap Size:      ${SWAP_SIZE:-none}
+  Extra Mounts:   ${EXMNTS:-none}
+  Mkinit Hooks:   ${HOOKS:-none}
 
+  LVM used:   ${LVM:-none}
+  LUKS used:  ${LUKS:-none}
 
 ------------ SYSTEM CONFIGURATION -------------
 
@@ -395,6 +256,7 @@ select_show()
   Hostname: ${MYHOST:-none}
   Timezone: ${ZONE:-none}/${SUBZ:-none}
 
+  Chroot cmd: ${USER_CMD:-none}
 
 ------------ USER CONFIGURATION ---------------
 
@@ -404,7 +266,6 @@ select_show()
   Autologin:     ${AUTOLOGIN:-none}
   Login Type:    ${LOGIN_TYPE:-none}
 
-
 ----------- PACKAGE CONFIGURATION -------------
 
   Kernel:     ${KERNEL:-none}
@@ -415,22 +276,18 @@ select_show()
 
 select_login()
 {
-       [[ $INSTALL_WMS ]] || return 0
-
        AUTOLOGIN='' # no autologin unless using xinit
 
-       if [[ -z $LOGIN_TYPE ]]; then
-               dlg LOGIN_TYPE menu "Login Management" "\nSelect what kind of login management to use." \
-                       "xinit"   "Console login without a display manager" \
-                       "ly"      "TUI display manager with a ncurses-like interface" \
-                       "lightdm" "Lightweight display manager with a gtk greeter" \
-                       "gdm"     "Gnome display manager" \
-                       "sddm"    "Simple desktop display manager" || return 1
-       fi
+       dlg LOGIN_TYPE menu "Login Management" "\nSelect what kind of login management to use." \
+               "xinit"   "Console login without a display manager" \
+               "ly"      "TUI display manager with a ncurses-like interface" \
+               "lightdm" "Lightweight display manager with a gtk greeter" \
+               "gdm"     "Gnome display manager" \
+               "sddm"    "Simple desktop display manager" || return 1
 
        case $LOGIN_TYPE in
-               ly) EDIT_FILES[login]="/etc/ly/config.ini" ;;
                gdm|sddm) EDIT_FILES[login]="" ;;
+               ly) EDIT_FILES[login]="/etc/ly/config.ini" ;;
                lightdm) EDIT_FILES[login]="/etc/lightdm/lightdm.conf /etc/lightdm/lightdm-gtk-greeter.conf" ;;
                xinit) EDIT_FILES[login]="/home/$NEWUSER/.xinitrc /home/$NEWUSER/.xprofile"
                        if (( $(wc -w <<< "$INSTALL_WMS") > 1 )); then
@@ -451,9 +308,9 @@ select_config()
        until [[ $CONFIG_DONE ]]; do
                case $i in
                        0) dlg MYSHELL menu "Shell" "\nChoose which shell to use." \
-                                       /usr/bin/zsh  'A very advanced and programmable command interpreter (shell) for UNIX' \
-                                       /bin/bash     'The GNU Bourne Again shell, standard in many GNU/Linux distributions' \
-                                       /usr/bin/mksh 'The MirBSD Korn Shell - an enhanced version of the public domain ksh' || return 1
+                                       zsh  'A very advanced and programmable command interpreter (shell) for UNIX' \
+                                       bash 'The GNU Bourne Again shell, standard in many GNU/Linux distributions' \
+                                       mksh 'The MirBSD Korn Shell - an enhanced version of the public domain ksh' || return 1
                                ;;
                        1) dlg MYHOST input "Hostname" "$_hostname" "${DIST,,}" limit || { i=0; continue; } ;;
                        2) dlg MYLOCALE menu "Locale" "$_locale" $LOCALES || { i=1; continue; } ;;
@@ -474,7 +331,11 @@ select_config()
                (( i++ )) # progress through to the next choice
        done
 
-       case $MYSHELL in *bash) LOGINRC='.bash_profile' ;; *zsh) LOGINRC='.zprofile' ;; *mksh) LOGINRC='.profile' ;; esac
+       case $MYSHELL in
+               bash) LOGINRC='.bash_profile' ;;
+               zsh) LOGINRC='.zprofile' ;;
+               mksh) LOGINRC='.profile' ;;
+       esac
 
        return 0
 }
@@ -482,40 +343,37 @@ select_config()
 select_mkuser()
 {
        NEWUSER=''
-       local v='' u='' p='' p2='' rp='' rp2=''
+       typeset -a ans
 
        until [[ $NEWUSER ]]; do
-               i=0
                tput cnorm
                dialog --insecure --backtitle "$DIST Installer - $SYS - v$VER" --separator $'\n' --title " User " --mixedform "$_user" 0 0 0 \
-                       "Username:"  1 1 "$u" 1 11 "$COLUMNS" 0 0 \
-                       "Password:"  2 1 ''   2 11 "$COLUMNS" 0 1 \
-                       "Password2:" 3 1 ''   3 12 "$COLUMNS" 0 1 \
+                       "Username:"  1 1 "${ans[0]}" 1 11 "$COLUMNS" 0 0 \
+                       "Password:"  2 1 ''          2 11 "$COLUMNS" 0 1 \
+                       "Password2:" 3 1 ''          3 12 "$COLUMNS" 0 1 \
                        "--- Root password, if left empty the user password will be used ---" 6 1 '' 6 68 "$COLUMNS" 0 2 \
-                       "Password:"  8 1 ''   8 11 "$COLUMNS" 0 1 \
-                       "Password2:" 9 1 ''   9 12 "$COLUMNS" 0 1 2>"$ANS" || return 1
+                       "Password:"  8 1 ''          8 11 "$COLUMNS" 0 1 \
+                       "Password2:" 9 1 ''          9 12 "$COLUMNS" 0 1 2> "$ANS" || return 1
 
-               while read -r line; do
-                       case $i in 0) u="$line" ;; 1) p="$line" ;; 2) p2="$line" ;; 3) rp="$line" ;; 4) rp2="$line" ;; esac
-                       (( i++ ))
-               done < "$ANS"
+               mapfile -t ans <"$ANS"
 
                # root passwords empty, so use the user passwords
-               [[ -z $rp && -z $rp2 ]] && { rp="$p"; rp2="$p2"; }
+               if [[ -z "${ans[4]}" && -z "${ans[5]}" ]]; then
+                       ans[4]="${ans[1]}"
+                       ans[5]="${ans[2]}"
+               fi
 
                # make sure a username was entered and that the passwords match
-               if [[ ${#u} -eq 0 || $u =~ \ |\' || $u =~ [^a-z0-9] ]]; then
-                       msg "Invalid Username" "\nIncorrect user name.\n\nPlease try again.\n"; u=''
-               elif [[ -z $p ]]; then
-                       msg "Empty Password" "\nThe user password cannot be left empty.\n\nPlease try again.\n"
-               elif [[ "$p" != "$p2" ]]; then
+               if [[ -z ${ans[0]} || ${ans[0]} =~ \ |\' || ${ans[0]} =~ [^a-z0-9] ]]; then
+                       msg "Invalid Username" "\nInvalid user name.\n\nPlease try again.\n"; u=''
+               elif [[ -z "${ans[1]}" || "${ans[1]}" != "${ans[2]}" ]]; then
                        msg "Password Mismatch" "\nThe user passwords do not match.\n\nPlease try again.\n"
-               elif [[ "$rp" != "$rp2" ]]; then
+               elif [[ "${ans[4]}" != "${ans[5]}" ]]; then
                        msg "Password Mismatch" "\nThe root passwords do not match.\n\nPlease try again.\n"
                else
-                       NEWUSER="$u"
-                       USER_PASS="$p"
-                       ROOT_PASS="$rp"
+                       NEWUSER="${ans[0]}"
+                       USER_PASS="${ans[1]}"
+                       ROOT_PASS="${ans[4]}"
                fi
        done
        return 0
@@ -551,39 +409,40 @@ select_keymap()
                dlg CMAP menu "Console Keymap" "$_vconsole" $CMAPS || return 1
        fi
 
-       if [[ $DISPLAY && $TERM != 'linux' ]]; then
-               setxkbmap "$KEYMAP" >/dev/null 2>&1
+       if [[ $TERM == 'linux' ]]; then
+               loadkeys "$CMAP" > /dev/null 2>&1
        else
-               loadkeys "$CMAP" >/dev/null 2>&1
+               setxkbmap "$KEYMAP" > /dev/null 2>&1
        fi
 
        return 0
 }
 
+select_usercmd()
+{
+       dlg USER_CMD input "User Command" "$_usercmd" "$USER_CMD" nolimit
+}
+
 select_sessions()
 {
        LOGIN_CHOICES=''
-
        dlg INSTALL_WMS check "Sessions" "$_sessions\n" \
                i3-gaps "A fork of i3wm with more features including gaps" "$(ofn i3-gaps "${INSTALL_WMS[*]}")" \
                openbox "A lightweight, powerful, and highly configurable stacking wm" "$(ofn openbox "${INSTALL_WMS[*]}")" \
-               awesome "A customized Awesome WM session created by @elanapan" "$(ofn awesome "${INSTALL_WMS[*]}")" \
                dwm "A dynamic WM for X that manages windows in tiled, floating, or monocle layouts" "$(ofn dwm "${INSTALL_WMS[*]}")" \
                bspwm "A tiling wm that represents windows as the leaves of a binary tree" "$(ofn bspwm "${INSTALL_WMS[*]}")" \
+               jwm "A lightweight window manager for Xorg written in C" "$(ofn jwm "${INSTALL_WMS[*]}")" \
+               xfce4 "A lightweight and modular desktop environment based on gtk+2/3" "$(ofn xfce4 "${INSTALL_WMS[*]}")" \
+               awesome "A customized Awesome WM session created by @elanapan" "$(ofn awesome "${INSTALL_WMS[*]}")" \
                fluxbox "A lightweight and highly-configurable window manager" "$(ofn fluxbox "${INSTALL_WMS[*]}")" \
-               gnome "A desktop environment that aims to be simple and easy to use" "$(ofn gnome "${INSTALL_WMS[*]}")" \
-               cinnamon "A desktop environment combining traditional desktop with modern effects" "$(ofn cinnamon "${INSTALL_WMS[*]}")" \
                plasma "A kde software project currently comprising a full desktop environment" "$(ofn plasma "${INSTALL_WMS[*]}")" \
-               xfce4 "A lightweight and modular desktop environment based on gtk+2/3" "$(ofn xfce4 "${INSTALL_WMS[*]}")"
+               gnome "A desktop environment that aims to be simple and easy to use" "$(ofn gnome "${INSTALL_WMS[*]}")" \
+               cinnamon "A desktop environment combining traditional desktop with modern effects" "$(ofn cinnamon "${INSTALL_WMS[*]}")"
 
        [[ $INSTALL_WMS ]] || return 0
-
-       WM_PKGS="${INSTALL_WMS/dwm/}" # remove dwm from package list
-       WM_PKGS="${WM_PKGS//  / }"    # remove double spaces
-       WM_PKGS="${WM_PKGS# }"        # remove leading space
-
-       # add archlabs base when choosing any session
-       [[ $WM_PKGS ]] && WM_PKGS+=" $AL_BASE_PKGS"
+       WM_PKGS="${INSTALL_WMS/dwm/}"
+       WM_PKGS="${WM_PKGS//  / }"
+       WM_PKGS="${WM_PKGS# }"
 
        for i in $INSTALL_WMS; do
                LOGIN_CHOICES+="$i - "
@@ -616,7 +475,6 @@ select_packages()
                cmus "A small, fast and powerful console music player" "$(ofn cmus "${USER_PKGS[*]}")" \
                deadbeef "A GTK+ audio player for GNU/Linux" "$(ofn deadbeef "${USER_PKGS[*]}")" \
                deluge "A BitTorrent client written in python" "$(ofn deluge "${USER_PKGS[*]}")" \
-               docky "Full fledged dock for opening applications and managing windows" "$(ofn docky "${USER_PKGS[*]}")" \
                emacs "An extensible, customizable, self-documenting real-time display editor" "$(ofn emacs "${USER_PKGS[*]}")" \
                epiphany "A GNOME web browser based on the WebKit rendering engine" "$(ofn epiphany "${USER_PKGS[*]}")" \
                evince "A document viewer" "$(ofn evince "${USER_PKGS[*]}")" \
@@ -649,7 +507,6 @@ select_packages()
                nautilus "The default file manager for Gnome" "$(ofn nautilus "${USER_PKGS[*]}")" \
                ncmpcpp "A mpd client and almost exact clone of ncmpc with some new features" "$(ofn ncmpcpp "${USER_PKGS[*]}")" \
                neovim "A fork of Vim aiming to improve user experience, plugins, and GUIs." "$(ofn neovim "${USER_PKGS[*]}")" \
-               nicotine+ "A graphical client for Soulseek" "$(ofn nicotine+ "${USER_PKGS[*]}")" \
                noto-fonts "Google Noto fonts" "$(ofn noto-fonts "${USER_PKGS[*]}")" \
                noto-fonts-cjk "Google Noto CJK fonts (Chinese, Japanese, Korean)" "$(ofn noto-fonts-cjk "${USER_PKGS[*]}")" \
                obs-studio "Free opensource streaming/recording software" "$(ofn obs-studio "${USER_PKGS[*]}")" \
@@ -687,12 +544,11 @@ select_packages()
                xapps "Common library for X-Apps project" "$(ofn xapps "${USER_PKGS[*]}")" \
                xarchiver "A GTK+ frontend to various command line archivers" "$(ofn xarchiver "${USER_PKGS[*]}")" \
                xed "A small and lightweight text editor. X-Apps Project." "$(ofn xed "${USER_PKGS[*]}")" \
-               xfce-terminal "A terminal emulator based in the Xfce Desktop Environment" "$(ofn xfce-terminal "${USER_PKGS[*]}")" \
+               xfce4-terminal "A terminal emulator based in the Xfce Desktop Environment" "$(ofn xfce4-terminal "${USER_PKGS[*]}")" \
                xreader "Document viewer for files like PDF and Postscript. X-Apps Project." "$(ofn xed "${USER_PKGS[*]}")" \
-               xterm "The standard terminal emulator for the X window system" "$(ofn xterm "${USER_PKGS[*]}")" \
                zathura "Minimalistic document viewer" "$(ofn zathura "${USER_PKGS[*]}")"
 
-       if [[ $USER_PKGS ]]; then
+       if [[ $USER_PKGS ]]; then    # add any needed PKG_EXT to the list
                for i in $USER_PKGS; do
                        [[ ${PKG_EXT[$i]} && $USER_PKGS != *"${PKG_EXT[$i]}"* ]] && USER_PKGS+=" ${PKG_EXT[$i]}"
                done
@@ -711,57 +567,37 @@ part_menu()
        no_bg_install || return 0
        local device choice devhash
        devhash="$(lsblk -f | base64)"
-       umount_dir $MNT
+       umount_dir "$MNT"
        part_device || return 1
        device="$DEVICE"
 
        while :; do
                choice=""
-               if [[ $DISPLAY && $TERM != 'linux' ]] && hash gparted >/dev/null 2>&1; then
-                       dlg choice menu "Edit Partitions" "$_part" \
-                               "auto"    "Whole device automatic partitioning" \
-                               "shrink"  "Shrink an existing ext2/3/4 or ntfs partition to make room for a new partition" \
-                               "gparted" "GUI front end to parted" \
-                               "cfdisk"  "Curses based variant of fdisk" \
-                               "parted"  "GNU partition editor" \
-                               "fdisk"   "Dialog-driven creation and manipulation of partitions" \
-                               "done"    "Return to the main menu" || return 0
-               else
-                       dlg choice menu "Edit Partitions" "$_part" \
-                               "auto"   "Whole device automatic partitioning" \
-                               "shrink" "Shrink an existing ext2/3/4 or ntfs partition to make room for a new partition" \
-                               "cfdisk" "Curses based variant of fdisk" \
-                               "parted" "GNU partition editor" \
-                               "fdisk"  "Dialog-driven creation and manipulation of partitions" \
-                               "done"   "Return to the main menu" || return 0
-               fi
-
-               if [[ $choice == 'done' ]]; then
+               dlg choice menu "Edit Partitions" "$_part\n\n$(lsblk -no NAME,MODEL,SIZE,TYPE,FSTYPE $device)" \
+                       "auto"   "Whole device automatic partitioning" \
+                       "cfdisk" "Curses based variant of fdisk" \
+                       "parted" "GNU partition editor" $([[ $DISPLAY ]] && hash gparted >/dev/null 2>&1 && printf "gparted 'A gui front end to parted'") \
+                       "fdisk"  "Dialog-driven creation and manipulation of partitions" \
+                       "done"   "Return to the main menu"
+                       # "shrink" "Shrink an existing ext or ntfs partition" \
+
+               if [[ -z $choice || $choice == 'done' ]]; then
                        return 0
                elif [[ $choice == 'shrink' ]]; then
                        part_shrink "$device"
                elif [[ $choice == 'auto' ]]; then
-                       local root_size txt table boot_fs
-                       root_size=$(lsblk -lno SIZE "$device" | awk 'NR == 1 {
-                               if ($1 ~ "G") {
-                                       sub(/G/, "")
-                                       print ($1 * 1000 - 512) / 1000 "G"
-                               } else {
-                                       sub(/M/, "")
-                                       print ($1 - 512) "M"
-                               }
-                       }')
+                       local root_size txt label boot_fs boot_type
+                       root_size=$(lsblk -lno SIZE "$device" | awk 'NR == 1 {if ($1 ~ "G") {sub(/G/, ""); print ($1 * 1000 - 512) / 1000 "G"} else {sub(/M/, ""); print ($1 - 512) "M"}}')
                        txt="\nWARNING:\n\nALL data on $device will be destroyed and the following partitions will be created\n\n- "
                        if [[ $SYS == 'BIOS' ]]; then
-                               table="msdos" boot_fs="ext4"
+                               label="msdos" boot_fs="ext4" boot_type="primary"
                                txt+="An $boot_fs boot partition with the boot flag enabled (512M)\n- "
                        else
-                               table="gpt" boot_fs="fat32"
+                               label="gpt" boot_fs="fat32" boot_type="ESP"
                                txt+="A $boot_fs efi boot partition (512M)\n- "
                        fi
                        txt+="An ext4 partition using all remaining space ($root_size)\n\nDo you want to continue?\n"
-                       yesno "Auto Partition" "$txt" && msg "Info" "\nGathering device info.\n" 1 && part_auto "$device" "$table" "$boot_fs" "$root_size"
-                               
+                       yesno "Auto Partition" "$txt" && part_auto "$device" "$label" "$boot_fs" "$root_size" "$boot_type"
                else
                        clear
                        tput cnorm
@@ -769,7 +605,7 @@ part_menu()
                fi
                if [[ $devhash != "$(lsblk -f | base64)" ]]; then
                        msg "Probing Partitions" "\nInforming kernel of partition changes using partprobe\n" 0
-                       partprobe >/dev/null 2>&1
+                       partprobe > /dev/null 2>&1
                        [[ $choice == 'auto' ]] && return
                fi
        done
@@ -788,42 +624,45 @@ part_show()
 
 part_auto()
 {
-       local device="$1" table="$2" boot_fs="$3" size="$4" dev_info=""
-       dev_info="$(parted -s "$device" print)"
+       local device="$1" label="$2" boot_fs="$3" size="$4" boot_type="$5" dev_info=""
 
-       msg "Auto Partition" "\nRemoving partitions on $device and setting table to $table\n" 1
+       msg "Auto Partition" "\nRemoving partitions on $device and setting label to $label\n" 1
+
+       dev_info="$(parted -s "$device" print 2> /dev/null)"
 
        swapoff -a
        while read -r PART; do
-               parted -s "$device" rm "$PART" >/dev/null 2>&1
+               [[ $PART ]] || continue
+               parted -s "$device" rm "$PART" > /dev/null 2> "$ERR"
+               errshow 0 "parted -s $device rm $PART" || return 1
        done <<< "$(awk '/^ [1-9][0-9]?/ {print $1}' <<< "$dev_info" | sort -r)"
 
-       [[ $(awk '/Table:/ {print $3}' <<< "$dev_info") != "$table" ]] && parted -s "$device" mklabel "$table" >/dev/null 2>&1
+       [[ $(awk '/Table:/ {print $3}' <<< "$dev_info") != "$label" ]] && parted -s "$device" mklabel "$label" > /dev/null 2> "$ERR"
 
        msg "Auto Partition" "\nCreating a 512M $boot_fs boot partition.\n" 1
-       if [[ $SYS == "BIOS" ]]; then
-               parted -s "$device" mkpart primary "$boot_fs" 1MiB 513MiB >/dev/null 2>&1
-       else
-               parted -s "$device" mkpart ESP "$boot_fs" 1MiB 513MiB >/dev/null 2>&1
-       fi
+       parted -s "$device" mkpart "$boot_type" "$boot_fs" 1MiB 513MiB > /dev/null 2> "$ERR"
+       errshow 0 "parted -s $device mkpart $boot_type $boot_fs 1MiB 513MiB" || return 1
 
        sleep 0.5
        BOOT_DEV="$device"
        AUTO_BOOT_PART=$(lsblk -lno NAME,TYPE "$device" | awk 'NR==2 {print "/dev/" $1}')
 
        if [[ $SYS == "BIOS" ]]; then
-               mkfs.ext4 -q "$AUTO_BOOT_PART" >/dev/null 2>&1
+               mkfs.ext4 -q "$AUTO_BOOT_PART" > /dev/null 2> "$ERR"
+               errshow 0 "mkfs.ext4 -q $AUTO_BOOT_PART" || return 1
        else
-               mkfs.vfat -F32 "$AUTO_BOOT_PART" >/dev/null 2>&1
+               mkfs.vfat -F32 "$AUTO_BOOT_PART" > /dev/null 2> "$ERR"
+               errshow 0 "mkfs.vfat -F32 $AUTO_BOOT_PART" || return 1
        fi
 
        msg "Auto Partition" "\nCreating a $size ext4 root partition.\n" 0
-       parted -s "$device" mkpart primary ext4 513MiB 100% >/dev/null 2>&1
+       parted -s "$device" mkpart primary ext4 513MiB 100% > /dev/null 2> "$ERR"
+       errshow 0 "parted -s $device mkpart primary ext4 513MiB 100%" || return 1
        sleep 0.5
        AUTO_ROOT_PART="$(lsblk -lno NAME,TYPE "$device" | awk 'NR==3 {print "/dev/" $1}')"
-       mkfs.ext4 -q "$AUTO_ROOT_PART" >/dev/null 2>&1
+       mkfs.ext4 -q "$AUTO_ROOT_PART" > /dev/null 2> "$ERR"
+       errshow 0 "mkfs.ext4 -q $AUTO_ROOT_PART" || return 1
        sleep 0.5
-       FORMATTED+="$AUTO_BOOT_PART $AUTO_ROOT_PART "
        msg "Auto Partition" "\nProcess complete.\n\n$(lsblk -o NAME,MODEL,SIZE,TYPE,FSTYPE "$device")\n"
 }
 
@@ -835,7 +674,7 @@ part_shrink()
 
        part_find "${device##*/}[^ ]" || return 1
        (( COUNT == 1 )) && part="$(awk '{print $1}' <<< "${PARTS[@]}" )"
-       
+
        if (( COUNT == 1 )) || dlg part menu "Resize" "\nWhich partition on $device do you want to resize?" $PARTS; then
                fs=$(lsblk -lno FSTYPE "$part")
                case "$fs" in
@@ -844,12 +683,12 @@ part_shrink()
                                num="${part: -1}"
                                end=$(parted -s "$device" unit KiB print | awk '/^\s*'"$num"'/ {print $3}')                    # part size in KiB
                                devsize=$(parted -s "$device" unit KiB print | awk '/Disk '"${device//\//\\/}"':/ {print $3}') # whole device size in KiB
-                               mount "$part" $MNT >/dev/null 2>&1; sleep 0.5
+                               mount "$part" "$MNT" > /dev/null 2>&1; sleep 0.5
                                min=$(df --output=used --block-size=MiB "$part" | awk 'NR == 2 {print int($1) + 256}')
                                max=$(df --output=avail --block-size=MiB "$part" | awk 'NR == 2 {print int($1)}')
-                               umount_dir $MNT
+                               umount_dir "$MNT"
                                tput cnorm
-                               if dialog --backtitle "$DIST Installer - $SYS - v$VER" --title " Resize: $part " --rangebox "$_resize" 17 "$COLUMNS" "$min" "$max" $((max / 2)) 2>$ANS; then
+                               if dialog --backtitle "$DIST Installer - $SYS - v$VER" --title " Resize: $part " --rangebox "$_resize" 17 "$COLUMNS" "$min" "$max" $((max / 2)) 2> $ANS; then
                                        size=$(< "$ANS")
                                        size=$((size * 1024))
                                else
@@ -859,8 +698,8 @@ part_shrink()
                                case "$fs" in
                                        ntfs)
                                                if ntfsresize -fc "$part"; then
-                                                       ntfsresize -ff --size $(( (size * 1024) / 1000 ))k "$part" 2>$ERR # k=10^3 bytes
-                                                       errshow "ntfsresize -f -s $(( (size * 1024) / 1000 ))k $part" || return 1
+                                                       ntfsresize -ff --size $(( (size * 1024) / 1000 ))k "$part" 2> "$ERR" # k=10^3 bytes
+                                                       errshow "ntfsresize -f -s $(( (size * 1024) / 1000 ))k $part" || return 1
                                                else
                                                        msg "Resize" "\nThe ntfs partition $part cannot be resized because it is scheduled for a consistency check.\n\nTo do a consistency check in windows open command prompt as admin and run:\n\n\tchkdsk /f /r /x\n"
                                                        return 1
@@ -868,8 +707,8 @@ part_shrink()
                                                ;;
                                        *)
                                                e2fsck -f "$part"; sleep 0.5
-                                               resize2fs -f "$part" ${size}K 2>$ERR # K=2^10 bytes
-                                               errshow "resize2fs -f $part ${size}K" || return 1
+                                               resize2fs -f "$part" ${size}K 2> "$ERR" # K=2^10 bytes
+                                               errshow "resize2fs -f $part ${size}K" || return 1
                                                ;;
                                esac
                                sleep 0.5
@@ -877,11 +716,11 @@ part_shrink()
                                (( size++ ))
                                sleep 0.5
                                if [[ $devsize == "$end" ]]; then
-                                       parted -s "$device" mkpart primary ext4 ${size}KiB 100% 2>$ERR
-                                       errshow "parted -s $device mkpart primary ext4 ${size}KiB 100%" || return 1
+                                       parted -s "$device" mkpart primary ext4 ${size}KiB 100% 2> "$ERR"
+                                       errshow "parted -s $device mkpart primary ext4 ${size}KiB 100%" || return 1
                                else
-                                       parted -s "$device" mkpart primary ext4 ${size}KiB ${end}KiB 2>$ERR
-                                       errshow "parted -s $device mkpart primary ext4 ${size}KiB ${end}KiB" || return 1
+                                       parted -s "$device" mkpart primary ext4 ${size}KiB ${end}KiB 2> "$ERR"
+                                       errshow "parted -s $device mkpart primary ext4 ${size}KiB ${end}KiB" || return 1
                                fi
                                msg "Resize Complete" "\n$part has been successfully resized to $((size / 1024))M.\n" 1
                                ;;
@@ -898,39 +737,36 @@ part_shrink()
 part_find()
 {
        local regexp="$1" err=''
+       local pts dev size isize ptcount=0
 
-       # string of partitions as /TYPE/PART SIZE
+       # string of partitions as /TYPE/PART SIZE.. eg. /dev/sda1 256G
        if [[ $IGNORE_DEV ]]; then
-               PARTS="$(lsblk -lno TYPE,NAME,SIZE |
-                       awk "/$regexp/"' && !'"/$IGNORE_DEV/"' {
-                               sub(/^part/, "/dev/")
-                               sub(/^lvm|^crypt/, "/dev/mapper/")
-                               print $1$2, $3
-                       }')"
+               PARTS="$(lsblk -lno TYPE,NAME,SIZE | awk "/$regexp/"' && !'"/$IGNORE_DEV/"' {sub(/^part/, "/dev/"); sub(/^lvm|^crypt/, "/dev/mapper/"); print $1$2, $3}')"
        else
-               PARTS="$(lsblk -lno TYPE,NAME,SIZE |
-                       awk "/$regexp/"' {
-                               sub(/^part/, "/dev/")
-                               sub(/^lvm|^crypt/, "/dev/mapper/")
-                               print $1$2 " " $3
-                       }')"
+               PARTS="$(lsblk -lno TYPE,NAME,SIZE | awk "/$regexp/"' {sub(/^part/, "/dev/"); sub(/^lvm|^crypt/, "/dev/mapper/"); print $1$2 " " $3}')"
        fi
 
-       # number of partitions total
-       COUNT=0
-       while read -r line; do
-               (( COUNT++ ))
+       # ensure we have enough partitions for the system and action were trying to do
+       COUNT=$(wc -l <<< "$PARTS")
+
+       while read -r dev size; do  # walk partition list and skip ones that are too small
+               [[ $dev && $size ]] || continue
+               size_t="${size: -1:1}"
+               isize=${size:0:-1}
+               isize=${isize%.*}
+               [[ $size_t == 'K' || ($size_t == 'M' && $isize -lt 100) ]] || { pts+="$dev $size "; (( ptcount++ )); }
        done <<< "$PARTS"
 
-       # ensure we have enough partitions for the system and action type
-       case "$str" in
-               'part|lvm|crypt') [[ $COUNT -lt 1 || ($SYS == 'UEFI' && $COUNT -lt 2) ]] && err="$_errpart" ;;
-               'part|crypt') (( COUNT < 1 )) && err="$_lvmerr" ;;
-               'part|lvm') (( COUNT < 2 )) && err="$_lukserr" ;;
+       case "$regexp" in
+               'part|lvm|crypt') [[ $ptcount -lt 1 || ($SYS == 'UEFI' && $COUNT -lt 2) ]] && err="$_errpart" ;;
+               'part|crypt') (( ptcount < 1 )) && err="$_lvmerr" ;;
+               'part|lvm') (( ptcount < 2 )) && err="$_lukserr" ;;
        esac
 
-       # if there aren't enough partitions show the relevant error message
-       [[ $err ]] && { msg "Not Enough Partitions" "$err" 2; return 1; }
+       if [[ $err ]]; then
+                msg "Not Enough Partitions" "$err" 2
+                return 1
+       fi
 
        return 0
 }
@@ -938,15 +774,15 @@ part_find()
 part_swap()
 {
        if [[ $1 == "$MNT/swapfile" && $SWAP_SIZE ]]; then
-               fallocate -l $SWAP_SIZE "$1" 2>$ERR
-               errshow "fallocate -l $SWAP_SIZE $1"
-               chmod 600 "$1" 2>$ERR
-               errshow "chmod 600 $1"
+               fallocate -l $SWAP_SIZE "$1" 2> "$ERR"
+               errshow "fallocate -l $SWAP_SIZE $1"
+               chmod 600 "$1" 2> "$ERR"
+               errshow "chmod 600 $1"
        fi
-       mkswap "$1" >/dev/null 2>$ERR
-       errshow "mkswap $1"
-       swapon "$1" >/dev/null 2>$ERR
-       errshow "swapon $1"
+       mkswap "$1" > /dev/null 2> "$ERR"
+       errshow "mkswap $1"
+       swapon "$1" > /dev/null 2> "$ERR"
+       errshow "swapon $1"
        return 0
 }
 
@@ -956,10 +792,10 @@ part_mount()
        fs="$(lsblk -lno FSTYPE "$part")"
        mkdir -p "$mountp"
 
-       if [[ $fs && ${FS_OPTS[$fs]} && $part != "$BOOT_PART" ]] && select_mntopts "$fs"; then
-               mount -o "$MNT_OPTS" "$part" "$mountp" >/dev/null 2>&1
+       if [[ $fs && ${FS_OPTS[$fs]} && $part != "$BOOT_PART" && $part != "$AUTO_ROOT_PART" ]] && select_mntopts "$fs"; then
+               mount -o "$MNT_OPTS" "$part" "$mountp" > /dev/null 2>&1
        else
-               mount "$part" "$mountp" >/dev/null 2>&1
+               mount "$part" "$mountp" > /dev/null 2>&1
        fi
 
        part_mountconf "$part" "$mountp" || return 1
@@ -973,10 +809,10 @@ part_format()
        local part="$1" fs="$2" delay="$3"
 
        msg "Format" "\nFormatting $part as $fs\n" 0
-       ${FS_CMDS[$fs]} "$part" >/dev/null 2>$ERR
-       errshow "${FS_CMDS[$fs]} $part" || return 1
+       mkfs.$fs ${FS_CMD_FLAGS[$fs]} "$part" > /dev/null 2> "$ERR"
+       errshow 0 "mkfs.$fs ${FS_CMD_FLAGS[$fs]} "$part"" || return 1
        FORMATTED+="$part "
-       sleep "${delay:-0}"
+       sleep $delay
 }
 
 part_device()
@@ -1006,9 +842,9 @@ part_bootdev()
        BOOT_PART_NUM="${BOOT_PART: -1}"
        [[ $BOOT_PART = /dev/nvme* ]] && BOOT_DEV="${BOOT_PART%p[1-9]}"
        if [[ $SYS == 'UEFI' ]]; then
-               parted -s $BOOT_DEV set $BOOT_PART_NUM esp on >/dev/null 2>&1
+               parted -s $BOOT_DEV set $BOOT_PART_NUM esp on > /dev/null 2>&1
        else
-               parted -s $BOOT_DEV set $BOOT_PART_NUM boot on >/dev/null 2>&1
+               parted -s $BOOT_DEV set $BOOT_PART_NUM boot on > /dev/null 2>&1
        fi
        return 0
 }
@@ -1022,7 +858,6 @@ part_cryptlv()
        if lsblk -lno TYPE "$part" | grep -q 'crypt'; then
                LUKS='encrypted'
                LUKS_NAME="${part#/dev/mapper/}"
-
                for dev in $(awk '/lvm/ && /crypto_LUKS/ {print "/dev/mapper/"$1}' <<< "$devs" | uniq); do
                        if lsblk -lno NAME "$dev" | grep -q "$LUKS_NAME"; then
                                LUKS_DEV="$LUKS_DEV cryptdevice=$dev:$LUKS_NAME"
@@ -1030,7 +865,6 @@ part_cryptlv()
                                break
                        fi
                done
-
                for dev in $(awk '/part/ && /crypto_LUKS/ {print "/dev/"$1}' <<< "$devs" | uniq); do
                        if lsblk -lno NAME "$dev" | grep -q "$LUKS_NAME"; then
                                LUKS_UUID="$(lsblk -lno UUID,TYPE,FSTYPE "$dev" | awk '/part/ && /crypto_LUKS/ {print $1}')"
@@ -1038,18 +872,15 @@ part_cryptlv()
                                break
                        fi
                done
-
        elif lsblk -lno TYPE "$part" | grep -q 'lvm'; then
                LVM='logical volume'
                VNAME="${part#/dev/mapper/}"
-
                for dev in $(awk '/crypt/ && /lvm2_member/ {print "/dev/mapper/"$1}' <<< "$devs" | uniq); do
                        if lsblk -lno NAME "$dev" | grep -q "$VNAME"; then
                                LUKS_NAME="${dev/\/dev\/mapper\//}"
                                break
                        fi
                done
-
                for dev in $(awk '/part/ && /crypto_LUKS/ {print "/dev/"$1}' <<< "$devs" | uniq); do
                        if lsblk -lno NAME "$dev" | grep -q "$LUKS_NAME"; then
                                LUKS_UUID="$(lsblk -lno UUID,TYPE,FSTYPE "$dev" | awk '/part/ && /crypto_LUKS/ {print $1}')"
@@ -1090,41 +921,42 @@ part_mountconf()
 
 mount_menu()
 {
-       msg "Info" "\nGathering device info.\n" 0
+       msg "Mount Menu" "\nGathering device and partition information.\n" 1
        no_bg_install || return 0
        lvm_detect
-       umount_dir $MNT
+       umount_dir "$MNT"
        part_find 'part|lvm|crypt' || { SEL=2; return 1; }
-
        [[ $LUKS && $LUKS_PART ]] && part_countdec $LUKS_PART
        [[ $LVM && $LVM_PARTS ]] && part_countdec $LVM_PARTS
-
-       select_root_partition || return 1
-
-       if [[ $SYS == 'UEFI' ]]; then
-               select_efi_partition || { BOOT_PART=''; return 1; }
-       elif (( COUNT > 0 )); then
-               select_boot_partition || { BOOT_PART=''; return 1; }
-       fi
-
+       select_root_partition || { ROOT_PART=''; return 1; }
+       select_boot_partition || { BOOT_PART=''; return 1; }
        if [[ $BOOT_PART ]]; then
-               part_mount "$BOOT_PART" "/$BOOTDIR" && SEP_BOOT=true || return 1
+               part_mount "$BOOT_PART" "/boot" && SEP_BOOT=true || return 1
                part_bootdev
        fi
-
        select_swap || return 1
        select_extra_partitions || return 1
        install_background
-
        return 0
 }
 
 select_swap()
 {
+       local pts dev size isize
+
+       if (( COUNT )) ; then
+               while read -r dev size; do  # walk partition list and skip ones that are too small/big for swap
+                       size_t="${size: -1:1}"
+                       isize=${size:0:-1}
+                       isize=${isize%.*}
+                       [[ $size_t =~ [KT] || ($size_t == 'G' && $isize -gt 16) || ($size_t == 'M' && $isize -lt 100) ]] || pts+="$dev $size "
+               done <<< "$PARTS"
+       fi
+
        dlg SWAP_PART menu "Swap Setup" "\nSelect whether to use a swapfile, swap partition, or none." \
                "none" "Don't allocate any swap space" \
                "swapfile" "Allocate $SYS_MEM at /swapfile" \
-               $PARTS
+               $pts
 
        if [[ -z $SWAP_PART || $SWAP_PART == "none" ]]; then
                SWAP_PART=''
@@ -1185,10 +1017,13 @@ select_filesystem()
 {
        local part="$1" fs='' cur=''
        local txt="\nSelect which filesystem to use for: $part\n\nDefault:  ext4"
-       cur="$(lsblk -lno FSTYPE "$part" 2>/dev/null)"
+       cur="$(lsblk -lno FSTYPE "$part" 2> /dev/null)"
+
+       # bail early if the partition was created in part_auto()
+       [[ $cur && $part == "$AUTO_ROOT_PART" ]] && return 0
 
        until [[ $fs ]]; do
-               if [[ $cur && ($part != "$ROOT_PART" || $FORMATTED == *"$part"*) ]]; then
+               if [[ $cur && $part != "$ROOT_PART" ]]; then
                        dlg fs menu "Filesystem" "$txt\nCurrent:  $cur" skip - ext4 - ext3 - ext2 - vfat - ntfs - f2fs - jfs - xfs - nilfs2 - reiserfs - || return 1
                else
                        dlg fs menu "Filesystem" "$txt" ext4 - ext3 - ext2 - vfat - ntfs - f2fs - jfs - xfs - nilfs2 - reiserfs - || return 1
@@ -1196,137 +1031,124 @@ select_filesystem()
                [[ $fs == 'skip' ]] && return 0
                yesno "Filesystem" "\nFormat $part as $fs?\n" || fs=''
        done
-       part_format "$part" "$fs"
+       part_format "$part" "$fs" 0
 }
 
-select_efi_partition()
+select_boot_partition()
 {
-       if [[ $AUTO_BOOT_PART ]]; then
-               msg "EFI Boot Partition" "\nUsing partition created during automatic format.\n" 2
-               BOOT_PART="$AUTO_BOOT_PART"; return 0 # were done here
-       else
-               local pts size dev isize bsize ptcount=0
+       local pts dev size isize ptcount=0
 
-               # walk partition list and skip ones that are too small/big for boot
-               while read -r dev size; do
-                       size_t="${size: -1:1}"  # size type eg. K, M, G, T
-                       isize=${size:0:-1}      # remove trailing size type character
-                       isize=${isize%.*}       # remove any decimal (round down)
-                       [[ $size_t =~ [KT] || ($size_t == 'G' && $isize -gt 2) || ($size_t == 'M' && $isize -lt 100) ]] || { pts+="$dev $size "; (( ptcount++ )); }
-               done <<< "$PARTS"
-
-               if (( ptcount == 1 )); then
-                       msg "EFI Boot Partition" "\nOnly one partition available that meets size requirements.\n" 1
-                       BOOT_PART="$(awk 'NF > 0 {print $1}' <<< "$pts")"
+       if [[ -z $BOOT_PART ]]; then
+               if [[ $AUTO_BOOT_PART && -z $LVM && -z $LUKS ]]; then
+                       BOOT_PART="$AUTO_BOOT_PART"
+                       return 0
                else
-                       dlg BOOT_PART menu "EFI Partition" "$_uefi" $pts
-               fi
-       fi
-
-       [[ $BOOT_PART ]] || return 1
+                       if (( COUNT )); then
+                               while read -r dev size; do  # walk partition list and skip ones that are too small/big for boot
+                                       size_t="${size: -1:1}"
+                                       isize=${size:0:-1}
+                                       isize=${isize%.*}
+                                       [[ $size_t =~ [KT] || ($size_t == 'G' && $isize -gt 2) || ($size_t == 'M' && $isize -lt 100) ]] || { pts+="$dev $size "; (( ptcount++ )); }
+                               done <<< "$PARTS"
+                       fi
 
-       if grep -q 'fat' <<< "$(fsck -N "$BOOT_PART")"; then
-               local txt="\nIMPORTANT:\n\nThe EFI partition $BOOT_PART $_format"
-               if yesno "Format EFI Partition" "$txt" "Format $BOOT_PART" "Skip Formatting" 1; then
-                       part_format "$BOOT_PART" "vfat" 2
+                       case "$SYS" in
+                               UEFI)
+                                       case "$ptcount" in
+                                               0) msg "EFI Boot Partition" "\nNo partitions available that meet size requirements!!\n\nReturning to the main menu.\n" 2; return 1 ;;
+                                               1) msg "EFI Boot Partition" "\nOnly one partition available that meets size requirements.\n" 1; BOOT_PART="$(awk 'NF > 0 {print $1}' <<< "$pts")" ;;
+                                               *) dlg BOOT_PART menu "EFI Partition" "$_uefi" $pts ;;
+                                       esac
+                                       [[ $BOOT_PART ]] || return 1
+                                       ;;
+                               BIOS)
+                                       if [[ $LUKS && ! $LVM ]]; then
+                                               case "$ptcount" in
+                                                       0) msg "Boot Partition" "\nLUKS without LVM requires a separate boot partition.\nNo partitions available that meet size requirements!!\n\nReturning to the main menu.\n" 2; return 1 ;;
+                                                       1) msg "Boot Partition" "\nOnly one partition available that meets size requirements.\n" 1; BOOT_PART="$(awk 'NF > 0 {print $1}' <<< "$pts")" ;;
+                                                       *) dlg BOOT_PART menu "Boot Partition" "$_biosluks" $pts ;;
+                                               esac
+                                               [[ $BOOT_PART ]] || return 1
+                                       else
+                                               (( ptcount == 0 )) && return 0
+                                               dlg BOOT_PART menu "Boot Partition" "$_bios" "skip" "no separate boot" $pts
+                                               [[ -z $BOOT_PART || $BOOT_PART == "skip" ]] && { BOOT_PART=''; return 0; }
+                                       fi
+                                       ;;
+                       esac
                fi
-       else
-               part_format "$BOOT_PART" "vfat" 2
        fi
 
-       return 0
-}
-
-select_boot_partition()
-{
-       if [[ $AUTO_BOOT_PART && ! $LVM ]]; then
-               msg "BIOS Boot Partition" "\nUsing partition created during automatic format.\n" 2
-               BOOT_PART="$AUTO_BOOT_PART"; return 0 # were done here
-       else
-               local pts size dev isize bsize ptcount=0
-
-               # walk partition list and skip ones that are too small/big for boot
-               while read -r dev size; do
-                       size_t="${size: -1:1}"  # size type eg. K, M, G, T
-                       isize=${size:0:-1}      # remove trailing size type character
-                       isize=${isize%.*}       # remove any decimal (round down)
-                       [[ $size_t =~ [KT] || ($size_t == 'G' && $isize -gt 2) || ($size_t == 'M' && $isize -lt 100) ]] || { pts+="$dev $size "; (( ptcount++ )); }
-               done <<< "$PARTS"
-
-               if [[ $LUKS && ! $LVM ]]; then
-                       dlg BOOT_PART menu "Boot Partition" "$_biosluks" $pts
-                       [[ $BOOT_PART ]] || return 1
-               else
-                       dlg BOOT_PART menu "Boot Partition" "$_bios" "skip" "don't use a separate boot" $pts
-                       [[ -z $BOOT_PART || $BOOT_PART == "skip" ]] && { BOOT_PART=''; return 0; }
-               fi
+       if ([[ $SYS == 'BIOS' ]] && grep -q 'ext[34]' <<< "$(fsck -N "$BOOT_PART")") || ([[ $SYS == 'UEFI' ]] && grep -q 'fat' <<< "$(fsck -N "$BOOT_PART")"); then
+               yesno "Format Boot Partition" "\nIMPORTANT:\n\nThe boot partition $BOOT_PART $_format" "Format $BOOT_PART" "Skip Formatting" 1 || return 0
        fi
 
-       if grep -q 'ext[34]' <<< "$(fsck -N "$BOOT_PART")"; then
-               local txt="\nIMPORTANT:\n\nThe boot partition $BOOT_PART $_format"
-               if yesno "Format Boot Partition" "$txt" "Format $BOOT_PART" "Skip Formatting" 1; then
-                       part_format "$BOOT_PART" "ext4" 2
-               fi
-       else
-               part_format "$BOOT_PART" "ext4" 2
-       fi
+       case "$SYS" in
+               UEFI) part_format "$BOOT_PART" "vfat" 2 || return 1 ;;
+               BIOS) part_format "$BOOT_PART" "ext4" 2 || return 1 ;;
+       esac
        return 0
 }
 
 select_root_partition()
 {
-       if [[ $AUTO_ROOT_PART && -z $LVM && -z $LUKS ]]; then
-               ROOT_PART="$AUTO_ROOT_PART"
-               msg "Select Root Partition (/)" "\nUsing partition created during automatic format.\n" 2
-               part_mount "$ROOT_PART" || { ROOT_PART=''; return 1; }
-               return 0  # we're done here
-       else
-               local pts size dev isize bsize ptcount=0
-
-               # walk partition list and skip ones that are too small for / (root)
-               while read -r dev size; do
-                       size_t="${size: -1:1}"  # size type eg. K, M, G, T
-                       isize=${size:0:-1}      # remove trailing size type character
-                       isize=${isize%.*}       # remove any decimal (round down)
-                       [[ $size_t =~ [MK] || ($size_t == 'G' && $isize -lt 4) ]] || { pts+="$dev $size "; (( ptcount++ )); }
-               done <<< "$PARTS"
-
-               if (( ptcount == 1 )); then  # only one available device
-                       msg "Select Root Partition (/)" "\nOnly one partition available that meets size requirements.\n" 2
-                       ROOT_PART="$(awk 'NR==1 {print $1}' <<< "$pts")"
+       if [[ -z $ROOT_PART ]]; then
+               if [[ $AUTO_ROOT_PART && -z $LVM && -z $LUKS ]]; then
+                       ROOT_PART="$AUTO_ROOT_PART"
+                       msg "Mount Menu" "\nUsing partitions created during automatic format.\n" 2
+                       part_mount "$ROOT_PART" || { ROOT_PART=''; return 1; }
+                       return 0  # we're done here
                else
-                       dlg ROOT_PART menu "Mount Root" "\nSelect the root (/) partition, this is where $DIST will be installed.\n\nDevices smaller than 8G will not be shown here." $pts
+                       local pts dev size isize ptcount=0
+
+                       # walk partition list and skip ones that are too small for / (root)
+                       while read -r dev size; do
+                               size_t="${size: -1:1}"  # size type eg. K, M, G, T
+                               isize=${size:0:-1}      # remove trailing size type character
+                               isize=${isize%.*}       # remove any decimal (round down)
+                               [[ $size_t =~ [MK] || ($size_t == 'G' && $isize -lt 4) ]] || { pts+="$dev $size "; (( ptcount++ )); }
+                       done <<< "$PARTS"
+
+                       if (( ptcount == 1 )); then  # only one available device
+                               msg "Root Partition (/)" "\nOnly one partition available that meets size requirements.\n" 2
+                               ROOT_PART="$(awk 'NF > 0 {print $1}' <<< "$pts")"
+                       else
+                               dlg ROOT_PART menu "Mount Root" "\nSelect the root (/) partition, this is where $DIST will be installed.\n\nDevices smaller than 8G will not be shown here." $pts
+                       fi
                fi
        fi
-       [[ $ROOT_PART ]] || return 1
-
-       select_filesystem "$ROOT_PART" || { ROOT_PART=''; return 1; }
-       part_mount "$ROOT_PART" || { ROOT_PART=''; return 1; }
 
+       if [[ -z $ROOT_PART ]] || ! select_filesystem "$ROOT_PART" || ! part_mount "$ROOT_PART"; then
+               ROOT_PART=''
+               return 1
+       fi
        return 0
 }
 
 select_extra_partitions()
 {
-       local part size dev
+       local part dev size
 
        # walk partition list and skip ones that are too small to be usable
-       while read -r dev size; do
-               [[ ${size: -1:1} =~ [KM] ]] && part_countdec "$dev"
-       done <<< "$PARTS"
+       if (( COUNT )); then
+               while read -r dev size; do
+                       [[ ${size: -1:1} =~ [KM] ]] && part_countdec "$dev"
+               done <<< "$PARTS"
+       fi
 
-       while (( COUNT > 0 )); do
+       while (( COUNT )); do
                part=''
                dlg part menu 'Mount Extra' "$_expart" 'done' 'finish mounting step' $PARTS || break
                if [[ $part == 'done' ]]; then
                        break
                elif select_filesystem "$part" && select_mountpoint && part_mount "$part" "$EXMNT"; then
                        EXMNTS+="$part: $EXMNT "
-                       [[ $EXMNT == '/usr' && $HOOKS != *usr* ]] && HOOKS="usr $HOOKS"
+                       [[ $EXMNT == '/usr' && $HOOKS != *usr* ]] && HOOKS+=" usr"
                else
                        return 1
                fi
        done
+       (( COUNT == 0 )) && msg "Mount Extra" "\nMounting Finished\n\n\nNo extra partitions available to mount, returning to main menu.\n" 2
        return 0
 }
 
@@ -1337,19 +1159,23 @@ select_extra_partitions()
 
 install_main()
 {
-       clear
-       tput cnorm
        install_base
-       genfstab -U $MNT >$MNT/etc/fstab 2>$ERR
-       errshow 1 "genfstab -U $MNT >$MNT/etc/fstab"
-       [[ -f $MNT/swapfile ]] && sed -i "s~${MNT}~~" $MNT/etc/fstab
+       genfstab -U "$MNT" > "$MNT/etc/fstab" 2> "$ERR"
+       errshow 1 "genfstab -U $MNT > $MNT/etc/fstab"
+       [[ -f $MNT/swapfile ]] && sed -i "s~${MNT}~~" "$MNT/etc/fstab"
        install_packages
+       # tear free configs, MUST be done after package install for nvidia
+       [[ $TEARFREE ]] && install_tearfree_conf "$MNT/etc/X11/xorg.conf.d"
        install_mkinitcpio
        install_boot
        chrun "hwclock --systohc --utc" || chrun "hwclock --systohc --utc --directisa"
        install_user
        install_login
        chrun "chown -Rf $NEWUSER:users /home/$NEWUSER"
+       if [[ "$USER_CMD" ]]; then
+               chrun "$USER_CMD" 2> "$ERR" 2>&1
+               errshow 0 "$USER_CMD"
+       fi
 
        while :; do
                dlg choice menu "Finalization" "$_edit" \
@@ -1367,68 +1193,65 @@ install_main()
                        login      "${EDIT_FILES[login]}"
 
                if [[ -z $choice || $choice == 'finished' ]]; then
-                       [[ $DEBUG == true && -r $DBG ]] && vim $DBG
-                       clear && die 127
+                       [[ $DEBUG == true && -r $DBG ]] && ${EDITOR:-vim} "$DBG"
+                       clear
+                       die 127
                else
                        local exists=''
                        for f in ${EDIT_FILES[$choice]}; do
-                               [[ -e ${MNT}$f ]] && exists+=" ${MNT}$f"
+                               if [[ -e ${MNT}$f ]]; then
+                                       ${EDITOR:-vim} "${MNT}$f"
+                               else
+                                       msg "File Missing" "\nThe file(s) selected do not exist:\n\n${MNT}$f\n"
+                               fi
                        done
-                       if [[ $exists ]]; then
-                               vim -O $exists
-                       else
-                               msg "File Missing" "\nThe file(s) selected do not exist:\n\n${EDIT_FILES[$choice]}\n"
-                       fi
                fi
        done
 }
 
 install_base()
 {
-       if kill -0 "$RSYNC_PID" 2>/dev/null || kill -0 "$MIRROR_PID" 2>/dev/null; then
-               printf "\nOne or more background install processes are still running, grabbing their output...\n" && cat /tmp/bg_out
-               while kill -0 "$RSYNC_PID" 2>/dev/null || kill -0 "$MIRROR_PID" 2>/dev/null; do
-                       sleep 1
-               done
-       fi
+       clear
+       tput cnorm
+       while kill -0 $BG_PID 2> /dev/null; do
+               clear; printf "\nA background install process is still running...\n"; sleep 1
+       done
        trap - EXIT
-       unset RSYNC_PID MIRROR_PID
-
-       rm -rf $MNT/etc/mkinitcpio-archiso.conf
-       find $MNT/usr/lib/initcpio -name 'archiso*' -type f -delete
-       sed -i 's/volatile/auto/g' $MNT/etc/systemd/journald.conf
-       find $MNT/boot -name '*-ucode.img' -delete
-
-       if [[ $DIST != "ArchLabs" ]]; then
-               for f in $MNT/etc/{lsb-release,os-release}; do
-                       sed -i "s/ArchLabs/$DIST/g" $MNT/etc/{lsb-release,os-release}
-               done
-       fi
-
-       if [[ $VM ]]; then
-               find $MNT/etc/X11/xorg.conf.d/ -name '*.conf' -delete
-       elif lspci | grep ' VGA ' | grep -q 'Intel'; then
-               cat > $MNT/etc/X11/xorg.conf.d/20-intel.conf <<- EOF
-               Section "Device"
-                   Identifier  "Intel Graphics"
-                   Driver      "intel"
-                   Option      "TearFree" "true"
-               EndSection
-               EOF
-       fi
-
-       [[ -e /run/archiso/sfs/airootfs && $KERNEL == 'linux' ]] && cp -vf $RUN/x86_64/vmlinuz $MNT/boot/vmlinuz-linux
-
-       cp -fv /etc/resolv.conf $MNT/etc/
-       [[ -e /etc/NetworkManager/system-connections ]] && cp -rvf /etc/NetworkManager/system-connections $MNT/etc/NetworkManager/
-
-       echo "LANG=$MYLOCALE" > $MNT/etc/locale.conf
-       cp -f $MNT/etc/locale.conf $MNT/etc/default/locale
-       sed -i "s/#en_US.UTF-8/en_US.UTF-8/g; s/#${MYLOCALE}/${MYLOCALE}/g" $MNT/etc/locale.gen
+       unset BG_PID
+
+       # archiso files
+       rm -rf "$MNT/etc/mkinitcpio-archiso.conf"
+       find "$MNT/usr/lib/initcpio" -name 'archiso*' -type f -delete
+
+       # remove/disable customizations done to airootfs during building
+       chrun "systemctl disable pacman-init.service choose-mirror.service" > /dev/null 2>&1
+       rm -f "$MNT/etc/systemd/scripts/choose-mirror"
+       rm -f "$MNT/etc/systemd/system/"{choose-mirror.service,etc-pacman.d-gnupg.mount,pacman-init.service}
+       sed -i 's/#\(Storage=\)volatile/\1auto/' "$MNT/etc/systemd/journald.conf"
+       sed -i 's/#\(HandleSuspendKey=\)ignore/\1suspend/' "$MNT/etc/systemd/logind.conf"
+       sed -i 's/#\(HandleHibernateKey=\)ignore/\1hibernate/' "$MNT/etc/systemd/logind.conf"
+       sed -i 's/#\(HandleLidSwitch=\)ignore/\1suspend/' "$MNT/etc/systemd/logind.conf"
+       find "$MNT/boot" -name '*-ucode.img' -delete
+
+       # changing distro name?
+       [[ $DIST != "ArchLabs" ]] || sed -i "s/ArchLabs/$DIST/g" "$MNT/etc/"{lsb-release,os-release}
+
+       # vmlinuz, if this isn't copied the standard kernel may fail mkinitcpio
+       cp -vf "$RUN/x86_64/vmlinuz" "$MNT/boot/vmlinuz-linux" 2> "$ERR" 2>&1
+       errshow 1 "cp -vf $RUN/x86_64/vmlinuz $MNT/boot/vmlinuz-linux"
+
+       # copy network settings
+       [[ -d /etc/netctl ]] && cp -rfv /etc/netctl "$MNT/etc/"
+       [[ -f /etc/resolv.conf ]] && cp -fv /etc/resolv.conf "$MNT/etc/"
+       [[ -e /etc/NetworkManager/system-connections ]] && cp -rvf /etc/NetworkManager/system-connections "$MNT/etc/NetworkManager/"
+
+       echo "LANG=$MYLOCALE" > "$MNT/etc/locale.conf"
+       cp -fv "$MNT/etc/locale.conf" "$MNT/etc/default/locale"
+       sed -i "s/#en_US.UTF-8/en_US.UTF-8/g; s/#${MYLOCALE}/${MYLOCALE}/g" "$MNT/etc/locale.gen"
        chrun "locale-gen"
        chrun "ln -svf /usr/share/zoneinfo/$ZONE/$SUBZ /etc/localtime"
 
-       cat > $MNT/etc/X11/xorg.conf.d/00-keyboard.conf <<- EOF
+       cat > "$MNT/etc/X11/xorg.conf.d/00-keyboard.conf" <<- EOF
        # Use localectl(1) to instruct systemd-localed to update it.
        Section "InputClass"
            Identifier      "system-keyboard"
@@ -1437,7 +1260,7 @@ install_base()
        EndSection
        EOF
 
-       cat > $MNT/etc/default/keyboard <<- EOF
+       cat > "$MNT/etc/default/keyboard" <<- EOF
        # KEYBOARD CONFIGURATION FILE
        # Consult the keyboard(5) manual page.
        XKBMODEL=""
@@ -1446,9 +1269,10 @@ install_base()
        XKBOPTIONS=""
        BACKSPACE="guess"
        EOF
-       printf "KEYMAP=%s\nFONT=%s\n" "$CMAP" "$FONT" > $MNT/etc/vconsole.conf
-       echo "$MYHOST" > $MNT/etc/hostname
-       cat > $MNT/etc/hosts <<- EOF
+       printf "KEYMAP=%s\nFONT=%s\n" "$CMAP" "$FONT" > "$MNT/etc/vconsole.conf"
+
+       echo "$MYHOST" > "$MNT/etc/hostname"
+       cat > "$MNT/etc/hosts" <<- EOF
        127.0.0.1       localhost
        127.0.1.1       $MYHOST
        ::1                     localhost ip6-localhost ip6-loopback
@@ -1471,32 +1295,31 @@ install_boot()
 
        if [[ $SYS == 'UEFI' ]]; then
                # remove our old install and generic BOOT/ dir
-               find $MNT/$BOOTDIR/EFI/ -maxdepth 1 -mindepth 1 -iname "$DIST" -type d -delete
-               find $MNT/$BOOTDIR/EFI/ -maxdepth 1 -mindepth 1 -iname 'BOOT' -type d -delete
+               echo "Removing conflicting boot directories"
+               find "$MNT/boot/EFI/" -maxdepth 1 -mindepth 1 -iname "$DIST" -type d -delete -printf "remove %p\n"
+               find "$MNT/boot/EFI/" -maxdepth 1 -mindepth 1 -iname 'BOOT' -type d -delete -printf "remove %p\n"
        fi
 
        prerun_$BOOTLDR
-       chrun "${BCMDS[$BOOTLDR]}" 2>$ERR
+       chrun "${BCMDS[$BOOTLDR]}" 2> "$ERR" 2>&1
        errshow 1 "${BCMDS[$BOOTLDR]}"
 
        if [[ -d $MNT/hostrun ]]; then
+               echo "Unmounting chroot directories"
                # cleanup the bind mounts we made earlier for the grub-probe module
-               umount_dir $MNT/hostrun/{udev,lvm}
-               rm -rf $MNT/hostrun >/dev/null 2>&1
+               umount_dir "$MNT/hostrun/"{udev,lvm}
+               rm -rf "$MNT/hostrun" > /dev/null 2>&1
        fi
 
        if [[ $SYS == 'UEFI' ]]; then
                # some UEFI firmware requires a generic esp/BOOT/BOOTX64.EFI
-               mkdir -pv $MNT/$BOOTDIR/EFI/BOOT
-               if [[ $BOOTLDR == 'grub' ]]; then
-                       cp -fv $MNT/$BOOTDIR/EFI/$DIST/grubx64.efi $MNT/$BOOTDIR/EFI/BOOT/BOOTX64.EFI
-               elif [[ $BOOTLDR == 'syslinux' ]]; then
-                       cp -rf $MNT/$BOOTDIR/EFI/syslinux/* $MNT/$BOOTDIR/EFI/BOOT/
-                       cp -f $MNT/$BOOTDIR/EFI/syslinux/syslinux.efi $MNT/$BOOTDIR/EFI/BOOT/BOOTX64.EFI
-               elif [[ $BOOTLDR == 'refind-efi' ]]; then
-                       sed -i '/#extra_kernel_version_strings/ c extra_kernel_version_strings linux-hardened,linux-zen,linux-lts,linux' $MNT/$BOOTDIR/EFI/refind/refind.conf
-                       cp -fv $MNT/$BOOTDIR/EFI/refind/refind_x64.efi $MNT/$BOOTDIR/EFI/BOOT/BOOTX64.EFI
-               fi
+               mkdir -pv "$MNT/boot/EFI/BOOT"
+               case "$BOOTLDR" in
+                       grub) cp -fv "$MNT/boot/EFI/$DIST/grubx64.efi" "$MNT/boot/EFI/BOOT/BOOTX64.EFI" ;;
+                       syslinux) cp -rf "$MNT/boot/EFI/syslinux/"* "$MNT/boot/EFI/BOOT/" && cp -f "$MNT/boot/EFI/syslinux/syslinux.efi" "$MNT/boot/EFI/BOOT/BOOTX64.EFI" ;;
+                       refind-efi) sed -i '/#extra_kernel_version_strings/ c extra_kernel_version_strings linux-hardened,linux-zen,linux-lts,linux' "$MNT/boot/EFI/refind/refind.conf"
+                               cp -fv "$MNT/boot/EFI/refind/refind_x64.efi" "$MNT/boot/EFI/BOOT/BOOTX64.EFI" ;;
+               esac
        fi
 
        return 0
@@ -1504,71 +1327,67 @@ install_boot()
 
 install_user()
 {
-       echo "Creating new user $NEWUSER and setting password"
-       rm -f $MNT/root/.zshrc  # remove welcome message from root zshrc
+       local groups='audio,video,floppy,log,network,rfkill,scanner,storage,optical,power,wheel'
+       [[ -e $MNT/etc/X11/xorg.conf.d/20-nvida.conf && -e $MNT/usr/bin/optirun ]] && groups+=',bumblebee'
+
+       rm -f "$MNT/root/.zlogin"  # remove welcome message
 
-       chrun "chpasswd <<< 'root:$ROOT_PASS'" 2>$ERR
+       chrun "chpasswd <<< 'root:$ROOT_PASS'" 2> "$ERR" 2>&1
        errshow 1 "set root password"
-       if [[ $MYSHELL != "/usr/bin/zsh" ]]; then # root uses zsh by default, change it if something else was chosen
-               chrun "usermod -s $MYSHELL root" 2>$ERR
-               errshow 1 "usermod -s $MYSHELL root"
-               # copy the default mkshrc to /root if mksh was picked
-               [[ $MYSHELL == '/usr/bin/mksh' ]] && cp -fv $MNT/etc/skel/.mkshrc $MNT/root/.mkshrc
+       if [[ $MYSHELL != 'zsh' ]]; then # root uses zsh by default
+               chrun "usermod -s /bin/$MYSHELL root" 2> "$ERR" 2>&1
+               errshow 1 "usermod -s /bin/$MYSHELL root"
+               # copy the default mkshrc to /root if it was selected
+               [[ $MYSHELL == 'mksh' ]] && cp -fv "$MNT/etc/skel/.mkshrc" "$MNT/root/.mkshrc"
        fi
 
-       local groups='audio,floppy,log,network,rfkill,scanner,storage,optical,power,wheel'
-
-       chrun "useradd -m -u 1000 -g users -G $groups -s $MYSHELL $NEWUSER" 2>$ERR
-       errshow 1 "useradd -m -u 1000 -g users -G $groups -s $MYSHELL $NEWUSER"
-       chrun "chpasswd <<< '$NEWUSER:$USER_PASS'" 2>$ERR
+       echo "Creating new user $NEWUSER and setting password"
+       chrun "useradd -m -u 1000 -g users -G $groups -s /bin/$MYSHELL $NEWUSER" 2> "$ERR" 2>&1
+       errshow 1 "useradd -m -u 1000 -g users -G $groups -s /bin/$MYSHELL $NEWUSER"
+       chrun "chpasswd <<< '$NEWUSER:$USER_PASS'" 2> "$ERR" 2>&1
        errshow 1 "set $NEWUSER password"
 
-       # if neovim was picked copy vim configs to ~/.config/nvim
-       if [[ $USER_PKGS == *neovim* ]]; then
-               mkdir -p $MNT/home/$NEWUSER/.config/nvim
-               cp -fv $MNT/home/$NEWUSER/.vimrc $MNT/home/$NEWUSER/.config/nvim/init.vim
-               cp -rfv $MNT/home/$NEWUSER/.vim/colors $MNT/home/$NEWUSER/.config/nvim/colors
+       if [[ $INSTALL_WMS == *dwm* ]]; then
+               install_suckless "/home/$NEWUSER" chroot
+               [[ $INSTALL_WMS == 'dwm' ]] && rm -rf "$MNT/home/$NEWUSER/.config/xfce4"
        fi
-
-       [[ $INSTALL_WMS == *dwm* ]] && install_suckless
-
-       [[ $WM_PKGS == *xfce* ]] && echo 'volumeicon &' >> $MNT/home/$NEWUSER/.xprofile
+       [[ $INSTALL_WMS == *jwm* ]] && sed '7,14d; s/xlock -mode blank/i3-lock-fancy -p/g; s/root:1/rofi_run/g' "$MNT/etc/system.jwmrc" > "$MNT/home/$NEWUSER/.jwmrc"
+       [[ $INSTALL_WMS =~ (bspwm|openbox) ]] || rm -rf "$MNT/home/$NEWUSER/.config/"{jgmenu,tint2}
+       [[ $USER_PKGS != *geany* ]] && rm -rf "$MNT/home/$NEWUSER/.config/geany"
+       [[ $MYSHELL != 'bash' ]] && rm -rf "$MNT/home/$NEWUSER/.bash"*
+       [[ $MYSHELL != 'zsh' ]] && rm -rf "$MNT/home/$NEWUSER/.z"*
 
        # remove some commands from ~/.xprofile when using KDE or Gnome as the login session
-       if [[ $LOGIN_WM =~ (startkde|gnome-session) || ($LOGIN_TYPE =~ (lightdm|ly) && $WM_PKGS =~ (plasma|gnome)) ]]; then
-               sed -i '/super/d' $MNT/home/$NEWUSER/.xprofile $MNT/root/.xprofile
-               sed -i '/nitrogen/d' $MNT/home/$NEWUSER/.xprofile $MNT/root/.xprofile
-               sed -i '/compton/d' $MNT/home/$NEWUSER/.xprofile $MNT/root/.xprofile
+       if [[ $LOGIN_WM =~ (startkde|gnome-session) || ($LOGIN_TYPE != 'xinit' && $WM_PKGS =~ (plasma|gnome)) ]]; then
+               sed -i '/super/d; /nitrogen/d; /compton/d' "$MNT/home/$NEWUSER/.xprofile" "$MNT/root/.xprofile"
+       elif [[ $LOGIN_WM == 'dwm' ]]; then # and dwm
+               sed -i '/super/d; /compton/d' "$MNT/home/$NEWUSER/.xprofile" "$MNT/root/.xprofile"
        fi
 
-       # create user home directories (Music, Documents, Downloads, etc..)
-       chrun 'xdg-user-dirs-update'
-       
        return 0
 }
 
 install_login()
 {
        local serv="$MNT/etc/systemd/system/getty@tty1.service.d"
-
        echo "Setting up $LOGIN_TYPE"
-
        case $LOGIN_TYPE in
                ly|sddm|gdm|lightdm)
-                       rm -rf "$serv" "$MNT/home/$NEWUSER/.xinitrc"
-                       chrun "systemctl enable $LOGIN_TYPE.service" 2>$ERR
-                       errshow 1 "systemctl enable $LOGIN_TYPE.service"
-                       if [[ $LOGIN_TYPE == 'lightdm' ]]; then
-                               cat > $MNT/etc/lightdm/lightdm-gtk-greeter.conf <<- EOF
-                               [greeter]
-                               default-user-image=/usr/share/icons/ArchLabs-Dark/64x64/places/distributor-logo-archlabs.png
-                               background=/usr/share/backgrounds/archlabs/archlabs.jpg
-                               theme-name=Adwaita-dark
-                               icon-theme-name=Adwaita
-                               font-name=DejaVu Sans Mono 11
-                               position=30%,end 50%,end
+                       if [[ $LOGIN_WM == *dwm* ]]; then # dwm doesn't include an xsession file for display managers
+                               mkdir -p "$MNT/usr/share/xsessions"
+                               cat > "$MNT/usr/share/xsessions/dwm.desktop" <<- EOF
+                               [Desktop Entry]
+                               Encoding=UTF-8
+                               Name=Dwm
+                               Comment=Dynamic Window Manager
+                               Exec=dwm
+                               Type=XSession
                                EOF
                        fi
+                       rm -rf "$serv" "$MNT/home/$NEWUSER/.xinitrc"
+                       chrun "systemctl enable $LOGIN_TYPE.service" 2> "$ERR" 2>&1
+                       errshow 1 "systemctl enable $LOGIN_TYPE.service"
+                       ${LOGIN_TYPE}_config
                        ;;
                xinit)
                        if [[ $INSTALL_WMS ]]; then
@@ -1581,7 +1400,7 @@ install_login()
                                sed -i "s/root/${NEWUSER}/g" $serv/autologin.conf
                                cat > "$MNT/home/$NEWUSER/$LOGINRC" <<- EOF
                                # automatically run startx when logging in on tty1
-                               [ -z \$DISPLAY ] && [ \$XDG_VTNR -eq 1 ] && exec startx
+                               [ \$XDG_VTNR -eq 1 ] && exec startx
                                EOF
                        else
                                rm -rf $serv
@@ -1592,34 +1411,28 @@ install_login()
 
 install_packages()
 {
-       local rmpkg="archlabs-installer "
-       local inpkg="$BASE_PKGS ${LOGIN_PKGS[$LOGIN_TYPE]} $PACKAGES $USER_PKGS "
+       local rmpkg=""
+       local inpkg="$PACKAGES $USER_PKGS $AL_BASE_PKGS "
+
+       if pacman -Qq archlabs-installer > /dev/null 2>&1; then
+               rmpkg+="archlabs-installer "
+       fi
 
-       # add extra packages chosen throughout the install
-       if [[ $MYSHELL == '/usr/bin/zsh' ]]; then
+       if [[ $MYSHELL == 'zsh' ]]; then
                inpkg+="zsh-completions "
        else
                rmpkg+="zsh "
-               [[ $MYSHELL == '/usr/bin/mksh' ]] && inpkg+="mksh "
        fi
 
-       # using a different kernel, remove the stock one
-       if [[ $KERNEL != 'linux' ]]; then
-               inpkg+="$KERNEL "
-               rmpkg+="linux "
+       if [[ $INSTALL_WMS =~ (openbox|bspwm|i3-gaps|fluxbox|jwm|awesome) ]]; then
+               inpkg+="$WM_BASE_PKGS "
+       elif [[ $INSTALL_WMS == 'dwm' ]]; then # dwm only needs a very limited package set
+               inpkg+="nitrogen polkit-gnome gnome-keyring dunst "
        fi
 
-       # gnome, plasma, and cinnamon have their own superkey bind and ksuperkey conflicts
-       [[ $INSTALL_WMS =~ ^(plasma|gnome|cinnamon)$ ]] || inpkg+="archlabs-ksuperkey "
-
-       # window manager only packages
-       [[ $INSTALL_WMS =~ (openbox|bspwm|i3-gaps|dwm|fluxbox) ]] && inpkg+="$WM_BASE_PKGS "
-
-       # ensure a terminal gets installed if one wasn't chosen or a DE that installs one
-       [[ $inpkg =~ (term|urxvt|tilix|alacritty|sakura|tilda|plasma|cinnamon) || $INSTALL_WMS == *dwm* ]] || inpkg+="xterm "
-
-       # update first to avoid issues
-       chrun "pacman -Syyu --noconfirm"
+       # update and install crucial packages first to avoid issues
+       chrun "pacman -Syyu $KERNEL $BASE_PKGS base-devel ${LOGIN_PKGS[$LOGIN_TYPE]} $MYSHELL --noconfirm --needed" 2> "$ERR" 2>&1
+       errshow 1 "pacman -Syyu $KERNEL $BASE_PKGS base-devel ${LOGIN_PKGS[$LOGIN_TYPE]} $MYSHELL --noconfirm --needed"
 
        # remove the packages we don't want on the installed system
        [[ $rmpkg ]] && chrun "pacman -Rnsc $rmpkg --noconfirm"
@@ -1628,69 +1441,76 @@ install_packages()
        chrun "pacman -S iputils $UCODE --noconfirm"
 
        # install the packages chosen throughout the install
-       chrun "pacman -S $inpkg --needed --noconfirm" 2>$ERR
+       chrun "pacman -S $inpkg --needed --noconfirm" 2> "$ERR" 2>&1
        errshow 1 "pacman -S $inpkg --needed --noconfirm"
 
        # bootloader packages
        if [[ $BOOTLDR == 'grub' ]]; then
                [[ $SYS == 'UEFI' ]] && local efib="efibootmgr"
-               chrun "pacman -S os-prober grub $efib --needed --noconfirm" 2>$ERR
+               chrun "pacman -S os-prober grub $efib --needed --noconfirm" 2> "$ERR" 2>&1
                errshow 1 "pacman -S os-prober grub $efib --needed --noconfirm"
        elif [[ $BOOTLDR == 'refind-efi' ]]; then
-               chrun "pacman -S refind-efi efibootmgr --needed --noconfirm" 2>$ERR
+               chrun "pacman -S refind-efi efibootmgr --needed --noconfirm" 2> "$ERR" 2>&1
                errshow 1 "pacman -S refind-efi efibootmgr --needed --noconfirm"
        elif [[ $SYS == 'UEFI' ]]; then
-               chrun "pacman -S efibootmgr --needed --noconfirm" 2>$ERR
+               chrun "pacman -S efibootmgr --needed --noconfirm" 2> "$ERR" 2>&1
                errshow 1 "pacman -S efibootmgr --needed --noconfirm"
        fi
 
+       if [[ $VM ]] && dmesg | grep -qi 'vbox'; then
+               case "$KERNEL" in
+                       linux) chrun "pacman -S virtualbox-guest-utils virtualbox-guest-modules-arch --needed --noconfirm" ;;
+                       *) chrun "pacman -S virtualbox-guest-utils virtualbox-guest-modules-dkms ${KERNEL}-headers --needed --noconfirm" ;;
+               esac
+       fi
+
        # allow members of the wheel group to run commands as root
-       sed -i "s/# %wheel ALL=(ALL) ALL/%wheel ALL=(ALL) ALL/g" $MNT/etc/sudoers
+       sed -i "s/# %wheel ALL=(ALL) ALL/%wheel ALL=(ALL) ALL/g" "$MNT/etc/sudoers"
 
        return 0
 }
 
 install_suckless()
 {
-       mkdir -pv "$MNT/home/$NEWUSER/suckless"
+       local dir="$1/suckless"
+       shift
 
-       for i in dwm dmenu st; do
-               if chrun "git clone https://git.suckless.org/$i /home/$NEWUSER/suckless/$i"; then
-                       chrun "cd /home/$NEWUSER/suckless/$i; make PREFIX=/usr install; make clean; rm config.h"
-               else
-                       printf "failed to clone %s repo\n" "$i"
-               fi
-       done
-
-       if [[ -x $MNT/usr/bin/dwm ]]; then
-               printf "To configure dwm edit %s\n" "/home/$NEWUSER/suckless/dwm/config.h"
-               printf "You can then recompile it with 'sudo make clean install'\n"
-               sleep 2
+       if [[ $1 == 'chroot' ]]; then
+               chrun "mkdir -pv '$dir'"
+               for i in dwm dmenu st; do
+                       if chrun "git clone 'https://git.suckless.org/$i' '$dir/$i'"; then
+                               chrun "cd '$dir/$i' && make PREFIX=/usr install"
+                       else
+                               printf "failed to clone %s repo\n" "$i"
+                       fi
+               done
+       else
+               mkdir -pv "$dir"
+               for i in dwm dmenu st; do
+                       if git clone "https://git.suckless.org/$i" "$dir/$i"; then
+                               cd "$dir/$i" && make PREFIX=/usr install
+                       else
+                               printf "failed to clone %s repo\n" "$i"
+                       fi
+               done
        fi
 }
 
 install_mkinitcpio()
 {
        local add=''
-
-       # luks keyfile creation
-       # currently not used due to not prompting for passphrase on startup
-       # [[ $LUKS_UUID && $LUKS_PASS && $SYS == 'UEFI' && $BOOTLDR == 'grub' ]] && luks_keyfile
-
        [[ $LUKS ]] && add="encrypt"
        [[ $LVM ]] && { [[ $add ]] && add+=" lvm2" || add+="lvm2"; }
-       sed -i "s/block filesystems/block ${add} filesystems ${HOOKS}/g" $MNT/etc/mkinitcpio.conf
-       chrun "mkinitcpio -p $KERNEL" 2>$ERR
+       sed -i "s/block filesystems/block ${add} filesystems ${HOOKS}/g" "$MNT/etc/mkinitcpio.conf"
+       chrun "mkinitcpio -p $KERNEL" 2> "$ERR" 2>&1
        errshow 1 "mkinitcpio -p $KERNEL"
 }
 
 install_mirrorlist()
 {
-       local mfile="$1"  # output mirrorlist file
-
-       if hash reflector >/dev/null 2>&1; then
-               reflector --verbose --score 80 -l 40 -f 5 --sort rate --save "$mfile"
-       elif hash rankmirrors >/dev/null 2>&1; then
+       if hash reflector > /dev/null 2>&1; then
+               reflector --verbose --score 80 -l 40 -f 5 --sort rate --save "$1"
+       elif hash rankmirrors > /dev/null 2>&1; then
                echo "Sorting mirrorlist"
                local key="access_key=5f29642060ab983b31fdf4c2935d8c56"
                ip_add="$(curl -fsSL "http://api.ipstack.com/check&?$key&fields=ip" | python -c "import sys, json; print(json.load(sys.stdin)['ip'])")"
@@ -1708,21 +1528,130 @@ install_mirrorlist()
                else # no country code so just grab all mirrors, will be a very slow sort but we don't have other options
                        mirror="https://www.archlinux.org/mirrorlist/?country=all&use_mirror_status=on"
                fi
-               curl -fsSL "$mirror" | sed -e 's/^#Server/Server/' -e '/^#/d' | rankmirrors -n 6 - >"$mfile"
+               curl -fsSL "$mirror" | sed -e 's/^#Server/Server/' -e '/^#/d' | rankmirrors -n 6 - > "$1"
        fi
-
-       return 0
 }
 
 install_background()
 {
-       msg "Background Install" "\nInstall will now begin in the background?\n" 2
-       rsync -a /run/archiso/sfs/airootfs/ $MNT/ &
-       RSYNC_PID=$!
-       ( install_mirrorlist "$MNT/etc/pacman.d/mirrorlist" >>/tmp/bg_out 2>&1 ) &
-       MIRROR_PID=$!
-       # end the background processes before exiting
-       trap "kill $RSYNC_PID $MIRROR_PID 2>/dev/null" EXIT
+       ( rsync -a /run/archiso/sfs/airootfs/ "$MNT/" && install_mirrorlist "$MNT/etc/pacman.d/mirrorlist" > /dev/null 2>&1 ) &
+       BG_PID=$!
+       trap "kill $BG_PID 2> /dev/null" EXIT
+}
+
+install_tearfree_conf()
+{
+       local xpath="$1"
+
+       if [[ $VM ]]; then
+               echo "Virtual machine detected, removing xorg configs"
+               find "$xpath/" -name '*.conf' -delete -printf "remove %p\n"
+       elif lspci | grep ' VGA ' | grep -q 'Intel'; then
+               echo "Creating Intel Tear Free config /etc/X11/xorg.conf.d/20-intel.conf"
+               cat > "$xpath/20-intel.conf" <<- EOF
+               Section "Device"
+                       Identifier  "Intel Graphics"
+                       Driver      "intel"
+                       Option      "TearFree" "true"
+               EndSection
+               EOF
+               cat "$xpath/20-intel.conf"
+       elif lspci | grep ' VGA ' | grep -q 'AMD/ATI.*RX\|AMD/ATI.*R[579]'; then # newer RX, R5, R7, and R9 cards can use the amdgpu driver
+               echo "Creating AMD Tear Free config /etc/X11/xorg.conf.d/20-amdgpu.conf"
+               cat > "$xpath/20-amdgpu.conf" <<- EOF
+               Section "Device"
+                       Identifier  "AMD Graphics"
+                       Driver      "amdgpu"
+                       Option      "TearFree" "true"
+               EndSection
+               EOF
+               cat "$xpath/20-amdgpu.conf"
+       elif lspci | grep ' VGA ' | grep -q 'AMD/ATI.*HD [2-6][0-9]*'; then # older HD 2xxx-6xxx cards must use the radeon driver
+               echo "Creating Radeon Tear Free config /etc/X11/xorg.conf.d/20-radeon.conf"
+               cat > "$xpath/20-radeon.conf" <<- EOF
+               Section "Device"
+                       Identifier  "AMD Graphics"
+                       Driver      "radeon"
+                       Option      "TearFree" "on"
+               EndSection
+               EOF
+               cat "$xpath/20-radeon.conf"
+       elif lspci | grep ' VGA ' | grep -q 'NVIDIA'; then # nvidia cards require a bit of checking for notebook gpus
+               echo "Trying nvidia driver install"
+               if lspci | grep ' VGA ' | grep -q 'Intel\|AMD' && lspci | grep ' VGA ' | grep -q 'NVIDIA.*[6-9][1-8][05]M[X]\?\|NVIDIA.*Quadro.*[KMP][1-6][0-2][0]*M'; then # optimus
+                       if [[ $xpath == *"$MNT"* ]]; then
+                               chrun "nvidia-installer --bumblebee"
+                       else
+                               nvidia-installer --bumblebee
+                       fi
+               else
+                       if [[ $xpath == *"$MNT"* ]]; then
+                               chrun "nvidia-installer" # unsure which card so try auto detection
+                       else
+                               nvidia-installer
+                       fi
+               fi
+               if [[ -e $xpath/20-nvidia.conf ]]; then
+                       cat "$xpath/20-radeon.conf"
+                       echo
+                       echo "NVIDIA driver installed"
+                       if [[ $xpath == *"$MNT"* ]]; then
+                               echo "Trying to load the driver for live session"
+                               nvidia-smi -r
+                       fi
+                       echo "To enable driver vsync:"
+                       echo -e "\trun nvidia-settings (as root) on first boot\n\tenable 'ForceFullCompositionPipeline' under the advanced settings"
+                       echo -e "\tlastly save the change to your nvida xorg config /etc/X11/xorg.conf.d/20-nvidia.conf"
+                       echo -e "\tand remove everything but the Device and Screen sections from the file"
+               else
+                       echo "Unable to install nvidia driver"
+               fi
+               return 0
+       fi
+
+       if lspci | grep ' VGA ' | grep -q 'Intel\|AMD/ATI'; then
+               if [[ $xpath == *"$MNT"* ]]; then
+                       sed -i 's/xrender/glx/g' "$MNT/etc/skel/.config/compton.conf"
+               else
+                       sed -i 's/xrender/glx/g' /etc/skel/.config/compton.conf
+               fi
+       fi
+
+       # remove nvidia installer from installed system when not running nvidia gpu
+       [[ $xpath == *"$MNT"* ]] && rm -rf "$MNT/usr/bin/nvidia-installer" "$MNT/var/lib/nvidia-installer"
+}
+
+###############################################################################
+# display manager config
+# these are called based on which DM is chosen after it is installed
+# additional config can be  handled here, for now only lightdm has one
+
+ly_config()
+{
+       : #TODO
+}
+
+gdm_config()
+{
+       : #TODO
+}
+
+sddm_config()
+{
+       : #TODO
+}
+
+lightdm_config()
+{
+       cat > "$MNT/etc/lightdm/lightdm-gtk-greeter.conf" <<- EOF
+       [greeter]
+       default-user-image=/usr/share/icons/ArchLabs-Dark/64x64/places/distributor-logo-archlabs.png
+       background=/usr/share/backgrounds/archlabs/archlabs.jpg
+       theme-name=Adwaita-dark
+       icon-theme-name=Adwaita
+       font-name=DejaVu Sans Mono 11
+       position=30%,end 50%,end
+       EOF
 }
 
 ###############################################################################
@@ -1739,13 +1668,9 @@ setup_grub()
                [[ $BOOT_DEV ]] || { part_device 1 || return 1; }
                BCMDS[grub]="grub-install --recheck --force --target=i386-pc $BOOT_DEV"
        else
-               # since we're not using the keyfile this is dead code
-               # if [[ $ROOT_PART == */dev/mapper/* && -z $LVM && -z $LUKS_PASS ]]; then
-               #       luks_pass "$_luksopen" 1 || return 1
-               # fi
-               BCMDS[grub]="mount -t efivarfs efivarfs /sys/firmware/efi/efivars >/dev/null 2>&1
-               grub-install --recheck --force --target=x86_64-efi --efi-directory=/$BOOTDIR --bootloader-id=$DIST"
-               grep -q /sys/firmware/efi/efivars /proc/mounts || mount -t efivarfs efivarfs /sys/firmware/efi/efivars >/dev/null 2>&1
+               BCMDS[grub]="mount -t efivarfs efivarfs /sys/firmware/efi/efivars > /dev/null 2>&1
+               grub-install --recheck --force --target=x86_64-efi --efi-directory=/boot --bootloader-id=$DIST"
+               grep -q /sys/firmware/efi/efivars /proc/mounts || mount -t efivarfs efivarfs /sys/firmware/efi/efivars > /dev/null 2>&1
        fi
 
        BCMDS[grub]="mkdir -p /run/udev /run/lvm &&
@@ -1760,22 +1685,22 @@ setup_grub()
 
 prerun_grub()
 {
-       sed -i "s/GRUB_DISTRIBUTOR=.*/GRUB_DISTRIBUTOR=\"${DIST}\"/g; s/GRUB_CMDLINE_LINUX_DEFAULT=.*/GRUB_CMDLINE_LINUX_DEFAULT=\"\"/g" $MNT/etc/default/grub
+       sed -i "s/GRUB_DISTRIBUTOR=.*/GRUB_DISTRIBUTOR=\"${DIST}\"/g; s/GRUB_CMDLINE_LINUX_DEFAULT=.*/GRUB_CMDLINE_LINUX_DEFAULT=\"\"/g" "$MNT/etc/default/grub"
 
        if [[ $LUKS_DEV ]]; then
-               sed -i "s~#GRUB_ENABLE_CRYPTODISK~GRUB_ENABLE_CRYPTODISK~g; s~GRUB_CMDLINE_LINUX=.*~GRUB_CMDLINE_LINUX=\"${LUKS_DEV}\"~g" $MNT/etc/default/grub 2>$ERR
+               sed -i "s~#GRUB_ENABLE_CRYPTODISK~GRUB_ENABLE_CRYPTODISK~g; s~GRUB_CMDLINE_LINUX=.*~GRUB_CMDLINE_LINUX=\"${LUKS_DEV}\"~g" "$MNT/etc/default/grub" 2> "$ERR" 2>&1
                errshow 1 "sed -i 's~#GRUB_ENABLE_CRYPTODISK~GRUB_ENABLE_CRYPTODISK~g; s~GRUB_CMDLINE_LINUX=.*~GRUB_CMDLINE_LINUX=\"${LUKS_DEV}\"~g' $MNT/etc/default/grub"
        fi
 
        if [[ $SYS == 'BIOS' && $LVM && -z $SEP_BOOT ]]; then
-               sed -i "s/GRUB_PRELOAD_MODULES=.*/GRUB_PRELOAD_MODULES=\"lvm\"/g" $MNT/etc/default/grub 2>$ERR
+               sed -i "s/GRUB_PRELOAD_MODULES=.*/GRUB_PRELOAD_MODULES=\"lvm\"/g" "$MNT/etc/default/grub" 2> "$ERR" 2>&1
                errshow 1 "sed -i 's/GRUB_PRELOAD_MODULES=.*/GRUB_PRELOAD_MODULES=\"lvm\"/g' $MNT/etc/default/grub"
        fi
 
        # setup for os-prober module
-       mkdir -p /run/{lvm,udev} $MNT/hostrun/{lvm,udev}
-       mount --bind /run/lvm $MNT/hostrun/lvm
-       mount --bind /run/udev $MNT/hostrun/udev
+       mkdir -p /run/{lvm,udev} "$MNT/hostrun/"{lvm,udev}
+       mount --bind /run/lvm "$MNT/hostrun/lvm"
+       mount --bind /run/udev "$MNT/hostrun/udev"
 
        return 0
 }
@@ -1787,7 +1712,7 @@ setup_efistub()
 
 prerun_efistub()
 {
-       BCMDS[systemd-boot]="mount -t efivarfs efivarfs /sys/firmware/efi/efivars >/dev/null 2>&1
+       BCMDS[efistub]="mount -t efivarfs efivarfs /sys/firmware/efi/efivars > /dev/null 2>&1
                efibootmgr -v -d $BOOT_DEV -p $BOOT_PART_NUM -c -L '${DIST} Linux' -l /vmlinuz-${KERNEL} \
                -u 'root=$ROOT_PART_ID rw $([[ $UCODE ]] && printf 'initrd=\%s.img ' "$UCODE")initrd=\initramfs-${KERNEL}.img'"
 }
@@ -1798,17 +1723,27 @@ setup_syslinux()
                EDIT_FILES[bootloader]="/boot/syslinux/syslinux.cfg"
        else
                EDIT_FILES[bootloader]="/boot/EFI/syslinux/syslinux.cfg"
-               BCMDS[syslinux]="mount -t efivarfs efivarfs /sys/firmware/efi/efivars >/dev/null 2>&1
+               BCMDS[syslinux]="mount -t efivarfs efivarfs /sys/firmware/efi/efivars > /dev/null 2>&1
                efibootmgr -v -c -d $BOOT_DEV -p $BOOT_PART_NUM -l /EFI/syslinux/syslinux.efi -L $DIST"
        fi
 }
 
 prerun_syslinux()
 {
-       local c="$MNT/boot/syslinux" s="/usr/lib/syslinux/bios" d=".."
-       [[ $SYS == 'UEFI' ]] && { c="$MNT/boot/EFI/syslinux"; s="/usr/lib/syslinux/efi64/"; d=''; }
-
-       mkdir -pv "$c" && cp -rfv $s/* "$c/" && cp -f "$RUN/syslinux/splash.png" "$c/"
+       local c="$MNT/boot/syslinux"
+       local s="/usr/lib/syslinux/bios"
+       local d=".."
+       if [[ $SYS == 'UEFI' ]]; then
+                c="$MNT/boot/EFI/syslinux"
+                s="/usr/lib/syslinux/efi64"
+                d='';
+       fi
+       mkdir -pv "$c" 2> "$ERR" 2>&1
+       errshow 1 "mkdir -pv $c"
+       cp -rfv "$s/"* "$c/" 2> "$ERR" 2>&1
+       errshow 1 "cp -rfv $s/* $c/"
+       cp -fv "$RUN/syslinux/splash.png" "$c/" 2> "$ERR" 2>&1
+       errshow 0 "cp -fv $RUN/syslinux/splash.png $c/"
        cat > "$c/syslinux.cfg" <<- EOF
        UI vesamenu.c32
        MENU TITLE $DIST Boot Menu
@@ -1854,13 +1789,12 @@ prerun_syslinux()
 setup_refind-efi()
 {
        EDIT_FILES[bootloader]="/boot/refind_linux.conf"
-       BCMDS[refind-efi]="mount -t efivarfs efivarfs /sys/firmware/efi/efivars >/dev/null 2>&1
-               refind-install"
+       BCMDS[refind-efi]="mount -t efivarfs efivarfs /sys/firmware/efi/efivars > /dev/null 2>&1; refind-install"
 }
 
 prerun_refind-efi()
 {
-       cat > $MNT/boot/refind_linux.conf <<- EOF
+       cat > "$MNT/boot/refind_linux.conf" <<- EOF
        "$DIST Linux"          "root=$ROOT_PART_ID $([[ $LUKS_DEV ]] &&
                                                printf "%s " "$LUKS_DEV")rw add_efi_memmap $([[ $UCODE ]] &&
                                                printf "initrd=%s " "/$UCODE.img")initrd=/initramfs-$KERNEL.img"
@@ -1868,8 +1802,8 @@ prerun_refind-efi()
                                                printf "%s " "$LUKS_DEV")rw add_efi_memmap $([[ $UCODE ]] &&
                                                printf "initrd=%s " "/$UCODE.img")initrd=/initramfs-$KERNEL-fallback.img"
        EOF
-       mkdir -p $MNT/etc/pacman.d/hooks
-       cat > $MNT/etc/pacman.d/hooks/refind.hook <<- EOF
+       mkdir -p "$MNT/etc/pacman.d/hooks"
+       cat > "$MNT/etc/pacman.d/hooks/refind.hook" <<- EOF
        [Trigger]
        Operation = Upgrade
        Type = Package
@@ -1885,32 +1819,31 @@ prerun_refind-efi()
 setup_systemd-boot()
 {
        EDIT_FILES[bootloader]="/boot/loader/entries/$DIST.conf"
-       BCMDS[systemd-boot]="mount -t efivarfs efivarfs /sys/firmware/efi/efivars >/dev/null 2>&1
-               bootctl --path=/boot install"
+       BCMDS[systemd-boot]="mount -t efivarfs efivarfs /sys/firmware/efi/efivars > /dev/null 2>&1; bootctl --path=/boot install"
 }
 
 prerun_systemd-boot()
 {
-       mkdir -p $MNT/boot/loader/entries
-       cat > $MNT/boot/loader/loader.conf <<- EOF
+       mkdir -p "$MNT/boot/loader/entries"
+       cat > "$MNT/boot/loader/loader.conf" <<- EOF
        default  $DIST
        timeout  5
        editor   no
        EOF
-       cat > $MNT/boot/loader/entries/$DIST.conf <<- EOF
+       cat > "$MNT/boot/loader/entries/$DIST.conf" <<- EOF
        title   $DIST Linux
        linux   /vmlinuz-${KERNEL}$([[ $UCODE ]] && printf "\ninitrd  %s" "/$UCODE.img")
        initrd  /initramfs-$KERNEL.img
        options root=$ROOT_PART_ID $([[ $LUKS_DEV ]] && printf "%s " "$LUKS_DEV")rw
        EOF
-       cat > $MNT/boot/loader/entries/$DIST-fallback.conf <<- EOF
+       cat > "$MNT/boot/loader/entries/$DIST-fallback.conf" <<- EOF
        title   $DIST Linux Fallback
        linux   /vmlinuz-${KERNEL}$([[ $UCODE ]] && printf "\ninitrd  %s" "/$UCODE.img")
        initrd  /initramfs-$KERNEL-fallback.img
        options root=$ROOT_PART_ID $([[ $LUKS_DEV ]] && printf "%s " "$LUKS_DEV")rw
        EOF
-       mkdir -p $MNT/etc/pacman.d/hooks
-       cat > $MNT/etc/pacman.d/hooks/systemd-boot.hook <<- EOF
+       mkdir -p "$MNT/etc/pacman.d/hooks"
+       cat > "$MNT/etc/pacman.d/hooks/systemd-boot.hook" <<- EOF
        [Trigger]
        Type = Package
        Operation = Upgrade
@@ -1930,7 +1863,6 @@ prerun_systemd-boot()
 
 lvm_menu()
 {
-       msg "Info" "\nGathering device info.\n" 0
        no_bg_install || return 1
        lvm_detect
        local choice
@@ -1939,10 +1871,10 @@ lvm_menu()
                        "$_lvmnew"    "vgcreate -f, lvcreate -L -n" \
                        "$_lvmdel"    "vgremove -f" \
                        "$_lvmdelall" "lvrmeove, vgremove, pvremove -f" \
-                       "back"        "return to the main menu"
+                       "Back"        "Return to the main menu"
                case "$choice" in
-                       "$_lvmnew") lvm_create ;;
-                       "$_lvmdel") lvm_delgroup && yesno "$_lvmdel" "$_lvmdelask" && vgremove -f "$DEL_VG" >/dev/null 2>&1 ;;
+                       "$_lvmnew") lvm_create && break ;;
+                       "$_lvmdel") lvm_delgroup && yesno "$_lvmdel" "$_lvmdelask" && vgremove -f "$DEL_VG" > /dev/null 2>&1 ;;
                        "$_lvmdelall") lvm_del_all ;;
                        *) break ;;
                esac
@@ -1953,24 +1885,21 @@ lvm_menu()
 
 lvm_detect()
 {
-       local v pv
-       pv="$(pvs -o pv_name --noheading 2>/dev/null)"
-       v="$(lvs -o vg_name,lv_name --noheading --separator - 2>/dev/null)"
-       VGROUP="$(vgs -o vg_name --noheading 2>/dev/null)"
-
-       if [[ $VGROUP && $v && $pv ]]; then
-               msg "Logical Volume Management" "\nActivating existing logical volume management (LVM).\n\n" 1
-               modprobe dm-mod >/dev/null 2>$ERR
-               errshow 'modprobe dm-mod'
-               vgscan >/dev/null 2>&1
-               vgchange -ay >/dev/null 2>&1
+       if [[ $(vgs -o vg_name --noheading 2> /dev/null) ]]; then
+               if [[ $(lvs -o vg_name,lv_name --noheading --separator - 2> /dev/null) && $(pvs -o pv_name --noheading 2> /dev/null) ]]; then
+                       msg "LVM Setup" "\nActivating existing logical volume management.\n" 0
+                       modprobe dm-mod > /dev/null 2> "$ERR"
+                       errshow 0 'modprobe dm-mod'
+                       vgscan > /dev/null 2>&1
+                       vgchange -ay > /dev/null 2>&1
+               fi
        fi
 }
 
 lvm_create()
 {
        VGROUP='' LVM_PARTS='' VGROUP_MB=0
-       umount_dir $MNT
+       umount_dir "$MNT"
        lvm_mkgroup || return 1
        local txt="\nThe last (or only) logical volume will automatically use all remaining space in the volume group."
        dlg VOL_COUNT menu "$_lvmnew" "\nSelect the number of logical volumes (LVs) to create in: $VGROUP\n$txt" 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 -
@@ -1978,8 +1907,8 @@ lvm_create()
        lvm_extra_lvs || return 1
        lvm_volume_name "$_lvmlvname\nNOTE: This LV will use up all remaining space in the volume group (${VGROUP_MB}MB)" || return 1
        msg "$_lvmnew (LV:$VOL_COUNT)" "\nCreating volume $VNAME from remaining space in $VGROUP\n" 0
-       lvcreate -l +100%FREE "$VGROUP" -n "$VNAME" >/dev/null 2>$ERR
-       errshow "lvcreate -l +100%FREE $VGROUP -n $VNAME" || return 1
+       lvcreate -l +100%FREE "$VGROUP" -n "$VNAME" > /dev/null 2> "$ERR"
+       errshow "lvcreate -l +100%FREE $VGROUP -n $VNAME" || return 1
        LVM='logical volume'; sleep 0.5
        txt="\nDone, volume: $VGROUP-$VNAME (${VOLUME_SIZE:-${VGROUP_MB}MB}) has been created.\n"
        msg "$_lvmnew (LV:$VOL_COUNT)" "$txt\n$(lsblk -o NAME,MODEL,TYPE,FSTYPE,SIZE $LVM_PARTS)\n"
@@ -2037,8 +1966,8 @@ lvm_mkgroup()
        done
 
        msg "$_lvmnew" "\nCreating volume group: $VGROUP\n" 0
-       vgcreate -f "$VGROUP" $LVM_PARTS >/dev/null 2>$ERR
-       errshow "vgcreate -f $VGROUP $LVM_PARTS" || return 1
+       vgcreate -f "$VGROUP" $LVM_PARTS > /dev/null 2> "$ERR"
+       errshow "vgcreate -f $VGROUP $LVM_PARTS" || return 1
 
        SIZE=$(vgdisplay "$VGROUP" | awk '/VG Size/ { gsub(/[^0-9.]/, ""); print int($0) }')
        SIZE_UNIT="$(vgdisplay "$VGROUP" | awk '/VG Size/ { print substr($NF, 0, 1) }')"
@@ -2055,15 +1984,15 @@ lvm_mkgroup()
 lvm_del_all()
 {
        local v pv
-       pv="$(pvs -o pv_name --noheading 2>/dev/null)"
-       v="$(lvs -o vg_name,lv_name --noheading --separator - 2>/dev/null)"
-       VGROUP="$(vgs -o vg_name --noheading 2>/dev/null)"
+       pv="$(pvs -o pv_name --noheading 2> /dev/null)"
+       v="$(lvs -o vg_name,lv_name --noheading --separator - 2> /dev/null)"
+       VGROUP="$(vgs -o vg_name --noheading 2> /dev/null)"
 
        if [[ $VGROUP || $v || $pv ]]; then
                if yesno "$_lvmdelall" "$_lvmdelask"; then
-                       for i in $v; do lvremove -f "/dev/mapper/$i" >/dev/null 2>&1; done
-                       for i in $VGROUP; do vgremove -f "$i" >/dev/null 2>&1; done
-                       for i in $pv; do pvremove -f "$i" >/dev/null 2>&1; done
+                       for i in $v; do lvremove -f "/dev/mapper/$i" > /dev/null 2>&1; done
+                       for i in $VGROUP; do vgremove -f "$i" > /dev/null 2>&1; done
+                       for i in $pv; do pvremove -f "$i" > /dev/null 2>&1; done
                        LVM=''
                fi
        else
@@ -2092,8 +2021,8 @@ lvm_extra_lvs()
        while (( VOL_COUNT > 1 )); do
                lvm_volume_name "$_lvmlvname" && lvm_lv_size || return 1
                msg "$_lvmnew (LV:$VOL_COUNT)" "\nCreating a $VOLUME_SIZE volume $VNAME in $VGROUP\n" 0
-               lvcreate -L "$VOLUME_SIZE" "$VGROUP" -n "$VNAME" >/dev/null 2>$ERR
-               errshow "lvcreate -L $VOLUME_SIZE $VGROUP -n $VNAME" || return 1
+               lvcreate -L "$VOLUME_SIZE" "$VGROUP" -n "$VNAME" > /dev/null 2> "$ERR"
+               errshow "lvcreate -L $VOLUME_SIZE $VGROUP -n $VNAME" || return 1
                msg "$_lvmnew (LV:$VOL_COUNT)" "\nDone, logical volume (LV) $VNAME ($VOLUME_SIZE) has been created.\n"
                (( VOL_COUNT-- ))
        done
@@ -2151,7 +2080,7 @@ luks_menu()
                "$_luksnew"  "cryptsetup -q luksFormat" \
                "$_luksopen" "cryptsetup open --type luks" \
                "$_luksadv"  "cryptsetup -q -s -c luksFormat" \
-               "back"       "Return to the main menu"
+               "Back"       "Return to the main menu"
 
        case "$choice" in
                "$_luksnew") luks_basic || return 1 ;;
@@ -2164,8 +2093,8 @@ luks_menu()
 
 luks_open()
 {
-       modprobe -a dm-mod dm_crypt >/dev/null 2>&1
-       umount_dir $MNT
+       modprobe -a dm-mod dm_crypt > /dev/null 2>&1
+       umount_dir "$MNT"
        part_find 'part|crypt|lvm' || return 1
 
        if (( COUNT == 1 )); then
@@ -2178,8 +2107,8 @@ luks_open()
 
        luks_pass "$_luksopen" || return 1
        msg "$_luksopen" "\nOpening encrypted partition: $LUKS_NAME\n\nUsing device/volume: $LUKS_PART\n" 0
-       cryptsetup open --type luks "$LUKS_PART" "$LUKS_NAME" <<< "$LUKS_PASS" 2>$ERR
-       errshow "cryptsetup open --type luks $LUKS_PART $LUKS_NAME" || return 1
+       cryptsetup open --type luks "$LUKS_PART" "$LUKS_NAME" <<< "$LUKS_PASS" 2> "$ERR"
+       errshow "cryptsetup open --type luks $LUKS_PART $LUKS_NAME" || return 1
        LUKS='encrypted'; luks_show
        return 0
 }
@@ -2187,49 +2116,26 @@ luks_open()
 luks_pass()
 {
        LUKS_PASS=''
-       local t="$1" op="$2" v='' p='' p2=''
+       local t="$1"
+       typeset -a ans=(cryptroot) # default name to start
 
        until [[ $LUKS_PASS ]]; do
-               i=0
                tput cnorm
-               if [[ $op ]]; then
-                       dialog --insecure --backtitle "$DIST Installer - $SYS - v$VER" --separator $'\n' --title " $t " \
-                               --mixedform "\nEnter the password to decrypt $ROOT_PART\n\nThis is needed to create a keyfile." 0 0 0 \
-                               "Password:"  1 1 '' 1 11 "$COLUMNS" 0 1 \
-                               "Password2:" 2 1 '' 2 12 "$COLUMNS" 0 1 2>"$ANS" || return 1
+               dialog --insecure --backtitle "$DIST Installer - $SYS - v$VER" --separator $'\n' --title " $t " --mixedform "$_luksomenu" 0 0 0 \
+                       "Name:"      1 1 "${ans[0]}" 1  7 "$COLUMNS" 0 0 \
+                       "Password:"  2 1 ''          2 11 "$COLUMNS" 0 1 \
+                       "Password2:" 3 1 ''          3 12 "$COLUMNS" 0 1 2> "$ANS" || return 1
 
-               else
-                       dialog --insecure --backtitle "$DIST Installer - $SYS - v$VER" --separator $'\n' --title " $t " --mixedform "$_luksomenu" 0 0 0 \
-                               "Name:"      1 1 "${LUKS_NAME:-cryptroot}" 1  7 "$COLUMNS" 0 0 \
-                               "Password:"  2 1 ''                        2 11 "$COLUMNS" 0 1 \
-                               "Password2:" 3 1 ''                        3 12 "$COLUMNS" 0 1 2>"$ANS" || return 1
-
-               fi
+               mapfile -t ans <"$ANS"
 
-               while read -r line; do
-                       if [[ $op ]]; then
-                               case $i in
-                                       0) p="$line" ;;
-                                       1) p2="$line" ;;
-                               esac
-                       else
-                               case $i in
-                                       0) n="$line" ;;
-                                       1) p="$line" ;;
-                                       2) p2="$line" ;;
-                               esac
-                       fi
-                       (( i++ ))
-               done < "$ANS"
-
-               if [[ -z $op && -z $n ]]; then
+               if [[ -z "${ans[0]}" ]]; then
                        msg "Name Empty" "\nEncrypted device name cannot be empty.\n\nPlease try again.\n" 2
-               elif [[ -z $p || "$p" != "$p2" ]]; then
-                       [[ $op ]] || LUKS_NAME="$n"
+               elif [[ -z "${ans[1]}" || "${ans[1]}" != "${ans[2]}" ]]; then
+                       LUKS_NAME="${ans[0]}"
                        msg "Password Mismatch" "\nThe passwords entered do not match.\n\nPlease try again.\n" 2
                else
-                       [[ $op ]] || LUKS_NAME="$n"
-                       LUKS_PASS="$p"
+                       LUKS_NAME="${ans[0]}"
+                       LUKS_PASS="${ans[1]}"
                fi
        done
 
@@ -2244,8 +2150,8 @@ luks_show()
 
 luks_setup()
 {
-       modprobe -a dm-mod dm_crypt >/dev/null 2>&1
-       umount_dir $MNT
+       modprobe -a dm-mod dm_crypt > /dev/null 2>&1
+       umount_dir "$MNT"
        part_find 'part|lvm' || return 1
 
        if [[ $AUTO_ROOT_PART ]]; then
@@ -2264,30 +2170,14 @@ luks_basic()
 {
        luks_setup || return 1
        msg "$_luksnew" "\nCreating encrypted partition: $LUKS_NAME\n\nDevice or volume used: $LUKS_PART\n" 0
-       cryptsetup -q luksFormat "$LUKS_PART" <<< "$LUKS_PASS" 2>$ERR
-       errshow "cryptsetup -q luksFormat $LUKS_PART" || return 1
-       cryptsetup open "$LUKS_PART" "$LUKS_NAME" <<< "$LUKS_PASS" 2>$ERR
-       errshow "cryptsetup open $LUKS_PART $LUKS_NAME" || return 1
+       cryptsetup -q luksFormat "$LUKS_PART" <<< "$LUKS_PASS" 2> "$ERR"
+       errshow "cryptsetup -q luksFormat $LUKS_PART" || return 1
+       cryptsetup open "$LUKS_PART" "$LUKS_NAME" <<< "$LUKS_PASS" 2> "$ERR"
+       errshow "cryptsetup open $LUKS_PART $LUKS_NAME" || return 1
        LUKS='encrypted'; luks_show
        return 0
 }
 
-luks_keyfile()
-{
-       if [[ ! -e $MNT/crypto_keyfile.bin ]]; then
-               # printf "Creating LUKS keyfile /crypto_keyfile.bin\n"
-               local n
-               n="$(lsblk -lno NAME,UUID,TYPE | awk "/$LUKS_UUID/"' && /part|crypt|lvm/ {print $1}')"
-               local mkkey="dd bs=512 count=8 if=/dev/urandom of=/crypto_keyfile.bin"
-               mkkey="$mkkey && chmod 000 /crypto_keyfile.bin"
-               mkkey="$mkkey && cryptsetup luksAddKey /dev/$n /crypto_keyfile.bin <<< '$LUKS_PASS'"
-               chrun "$mkkey"
-               sed -i 's/FILES=()/FILES=(\/crypto_keyfile.bin)/g' $MNT/etc/mkinitcpio.conf 2>$ERR
-       fi
-
-       return 0
-}
-
 luks_advanced()
 {
        if luks_setup; then
@@ -2295,10 +2185,10 @@ luks_advanced()
                dlg cipher input "LUKS Encryption" "$_lukskey" "-s 512 -c aes-xts-plain64"
                [[ $cipher ]] || return 1
                msg "$_luksadv" "\nCreating encrypted partition: $LUKS_NAME\n\nDevice or volume used: $LUKS_PART\n" 0
-               cryptsetup -q $cipher luksFormat "$LUKS_PART" <<< "$LUKS_PASS" 2>$ERR
-               errshow "cryptsetup -q $cipher luksFormat $LUKS_PART" || return 1
-               cryptsetup open "$LUKS_PART" "$LUKS_NAME" <<< "$LUKS_PASS" 2>$ERR
-               errshow "cryptsetup open $LUKS_PART $LUKS_NAME" || return 1
+               cryptsetup -q $cipher luksFormat "$LUKS_PART" <<< "$LUKS_PASS" 2> "$ERR"
+               errshow "cryptsetup -q $cipher luksFormat $LUKS_PART" || return 1
+               cryptsetup open "$LUKS_PART" "$LUKS_NAME" <<< "$LUKS_PASS" 2> "$ERR"
+               errshow "cryptsetup open $LUKS_PART $LUKS_NAME" || return 1
                luks_show
                return 0
        fi
@@ -2312,28 +2202,21 @@ luks_advanced()
 
 ofn()
 {
-       # does $2 contain $1
        [[ "$2" == *"$1"* ]] && printf "on" || printf "off"
 }
 
 die()
 {
        # cleanup and exit the installer cleanly with exit code $1
-       # when ecode is 127 unmount /run/archiso/bootmnt and reboot
-       local ecode="$1"
+       local e="$1" # when e is 127 unmount /run/archiso/bootmnt and reboot
 
        trap - INT
        tput cnorm
-       if [[ -d $MNT ]] && command cd /; then
-               umount_dir $MNT
-               if (( ecode == 127 )); then
-                       umount_dir /run/archiso/bootmnt
-                       sleep 0.5
-                       reboot -f
-               fi
+       if [[ -d $MNT ]]; then
+               umount_dir "$MNT"
+               (( e == 127 )) && umount_dir /run/archiso/bootmnt && sleep 0.5 && reboot -f
        fi
-       termcol
-       exit "$ecode"
+       exit $e
 }
 
 dlg()
@@ -2346,22 +2229,22 @@ dlg()
 
        shift 4  # shift off args assigned above
 
-       # adjust $n when passed a large list
+       # adjust n when passed a large list
        local l=$((LINES - 20))
        (( ($# / 2) > l )) && n=$l
-       
+
        tput civis
        case "$dlg_t" in
-               menu) dialog --backtitle "$DIST Installer - $SYS - v$VER" --title " $title " --menu "$body" 0 0 $n "$@" 2>"$ANS" || return 1 ;;
-               check) dialog --backtitle "$DIST Installer - $SYS - v$VER" --title " $title " --checklist "$body" 0 0 $n "$@" 2>"$ANS" || return 1 ;;
+               menu) dialog --backtitle "$DIST Installer - $SYS - v$VER" --title " $title " --menu "$body" 0 0 $n "$@" 2> "$ANS" || return 1 ;;
+               check) dialog --backtitle "$DIST Installer - $SYS - v$VER" --title " $title " --checklist "$body" 0 0 $n "$@" 2> "$ANS" || return 1 ;;
                input)
                        tput cnorm
                        local def="$1" # assign default value for input
                        shift
                        if [[ $1 == 'limit' ]]; then
-                               dialog --backtitle "$DIST Installer - $SYS - v$VER" --max-input 63 --title " $title " --inputbox "$body" 0 0 "$def" 2>"$ANS" || return 1
+                               dialog --backtitle "$DIST Installer - $SYS - v$VER" --max-input 63 --title " $title " --inputbox "$body" 0 0 "$def" 2> "$ANS" || return 1
                        else
-                               dialog --backtitle "$DIST Installer - $SYS - v$VER" --title " $title " --inputbox "$body" 0 0 "$def" 2>"$ANS" || return 1
+                               dialog --backtitle "$DIST Installer - $SYS - v$VER" --title " $title " --inputbox "$body" 0 0 "$def" 2> "$ANS" || return 1
                        fi
                        ;;
        esac
@@ -2384,6 +2267,98 @@ msg()
        fi
 }
 
+live()
+{
+       local ses="$1"
+
+       if ! select_keymap; then
+               clear
+               die 0
+       elif ! net_connect; then
+               msg "Not Connected" "\nRunning live requires an active internet connection to install packages.\n\nExiting..\n" 2
+               die 1
+       elif (( $(awk '/MemTotal/ {print int($2 / 1024)}' /proc/meminfo) < 2500)); then
+               msg "Not Enough Memory" "\nLive session requires at least 2.5G of system memory for installing packages.\n\nExiting..\n" 2
+               die 1
+       fi
+
+       clear
+       echo "Sorting mirrorlist"
+       mount /run/archiso/cowspace -o remount,size=2G
+       install_mirrorlist "/etc/pacman.d/mirrorlist"
+       pacman -Syyu --noconfirm || die 1
+       rm -rf /var/cache/pacman/pkg/*
+       pacman -S $BASE_PKGS $AL_BASE_PKGS xorg-xinit --needed --noconfirm || die 1
+       rm -rf /var/cache/pacman/pkg/*
+       case "$ses" in
+               i3-gaps|openbox|fluxbox|bspwm|awesome|xfce4|jwm) pacman -S "$ses" $WM_BASE_PKGS ${WM_EXT[$ses]} --needed --noconfirm || die 1 ;;
+               gnome|plasma|cinnamon) pacman -S "$ses" ${WM_EXT[$ses]} --needed --noconfirm || die 1 ;;
+               dwm) { pacman -S git --needed --noconfirm || die 1; }; install_suckless "/root" nochroot ;;
+       esac
+       rm -rf /var/cache/pacman/pkg/*
+       [[ $VM ]] && dmesg | grep -qi 'vbox' && pacman -S virtualbox-guest-utils virtualbox-guest-modules-arch --needed --noconfirm
+       pacman -Scc --noconfirm
+       rm -rf /var/cache/pacman/pkg/*
+       cp -rfT /etc/skel /root
+       [[ $TEARFREE ]] && install_tearfree_conf "/etc/X11/xorg.conf.d"
+       case "$ses" in
+               plasma|gnome|cinnamon) sed -i '/super/d; /nitrogen/d; /compton/d' /root/.xprofile ;;
+               dwm) sed -i '/super/d; /compton/d' /root/.xprofile ;;
+       esac
+       rm -f /root/.zlogin
+       echo -e "pulseaudio &\n(sleep 1; pamixer --unmute --set-volume 50) &" >> /root/.xprofile
+       sed -i "/exec/ c exec ${WM_SESSIONS[$ses]}" /root/.xinitrc
+       printf "\n%s has been set as the login session in ~/.xinitrc, to start the session simply run\n\n\tstartx\n\n" "${WM_SESSIONS[$ses]}"
+       die 0
+}
+
+usage()
+{
+       cat <<- EOF
+       usage: $1 [-hdl] [session]
+
+       options:
+               -h, --help      print this message and exit
+               -l, --live      install and setup a live session
+               -d, --debug     enable xtrace and log output to $DBG
+               -t, --tearfree  install and setup drivers for nvidia or tearfree xorg configs for other vendors
+                                               if you experience boot issues with this option you can remove
+                                                   /etc/X11/xorg.conf.d/20-*.conf
+
+       sessions:
+               i3-gaps  - A fork of i3wm with more features including gaps
+               openbox  - A lightweight, powerful, and highly configurable stacking wm
+               dwm      - A dynamic WM for X that manages windows in tiled, floating, or monocle layouts
+               awesome  - A customized Awesome WM session created by @elanapan
+               bspwm    - A tiling wm that represents windows as the leaves of a binary tree
+               fluxbox  - A lightweight and highly-configurable window manager
+               gnome    - A desktop environment that aims to be simple and easy to use
+               cinnamon - A desktop environment combining traditional desktop with modern effects
+               plasma   - A kde software project currently comprising a full desktop environment
+               xfce4    - A lightweight and modular desktop environment based on gtk+2/3
+
+       distro name:
+
+               set the DIST environment variable before launching the installer eg.
+
+                       DIST='MyDistro' $1
+
+       root/boot partition:
+
+               set the ROOT_PART and/or BOOT_PART environment variables before launching the installer eg.
+
+                       ROOT_PART='/dev/sda2' BOOT_PART='/dev/sda1' $1
+
+       editor used:
+
+               set the EDITOR environment variable before launching the installer eg.
+
+                       EDITOR='nano' $1
+
+       EOF
+       exit 0
+}
+
 yesno()
 {
        local title="$1" body="$2" yes='Yes' no='No'
@@ -2411,12 +2386,6 @@ debug()
        DEBUG=true
 }
 
-sigint()
-{
-       printf "\n^C caught, cleaning up...\n"
-       die 1
-}
-
 termcol()
 {
        local colors=(
@@ -2445,31 +2414,22 @@ errshow()
 {
        [ $? -eq 0 ] && return 0
 
-       local fatal=0 err=""
-       err="$(sed 's/[^[:print:]]//g; s/\[[0-9\;:]*\?m//g; s/==> //g; s/] ERROR:/]\nERROR:/g' "$ERR")"
-
-       (( $1 == 1 )) && { fatal=1; shift; }
+       local fatal=$1
+       shift # always shift off the fatal level arg
 
-       local txt="\nThe command exited abnormally:\n\n$1\n\n"
-
-       if [[ $err ]]; then
-               txt+="With the following message:\n\n$err\n\n"
-       else
-               txt+="With no error message:\n\n"
-       fi
+       local err=""
+       err="$(sed 's/[^[:print:]]//g; s/\[[0-9\;:]*\?m//g; s/==> //g; s/] ERROR:/]\nERROR:/g' "$ERR")"
+       [[ -z $err ]] && err="no error message was found"
 
-       if (( fatal )); then
-               txt+="Errors at this stage are fatal and the install cannot continue.\n"
-       else
-               txt+="Errors at this stage are non-fatal and can be either fixed or ignored depending on the error.\n"
-       fi
-       msg "Install Error" "$txt"
+       local txt="\nCommand: $1\n\n\n\nError: $err\n\n"
 
        if (( fatal )); then
+               msg "Install Error" "${txt}Errors at this stage are fatal, the install cannot continue.\n"
                [[ -r $DBG && $TERM == 'linux' ]] && less "$DBG"
                die 1
        fi
 
+       msg "Install Error" "${txt}Errors at this stage are non-fatal and may be fixed or ignored depending on the error.\n"
        return 1
 }
 
@@ -2497,14 +2457,18 @@ umount_dir()
 {
        mount | grep -q 'swap' && swapoff -a
        for dir; do
-               [[ -d $dir && "$(mount | grep "on $dir ")" ]] || continue
-               umount "$dir" 2>/dev/null || { sleep 0.5; umount -f "$dir" 2>/dev/null || umount -l "$dir"; }
+               if [[ -d $dir ]] && mount | grep -q "on $dir "; then
+                       if ! umount "$dir" 2> /dev/null; then
+                               sleep 0.5
+                               umount -f "$dir" 2> /dev/null || umount -l "$dir"
+                       fi
+               fi
        done
 }
 
 chk_connect()
 {
-       msg "Network Connect" "\nVerifying network connection\n" 1
+       msg "Network Connect" "\nVerifying network connection\n" 0
        curl -sIN --connect-timeout 5 'https://www.archlinux.org/' | sed '1q' | grep -q '200'
 }
 
@@ -2512,26 +2476,27 @@ net_connect()
 {
        if chk_connect; then
                return 0
-       else
-               if hash nmtui >/dev/null 2>&1; then
-                       tput civis
-                       if [[ $TERM == 'linux' ]]; then
-                               printf "%b" "\e]P1191919" "\e]P4191919"
-                               nmtui-connect
-                               printf "%b" "\e]P1D15355" "\e]P4255a9b"
-                       else
-                               nmtui-connect
-                       fi
-                       chk_connect
+       elif hash nmtui > /dev/null 2>&1; then
+               tput civis
+               if [[ $TERM == 'linux' ]]; then
+                       printf "%b" "\e]P1191919" "\e]P4191919"
+                       nmtui-connect
+                       printf "%b" "\e]P1D15355" "\e]P4255a9b"
                else
-                       return 1
+                       nmtui-connect
                fi
+               chk_connect
+       elif hash wifi-menu > /dev/null 2>&1; then
+               wifi-menu
+               chk_connect
+       else
+               return 1
        fi
 }
 
 no_bg_install()
 {
-       [[ $RSYNC_PID || $MIRROR_PID ]] || return 0
+       [[ $BG_PID ]] || return 0
        msg "Install Running" "\nA background install process is currently running.\n" 2
        return 1
 }
@@ -2561,25 +2526,21 @@ system_identify()
 {
        if [[ $VM ]]; then
                UCODE=''
-       elif grep -q 'AuthenticAMD' /proc/cpuinfo; then
-               UCODE="amd-ucode"
+       # amd-ucode is not needed it's provided by linux-firmware
+       # elif grep -q 'AuthenticAMD' /proc/cpuinfo; then
+       #       UCODE="amd-ucode"
        elif grep -q 'GenuineIntel' /proc/cpuinfo; then
                UCODE="intel-ucode"
        fi
 
-       modprobe -q efivarfs >/dev/null 2>&1
+       modprobe -q efivarfs > /dev/null 2>&1
 
-       _prep="\nOnce a step is finished a step you will be returned here, if the step was successful the cursor will be advanced to the next step.\nIf a step is unsuccessful the cursor will be placed on the step required to advance (when possible).\n\nTo begin the install you should have:\n\n  - A root (/) partition mounted."
        if [[ -d /sys/firmware/efi/efivars ]]; then
                export SYS="UEFI"
                grep -q /sys/firmware/efi/efivars /proc/mounts || mount -t efivarfs efivarfs /sys/firmware/efi/efivars
-               _prep+="\n  - An EFI boot partition mounted."
        else
                export SYS="BIOS"
        fi
-       _prep+="\n\nOnce finished mounting, a portion of the install can be done in the background while you continue configuring the system:\n"
-       _prep+="\n  - Choose the system bootloader.\n  - Create a user and password."
-       _prep+="\n  - Basic system configuration, kernel, shell, login, packages, etc..\n\nOnce you're happy with the choices and the required steps are complete, the main install can be started."
 }
 
 ###############################################################################
@@ -2594,23 +2555,40 @@ if (( UID != 0 )); then
 elif ! grep -qwm 1 'lm' /proc/cpuinfo; then
        msg "Not x86_64 Architecture" "\nThis installer only supports x86_64 architectures.\n\nExiting..\n" 2
        die 1
-elif [[ $1 =~ (-d|--debug) ]]; then
-       debug
 fi
 
 # trap ^C to perform cleanup
-trap sigint INT
+trap 'printf "\n^C\n" && die 1' INT
+
+while getopts ":htl:d" OPT; do
+       case "$OPT" in
+               d) debug ;;
+               h) usage "$0" ;;
+               t) TEARFREE=true ;;
+               l)
+                       if [[ "${!WM_SESSIONS[@]}" =~ $OPTARG ]]; then
+                               live "$OPTARG"
+                       else
+                               echo "error: invalid session for -l, see -h for help"; die 1
+                       fi
+                       ;;
+               \?) echo "error: invalid option: -$OPTARG"; die 1 ;;
+       esac
+done
 
 system_identify
 system_devices
 
-msg "Welcome to the $DIST Installer" "\nThis will help you get $DIST setup on your system.\nHaving previous GNU/Linux and shell experience will be an asset, however we try our best to keep things simple.\n\nIf you are unsure about an option, a default will be listed or\nthe first selected option will usually be the default (excluding language and timezone).\n\n\nMenu Navigation:\n\n - Select items with the arrow keys or the option number.\n - Use [Space] to toggle options and [Enter] to confirm.\n - Switch between buttons using [Tab] or the arrow keys.\n - Use [Page Up] and [Page Down] to jump whole pages\n - Press the highlighted key of an option to select it.\n"
+msg "Welcome to the $DIST Installer" "$_welcome"
 
-select_keymap || { clear; die 0; }
-net_connect || { msg "Not Connected" "\nThis installer requires an active internet connection.\n\nExiting..\n" 2; die 1; }
+if ! select_keymap; then
+       clear; die 0
+elif ! net_connect; then
+       msg "Not Connected" "\nThis installer requires an active internet connection.\n\nExiting..\n" 2
+       die 1
+fi
 
 while :; do
        main
 done
-
 # vim:fdm=marker:fmr={,}