diff --git a/Amelia.sh b/Amelia.sh
index 305d57e..7ddbdf3 100644
--- a/Amelia.sh
+++ b/Amelia.sh
@@ -2,7 +2,7 @@
 
 # Amelia Installer
 # Source: https://gitlab.com/prism7/archery
-# Version: 1.0.7
+# Version: 1.0.8
 
         set -euo pipefail
 ###################################################################################################
@@ -212,17 +212,16 @@ ok() {
 }
 stage_ok() {
         sleep 0.2
-        NC "
-==> [${green}${stage_prompt} OK${nc}]
-        "
+        GREEN "
+        >>  ${nc}${stage_prompt} ${green}OK "
         sleep 0.3
 }
 stage_fail() {
         sleep 0.2
-        NC "
+        RED "
+        >>  ${bwhite}${stage_prompt} ${nc}${red}FAILED${cyan}
 
-==> [${red}[!] ${yellow}${stage_prompt} ${red}FAILED!${nc}]
-        "
+            >>  ${nc}Check ${yellowl}Amelia.log ${nc}for errors "
         failure
 }
 completion_err() {
@@ -3792,6 +3791,7 @@ partitioner() {
         local prompt="Disk ${sgdrive} Preset-Partitioned"
     fi
 
+        local stage_prompt="Partitioning Drive"
         wipefs -af "${sgdrive}" > "${void}" 2> "${log}" || stage_fail
     if [[ "${gptok}" != "yes" ]]; then
         sgdisk -Z "${sgdrive}" > "${void}" 2> "${log}" || stage_fail
@@ -4556,6 +4556,10 @@ ${multi_swap}
                 reload
                 until manual_part; do : ; done
                 return 0
+            elif [[ "${multibooting}" == "n" ]]; then
+                reload
+                until auto_part; do : ; done
+                return 0
             elif [[ "${multibooting}" == "y" ]]; then
                 reload
                 until manual_part; do : ; done
@@ -4655,12 +4659,12 @@ ${magenta}###${nc}------------------------------------${magenta}[ ${bwhite}Encry
         "
         BLUE "
 
-        >  Utilize LUKS encryption ? "
+        >  Utilize LUKS encryption for your system ? "
         NC "
 
             * Type '${cyan}no${nc}' to proceed without encryption
 
-            * Type '${cyan}yes${nc}' to encrypt your ${LuksParts}
+            * Type '${cyan}yes${nc}' to encrypt your ${yellowl}${LuksParts}
         "
         read -r -p "
 ==> " encrypt
@@ -4885,13 +4889,14 @@ instl() {
 ###################################################################################################
 swappart() {
 
+        local prompt="Swap Partition Creation"
         local stage_prompt="Swap Partition Creation"
         sleep 0.2
         NC "
 ${magenta}###${nc}----------------------------------${magenta}[ ${bwhite}Swap  Partition Setup${nc} ${magenta}]${nc}----------------------------------${magenta}###
         "
     if mkswap "${swap_dev}" > "${void}" 2> "${log}" ; then
-        stage_ok
+        ok
     else
         stage_fail
     fi
@@ -4920,11 +4925,10 @@ set_mode() {
         return 0
     fi
 
-    if [[ "${swapmode}" != "1" ]]; then
-        line2
-    fi
         sleep 0.2
         NC "
+
+
 ${magenta}###${nc}-------------------------------------${magenta}[ ${bwhite}Mode  Selection${nc} ${magenta}]${nc}-------------------------------------${magenta}###
         "
         YELLOW "
@@ -5849,12 +5853,11 @@ revise() {
 ###################################################################################################
 sec_erase() {
 
-    if [[ "${swapmode}" != "1" ]]; then
-        line2
-    fi
         local prompt="Secure Erasure"
         sleep 0.2
         NC "
+
+
 ${magenta}###${nc}-----------------------------------${magenta}[ ${bwhite}Secure Disk Erasure${nc} ${magenta}]${nc}-----------------------------------${magenta}###
         "
         erase_dsk_nmbr=" "
@@ -6344,6 +6347,7 @@ FSTAB_SBVL_MNT_OPTS
 ###################################################################################################
 swapfile() {
 
+        local prompt="Swapfile Creation"
         local stage_prompt="Swapfile Creation"
         sleep 0.2
         NC "
@@ -6357,7 +6361,7 @@ SWAPFILE
         cat >> /mnt/etc/fstab <<-FSTAB || err_abort
 			/swapfile none swap defaults 0 0
 FSTAB
-        stage_ok
+        ok
     else
         stage_fail
     fi
@@ -6365,6 +6369,7 @@ FSTAB
 ###################################################################################################
 swapfile_btrfs() {
 
+        local prompt="Btrfs Swapfile Creation"
         local stage_prompt="Btrfs Swapfile Creation"
         sleep 0.2
         NC "
@@ -6378,7 +6383,7 @@ SWAPFILE_BTRFS
         cat >> /mnt/etc/fstab <<-FSTAB || err_abort
 			/swap/swapfile none swap defaults 0 0
 FSTAB
-        stage_ok
+        ok
     else
         stage_fail
     fi
@@ -6386,16 +6391,17 @@ FSTAB
 ###################################################################################################
 set_wireless_regdom() {
 
+        local prompt="Wireless Regulatory Domain"
         local stage_prompt="Wireless Regulatory Domain"
-    if [[ "${swapmode}" != "2" ]]; then
-        line2
-    fi
         sleep 0.2
         NC "
+
+
 ${magenta}###${nc}--------------------------${magenta}[ ${bwhite}Setting Up Wireless Regulatory Domain${nc} ${magenta}]${nc}--------------------------${magenta}###
         "
     if sed -i "/^#WIRELESS_REGDOM=\"${REGDOM}\"/s/^#//" /mnt/etc/conf.d/wireless-regdom ; then
-        stage_ok
+        ok
+        line2
     else
         stage_fail
     fi
@@ -7457,7 +7463,7 @@ CUSTOM_SRVC
         run_as="$(whoami)"
         tty="$(tty)"
         void="/dev/null"
-        log="Amelia_log.txt"
+        log="Amelia.log"
         disks="$(lsblk --nodeps --paths --noheadings --output=name,size,model | cat --number)"
         trg=""
         vars=(LOCALESET="" SETLOCALE="" lcl_slct="" USERNAME="" kernelnmbr="" fs="" gfxcount="" gfxcard="" intelcount="" intelcards="" nvidiacount="" nvidiacards="" amdcount="" amdcards="" vendor="" vendors="" desktop="" terminal="" efi_entr_del="" sanity="" install="" bootldr_pkgs="" devel="" REGDOM="" gfx_bootopts="" btrfs_bootopts="" trim="" swapmode="" homecrypt="" greeter="" greeternmbr="" cust_bootopts="" vmpkgs="" vm_services="" perf_stream="" displaymanager="" wireless_reg="" bitness="" bootloader="" gfx_slct="" espsize="" autoroot="" autoesp="" autoxboot="" autohome="" autoswap="" rootprt="" espprt="" xbootprt="" homeprt="" swapprt="" partok="" instl_drive="" sgdsk_nmbr="" part_mode="" preset="" capacity="" cap_gib="" rootsize="" sgdrive="" cgdrive="" smartpart="" presetpart="" prcnt="" roottype="" stage_prompt="" zram="" xbootloader="" multibooting="" hypervisor="" mkinitcpio_mods="" mkinitcpio_bins="" uki="" ukify="" cng_espmnt="" sep_home="" encr_swap_bootopts="" uefimode="" luks_encrypt="" nrg_plc="" multilib="" nvname="" nogsp="" luks_root="" luks_swap="" luks_home="" installation="" kill_watchdog="" oomd="" setrescue="" lowlat="" dev="" web="" web_pkg="" web_aur="" web_slct="" printer="" print_pkgs="" shellnmbr="" shell="" shellname="" shellname2="" shell_pkgs="" genoptm="" set_optm="" ask_param="" desk_setup="" set_optm_slct="" irqbalance="" thermald="" rngd="" rtkit="" tlp="" CRYPTPASS="" CRYPTPASS2="" askoptm="" gptslct="" gptok="" gptabort="" nvdprop="" nowarning="" efiname="" path="" hometype="" homeform="")