From 158f224ccd7e3446b904ebe81e34493714310c37 Mon Sep 17 00:00:00 2001
From: Jane Doe <ifeelsosecurenow@gmail.com>
Date: Fri, 24 May 2024 20:05:58 +0000
Subject: [PATCH] Reduce visual prompts loading time Hide <command>
 stdout/stderr for improved aesthetics Greatly improve aesthetics in
 'Filesystem Overview' prompt Delete some visual prompts for clarity reasons
 Add 'Warning' prompts when selecting NOT to format partitions, when in
 'Manual Mode' > 'Format Partitions' stage Revert 'Reflector's' output to
 'verbose' for clarity reasons Code indentation

---
 Amelia.sh | 1219 +++++++++++++++++++++++++----------------------------
 1 file changed, 583 insertions(+), 636 deletions(-)

diff --git a/Amelia.sh b/Amelia.sh
index ef08cc0..e1554fb 100644
--- a/Amelia.sh
+++ b/Amelia.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # Amelia Installer
-# Version: 4.7
+# Version: 4.8
 
 set -euo pipefail
 trap 's=$?; echo "$0: Error on line "$LINENO": $BASH_COMMAND"; exit $s' ERR
@@ -52,13 +52,13 @@ WHITEB (){
 # ### PROMPT FUNCTIONS ###
 
 skip (){
-        sleep 0.5
+        sleep 0.3
         YELLOW "
     -->  Skipping.. "
 }
 #----------------------------------------------------------
 reload (){
-        sleep 0.5
+        sleep 0.3
         NC "
 
 
@@ -66,7 +66,7 @@ reload (){
 }
 #----------------------------------------------------------
 invalid (){
-        sleep 0.5
+        sleep 0.3
         RED "
 
         [!] Invalid response "
@@ -74,7 +74,7 @@ invalid (){
 }
 #----------------------------------------------------------
 err_try (){
-        sleep 0.5
+        sleep 0.3
         RED "
 
         [!] Errors occured. Please try again.. "
@@ -82,7 +82,7 @@ err_try (){
 }
 #----------------------------------------------------------
 abort (){
-        sleep 0.5
+        sleep 0.3
         RED "
         [!] Aborting..
 
@@ -92,7 +92,7 @@ abort (){
 }
 #----------------------------------------------------------
 err_abort (){
-        sleep 0.5
+        sleep 0.3
         RED "
 
         [!] Errors occured "
@@ -100,7 +100,7 @@ err_abort (){
 }
 #----------------------------------------------------------
 umount_abort (){
-        sleep 0.5
+        sleep 0.3
         RED "
 
 
@@ -110,7 +110,7 @@ umount_abort (){
 
         [!] Unmounting and Retrying.. "
         reload
-        sleep 0.5
+        sleep 0.3
         NC "
 ___________________________
 
@@ -119,12 +119,12 @@ ${purple}###${nc} Unmount Filesystems ${purple}###${nc}
 
         "
     if umount -R /mnt; then
-        sleep 0.5
+        sleep 0.3
         NC "
 
 ==> [${green}Unmount OK${nc}]"
     else
-        sleep 0.5
+        sleep 0.3
         RED "
 
 
@@ -135,7 +135,7 @@ ${purple}###${nc} Unmount Filesystems ${purple}###${nc}
 }
 #----------------------------------------------------------
 umount_manual (){
-        sleep 0.5
+        sleep 0.3
         RED "
 
 
@@ -145,42 +145,42 @@ umount_manual (){
 
         [!] Unmounting and Retrying.. "
         reload
-        sleep 0.5
+        sleep 0.3
         NC "
 ___________________________
 
 ${purple}###${nc} Unmount Filesystems ${purple}###${nc}
         "
     if umount -R /mnt; then
-        sleep 0.5
+        sleep 0.3
         NC "
 
 
 
 ==> [${green}Unmount OK${nc}]"
     else
-        sleep 0.5
+        sleep 0.3
         RED "
 
 
         [!] Unmounting failed "
         abort
     fi
-        sleep 0.5
+        sleep 0.3
         NC "
 
   --> [Switching to ${green}Manual Mode${nc}]"
 }
 #----------------------------------------------------------
 err_swapfile (){
-        sleep 0.5
+        sleep 0.3
         RED "
         [!] Swapfile creation error "
         abort
 }
 #----------------------------------------------------------
 err_reload (){
-        sleep 0.5
+        sleep 0.3
         RED "
 
         [!] Errors occured "
@@ -188,21 +188,21 @@ err_reload (){
 }
 #----------------------------------------------------------
 choice (){
-        sleep 0.5
+        sleep 0.3
         RED "
         [!] Please make a choice to continue "
         reload
 }
 #----------------------------------------------------------
 ok (){
-        sleep 0.5
+        sleep 0.3
         NC "
 
 ==> [${green}${prompt} OK${nc}] "
 }
 #----------------------------------------------------------
 stage_ok (){
-        sleep 0.5
+        sleep 0.3
         NC "
 
 ==> [${green}${stage_prompt} configuration OK${nc}] 
@@ -211,7 +211,7 @@ stage_ok (){
 }
 #----------------------------------------------------------
 stage_fail (){
-        sleep 0.5
+        sleep 0.3
         RED "
 
         [!] ${stage_prompt} configuration failed "
@@ -220,7 +220,7 @@ stage_fail (){
 }
 #----------------------------------------------------------
 completion (){
-        sleep 0.5
+        sleep 0.3
         CYAN "
 
 
@@ -274,7 +274,7 @@ REDBG "     ----------------------------------------
 ###########################################################################################
 slct_font (){
 
-        sleep 0.5
+        sleep 0.3
         NC "
 ______________________
 
@@ -296,7 +296,7 @@ Enter a number: "
 ==> " fontselect
 
     if [[ "${fontselect}" == "1" ]]; then
-        setfont ter-v20b
+        setfont ter-v18b
     elif [[ "${fontselect}" == "2" ]]; then
         setfont ter-v32b
     else
@@ -310,7 +310,7 @@ uefi_check (){
 
 		bootmode=$(cat /sys/firmware/efi/fw_platform_size)
         local prompt="UEFI ${bootmode}-bit Mode"
-        sleep 0.5
+        sleep 0.3
         NC "
 
 
@@ -331,7 +331,7 @@ ${purple}###${nc} UEFI Mode Verification ${purple}###${nc}
 connection_check (){
 
         local prompt="Internet Connection"
-        sleep 0.5
+        sleep 0.3
         NC "
 _________________________________
 
@@ -350,14 +350,14 @@ ${purple}###${nc} Internet Connection Check ${purple}###${nc}
 upd_clock (){
 
         local prompt="System Clock"
-        sleep 0.5
+        sleep 0.3
         NC "
 ___________________________
 
 ${purple}###${nc} System Clock Update ${purple}###${nc}
 
         "
-        sleep 0.5
+        sleep 0.3
         timedatectl
         ok
 }
@@ -365,7 +365,7 @@ ${purple}###${nc} System Clock Update ${purple}###${nc}
 dtct_microcode (){
 
         local prompt="Microcode"
-        sleep 0.5
+        sleep 0.3
         NC "
 ___________________________
 
@@ -381,7 +381,7 @@ ${purple}###${nc} Microcode Detection ${purple}###${nc}
         microcode="amd-ucode"
         microname="'AMD'"
     fi
-        sleep 0.5
+        sleep 0.3
         YELLOW "
 
         ###  Detection completed, the ""${microname}"" microcode will be installed
@@ -391,7 +391,7 @@ ${purple}###${nc} Microcode Detection ${purple}###${nc}
 ###########################################################################################
 main_menu (){
 
-        sleep 0.5
+        sleep 0.3
         NC "
 _________________
 
@@ -402,7 +402,7 @@ ${purple}###${nc} Main Menu ${purple}###${nc}
         >  Make a selection:
         
         
-        ###  Select [4] for guided navigation 
+        ###  Select ${nc}[4] ${yellow}for${bwhite} ${yellow}guided${nc} ${yellow}navigation 
         "
         NC "
 
@@ -430,7 +430,7 @@ Enter a number: "
         4)
             instl ;;
         "")
-            sleep 0.5
+            sleep 0.3
             RED "
 
         [!] Please select a Submenu "
@@ -444,7 +444,7 @@ Enter a number: "
 ###########################################################################################
 persnl_submn (){
 
-        sleep 0.5
+        sleep 0.3
         NC "
 _______________________
 
@@ -488,7 +488,7 @@ Enter a number: "
 slct_locale (){
 
         local prompt="Locale"
-        sleep 0.5
+        sleep 0.3
         NC "
 ________________________
 
@@ -504,13 +504,13 @@ ${purple}###${nc} Locale Selection ${purple}###${nc}
 
 
 
-Enter your Locale ${bwhite}(empty for 'en_US.UTF-8')${blue}: "
+Enter your Locale ${bwhite}(empty for '${cyan}en_US.UTF-8${bwhite}')${blue}: "
         read -r -p "
 ==> " SETLOCALE
 
     if [[ -z "${SETLOCALE}" ]]; then
         SETLOCALE="en_US.UTF-8"
-        sleep 0.5
+        sleep 0.3
         YELLOW "
 
         ###  'en_US.UTF-8' Locale has been selected
@@ -524,7 +524,7 @@ Enter your Locale ${bwhite}(empty for 'en_US.UTF-8')${blue}: "
         return 1
 
     else
-        sleep 0.5
+        sleep 0.3
         YELLOW "
 
         ###  '${SETLOCALE}' Locale has been selected
@@ -536,7 +536,7 @@ Enter your Locale ${bwhite}(empty for 'en_US.UTF-8')${blue}: "
 slct_kbd (){
 
         local prompt="Keyboard Layout"
-        sleep 0.5
+        sleep 0.3
         NC "
 _________________________________
 
@@ -552,13 +552,13 @@ ${purple}###${nc} Keyboard Layout Selection ${purple}###${nc}
 
 
 
-Enter your keyboard layout ${bwhite}(empty for 'us')${blue}: "
+Enter your keyboard layout ${bwhite}(empty for '${cyan}us${bwhite}')${blue}: "
         read -r -p "
 ==> " SETKBD
 
     if [[ -z "${SETKBD}" ]]; then
         SETKBD="us"
-        sleep 0.5
+        sleep 0.3
         YELLOW "
 
         ###  'us' Keyboard Layout has been selected
@@ -572,7 +572,7 @@ Enter your keyboard layout ${bwhite}(empty for 'us')${blue}: "
         return 1
 
     else
-        sleep 0.5
+        sleep 0.3
         YELLOW "
 
         ###  '${SETKBD}' Keyboard Layout has been selected
@@ -585,7 +585,7 @@ Enter your keyboard layout ${bwhite}(empty for 'us')${blue}: "
 user_setup (){
 
         local prompt="User"
-        sleep 0.5
+        sleep 0.3
         NC "
 __________________
 
@@ -599,14 +599,14 @@ Enter a username: "
         echo
 
     if [[ -z "${USERNAME}" ]]; then
-        sleep 0.5
+        sleep 0.3
         RED "
         [!] Please enter a username to continue "
         reload
         return 1
 
     elif [[ "${USERNAME}" =~ [[:upper:]] ]]; then
-        sleep 0.5
+        sleep 0.3
         RED "
         [!] Uppercase is not allowed. Please try again.. "
         reload
@@ -619,7 +619,7 @@ Enter a password for${nc} ${cyan}${USERNAME}${blue}: "
         echo
 
     if [[ -z "${USERPASSWD}" ]]; then
-        sleep 0.5
+        sleep 0.3
         RED "
         [!] Please enter a password for ${USERNAME} to continue "
         reload
@@ -633,7 +633,7 @@ Re-enter${nc} ${cyan}${USERNAME}'s ${blue}password: "
         echo
 
     if [[ "${USERPASSWD}" != "${USERPASSWD2}" ]]; then
-        sleep 0.5
+        sleep 0.3
         RED "
         [!] Passwords don't match. Please try again.. "
         reload
@@ -645,7 +645,7 @@ Re-enter${nc} ${cyan}${USERNAME}'s ${blue}password: "
 rootuser_setup (){
 
         local prompt="Root User"
-        sleep 0.5
+        sleep 0.3
         NC "
 _______________________
 
@@ -658,7 +658,7 @@ Enter a password for the${nc}${cyan} Root ${blue}user: "
 ==> " ROOTPASSWD
 
     if [[ -z "${ROOTPASSWD}" ]]; then
-        sleep 0.5
+        sleep 0.3
         RED "
 
         [!] Please enter a password for the Root user to continue "
@@ -674,7 +674,7 @@ Re-enter${nc} ${cyan}Root ${blue}user's password: "
         echo
 
     if [[ "${ROOTPASSWD}" != "${ROOTPASSWD2}" ]]; then
-        sleep 0.5
+        sleep 0.3
         RED "
         [!] Passwords don't match. Please try again.. "
         reload
@@ -686,7 +686,7 @@ Re-enter${nc} ${cyan}Root ${blue}user's password: "
 slct_hostname (){
 
         local prompt="Hostname"
-        sleep 0.5
+        sleep 0.3
         NC "
 ______________________
 
@@ -700,14 +700,14 @@ Enter a hostname: "
         echo
 
     if [[ -z "${HOSTNAME}" ]]; then
-        sleep 0.5
+        sleep 0.3
         RED "
         [!] Please enter a hostname to continue "
         reload
         return 1
 
     elif [[ "${HOSTNAME}" =~ [[:upper:]] ]]; then
-        sleep 0.5
+        sleep 0.3
         RED "
         [!] Lowercase is preferred. Please try again.. "
         reload
@@ -718,7 +718,7 @@ Enter a hostname: "
 ###########################################################################################
 sys_submn (){
 
-        sleep 0.5
+        sleep 0.3
         NC "
 ____________________________
 
@@ -781,7 +781,7 @@ Enter a number: "
 slct_krnl (){
 
         local prompt="Kernel"
-        sleep 0.5
+        sleep 0.3
         NC "
 ________________________
 
@@ -824,7 +824,7 @@ Enter a number: "
             kernelname="Linux Zen"
             entrname="Arch Linux Zen" ;;
         "")
-            sleep 0.5
+            sleep 0.3
             RED "
 
         [!] Please select a Kernel "
@@ -835,7 +835,7 @@ Enter a number: "
             return 1 ;;
     esac
 
-        sleep 0.5
+        sleep 0.3
         YELLOW "
 
         ###  The ${kernelname} kernel has been selected
@@ -852,7 +852,7 @@ Enter a number: "
 ask_bootldr (){
 
         local prompt="Bootloader"
-        sleep 0.5
+        sleep 0.3
         NC "
 ____________________________
 
@@ -875,19 +875,19 @@ Enter a number: "
 
     case "${bootloader}" in
         1)
-            sleep 0.5
+            sleep 0.3
             YELLOW "
 
         ###  Systemd-boot has been selected
             " ;;
         2)
-            sleep 0.5
+            sleep 0.3
             YELLOW "
 
         ###  Grub has been selected
             " ;;
         "")
-            sleep 0.5
+            sleep 0.3
             RED "
 
         [!] Please select a Bootloader "
@@ -903,7 +903,7 @@ Enter a number: "
 ask_fs (){
 
         local prompt="Filesystem Setup"
-        sleep 0.5
+        sleep 0.3
         NC "
 ____________________________
 
@@ -931,7 +931,7 @@ Enter a number: "
             fs_mod="ext4"
             fstools="e2fsprogs"
             roottype="/ROOT"
-            sleep 0.5
+            sleep 0.3
             YELLOW "
         ###  ${fsname} has been selected
             " ;;
@@ -941,11 +941,11 @@ Enter a number: "
             fstools="btrfs-progs"
             roottype="/@"
             btrfs_bootopts="rootflags=subvol=@ "
-            sleep 0.5
+            sleep 0.3
             YELLOW "
         ###  ${fsname} has been selected
             "
-            sleep 0.5
+            sleep 0.3
             YELLOW "
 
         >  Label your Btrfs snapshot directory: "
@@ -961,7 +961,7 @@ Enter a name: "
                 return 1
             fi ;;
         "")
-            sleep 0.5
+            sleep 0.3
             RED "
         [!] Please select a Filesystem "
             reload
@@ -976,7 +976,7 @@ Enter a name: "
 ask_swap (){
 
         local prompt="Swap Setup"
-        sleep 0.5
+        sleep 0.3
         NC "
 ______________________
 
@@ -1002,7 +1002,7 @@ Enter a number: "
     case "${swapmode}" in
         1)
             swaptype="swappart"
-            sleep 0.5
+            sleep 0.3
             YELLOW "
 
         ###  Swap Partition has been selected
@@ -1013,7 +1013,7 @@ Enter a number: "
             elif [[ "${fs}" == "2" ]]; then
                 swaptype="swapfile_btrfs"
             fi
-            sleep 0.5
+            sleep 0.3
             YELLOW "
 
         ###  Swapfile has been selected
@@ -1021,14 +1021,14 @@ Enter a number: "
             "
             until set_swapsize; do : ; done ;;
         3)
-            sleep 0.5
+            sleep 0.3
             YELLOW "
 
         ###  No Swap will be used
             "
             skip ;;
         "")
-            sleep 0.5
+            sleep 0.3
             RED "
 
         [!] Please make a selection to continue "
@@ -1051,7 +1051,7 @@ Enter Swapfile size ${bwhite}(in GiB)${blue}: "
         echo
 
     if [[ -z "${swapsize}" ]]; then
-        sleep 0.5
+        sleep 0.3
         RED "
         [!] Please enter a value to continue "
         reload
@@ -1063,7 +1063,7 @@ Enter Swapfile size ${bwhite}(in GiB)${blue}: "
         ok
 
     else
-        sleep 0.5
+        sleep 0.3
         RED "
         [!] Please use only digits as a value "
         reload
@@ -1076,7 +1076,7 @@ Enter Swapfile size ${bwhite}(in GiB)${blue}: "
 dtct_vga (){
 
         local prompt="Graphics"
-        sleep 0.5
+        sleep 0.3
         NC "
 ______________________
 
@@ -1123,7 +1123,7 @@ ${purple}###${nc} Graphics Setup ${purple}###${nc}
             esac
         fi
 
-        sleep 0.5
+        sleep 0.3
         YELLOW "
 
         ###  ${vendor} Graphics detected : ${nc}${vgacard}"
@@ -1156,7 +1156,7 @@ Enter [y/n]: "
 
         if [[ "${vgaconf}" == "y" ]]; then
             if [[ "${vendor}" == "AMD" ]]; then
-                sleep 0.5
+                sleep 0.3
                 YELLOW "
 
         >  Enable 'amdgpu' driver support for: "
@@ -1192,7 +1192,7 @@ Enter a number ${bwhite}(empty to skip)${blue}: "
                     fi
 
             elif [[ "${vendor}" == "Nvidia" ]]; then
-                sleep 0.5
+                sleep 0.3
                 YELLOW "
         >  Select Nvidia architecture: "
                 NC "
@@ -1213,7 +1213,7 @@ Enter a number: "
 ==> [${green}Maxwell+ OK${nc}]
                         "
                     elif [[ "${family}" == "2" ]]; then
-                        sleep 0.5
+                        sleep 0.3
                         YELLOW "
         >  Select Nvidia driver: "
                         NC "
@@ -1286,7 +1286,7 @@ Enter a number: "
                             fi
                         fi
             fi
-            sleep 0.5
+            sleep 0.3
             YELLOW "
 
         ###  ${vendor} Graphics will be automatically configured
@@ -1306,7 +1306,7 @@ Enter a number: "
             vendor="Triple"
         fi
 
-        sleep 0.5
+        sleep 0.3
         YELLOW "
 
         ###  ${vendor} Graphics setup detected, consisting of: "
@@ -1357,7 +1357,7 @@ slct_dsktp (){
 
         local prompt="Desktop Setup"
         custompkgs=""
-        sleep 0.5
+        sleep 0.3
         NC "
 _____________________
 
@@ -1411,7 +1411,7 @@ Enter a number: "
             desktopname="Xfce" ;;
         6)
             desktopname="Cinnamon"
-            sleep 0.5
+            sleep 0.3
             YELLOW "
 
 
@@ -1431,15 +1431,15 @@ Enter [y/n]: "
         case "${console}" in
             y)
                 terminal="gnome-terminal"
-                sleep 0.5
+                sleep 0.3
                 NC "
 
 ==> [${green}Terminal OK${nc}] " ;;
             n)
                 echo
                 skip ;;
-            "")
-                sleep 0.5
+           "")
+                sleep 0.3
                 echo
                 RED "
             [!] Please type 'y' or 'n' to continue "
@@ -1454,7 +1454,7 @@ Enter [y/n]: "
             desktopname="Deepin" ;;
         8)
             desktopname="Budgie"
-            sleep 0.5
+            sleep 0.3
             YELLOW "
 
 
@@ -1474,15 +1474,15 @@ Enter [y/n]: "
         case "${console}" in
             y)
                 terminal="gnome-terminal"
-                sleep 0.5
+                sleep 0.3
                 NC "
 
 ==> [${green}Terminal OK${nc}] " ;;
             n)
                 echo
                 skip ;;
-            "")
-                sleep 0.5
+           "")
+                sleep 0.3
                 echo
                 RED "
             [!] Please type 'y' or 'n' to continue "
@@ -1504,7 +1504,7 @@ Enter [y/n]: "
             until cust_sys; do :; done
             return 0 ;;
        "")
-            sleep 0.5
+            sleep 0.3
             RED "
 
         [!] Please make a selection.. "
@@ -1514,8 +1514,7 @@ Enter [y/n]: "
             invalid
             return 1 ;;
     esac
-
-        sleep 0.5
+        sleep 0.3
         YELLOW "
 
 
@@ -1535,15 +1534,15 @@ Enter [y/n]: "
     case "${dev}" in
         y)
             devel="base-devel"
-            sleep 0.5
+            sleep 0.3
             NC "
 
 ==> [${green}base-devel OK${nc}] " ;;
         n)
             echo
             skip ;;
-        "")
-            sleep 0.5
+       "")
+            sleep 0.3
             echo
             RED "
         [!] Please type 'y' or 'n' to continue "
@@ -1554,7 +1553,7 @@ Enter [y/n]: "
             return 1 ;;
     esac
 
-        sleep 0.5
+        sleep 0.3
         YELLOW "
 
 
@@ -1575,7 +1574,7 @@ Enter [y/n]: "
                 echo
                 skip ;;
             "")
-                sleep 0.5
+                sleep 0.3
                 echo
                 RED "
         [!] Please type 'y' or 'n' to continue "
@@ -1600,7 +1599,7 @@ cust_sys (){
 add_pkgs (){
 
         local prompt="Add Packages"
-        sleep 0.5
+        sleep 0.3
         NC "
 _________________________
 
@@ -1616,7 +1615,7 @@ Enter any additional packages ${bwhite}(space-seperated)${blue}: "
 ==> " custompkgs
 
     if [[ -z "${custompkgs}" ]]; then
-        sleep 0.5
+        sleep 0.3
         RED "
 
         [!] Please enter package(s) to continue "
@@ -1626,7 +1625,7 @@ Enter any additional packages ${bwhite}(space-seperated)${blue}: "
     elif [[ "${custompkgs}" =~ "lightdm" ]]; then
 
         echo
-        sleep 0.5
+        sleep 0.3
         NC "
 _________________________________
 
@@ -1650,20 +1649,20 @@ Enter a number: "
         case "${greeternmbr}" in
             1)
                 greeter="lightdm-gtk-greeter"
-                sleep 0.5
+                sleep 0.3
                 NC "
 
 ==> [${green}Lightdm Gtk Greeter OK${nc}] " ;;
 
             2)
                 greeter="lightdm-slick-greeter"
-                sleep 0.5
+                sleep 0.3
                 NC "
 
 ==> [${green}Lightdm Slick Greeter OK${nc}] " ;;
 
-            "")
-                sleep 0.5
+           "")
+                sleep 0.3
                 echo
                 RED "
         [!] Please make a selection.. "
@@ -1673,7 +1672,6 @@ Enter a number: "
                 invalid
                 return 1 ;;
         esac
-
     else
         ok
     fi
@@ -1682,7 +1680,7 @@ Enter a number: "
 add_services (){
 
         local prompt="Add Services"
-        sleep 0.5
+        sleep 0.3
         NC "
 _________________________
 
@@ -1709,7 +1707,7 @@ Enter services to be enabled ${bwhite}(space-seperated)${blue}: "
 add_prmtrs (){
 
         local prompt="Kernel Parameters"
-        sleep 0.5
+        sleep 0.3
         NC "
 __________________________________
 
@@ -1738,14 +1736,14 @@ boot_entr (){
         local prompt="Boot Entries"
         efi_entr_del="1"
         hypervisor="$(systemd-detect-virt)"
-        sleep 0.5
+        sleep 0.3
         NC "
 _________________________________
 
 ${purple}###${nc} EFI Boot Entries Deletion ${purple}###${nc}
         "
     if [[ "${hypervisor}" != "none" ]]; then
-        sleep 0.5
+        sleep 0.3
         YELLOW "
 
         ###  Virtual Machine detected
@@ -1761,7 +1759,7 @@ ${purple}###${nc} EFI Boot Entries Deletion ${purple}###${nc}
         >  Select an EFI Boot Entry to Delete  ${red}[!] (CAUTION) [!]${yellow}
 
         "
-        sleep 0.5
+        sleep 0.3
         efibootmgr
         boot_entry=" "
 
@@ -1775,17 +1773,15 @@ Enter a${nc} ${cyan}BootOrder${blue} number for Deletion ${bwhite}(empty to skip
         echo
 
             if [[ -n "${boot_entry}" ]]; then
-
                 if [[ "${run_as}" != "root" ]]; then
-                    sleep 0.5
+                    sleep 0.3
                     RED "
         [!] Root Privileges Missing.. "
                     reload
                     until sys_submn; do : ; done
                 fi
-
                 if efibootmgr -b "${boot_entry}" -B; then
-                    sleep 0.5
+                    sleep 0.3
                     NC "
 
 ==> [${green}Entry ${boot_entry} Deleted${nc}] "
@@ -1805,14 +1801,14 @@ wireless_rgd (){
         local prompt="Wireless Regdom Setup"
         wrlss_rgd="1"
         hypervisor="$(systemd-detect-virt)"
-        sleep 0.5
+        sleep 0.3
         NC "
 ________________________________________
 
 ${purple}###${nc} Wireless Regulatory Domain Setup ${purple}###${nc}
         "
     if [[ "${hypervisor}" != "none" ]]; then
-        sleep 0.5
+        sleep 0.3
         YELLOW "
 
         ###  Virtual Machine detected
@@ -1833,7 +1829,7 @@ Enter your Country Code, ie:${nc} ${cyan}US ${bwhite}(empty to skip)${blue}: "
         echo
         skip
     elif [[ "${REGDOM}" =~ [[:lower:]] ]]; then
-        sleep 0.5
+        sleep 0.3
         RED "
 
         [!] Lowercase is not allowed. Please try again.. "
@@ -1844,7 +1840,7 @@ Enter your Country Code, ie:${nc} ${cyan}US ${bwhite}(empty to skip)${blue}: "
         return 1
     else
         wireless_reg="wireless-regdb"
-        sleep 0.5
+        sleep 0.3
         YELLOW "
 
         ###  '${REGDOM}' Country Code has been selected
@@ -1855,7 +1851,7 @@ Enter your Country Code, ie:${nc} ${cyan}US ${bwhite}(empty to skip)${blue}: "
 ###########################################################################################
 dsks_submn (){
 
-        sleep 0.5
+        sleep 0.3
         NC "
 _______________________
 
@@ -1888,7 +1884,7 @@ Enter a number: "
         3)
             until instl_dsk; do : ; done
                 if [[ -z "${fs}" ]]; then
-                    sleep 0.5
+                    sleep 0.3
                     RED "
 
 
@@ -1909,7 +1905,7 @@ Enter a number: "
 gpt_mngr (){
 
         local prompt="Disk GPT"
-        sleep 0.5
+        sleep 0.3
         NC "
 ________________________
 
@@ -1932,29 +1928,29 @@ Enter a disk number ${bwhite}(empty to skip)${blue}: "
 ==> " gpt_dsk_nmbr
 
         if [[ -n "${gpt_dsk_nmbr}" ]]; then
-            gptdrive="$(echo "${disks}" | awk "\$1 == ${gpt_dsk_nmbr} { print \$2}")"
-                if [[ -e "${gptdrive}" ]]; then
-                    if [[ "${run_as}" != "root" ]]; then
-                        sleep 0.5
-                        RED "
+        gptdrive="$(echo "${disks}" | awk "\$1 == ${gpt_dsk_nmbr} { print \$2}")"
+            if [[ -e "${gptdrive}" ]]; then
+                if [[ "${run_as}" != "root" ]]; then
+                    sleep 0.3
+                    RED "
 
         [!] Root Privileges Missing.. "
-                        reload
-                        until dsks_submn; do : ; done
-                    fi
+                    reload
+                    until dsks_submn; do : ; done
+                fi
 
-                    NC "
+                NC "
 ______________________________________________
-                    "
-                    gdisk "${gptdrive}"
-                    sleep 0.5
-                    NC "
+                "
+                gdisk "${gptdrive}"
+                sleep 0.3
+                NC "
 
 ==> [${green}${gptdrive} OK${nc}] "
-                else
-                    invalid
-                    return 1
-                fi
+            else
+                invalid
+                return 1
+            fi
         else
             skip
             ok
@@ -1971,7 +1967,7 @@ ______________________________________________
 disk_mngr (){
 
         local prompt="Disks"
-        sleep 0.5
+        sleep 0.3
         NC "
 _________________________
 
@@ -2005,28 +2001,28 @@ Enter a disk number ${bwhite}(empty to skip)${blue}: "
 ==> " cgdsk_nmbr
 
         if [[ -n "${cgdsk_nmbr}" ]]; then
-            drive="$(echo "${disks}" | awk "\$1 == ${cgdsk_nmbr} {print \$2}")"
-                if [[ -e "${drive}" ]]; then
-                    if [[ "${run_as}" != "root" ]]; then
-                        sleep 0.5
-                        RED "
+        drive="$(echo "${disks}" | awk "\$1 == ${cgdsk_nmbr} {print \$2}")"
+            if [[ -e "${drive}" ]]; then
+                if [[ "${run_as}" != "root" ]]; then
+                    sleep 0.3
+                    RED "
 
         [!] Root Privileges Missing.. "
-                        reload
-                        until dsks_submn; do : ; done
-                    fi
-                    cgdisk "${drive}"
-                    clear
-                    sleep 0.5
-                    NC "
+                    reload
+                    until dsks_submn; do : ; done
+                fi
+                cgdisk "${drive}"
+                clear
+                sleep 0.3
+                NC "
 
 
 ==> [${green}Disk ${drive} OK${nc}] "
-                    return 1
-                else
-                    invalid
-                    return 1
-                fi
+                return 1
+            else
+                invalid
+                return 1
+            fi
         else
             skip
             ok
@@ -2049,7 +2045,7 @@ Enter a disk number ${bwhite}(empty to skip)${blue}: "
 ###########################################################################################
 instl_dsk (){
 
-        sleep 0.5
+        sleep 0.3
         NC "
 ___________________________________
 
@@ -2070,37 +2066,37 @@ Enter a disk number: "
         echo
 
     if [[ -n "${instl_dsk_nmbr}" ]]; then
-        instl_drive="$(echo "${disks}" | awk "\$1 == ${instl_dsk_nmbr} {print \$2}")"
-            if [[ -e "${instl_drive}" ]]; then
-                if [[ "${run_as}" != "root" ]]; then
-                    sleep 0.5
-                    RED "
+    instl_drive="$(echo "${disks}" | awk "\$1 == ${instl_dsk_nmbr} {print \$2}")"
+        if [[ -e "${instl_drive}" ]]; then
+            if [[ "${run_as}" != "root" ]]; then
+                sleep 0.3
+                RED "
         [!] Root Privileges Missing.. "
-                    reload
-                    until dsks_submn; do : ; done
-                fi
-                volumes="$(fdisk -l | grep '^/dev' | cat --number)"
-                rota="$(lsblk "${instl_drive}" --nodeps --noheadings --output=rota | awk "{print \$1}")"
-                if [[ "${rota}" == "0" ]]; then
-                    sbvl_mnt_opts="rw,noatime,compress=zstd:1"
-                    trim="fstrim.timer"
-                else
-                    sbvl_mnt_opts="rw,compress=zstd"
-                fi
-                parttable="$(fdisk -l "${instl_drive}" | grep '^Disklabel type' | awk "{print \$3}")"
-                if [[ "${parttable}" != "gpt" ]]; then
-                    sleep 0.5
-                    RED "
-        [!] No GPT found on selected disk "
-                    reload
-                    until gpt_mngr; do : ; done
-                    return 0
-                fi
-                until sanity_check; do : ; done
-            else
-                invalid
-                return 1
+                reload
+                until dsks_submn; do : ; done
             fi
+            volumes="$(fdisk -l | grep '^/dev' | cat --number)"
+            rota="$(lsblk "${instl_drive}" --nodeps --noheadings --output=rota | awk "{print \$1}")"
+            if [[ "${rota}" == "0" ]]; then
+                sbvl_mnt_opts="rw,noatime,compress=zstd:1"
+                trim="fstrim.timer"
+            else
+                sbvl_mnt_opts="rw,compress=zstd"
+            fi
+            parttable="$(fdisk -l "${instl_drive}" | grep '^Disklabel type' | awk "{print \$3}")"
+            if [[ "${parttable}" != "gpt" ]]; then
+                sleep 0.3
+                RED "
+        [!] No GPT found on selected disk "
+                reload
+                until gpt_mngr; do : ; done
+                return 0
+            fi
+                until sanity_check; do : ; done
+        else
+            invalid
+            return 1
+        fi
     else
         choice
         return 1
@@ -2110,7 +2106,7 @@ Enter a disk number: "
 sanity_check (){
 
         local prompt="Installation Disk"
-        sleep 0.5
+        sleep 0.3
         NC "
 ____________________
 
@@ -2123,13 +2119,13 @@ ${purple}###${nc} Sanity Check ${purple}###${nc}
 
     if [[ ! -e "${root_dev}" && ! -e "${boot_dev}" ]]; then
         sanity="no"
-        sleep 0.5
+        sleep 0.3
         RED "
         [!] Linux x86-64 Root (/) Partition not detected "
-        sleep 0.5
+        sleep 0.3
         RED "
         [!] EFI System Partition not detected "
-        sleep 0.5
+        sleep 0.3
         YELLOW "
 
             -->  Please comply with the Discoverable Partitions Specification to continue..
@@ -2138,7 +2134,7 @@ ${purple}###${nc} Sanity Check ${purple}###${nc}
         ###  Ensure that a Linux x86-64 Root (/) Partition with a valid GUID code ${nc}(8304)${yellow} is present on disk
 
         ###  Ensure that an EFI System Partition with a valid GUID code ${nc}(ef00)${yellow} is present on disk "
-        sleep 0.5
+        sleep 0.3
         RED "
 
         [!] Sanity Check Failed [!] "
@@ -2146,25 +2142,24 @@ ${purple}###${nc} Sanity Check ${purple}###${nc}
         reload
         until disk_mngr; do : ; done
         return 0
-
     elif [[ ! -e "${root_dev}" && -e "${boot_dev}" ]]; then
         sanity="no"
-        sleep 0.5
+        sleep 0.3
         NC "
 
 ==> [EFI System Partition ${green}OK${nc}] "
-        sleep 0.5
+        sleep 0.3
         RED "
 
         [!] Linux x86-64 Root (/) Partition not detected "
-        sleep 0.5
+        sleep 0.3
         YELLOW "
 
             -->  Please comply with the Discoverable Partitions Specification to continue..
 
 
         ###  Ensure that a Linux x86-64 Root (/) Partition with a valid GUID code ${nc}(8304)${yellow} is present on disk "
-        sleep 0.5
+        sleep 0.3
         RED "
 
         [!] Sanity Check Failed [!] "
@@ -2172,25 +2167,24 @@ ${purple}###${nc} Sanity Check ${purple}###${nc}
         reload
         until disk_mngr; do : ; done
         return 0
-
     elif [[ -e "${root_dev}" && ! -e "${boot_dev}" ]]; then
         sanity="no"
-        sleep 0.5
+        sleep 0.3
         NC "
 
 ==> [Linux x86-64 Root (/) ${green}OK${nc}] "
-        sleep 0.5
+        sleep 0.3
         RED "
 
         [!] EFI Partition not detected "
-        sleep 0.5
+        sleep 0.3
         YELLOW "
 
             -->  Please comply with the Discoverable Partitions Specification to continue..
 
 
         ###  Ensure that an EFI System Partition with a valid GUID code ${nc}(ef00)${yellow} is present on disk "
-        sleep 0.5
+        sleep 0.3
         RED "
 
         [!] Sanity Check Failed [!] "
@@ -2198,45 +2192,44 @@ ${purple}###${nc} Sanity Check ${purple}###${nc}
         reload
         until disk_mngr; do : ; done
         return 0
-
     elif [[ -e "${root_dev}" && -e "${boot_dev}" ]]; then
-        sleep 0.5
+        sleep 0.3
         NC "
 
 ==> [Linux x86-64 Root (/) ${green}OK${nc}] "
-        sleep 0.5
+        sleep 0.3
         NC "
 
 ==> [EFI System Partition ${green}OK${nc}] "
 
         if [[ -e "${home_dev}" ]]; then
-            sleep 0.5
+            sleep 0.3
             NC "
 
 ==> [Linux (/Home) ${green}OK${nc}] "
         fi
-
+        
         if [[ "${swapmode}" == "1" ]]; then
             if [[ -e "${swap_dev}" ]]; then
                 sanity="ok"
-                sleep 0.5
+                sleep 0.3
                 NC "
 
 ==> [Linux Swap ${green}OK${nc}] "
             else
                 sanity="no"
-                sleep 0.5
+                sleep 0.3
                 RED "
 
         [!] Linux Swap Partition not detected "
-                sleep 0.5
+                sleep 0.3
                 YELLOW "
 
             -->  Please comply with the Discoverable Partitions Specification to continue..
 
 
         ###  Ensure that a Linux Swap Partition with a valid GUID code ${nc}(8200)${yellow} is present on disk "
-                sleep 0.5
+                sleep 0.3
                 RED "
 
         [!] Sanity Check Failed [!] "
@@ -2248,16 +2241,13 @@ ${purple}###${nc} Sanity Check ${purple}###${nc}
         fi
         sanity="ok"
     fi
-
-
-
     [[ "${sanity}" == "ok" ]] && ok
 }
 ###########################################################################################
 ask_crypt (){
 
         local prompt="Encryption Setup"
-        sleep 0.5
+        sleep 0.3
         NC "
 ________________________
 
@@ -2280,9 +2270,8 @@ ${purple}###${nc} Encryption Setup ${purple}###${nc}
         skip
         ok
         return 0
-
     elif [[ "${encrypt}" == "yes" ]]; then
-        sleep 0.5
+        sleep 0.3
         YELLOW "
         >  Enter a name for your Encrypted ${roottype} Partition: "
         BLUE "
@@ -2294,19 +2283,19 @@ Enter a name: "
         echo
 
         if [[ -z "${ENCROOT}" ]]; then
-            sleep 0.5
+            sleep 0.3
             RED "
         [!] Please enter a name to continue "
             reload
             return 1
         elif [[ "${ENCROOT}" =~ [[:upper:]] ]]; then
-            sleep 0.5
+            sleep 0.3
             RED "
         [!] Uppercase is not allowed. Please try again.. "
             reload
             return 1
         elif [[ -n "${ENCROOT}" ]]; then
-            sleep 0.5
+            sleep 0.3
             NC "
 
 ==> [${green}Encrypted ${roottype} Label OK${nc}] "
@@ -2314,12 +2303,12 @@ Enter a name: "
 
         if [[ -e "${home_dev}" ]]; then
             if [[ "${fs}" == "1" ]]; then
-                sleep 0.5
+                sleep 0.3
                 YELLOW "
 
 
         ###  A /HOME Partition has been detected "
-                sleep 0.5
+                sleep 0.3
                 BLUE "
 
 
@@ -2334,53 +2323,51 @@ Enter a name: "
 ==> " homecrypt
                 echo
 
-                    if [[ "${homecrypt}" == "no" ]]; then
-                        skip
-                        ok
-                    elif [[ "${homecrypt}" == "yes" ]]; then
-                        sleep 0.5
-                        YELLOW "
+                if [[ "${homecrypt}" == "no" ]]; then
+                    skip
+                    ok
+                elif [[ "${homecrypt}" == "yes" ]]; then
+                    sleep 0.3
+                    YELLOW "
         >  Enter a name for your Encrypted Home Partition: "
-                        BLUE "
+                    BLUE "
 
 
 Enter a name: "
-                        read -r -p "
+                    read -r -p "
 ==> " ENCRHOME
-                        echo
+                    echo
 
                         if [[ -z "${ENCRHOME}" ]]; then
-                            sleep 0.5
+                            sleep 0.3
                             RED "
         [!] Please enter a name to continue "
                             reload
                             return 1
                         elif [[ "${ENCRHOME}" =~ [[:upper:]] ]]; then
-                            sleep 0.5
+                            sleep 0.3
                             RED "
         [!] Uppercase is not allowed. Please try again.. "
                             reload
                             return 1
                         elif [[ -n "${ENCRHOME}" ]]; then
-                            sleep 0.5
+                            sleep 0.3
                             NC "
 
 ==> [${green}Encrypted /HOME Label OK${nc}] "
-                            ok
                         fi
-
-                    else
-                        sleep 0.5
-                        RED "
+                else
+                    sleep 0.3
+                    RED "
         [!] Please type 'yes' or 'no' to continue "
-                        reload
-                        return 1
-                    fi
+                    reload
+                    return 1
+                fi
             fi
         fi
         ok
     else
-        sleep 0.5
+        sleep 0.3
         RED "
         [!] Please type 'yes' or 'no' to continue "
         reload
@@ -2393,7 +2380,7 @@ instl (){
         install="yes"
 
         if [[ -z "${SETLOCALE}" ]]; then
-            sleep 0.5
+            sleep 0.3
             RED "
 
 
@@ -2405,7 +2392,7 @@ instl (){
         fi
 
         if [[ -z "${USERNAME}" ]]; then
-            sleep 0.5
+            sleep 0.3
             RED "
 
 
@@ -2419,7 +2406,7 @@ instl (){
         fi
 
         if [[ -z "${kernelnmbr}" ]]; then
-            sleep 0.5
+            sleep 0.3
             RED "
 
 
@@ -2432,7 +2419,7 @@ instl (){
         fi
 
         if [[ -z "${fs}" ]]; then
-            sleep 0.5
+            sleep 0.3
             RED "
 
 
@@ -2445,7 +2432,7 @@ instl (){
         fi
 
         if [[ -z "${vgaconf}" ]]; then
-            sleep 0.5
+            sleep 0.3
             RED "
 
 
@@ -2457,7 +2444,7 @@ instl (){
         fi
 
         if [[ -z "${packages}" ]]; then
-            sleep 0.5
+            sleep 0.3
             RED "
 
 
@@ -2469,7 +2456,7 @@ instl (){
         fi
 
         if [[ -z "${efi_entr_del}" ]]; then
-            sleep 0.5
+            sleep 0.3
             RED "
 
 
@@ -2481,7 +2468,7 @@ instl (){
         fi
 
         if [[ -z "${wrlss_rgd}" ]]; then
-            sleep 0.5
+            sleep 0.3
             RED "
 
 
@@ -2493,7 +2480,7 @@ instl (){
         fi
 
         if [[ "${sanity}" != "ok" ]]; then
-            sleep 0.5
+            sleep 0.3
             RED "
 
 
@@ -2531,13 +2518,13 @@ instl (){
 swappart (){
 
         local prompt="Swap Partition"
-        sleep 0.5
+        sleep 0.3
         NC "
-_________________________________
+____________________________
 
-${purple}###${nc} Swap Partition Activation ${purple}###${nc}
+${purple}###${nc} Swap Partition Setup ${purple}###${nc}
         "
-    if mkswap "${swap_dev}"; then
+    if mkswap "${swap_dev}" > /dev/null 2>&1 ; then
         ok
     else
         err_reload
@@ -2548,7 +2535,7 @@ ${purple}###${nc} Swap Partition Activation ${purple}###${nc}
 ###########################################################################################
 set_mode (){
 
-        sleep 0.5
+        sleep 0.3
         NC "
 ______________________
 
@@ -2575,7 +2562,7 @@ Enter a Mode number: "
             until auto_mode; do : ; done ;;
         2)
             until manual_mode; do : ; done ;;
-        "")
+       "")
             RED "
         [!] Please select a Mode to continue "
             reload
@@ -2585,24 +2572,29 @@ Enter a Mode number: "
             return 1 ;;
     esac
 
-        sleep 0.5
+        sleep 0.3
         NC "
-------------------------------------------------------------------------------------------------------------
+-------------------------------------------------------------------------------------------------------------
 
 
 ==> [${green}Filesystems OK${nc}]
-
-
         "
-        sleep 0.5
-        lsblk -f
+        sleep 0.3
+        YELLOW "
+###---------------------------------------[  FILESYSTEM OVERVIEW  ]---------------------------------------###
+
+               "
+        lsblk -f |GREP_COLORS='mt=01;36' grep -E --color=always 'vfat|$'|GREP_COLORS='mt=01;32' grep -E --color=always 'ext4|$'|GREP_COLORS='mt=01;35' grep -E --color=always 'btrfs|$'|GREP_COLORS='mt=01;31' grep -E --color=always 'ntfs|$'|GREP_COLORS='mt=01;33' grep -E --color=always 'swap|$'
+        YELLOW "
+        
+###-------------------------------------------------------------------------------------------------------###"
         echo
         sleep 1
 }
 ###########################################################################################
 auto_mode (){
 
-        sleep 0.5
+        sleep 0.3
         YELLOW "
 
         >  Auto Mode Selected
@@ -2611,13 +2603,11 @@ auto_mode (){
         sleep 1
 
     if [[ "${fs}" == "1" ]]; then
-        if mkfs.ext4 -F -L Root "${root_dev}"; then
+        if mkfs.ext4 -F -L Root "${root_dev}" > /dev/null 2>&1 ; then
             if mount "${root_dev}" /mnt; then
-                sleep 0.5
+                sleep 0.3
                 NC "
-
 ==> [${green}/ROOT OK${nc}]
-
                 "
             else
                 umount_manual
@@ -2633,7 +2623,7 @@ auto_mode (){
         fi
 #------------------------------------------------------------------------------------------
     elif [[ "${fs}" == "2" ]]; then
-        mkfs.btrfs -f -L ROOT "${root_dev}" &&
+        mkfs.btrfs -f -L Root "${root_dev}" > /dev/null 2>&1 &&
         mount "${root_dev}" /mnt &&
         btrfs subvolume create /mnt/@ &&
         btrfs subvolume create /mnt/@home &&
@@ -2647,18 +2637,17 @@ auto_mode (){
         if umount /mnt; then
         mount -o "${sbvl_mnt_opts}",subvol=@ "${root_dev}" /mnt &&
         if [[ "${swapmode}" == "2" ]]; then
-            mkdir -p /mnt/swap &&
+            mkdir -p /mnt/swap > /dev/null 2>&1 &&
             mount -o rw,nodatacow,subvol=@swap "${root_dev}" /mnt/swap
         fi
-        mkdir -p /mnt/{var/cache,home,var/log,var/tmp,"${snapname}"} &&
+        mkdir -p /mnt/{var/cache,home,var/log,var/tmp,"${snapname}"} > /dev/null 2>&1 &&
         mount -o "${sbvl_mnt_opts}",subvol=@cache "${root_dev}" /mnt/var/cache &&
         mount -o "${sbvl_mnt_opts}",subvol=@home "${root_dev}" /mnt/home &&
         mount -o "${sbvl_mnt_opts}",subvol=@log "${root_dev}" /mnt/var/log &&
         mount -o "${sbvl_mnt_opts}",subvol=@snapshots "${root_dev}" /mnt/"${snapname}" &&
             if mount -o "${sbvl_mnt_opts}",subvol=@tmp "${root_dev}" /mnt/var/tmp; then
-                sleep 0.5
+                sleep 0.3
                 NC "
-
 ==> [${green}/@ OK${nc}]
                 "
             else
@@ -2671,16 +2660,14 @@ auto_mode (){
             err_abort
         fi
     fi
-        sleep 0.5
+        sleep 0.3
 #------------------------------------------------------------------------------------------
-    if mkdir -pv /mnt/boot; then
-        if mkfs.fat -F 32 -n Boot "${boot_dev}"; then
+    if mkdir -pv /mnt/boot > /dev/null 2>&1 ; then
+        if mkfs.fat -F 32 -n Boot "${boot_dev}" > /dev/null 2>&1 ; then
             if mount "${boot_dev}" /mnt/boot; then
-                sleep 0.5
+                sleep 0.3
                 NC "
-
 ==> [${green}/BOOT OK${nc}]
-
                 "
             else
                 umount_manual
@@ -2697,12 +2684,12 @@ auto_mode (){
             until mount_boot; do : ; done
         fi
     else
-        sleep 0.5
+        sleep 0.3
         RED "
         [!] Failed creating /mnt/boot directory "
         abort
     fi
-        sleep 0.5
+        sleep 0.3
 #------------------------------------------------------------------------------------------
     if [[ -e "${home_dev}" && "${fs}" == "1" ]]; then
         BLUE "
@@ -2715,14 +2702,12 @@ auto_mode (){
 ==> " homeform
 
         if [[ "${homeform}" == "y" ]]; then
-            if mkdir -pv /mnt/home; then
-                if mkfs.ext4 -F -L Home "${home_dev}"; then
+            if mkdir -pv /mnt/home > /dev/null 2>&1 ; then
+                if mkfs.ext4 -F -L Home "${home_dev}" > /dev/null 2>&1 ; then
                     if mount "${home_dev}" /mnt/home; then
-                        sleep 0.5
+                        sleep 0.3
                         NC "
-
 ==> [${green}/HOME OK${nc}]
-
                         "
                     else
                         umount_manual
@@ -2741,18 +2726,13 @@ auto_mode (){
                     until mount_home; do : ; done
                 fi
             else
-                sleep 0.5
+                sleep 0.3
                 RED "
         [!] Failed creating /mnt/home directory "
                 abort
             fi
         elif [[ "${homeform}" == "n" ]]; then
             skip
-            NC "
-
-==> [${green}/HOME OK${nc}]
-
-            "
         else
             invalid
             ask_homepart_form
@@ -2768,37 +2748,37 @@ manual_mode (){
             until form_root; do : ; done
             until form_home; do : ; done
             until mount_mnt; do : ; done
-            mkdir -pv /mnt/{boot,home}
+            mkdir -pv /mnt/{boot,home} > /dev/null 2>&1
             until mount_boot; do : ; done
             until mount_home; do : ; done
         elif [[ "${fs}" == "2" ]]; then
             until form_efi; do : ; done
             until form_root; do : ; done
             until mount_mnt; do : ; done
-            mkdir -pv /mnt/boot
+            mkdir -pv /mnt/boot > /dev/null 2>&1
             until mount_boot; do : ; done
         fi
     else
         until form_efi; do : ; done
         until form_root; do : ; done
         until mount_mnt; do : ; done
-        mkdir -pv /mnt/boot
+        mkdir -pv /mnt/boot > /dev/null 2>&1
         until mount_boot; do : ; done
     fi
 }
 ###########################################################################################
 form_efi (){
 
-        sleep 0.5
+        sleep 0.3
         NC "
 _____________________________
 
 ${purple}###${nc} Format Boot Partition ${purple}###${nc}
         "
-            form_boot_nmbr=" "
+        form_boot_nmbr=" "
 
     while [[ -n "${form_boot_nmbr}" ]]; do
-
+    
         YELLOW "
 
         >  Select a partition to format as EFI [/BOOT] "
@@ -2813,39 +2793,36 @@ Enter a partition number ${bwhite}(empty to skip and proceed)${blue}: "
 ==> " form_boot_nmbr
 
     if [[ -n "${form_boot_nmbr}" ]]; then
-        bootpart="$(echo "${volumes}" | awk "\$1 == ${form_boot_nmbr} { print \$2}")"
-            if [[ -e "${bootpart}" ]]; then
-                if mkfs.fat -F 32 -n Boot "${bootpart}"; then
-                    sleep 0.5
-                    NC "
+    bootpart="$(echo "${volumes}" | awk "\$1 == ${form_boot_nmbr} { print \$2}")"
+        if [[ -e "${bootpart}" ]]; then
+            if mkfs.fat -F 32 -n Boot "${bootpart}" > /dev/null 2>&1 ; then
+                sleep 0.3
+                NC "
 
-
-==> [${green}Format /BOOT OK${nc}] "
-                    sleep 0.5
-                    NC "
-
-
-==> [${green}Label /BOOT OK${nc}] "
-                    return 0
-                else
-                    umount_abort
-                    until disk_mngr; do : ; done
-                    until form_efi; do : ; done
-                    return 0
-                fi
+==> [${green}Format & Label /BOOT OK${nc}] "
+                return 0
             else
-                invalid
-                return 1
+                umount_abort
+                until disk_mngr; do : ; done
+                until form_efi; do : ; done
+                return 0
             fi
+        else
+            invalid
+            return 1
+        fi
     fi
-
-    done
+        RED "
+        
+        [!] Warning: Partition NOT Formatted ! 
+        "
         skip
+    done
 }
 ###########################################################################################
 form_root (){
 
-        sleep 0.5
+        sleep 0.3
         NC "
 _____________________________
 
@@ -2869,59 +2846,58 @@ Enter a partition number ${bwhite}(empty to skip and proceed)${blue}: "
 ==> " form_root_nmbr
 
     if [[ -n "${form_root_nmbr}" ]]; then
-        rootpart="$(echo "${volumes}" | awk "\$1 == ${form_root_nmbr} { print \$2}")"
-            if [[ -e "${rootpart}" ]]; then
+    rootpart="$(echo "${volumes}" | awk "\$1 == ${form_root_nmbr} { print \$2}")"
+        if [[ -e "${rootpart}" ]]; then
 #------------------------------------------------------------------------------------------
-                if [[ "${fs}" == "1" ]]; then
-                    if mkfs.ext4 -F "${rootpart}"; then
-                        sleep 0.5
+            if [[ "${fs}" == "1" ]]; then
+                if mkfs.ext4 -F "${rootpart}" > /dev/null 2>&1 ; then
+                    sleep 0.3
+                    NC "
+
+
+==> [${green}Format ${roottype} OK${nc}] "
+                else
+                    umount_abort
+                    until disk_mngr; do : ; done
+                    until form_root; do : ; done
+                    return 0
+                fi
+#------------------------------------------------------------------------------------------
+            elif [[ "${fs}" == "2" ]]; then
+                if mkfs.btrfs -f "${rootpart}" > /dev/null 2>&1 ; then
+                    mount "${rootpart}" /mnt &&
+                    btrfs subvolume create /mnt/@ &&
+                    btrfs subvolume create /mnt/@home &&
+                    btrfs subvolume create /mnt/@cache &&
+                    btrfs subvolume create /mnt/@log &&
+                    btrfs subvolume create /mnt/@tmp &&
+                    btrfs subvolume create /mnt/@snapshots &&
+                    if [[ "${swapmode}" == "2" ]]; then
+                        btrfs subvolume create /mnt/@swap
+                    fi
+                    if umount /mnt; then
+                        sleep 0.3
                         NC "
 
 
 ==> [${green}Format ${roottype} OK${nc}] "
                     else
-                        umount_abort
-                        until disk_mngr; do : ; done
-                        until form_root; do : ; done
-                        return 0
-
-                    fi
-#------------------------------------------------------------------------------------------
-                elif [[ "${fs}" == "2" ]]; then
-                    if mkfs.btrfs -f "${rootpart}"; then
-                        mount "${rootpart}" /mnt &&
-                        btrfs subvolume create /mnt/@ &&
-                        btrfs subvolume create /mnt/@home &&
-                        btrfs subvolume create /mnt/@cache &&
-                        btrfs subvolume create /mnt/@log &&
-                        btrfs subvolume create /mnt/@tmp &&
-                        btrfs subvolume create /mnt/@snapshots &&
-                        if [[ "${swapmode}" == "2" ]]; then
-                            btrfs subvolume create /mnt/@swap
-                        fi
-                        if umount /mnt; then
-                            sleep 0.5
-                            NC "
-
-
-==> [${green}Format ${roottype} OK${nc}] "
-                        else
-                            sleep 0.5
-                            RED "
+                        sleep 0.3
+                        RED "
         [!] Unmounting failed "
-                            abort
-                        fi
-                    else
-                        reload
-                        until disk_mngr; do : ; done
-                        until form_root; do : ; done
-                        return 0
+                        abort
                     fi
+                else
+                    reload
+                    until disk_mngr; do : ; done
+                    until form_root; do : ; done
+                    return 0
                 fi
-            else
-                invalid
-                return 1
             fi
+        else
+            invalid
+            return 1
+        fi
 
             YELLOW "
 
@@ -2933,51 +2909,45 @@ Enter a name ${bwhite}(empty to skip and proceed)${blue}: "
             read -r -p "
 ==> " rootpartname
 
-            if [[ -n "${rootpartname}" ]]; then
-
-                if [[ "${fs}" == "1" ]]; then
-                		if e2label "${rootpart}" "${rootpartname}"; then
-                    		sleep 0.5
-                    		NC "
+        if [[ -n "${rootpartname}" ]]; then
+            if [[ "${fs}" == "1" ]]; then
+            	if e2label "${rootpart}" "${rootpartname}" > /dev/null 2>&1 ; then
+            		sleep 0.3
+            		NC "
 
 ==> [${green}Label ${roottype} OK${nc}] "
-                    		return 0
-                		else
-                    		err_try
-                    		until disk_mngr; do : ; done
-                    		until form_root; do : ; done
-                    		return 0
-                		fi
-                    	
-                elif [[ "${fs}" == "2" ]]; then
-                    mount "${rootpart}" /mnt &&
-                    btrfs filesystem label /mnt "${rootpartname}" &&
-                    if umount /mnt; then
-                    		sleep 0.5
-                    		NC "
+            		return 0
+            	else
+            		err_try
+            		until disk_mngr; do : ; done
+            		until form_root; do : ; done
+            		return 0
+            	fi
+            elif [[ "${fs}" == "2" ]]; then
+                mount "${rootpart}" /mnt &&
+                btrfs filesystem label /mnt "${rootpartname}" > /dev/null 2>&1 &&
+                if umount /mnt; then
+            		sleep 0.3
+            		NC "
 
 ==> [${green}Label ${roottype} OK${nc}] "
-                    		return 0
-                		else
-                    		err_try
-                    		until disk_mngr; do : ; done
-                    		until form_root; do : ; done
-                    		return 0
-                		fi
+                	return 0
+                else
+                	err_try
+                	until disk_mngr; do : ; done
+                	until form_root; do : ; done
+                	return 0
                 fi
             fi
-
-            skip
-            NC "
-
-==> [${green}Label ${roottype} OK${nc}] "
-            return 0
-    else
+        fi
+        skip
+        return 0
+    else
+        RED "
+        
+        [!] Warning: Partition NOT Formatted ! 
+        "
         skip
-        NC "
-
-
-==> [${green}Format ${roottype} OK${nc}] "
         return 0
     fi
   	done
@@ -3000,10 +2970,10 @@ ask_homepart_form (){
         echo
 
         if [[ "${homeform}" == "y" ]]; then
-            if mkdir -pv /mnt/home; then
-                if mkfs.ext4 -F -L Home "${home_dev}"; then
+            if mkdir -pv /mnt/home > /dev/null 2>&1 ; then
+                if mkfs.ext4 -F -L Home "${home_dev}" > /dev/null 2>&1 ; then
                     if mount "${home_dev}" /mnt/home; then
-                        sleep 0.5
+                        sleep 0.3
                         NC "
 
 ==> [${green}/HOME OK${nc}]
@@ -3026,18 +2996,14 @@ ask_homepart_form (){
                     until mount_home; do : ; done
                 fi
             else
-                sleep 0.5
+                sleep 0.3
                 RED "
         [!] Failed creating /mnt/home directory "
                 abort
             fi
         elif [[ "${homeform}" == "n" ]]; then
             skip
-            NC "
-
-==> [${green}/HOME OK${nc}]
-
-            "
+            return 0
         else
             invalid
             ask_homepart_form
@@ -3047,7 +3013,7 @@ ask_homepart_form (){
 ###########################################################################################
 form_home (){
 
-        sleep 0.5
+        sleep 0.3
         NC "
 _____________________________
 
@@ -3072,24 +3038,24 @@ Enter a partition number ${bwhite}(empty to skip and proceed)${blue}: "
 ==> " form_home_nmbr
 
         if [[ -n "${form_home_nmbr}" ]]; then
-            homepart="$(echo "${volumes}" | awk "\$1 == ${form_home_nmbr} { print \$2}")"
-                if [[ -e "${homepart}" ]]; then
-                    if mkfs.ext4 -F "${homepart}"; then
-                        sleep 0.5
-                        NC "
+        homepart="$(echo "${volumes}" | awk "\$1 == ${form_home_nmbr} { print \$2}")"
+            if [[ -e "${homepart}" ]]; then
+                if mkfs.ext4 -F "${homepart}" > /dev/null 2>&1 ; then
+                    sleep 0.3
+                    NC "
 
 
 ==> [${green}Format /HOME OK${nc}] "
-                    else
-                        umount_abort
-                        until disk_mngr; do : ; done
-                        until form_home; do : ; done
-                        return 0
-                    fi
                 else
-                    invalid
-                    return 1
+                    umount_abort
+                    until disk_mngr; do : ; done
+                    until form_home; do : ; done
+                    return 0
                 fi
+            else
+                invalid
+                return 1
+            fi
 
             YELLOW "
 
@@ -3103,7 +3069,7 @@ Enter a name ${bwhite}(empty to skip and proceed)${blue}: "
 
             if [[ -n "${homepartname}" ]]; then
                 if e2label "${homepart}" "${homepartname}"; then
-                    sleep 0.5
+                    sleep 0.3
                     NC "
 
 ==> [${green}Label /HOME OK${nc}] "
@@ -3115,19 +3081,10 @@ Enter a name ${bwhite}(empty to skip and proceed)${blue}: "
                     return 0
                 fi
             fi
-
             skip
-            NC "
-
-
-==> [${green}Label /HOME OK${nc}] "
             return 0
         else
             skip
-            NC "
-
-
-==> [${green}Format /HOME OK${nc}] "
             return 0
         fi
     done
@@ -3135,7 +3092,8 @@ Enter a name ${bwhite}(empty to skip and proceed)${blue}: "
 ###########################################################################################
 mount_mnt (){
 
-        sleep 0.5
+        local prompt="Mount ${roottype} "
+        sleep 0.3
         NC "
 ____________________________
 
@@ -3157,52 +3115,44 @@ Enter your${nc} ${cyan}${roottype}${blue} partition number: "
         echo
 
     if [[ -n "${mntroot_nmbr}" ]]; then
-        rootpart="$(echo "${volumes}" | awk "\$1 == ${mntroot_nmbr} { print \$2}")"
-            if [[ -e "${rootpart}" ]]; then
+    rootpart="$(echo "${volumes}" | awk "\$1 == ${mntroot_nmbr} { print \$2}")"
+        if [[ -e "${rootpart}" ]]; then
 #------------------------------------------------------------------------------------------
-                if [[ "${fs}" == "1" ]]; then
-                		if mount "${rootpart}" /mnt; then
-                    		sleep 0.5
-                    		NC "
-
-==> [${green}Mount ${roottype} OK${nc}]
-
-                    		"
-                    		return 0
-                		else
-                    		umount_abort
-                    		until mount_mnt; do : ; done
-                		fi                		
+            if [[ "${fs}" == "1" ]]; then
+                if mount "${rootpart}" /mnt; then
+                    sleep 0.3
+                    ok
+                    return 0
+                else
+                    umount_abort
+                    until mount_mnt; do : ; done
+                fi                		
 #------------------------------------------------------------------------------------------
-                elif [[ "${fs}" == "2" ]]; then
-                    mount -o "${sbvl_mnt_opts}",subvol=@ "${rootpart}" /mnt &&
-                    if [[ "${swapmode}" == "2" ]]; then
-                        mkdir -p /mnt/swap &&
-                        mount -o rw,nodatacow,subvol=@swap "${rootpart}" /mnt/swap
-                    fi
-                    mkdir -p /mnt/{var/cache,home,var/log,var/tmp,"${snapname}"} &&
-                    mount -o "${sbvl_mnt_opts}",subvol=@cache "${rootpart}" /mnt/var/cache &&
-                    mount -o "${sbvl_mnt_opts}",subvol=@home "${rootpart}" /mnt/home &&
-                    mount -o "${sbvl_mnt_opts}",subvol=@log "${rootpart}" /mnt/var/log &&
-                    mount -o "${sbvl_mnt_opts}",subvol=@snapshots "${rootpart}" /mnt/"${snapname}" &&
-                    		if mount -o "${sbvl_mnt_opts}",subvol=@tmp "${rootpart}" /mnt/var/tmp; then
-                    				sleep 0.5
-                    				NC "
-
-==> [${green}Mount ${roottype} OK${nc}]
-
-                    				"
-                    				return 0
-                				else
-                    				umount_abort
-                    				until mount_mnt; do : ; done
-                				fi
+            elif [[ "${fs}" == "2" ]]; then
+                mount -o "${sbvl_mnt_opts}",subvol=@ "${rootpart}" /mnt &&
+                if [[ "${swapmode}" == "2" ]]; then
+                    mkdir -p /mnt/swap > /dev/null 2>&1 &&
+                    mount -o rw,nodatacow,subvol=@swap "${rootpart}" /mnt/swap
+                fi
+                mkdir -p /mnt/{var/cache,home,var/log,var/tmp,"${snapname}"} > /dev/null 2>&1 &&
+                mount -o "${sbvl_mnt_opts}",subvol=@cache "${rootpart}" /mnt/var/cache &&
+                mount -o "${sbvl_mnt_opts}",subvol=@home "${rootpart}" /mnt/home &&
+                mount -o "${sbvl_mnt_opts}",subvol=@log "${rootpart}" /mnt/var/log &&
+                mount -o "${sbvl_mnt_opts}",subvol=@snapshots "${rootpart}" /mnt/"${snapname}" &&
+                if mount -o "${sbvl_mnt_opts}",subvol=@tmp "${rootpart}" /mnt/var/tmp; then
+                    sleep 0.3
+                    ok
+                	return 0
+                else
+                	umount_abort
+                	until mount_mnt; do : ; done
                 fi
-#------------------------------------------------------------------------------------------
-            else
-                invalid
-                return 1
             fi
+#------------------------------------------------------------------------------------------
+        else
+            invalid
+            return 1
+        fi
     else
         choice
         return 1
@@ -3212,7 +3162,7 @@ Enter your${nc} ${cyan}${roottype}${blue} partition number: "
 mount_boot (){
 
         local prompt="Mount /BOOT"
-        sleep 0.5
+        sleep 0.3
         NC "
 ____________________________
 
@@ -3234,20 +3184,20 @@ Enter your${nc} ${cyan}/BOOT${blue} partition number: "
         echo
 
     if [[ -n "${mntboot_nmbr}" ]]; then
-        bootpart="$(echo "${volumes}" | awk "\$1 == ${mntboot_nmbr} { print \$2}")"
-            if [[ -e "${bootpart}" ]]; then
-                if mount "${bootpart}" /mnt/boot; then
-                    ok
-                    return 0
-                else
-                    umount_abort
-                    until mount_mnt; do : ; done
-                    until mount_boot; do : ; done
-                fi
+    bootpart="$(echo "${volumes}" | awk "\$1 == ${mntboot_nmbr} { print \$2}")"
+        if [[ -e "${bootpart}" ]]; then
+            if mount "${bootpart}" /mnt/boot; then
+                ok
+                return 0
             else
-                invalid
-                return 1
+                umount_abort
+                until mount_mnt; do : ; done
+                until mount_boot; do : ; done
             fi
+        else
+            invalid
+            return 1
+        fi
     else
         choice
         return 1
@@ -3257,7 +3207,7 @@ Enter your${nc} ${cyan}/BOOT${blue} partition number: "
 mount_home (){
 
         local prompt="Mount /HOME"
-        sleep 0.5
+        sleep 0.3
         NC "
 ____________________________
 
@@ -3279,21 +3229,21 @@ Enter your${nc} ${cyan}/HOME${blue} partition number: "
         echo
 
     if [[ -n "${mnthome_nmbr}" ]]; then
-        homepart="$(echo "${volumes}" | awk "\$1 == ${mnthome_nmbr} { print \$2}")"
-            if [[ -e "${homepart}" ]]; then
-                if mount "${homepart}" /mnt/home; then
-                    ok
-                    return 0
-                else
-                    umount_abort
-                    until mount_mnt; do : ; done
-                    until mount_boot; do : ; done
-                    until mount_home; do : ; done
-                fi
+    homepart="$(echo "${volumes}" | awk "\$1 == ${mnthome_nmbr} { print \$2}")"
+        if [[ -e "${homepart}" ]]; then
+            if mount "${homepart}" /mnt/home; then
+                ok
+                return 0
             else
-                invalid
-                return 1
+                umount_abort
+                until mount_mnt; do : ; done
+                until mount_boot; do : ; done
+                until mount_home; do : ; done
             fi
+        else
+            invalid
+            return 1
+        fi
     else
         choice
         return 1
@@ -3303,7 +3253,7 @@ Enter your${nc} ${cyan}/HOME${blue} partition number: "
 confirm_status (){
 
         local prompt="System Ready"
-        sleep 0.5
+        sleep 0.3
         NC "
 ___________________________________
 
@@ -3335,26 +3285,26 @@ ${purple}###${nc} Confirm Installation Status ${purple}###${nc}
         chroot_conf
     elif [[ "${agree}" == "no" ]]; then
         reload
-        sleep 0.5
+        sleep 0.3
         NC "
 ___________________________
 
 ${purple}###${nc} Unmount Filesystems ${purple}###${nc}
         "
         if umount -R /mnt; then
-            sleep 0.5
+            sleep 0.3
             NC "
 
 ==> [${green}Unmount OK${nc}]"
         else
-            sleep 0.5
+            sleep 0.3
             RED "
         [!] Unmounting failed "
             abort
         fi
         revise
     else
-        sleep 0.5
+        sleep 0.3
         RED "
         [!] Please type 'yes' or 'no' to continue.. "
         reload
@@ -3365,7 +3315,6 @@ ${purple}###${nc} Unmount Filesystems ${purple}###${nc}
 revise (){
 
         revision="yes"
-
         until slct_krnl; do : ; done
         until ask_bootldr; do : ; done
         until ask_fs; do : ; done
@@ -3387,7 +3336,7 @@ revise (){
 sec_erase (){
 
         local prompt="Secure Erasure"
-        sleep 0.5
+        sleep 0.3
         NC "
 ___________________________
 
@@ -3414,27 +3363,27 @@ Enter a disk number ${bwhite}(empty to skip)${blue}: "
         echo
 
         if [[ -n "${erase_dsk_nmbr}" ]]; then
-            erasedrive="$(echo "${disks}" | awk "\$1 == ${erase_dsk_nmbr} {print \$2}")"
-                if [[ -e "${erasedrive}" ]]; then
-                    cryptsetup open --type plain -d /dev/urandom "${erasedrive}" temp &&
-                    dd if=/dev/zero of=/dev/mapper/temp status=progress bs=1M oflag=direct &&
-                    cryptsetup close temp
-                    sleep 0.5
-                    NC "
+        erasedrive="$(echo "${disks}" | awk "\$1 == ${erase_dsk_nmbr} {print \$2}")"
+            if [[ -e "${erasedrive}" ]]; then
+                cryptsetup open --type plain -d /dev/urandom "${erasedrive}" temp &&
+                dd if=/dev/zero of=/dev/mapper/temp status=progress bs=1M oflag=direct &&
+                cryptsetup close temp
+                sleep 0.3
+                NC "
 
 
 ==> [${green}Drive ${erasedrive} Erased OK${nc}] "
 
-                    sleep 1
-                    NC "
+                sleep 1
+                NC "
 
 ==> [${green}Rebooting${nc}] "
-                    sleep 3
-                    reboot
-                else
-                    invalid
-                    return 1
-                fi
+                sleep 3
+                reboot
+            else
+                invalid
+                return 1
+            fi
         else
             skip
             ok
@@ -3444,7 +3393,7 @@ Enter a disk number ${bwhite}(empty to skip)${blue}: "
 ###########################################################################################
 luks (){
 
-        sleep 0.5
+        sleep 0.3
         NC "
 _______________________
 
@@ -3460,56 +3409,56 @@ ${purple}###${nc} LUKS Encryption ${purple}###${nc}
             cryptsetup luksOpen "${root_dev}" "${ENCROOT}"
         fi
 #------------------------------------------------------------------------------------------
-            if [[ "${fs}" == "1" ]]; then
-                if mkfs.ext4 -F -L ROOT /dev/mapper/"${ENCROOT}"; then
-                    if mount /dev/mapper/"${ENCROOT}" /mnt; then
-                        sleep 0.5
-                        NC "
-
-==> [${green}Encrypted Root OK${nc}]
-
-                        "
-                    else
-                        err_abort
-                    fi
-                else
-                    err_abort
-                fi
-#------------------------------------------------------------------------------------------
-            elif [[ "${fs}" == "2" ]]; then
-                if mkfs.btrfs -L ROOT /dev/mapper/"${ENCROOT}"; then
-                    mount /dev/mapper/"${ENCROOT}" /mnt &&
-                    btrfs subvolume create /mnt/@ &&
-                    btrfs subvolume create /mnt/@home &&
-                    btrfs subvolume create /mnt/@cache &&
-                    btrfs subvolume create /mnt/@log &&
-                    btrfs subvolume create /mnt/@snapshots &&
-                    btrfs subvolume create /mnt/@tmp &&
-                    if [[ "${swapmode}" == "2" ]]; then
-                        btrfs subvolume create /mnt/@swap
-                    fi
-                    umount /mnt &&
-                    mount -o "${sbvl_mnt_opts}",subvol=@ /dev/mapper/"${ENCROOT}" /mnt &&
-                    if [[ "${swapmode}" == "2" ]]; then
-                        mkdir -p /mnt/swap &&
-                        mount -o rw,nodatacow,subvol=@swap /dev/mapper/"${ENCROOT}" /mnt/swap
-                    fi
-                    mkdir -p /mnt/{var/cache,home,var/log,var/tmp,"${snapname}"} &&
-                    mount -o "${sbvl_mnt_opts}",subvol=@cache /dev/mapper/"${ENCROOT}" /mnt/var/cache &&
-                    mount -o "${sbvl_mnt_opts}",subvol=@home /dev/mapper/"${ENCROOT}" /mnt/home &&
-                    mount -o "${sbvl_mnt_opts}",subvol=@log /dev/mapper/"${ENCROOT}" /mnt/var/log &&
-                    mount -o "${sbvl_mnt_opts}",subvol=@snapshots /dev/mapper/"${ENCROOT}" /mnt/"${snapname}" &&
-                    mount -o "${sbvl_mnt_opts}",subvol=@tmp /dev/mapper/"${ENCROOT}" /mnt/var/tmp &&
-                    sleep 0.5
+        if [[ "${fs}" == "1" ]]; then
+            if mkfs.ext4 -F -L Root /dev/mapper/"${ENCROOT}" > /dev/null 2>&1 ; then
+                if mount /dev/mapper/"${ENCROOT}" /mnt; then
+                    sleep 0.3
                     NC "
 
-==> [${green}Encrypted /@ OK${nc}]
+==> [${green}Encrypted Root OK${nc}]
 
                     "
                 else
                     err_abort
                 fi
+            else
+                err_abort
             fi
+#------------------------------------------------------------------------------------------
+        elif [[ "${fs}" == "2" ]]; then
+            if mkfs.btrfs -L Root /dev/mapper/"${ENCROOT}" > /dev/null 2>&1 ; then
+                mount /dev/mapper/"${ENCROOT}" /mnt &&
+                btrfs subvolume create /mnt/@ &&
+                btrfs subvolume create /mnt/@home &&
+                btrfs subvolume create /mnt/@cache &&
+                btrfs subvolume create /mnt/@log &&
+                btrfs subvolume create /mnt/@snapshots &&
+                btrfs subvolume create /mnt/@tmp &&
+                if [[ "${swapmode}" == "2" ]]; then
+                    btrfs subvolume create /mnt/@swap
+                fi
+                umount /mnt &&
+                mount -o "${sbvl_mnt_opts}",subvol=@ /dev/mapper/"${ENCROOT}" /mnt &&
+                if [[ "${swapmode}" == "2" ]]; then
+                    mkdir -p /mnt/swap > /dev/null 2>&1 &&
+                    mount -o rw,nodatacow,subvol=@swap /dev/mapper/"${ENCROOT}" /mnt/swap
+                fi
+                mkdir -p /mnt/{var/cache,home,var/log,var/tmp,"${snapname}"} > /dev/null 2>&1 &&
+                mount -o "${sbvl_mnt_opts}",subvol=@cache /dev/mapper/"${ENCROOT}" /mnt/var/cache &&
+                mount -o "${sbvl_mnt_opts}",subvol=@home /dev/mapper/"${ENCROOT}" /mnt/home &&
+                mount -o "${sbvl_mnt_opts}",subvol=@log /dev/mapper/"${ENCROOT}" /mnt/var/log &&
+                mount -o "${sbvl_mnt_opts}",subvol=@snapshots /dev/mapper/"${ENCROOT}" /mnt/"${snapname}" &&
+                mount -o "${sbvl_mnt_opts}",subvol=@tmp /dev/mapper/"${ENCROOT}" /mnt/var/tmp &&
+                sleep 0.3
+                NC "
+
+==> [${green}Encrypted /@ OK${nc}]
+
+                "
+            else
+                err_abort
+            fi
+        fi
     else
         umount_abort
         until luks; do : ; done
@@ -3525,16 +3474,16 @@ ${purple}###${nc} LUKS Encryption ${purple}###${nc}
             else
                 cryptsetup luksOpen "${swap_dev}" swap
             fi
-                if mkswap /dev/mapper/swap; then
-                    sleep 0.5
-                    NC "
+            if mkswap /dev/mapper/swap > /dev/null 2>&1 ; then
+                sleep 0.3
+                NC "
 
 ==> [${green}Encrypted Swap OK${nc}]
 
-                    "
-                else
-                    err_abort
-                fi
+                "
+            else
+                err_abort
+            fi
         else
             umount_abort
             until luks; do : ; done
@@ -3551,10 +3500,10 @@ ${purple}###${nc} LUKS Encryption ${purple}###${nc}
             else
                 cryptsetup luksOpen "${home_dev}" "${ENCRHOME}"
             fi
-            mkfs.ext4 -F -L HOME /dev/mapper/"${ENCRHOME}" &&
-            mkdir -p /mnt/home &&
+            mkfs.ext4 -F -L Home /dev/mapper/"${ENCRHOME}" > /dev/null 2>&1 &&
+            mkdir -p /mnt/home > /dev/null 2>&1 &&
                 if mount /dev/mapper/"${ENCRHOME}" /mnt/home; then
-                    sleep 0.5
+                    sleep 0.3
                     NC "
 
 ==> [${green}Encrypted Home OK${nc}]
@@ -3567,7 +3516,6 @@ ${purple}###${nc} LUKS Encryption ${purple}###${nc}
             umount_abort
             until luks; do : ; done
         fi
-
     elif [[ "${homecrypt}" == "no" ]]; then
         BLUE "
 
@@ -3579,68 +3527,67 @@ ${purple}###${nc} LUKS Encryption ${purple}###${nc}
         echo
 
         if [[ "${homeform}" == "y" ]]; then
-            if mkfs.ext4 -F -L HOME "${home_dev}"; then
-                mkdir -p /mnt/home &&
-                    if mount "${home_dev}" /mnt/home; then
-                        sleep 0.5
-                        NC "
+            if mkfs.ext4 -F -L Home "${home_dev}" > /dev/null 2>&1 ; then
+                mkdir -p /mnt/home > /dev/null 2>&1 &&
+                if mount "${home_dev}" /mnt/home; then
+                    sleep 0.3
+                    NC "
 
 
 ==> [${green}/Home OK${nc}]
-                        "
-                    else
-                        err_abort
-                    fi
+                    "
+                else
+                    err_abort
+                fi
             else
                 umount_abort
                 until luks; do : ; done
             fi
-
         elif [[ "${homeform}" == "n" ]]; then
             skip
-            NC "
-
-
-==> [${green}/Home OK${nc}]
-            "
         else
             invalid
             return 1
         fi
     fi
 #------------------------------------------------------------------------------------------
-    if mkfs.fat -F 32 -n BOOT "${boot_dev}"; then
-        mkdir -pv /mnt/boot &&
-            if mount "${boot_dev}" /mnt/boot; then
-                sleep 0.5
-                NC "
+    if mkfs.fat -F 32 -n Boot "${boot_dev}" > /dev/null 2>&1 ; then
+        mkdir -pv /mnt/boot > /dev/null 2>&1 &&
+        if mount "${boot_dev}" /mnt/boot; then
+            sleep 0.3
+            NC "
 
 ==> [${green}/BOOT OK${nc}]
-                "
-            else
-                umount_abort
-                until luks; do : ; done
-            fi
+            "
+        else
+            umount_abort
+            until luks; do : ; done
+        fi
     else
         umount_abort
         until luks; do : ; done
     fi
-        sleep 0.5
+        sleep 0.3
         NC "
 
 
 ==> [${green}Encryption OK${nc}]"
-        sleep 0.5
+        sleep 0.3
         NC "
 ------------------------------------------------------------------------------------------------------------------
 
 
 ==> [${green}Filesystems OK${nc}]
-
-
         "
-        sleep 0.5
-        lsblk -f
+        sleep 0.3
+        YELLOW "
+###---------------------------------------[  FILESYSTEM OVERVIEW  ]---------------------------------------###
+
+               "
+        lsblk -f |GREP_COLORS='mt=01;36' grep -E --color=always 'vfat|$'|GREP_COLORS='mt=01;32' grep -E --color=always 'ext4|$'|GREP_COLORS='mt=01;35' grep -E --color=always 'btrfs|$'|GREP_COLORS='mt=01;31' grep -E --color=always 'ntfs|$'|GREP_COLORS='mt=01;33' grep -E --color=always 'swap|$'
+        YELLOW "
+        
+###-------------------------------------------------------------------------------------------------------###"
         echo
         sleep 1
 }   
@@ -3648,7 +3595,7 @@ ${purple}###${nc} LUKS Encryption ${purple}###${nc}
 opt_pcmn (){
 
         local prompt="PacMan"
-        sleep 0.5
+        sleep 0.3
         NC "
 _______________________
 
@@ -3670,7 +3617,7 @@ Enter country name or country code ${bwhite}(Empty for Defaults)${blue}: "
         echo
 
     if [[ -z "${COUNTRY}" ]] ; then
-        sleep 0.5
+        sleep 0.3
         NC "
 
 ==> [${green}Default Mirrors OK${nc}] "
@@ -3682,8 +3629,8 @@ Enter country name or country code ${bwhite}(Empty for Defaults)${blue}: "
     elif [[ -n "${COUNTRY}" ]] ; then
         NC "
         "
-        if reflector --verbose -c "${COUNTRY}" -l 10 -p https -f 10 --sort rate --save /etc/pacman.d/mirrorlist 2>/dev/null; then
-            sleep 0.5
+        if reflector --verbose -c "${COUNTRY}" -l 10 -p https -f 10 --sort rate --save /etc/pacman.d/mirrorlist ; then
+            sleep 0.3
             NC "
 
 ==> [${green}${COUNTRY}'s Mirrors OK${nc}] "
@@ -3708,7 +3655,7 @@ Enter [y/n]: "
         echo
 
     if [[ "${parallel}" == "y" ]]; then
-        sleep 0.5
+        sleep 0.3
         YELLOW "
 
         >  Select number of Parallel Downloads [2-5] "
@@ -3734,7 +3681,7 @@ Enter a number: "
                 invalid
                 return 1
             fi
-                sleep 0.5
+                sleep 0.3
                 NC "
 
 ==> [${green}${parallelnmbr} Parallel Downloads OK${nc}]"
@@ -3742,7 +3689,7 @@ Enter a number: "
     elif [[ "${parallel}" == "n" ]]; then
         skip
     elif [[ -z "${parallel}" ]]; then
-        sleep 0.5
+        sleep 0.3
         RED "
         [!] Please make a selection to continue "
         reload
@@ -3757,7 +3704,7 @@ Enter a number: "
 pacstrap_system (){
 
         local prompt="${desktopname}"
-        sleep 0.5
+        sleep 0.3
         NC "
 _______________________
 
@@ -3860,7 +3807,7 @@ ${purple}###${nc} Pacstrap System ${purple}###${nc}
     if pacstrap -K -i /mnt ${deskpkgs}; then
             if [[ "${fs}" == "2"  ]]; then
                 if genfstab -t PARTUUID /mnt >> /mnt/etc/fstab ; then
-                    sleep 0.5
+                    sleep 0.3
                     NC "
 
 ==> [${green}Fstab OK${nc}] "
@@ -3879,21 +3826,21 @@ ${purple}###${nc} Pacstrap System ${purple}###${nc}
 swapfile (){
 
         local prompt="Swapfile"
-        sleep 0.5
+        sleep 0.3
         NC "
 ___________________________
 
 ${purple}###${nc} Swapfile Activation ${purple}###${nc}
         "
     if arch-chroot /mnt <<-SWAP ; then
-        mkswap -U clear --size ${swapsize}G --file /swapfile
+        mkswap -U clear --size ${swapsize}G --file /swapfile > /dev/null 2>&1
 SWAP
 	    if cat >> /mnt/etc/fstab <<-FSTAB ; then
 	        /swapfile none swap defaults 0 0
 FSTAB
 	        ok
         else
-            sleep 0.5
+            sleep 0.3
             RED "
         [!] Populating the 'fstab' file has failed "
             abort
@@ -3906,21 +3853,21 @@ FSTAB
 swapfile_btrfs (){
 
         local prompt="Btfrs Swapfile"
-        sleep 0.5
+        sleep 0.3
         NC "
 _________________________________
 
 ${purple}###${nc} Btrfs Swapfile Activation ${purple}###${nc}
         "
     if arch-chroot /mnt <<-SWAP ; then
-        btrfs filesystem mkswapfile --size ${swapsize}g --uuid clear /swap/swapfile
+        btrfs filesystem mkswapfile --size ${swapsize}g --uuid clear /swap/swapfile > /dev/null 2>&1
 SWAP
         if cat >> /mnt/etc/fstab <<-FSTAB ; then
             /swap/swapfile none swap defaults 0 0
 FSTAB
             ok
         else
-            sleep 0.5
+            sleep 0.3
             RED "
         [!] Populating the 'fstab' file has failed "
             abort
@@ -3933,7 +3880,7 @@ FSTAB
 wireless_regdom (){
 
         local prompt="Wireless-Regdom"
-        sleep 0.5
+        sleep 0.3
         NC "
 __________________________________
 
@@ -3951,7 +3898,7 @@ REGDOM
 ###########################################################################################
 chroot_conf (){
 
-        sleep 0.5
+        sleep 0.3
         NC "
 _________________________________
 
@@ -4244,7 +4191,7 @@ NVIDIAGRUB
             if [[ "${kernelnmbr}" == "1" ]] || [[ "${kernelnmbr}" == "2" && "${family}" == "1" ]] || [[ "${kernelnmbr}" == "2" && "${family}" == "2" && "${nvdriver}" == "2" ]]; then
                 stage_prompt="Nvidia-Hook"
                 if arch-chroot /mnt <<-NVIDIAHOOK ; then
-                    mkdir -p /etc/pacman.d/hooks/ &&
+                    mkdir -p /etc/pacman.d/hooks/ > /dev/null 2>&1 &&
                     echo "
                     [Trigger]
                     Operation=Install
@@ -4389,11 +4336,11 @@ NRG
                 return permission[action.id];
             }
             });' | tee /etc/polkit-1/rules.d/99-udisks2.rules &&
-            mkdir -p /etc/systemd/journald.conf.d &&
+            mkdir -p /etc/systemd/journald.conf.d > /dev/null 2>&1 &&
             echo "
             [Journal]
             SystemMaxUse=100M" | tee /etc/systemd/journald.conf.d/00-journald.conf &&
-            mkdir -p /etc/systemd/user.conf.d &&
+            mkdir -p /etc/systemd/user.conf.d > /dev/null 2>&1 &&
             echo "
             [Manager]
             DefaultTimeoutStopSec=5s
@@ -4434,7 +4381,7 @@ OPTIMIZED_CONF
             if [[ "${kernelnmbr}" == "1" ]] || [[ "${kernelnmbr}" == "2" && "${family}" == "1" ]] || [[ "${kernelnmbr}" == "2" && "${family}" == "2" && "${nvdriver}" == "2" ]]; then
                 stage_prompt="Nvidia-Hook"
                 if arch-chroot /mnt <<-NVIDIAHOOK ; then
-                    mkdir -p /etc/pacman.d/hooks/ &&
+                    mkdir -p /etc/pacman.d/hooks/ > /dev/null 2>&1 &&
                     echo "
                     [Trigger]
                     Operation=Install
@@ -4585,7 +4532,7 @@ NVIDIAGRUB
             if [[ "${kernelnmbr}" == "1" ]] || [[ "${kernelnmbr}" == "2" && "${family}" == "1" ]] || [[ "${kernelnmbr}" == "2" && "${family}" == "2" && "${nvdriver}" == "2" ]]; then
                 stage_prompt="Nvidia-Hook"
             	if arch-chroot /mnt <<-NVIDIAHOOK ; then
-                    mkdir -p /etc/pacman.d/hooks/ &&
+                    mkdir -p /etc/pacman.d/hooks/ > /dev/null 2>&1 &&
                     echo "
                     [Trigger]
                     Operation=Install