diff --git a/Amelia.sh b/Amelia.sh
index 3a355d7..78e7923 100644
--- a/Amelia.sh
+++ b/Amelia.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # Amelia Installer
-# Version: 3.2
+# Version: 3.3
 
 ###########################################################################################
 # ### COLOR FUNCTIONS ###
@@ -3648,63 +3648,83 @@ ${purple}###${nc} Pacstrap System ${purple}###${nc}
     fi
 
     if [[ "${vendor}" == "Virtual Machine" ]]; then
-        basepkgs="base sudo "${kernel}" nano vim "${microcode}" "${fstools}" "${bootldr_pkgs}" "${devel}""
+        basepkgs="base nano sudo vim "${bootldr_pkgs}" "${fstools}" "${kernel}" "${microcode}" "${devel}""
     elif [[ "${vendor}" == "Nvidia" ]]; then
-        basepkgs="base sudo "${kernel}" "${kernel}"-headers linux-firmware nano vim "${microcode}" "${wireless_reg}" "${vgapkgs}" "${fstools}" "${bootldr_pkgs}" "${devel}""
+        basepkgs="base linux-firmware nano sudo vim "${bootldr_pkgs}" "${fstools}" "${kernel}" "${kernel}"-headers "${microcode}" "${vgapkgs}" "${wireless_reg}" "${devel}""
     else
-        basepkgs="base sudo "${kernel}" linux-firmware nano vim "${microcode}" "${wireless_reg}" "${vgapkgs}" "${fstools}" "${bootldr_pkgs}" "${devel}""
+        basepkgs="base linux-firmware nano sudo vim "${bootldr_pkgs}" "${fstools}" "${kernel}" "${microcode}" "${vgapkgs}" "${wireless_reg}" "${devel}""
     fi
 
     case "${packages}" in
-        1)
+
+        1)  # NOTE: Plasma Desktop:
+
             deskpkgs=""${basepkgs}" plasma konsole"
             displaymanager="sddm"
             bluetooth="bluetooth"
             network="NetworkManager" ;;
 
-        2)  # NOTE: Plasma & Systemd-boot & Wayland (System Optimized) Packages:
+        2)  # NOTE: Plasma & Systemd-boot & Wayland Desktop:
 
             deskpkgs=""${basepkgs}" alsa-firmware alsa-utils arj ark bluedevil breeze-gtk ccache cups-pdf cups-pk-helper dolphin-plugins e2fsprogs efibootmgr exfatprogs fdkaac ffmpegthumbs firefox git glibc-locales gst-libav gst-plugin-libcamera gst-plugin-msdk gst-plugin-opencv gst-plugin-pipewire gst-plugin-qmlgl gst-plugin-va gst-plugin-wpe gst-plugins-ugly gstreamer-vaapi htop icoutils ipp-usb kamera kamoso kate kcalc kde-gtk-config kdegraphics-mobipocket kdegraphics-thumbnailers kdenetwork-filesharing kdeplasma-addons kdesdk-kio kdesdk-thumbnailers kdialog keditbookmarks kget kimageformats5 kinit kio-admin kio-gdrive kio-zeroconf kompare konsole kscreen kvantum kwrited latte-dock libappimage libfido2 libktorrent libmms libnfs libva-utils lirc lrzip lua52-socket lzop mac man-db man-pages mesa-demos mesa-utils nano-syntax-highlighting nss-mdns ntfs-3g okular opus-tools p7zip packagekit-qt5 pacman-contrib partitionmanager pdfmixtool pigz pipewire-alsa pipewire-pulse pkgstats plasma-browser-integration plasma-desktop plasma-disks plasma-firewall plasma-nm plasma-pa plasma-wayland-protocols plasma-wayland-session power-profiles-daemon powerdevil powerline powerline-fonts print-manager python-pyqt5 python-reportlab qbittorrent qt5-feedback qt5-imageformats qt5-virtualkeyboard qt5-xmlpatterns realtime-privileges reflector rng-tools sddm-kcm skanlite sof-firmware sox spectacle sshfs system-config-printer terminus-font timidity++ ttf-ubuntu-font-family ufw-extras unarchiver unrar unzip usb_modeswitch usbutils vdpauinfo vlc vorbis-tools vorbisgain wget xdg-desktop-portal xdg-desktop-portal-gtk xdg-desktop-portal-kde xsane zip zsh zsh-autosuggestions zsh-completions zsh-syntax-highlighting "${nrg_plc}"" ;;
 
-        3)
+        3)  # NOTE: Gnome Desktop:
+
             deskpkgs=""${basepkgs}" gnome networkmanager"
             displaymanager="gdm"
             bluetooth="bluetooth"
             network="NetworkManager" ;;
-        4)
+
+        4)  # NOTE: Xfce Desktop:
+
             deskpkgs=""${basepkgs}" xfce4 lightdm-slick-greeter network-manager-applet"
             displaymanager="lightdm"
             network="NetworkManager" ;;
