diff --git a/Amelia.sh b/Amelia.sh
index b900ad4..a28c5c1 100644
--- a/Amelia.sh
+++ b/Amelia.sh
@@ -2,7 +2,7 @@
 
 # Amelia Installer
 # Source: https://gitlab.com/prism7/archery
-# Version: 9.9.7
+# Version: 9.9.8
 
         set -euo pipefail
 ###################################################################################################
@@ -1511,13 +1511,11 @@ ${magenta}###${nc}-------------------------------------${magenta}[ ${bwhite}Swap
 
             [2]  Swapfile
 
-            [3]  Zram Swap
-
-            [4]  None "
+            [3]  Zram Swap "
         BLUE "
 
 
-Enter a number: "
+Enter a number ${bwhite}(empty to skip)${blue}: "
         read -r -p "
 ==> " swapmode
         echo
@@ -1551,15 +1549,12 @@ Enter a number: "
 
         ###  Zram Swap has been selected
             " ;;
-        4)
+       "")
             sleep 0.2
             YELLOW "
 
         ###  No Swap will be used "
             skip ;;
-       "")
-            choice
-            return 1 ;;
         *)
             invalid
             return 1 ;;
@@ -3429,7 +3424,6 @@ Enter [y/n]: "
 
     case "${multibooting}" in
         y)
-            uki="n"
             sleep 0.2
             YELLOW "
 
@@ -5872,7 +5866,9 @@ revise() {
     fi
         until dsktp_slct; do : ; done
         until base_devel; do : ; done
+    if [[ ! "${desktop}" =~ ^(11|12)$ ]]; then
         until web_browser; do : ; done
+    fi
     if [[ "${vendor}" != "Virtual Machine" ]]; then
         until print_scan; do : ; done
         until boot_entr; do : ; done
@@ -6512,7 +6508,7 @@ SDBOOT_INSTL
                 stage_fail
             fi
         elif [[ "${xbootloader}" == "yes" ]]; then
-            if arch-chroot /mnt <<-SD_XBOOTLDR_INSTL > "${void}" 2>&1 2> "${log}" ; then
+            if arch-chroot /mnt <<-SDBOOT_XBOOTLDR_INSTL > "${void}" 2>&1 2> "${log}" ; then
 				bootctl --esp-path=/efi --boot-path=/boot install || exit
 				cat <<-LOADER_CFG > ${btldr_esp_mount}/loader/loader.conf || exit
 					default arch.conf
@@ -6527,7 +6523,7 @@ LOADER_CFG
 					options rw ${boot_opts[*]}
 ENTRY_CFG
 				systemctl enable systemd-boot-update || exit
-SD_XBOOTLDR_INSTL
+SDBOOT_XBOOTLDR_INSTL
                 stage_ok
             else
                 stage_fail
@@ -7198,6 +7194,10 @@ GRUB_FALLBACK_SEC_SIGN
 ###################################################################################################
 set_vars() {
 
+    if [[ "${multibooting}" == "y" && "${xbootloader}" == "yes" ]]; then
+        uki="n"
+    fi
+
         # Mkinitcpio Modules/Binaries/Hooks
         MODULES=()
         BINARIES=()