-        5)
-            deskpkgs=""${basepkgs}" cinnamon blueberry lightdm-slick-greeter system-config-printer gnome-keyring ${terminal}"
+
+        5)  # NOTE: Cinnamon Desktop:
+
+            deskpkgs=""${basepkgs}" cinnamon blueberry lightdm-slick-greeter system-config-printer gnome-keyring "${terminal}""
             displaymanager="lightdm"
             bluetooth="bluetooth"
             network="NetworkManager" ;;
-        6)
+
+        6)  # NOTE: Deepin Desktop:
+
             deskpkgs=""${basepkgs}" deepin deepin-terminal deepin-kwin networkmanager"
             displaymanager="lightdm"
             network="NetworkManager" ;;
-        7)
-            deskpkgs=""${basepkgs}" budgie lightdm-gtk-greeter arc-gtk-theme papirus-icon-theme network-manager-applet ${terminal}"
+
+        7)  # NOTE: Budgie Desktop:
+
+            deskpkgs=""${basepkgs}" budgie lightdm-gtk-greeter arc-gtk-theme papirus-icon-theme network-manager-applet "${terminal}""
             displaymanager="lightdm"
             network="NetworkManager" ;;
-        8)
+
+        8)  # NOTE: Lxqt Desktop:
+
             deskpkgs=""${basepkgs}" lxqt breeze-icons network-manager-applet sddm xscreensaver"
             displaymanager="sddm"
             network="NetworkManager" ;;
-        9)
+
+        9)  # NOTE: Mate Desktop:
+
             deskpkgs=""${basepkgs}" mate mate-terminal mate-media blueman network-manager-applet mate-power-manager system-config-printer lightdm-slick-greeter"
             displaymanager="lightdm"
             bluetooth="bluetooth"
             network="NetworkManager" ;;
-        10)
+
+        10) # NOTE: Base System:
+
             deskpkgs=""${basepkgs}" networkmanager"
             network="NetworkManager" ;;
-#------------------------------------------------------------------------------------------
-        11)
 
-        deskpkgs="base sudo "${kernel}" "${microcode}" "${vgapkgs}" "${fstools}" "${bootldr_pkgs}" "${wireless_reg}" "${custompkgs}"" ;;
-#------------------------------------------------------------------------------------------
+        11) # NOTE: Custom System:
+
+            if [[ "${vendor}" == "Virtual Machine" ]]; then
+                deskpkgs="base sudo "${bootldr_pkgs}" "${custompkgs}" "${fstools}" "${kernel}" "${microcode}""
+            else
+                deskpkgs="base linux-firmware sudo "${bootldr_pkgs}" "${custompkgs}" "${fstools}" "${kernel}" "${microcode}" "${vgapkgs}" "${wireless_reg}""
+            fi ;;
     esac
 
     if pacstrap -K -i /mnt ${deskpkgs}; then
@@ -3922,7 +3942,7 @@ ${purple}###${nc} Chroot & Configure System ${purple}###${nc}
 
 #------------------------------------------------------------------------------------------
 
-    # NOTE: Vanilla Desktops Basic Configuration
+    # NOTE: All Vanilla Desktops Basic Configuration:
 
     if [[ "${packages}" =~ ^(1|3|4|5|6|7|8|9|10)$ ]]; then
 
@@ -4039,7 +4059,7 @@ NVIDIAHOOK
 
 #------------------------------------------------------------------------------------------
 
-    # NOTE: Plasma & Systemd-boot & Wayland (System Optimized) Extended Configuration
+    # NOTE: Plasma & Systemd-boot & Wayland Optimized System Configuration:
 
     if [[ "${packages}" == "2" ]]; then
 
@@ -4219,7 +4239,7 @@ NVIDIAHOOK
 
 #------------------------------------------------------------------------------------------
 
-    # NOTE: Custom System Basic Configuration (Add any extra/your own configuration below, if so desired )
+    # NOTE: Custom System Configuration (Add any extra configuration below):
 
     if [[ "${packages}" == "11" ]]; then
         arch-chroot /mnt <<-CUSTOM
@@ -4268,10 +4288,11 @@ BOOTCTL
             -e "/^#GRUB_DISABLE_OS_PROBER=false/s/^#//" \
             /etc/default/grub &&
             grub-mkconfig -o /boot/grub/grub.cfg
+            systemctl enable ${customservices} ${trim}
 GRUB
             if [[ "${bootloader}" == "2" && "${fs}" == "2" ]]; then
                 arch-chroot /mnt <<-GRUBBTRFSD
-                systemctl enable grub-btrfsd ${customservices} ${trim}
+                systemctl enable grub-btrfsd
 GRUBBTRFSD
             fi
 
@@ -4312,7 +4333,6 @@ NVIDIAHOOK
             err_instl_abort
         fi
     fi
-
         umount -R /mnt
         exit
 }