diff --git a/Amelia.sh b/Amelia.sh
index 63bebd3..01d8600 100644
--- a/Amelia.sh
+++ b/Amelia.sh
@@ -2,7 +2,7 @@
 
 # Amelia Installer
 # https://gitlab.com/prism7/archery
-# Version: 8.0.5
+# Version: 8.0.6
 
         set -euo pipefail
 ###################################################################################################
@@ -882,7 +882,7 @@ dtct_hyper() {
             vm_services="vmtoolsd vmware-vmblock-fuse" ;;
         oracle)
             vmpkgs="virtualbox-guest-utils"
-            vm_services="vboxservice" ;;
+            vm_services="" ;;
         microsoft)
             vmpkgs="hyperv"
             vm_services="hv_fcopy_daemon hv_kvp_daemon hv_vss_daemon" ;;
@@ -5187,7 +5187,7 @@ ${magenta}###${nc}-------------------------------------${magenta}[ ${bwhite}Pacs
             network="NetworkManager" ;;
 
         2)  # Minimal Plasma & Apps:
-            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 kimageformats kinit kio-admin kio-gdrive kio-zeroconf kompare konsole kscreen kvantum kwrited libappimage libfido2 libktorrent libmms libnfs libva-utils lirc lrzip lua52-socket lzop mac man-db man-pages mesa-demos mesa-utils mold nano-syntax-highlighting nss-mdns ntfs-3g okular opus-tools p7zip packagekit-qt6 pacman-contrib partitionmanager pbzip2 pdfmixtool pigz pipewire-alsa pipewire-jack pipewire-pulse plasma-browser-integration plasma-desktop plasma-disks plasma-firewall plasma-nm plasma-pa plasma-wayland-protocols power-profiles-daemon powerdevil powerline powerline-fonts print-manager python-pyqt6 python-reportlab qbittorrent qt6-imageformats qt6-scxml qt6-virtualkeyboard realtime-privileges reflector rng-tools sddm-kcm skanlite sof-firmware sox spectacle sshfs system-config-printer terminus-font timidity++ ttf-ubuntu-font-family unarchiver unrar unzip usb_modeswitch usbutils vdpauinfo vlc vorbis-tools wget xdg-desktop-portal xdg-desktop-portal-gtk xdg-desktop-portal-kde zip zsh zsh-autosuggestions zsh-completions zsh-syntax-highlighting ${nrg_plc}" ;;
+            deskpkgs="${basepkgs} alsa-firmware alsa-utils arj ark bluedevil breeze-gtk ccache cups-pdf cups-pk-helper dolphin-plugins efibootmgr exfatprogs fdkaac ffmpegthumbs 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 kimageformats kinit kio-admin kio-gdrive kio-zeroconf kompare konsole kscreen kvantum kwrited libappimage libfido2 libktorrent libmms libnfs libva-utils lirc lrzip lua52-socket lzop mac man-db man-pages mesa-demos mesa-utils mold nano-syntax-highlighting nss-mdns ntfs-3g okular opus-tools p7zip packagekit-qt6 pacman-contrib partitionmanager pbzip2 pigz pipewire-alsa pipewire-jack pipewire-pulse plasma-browser-integration plasma-desktop plasma-disks plasma-firewall plasma-nm plasma-pa plasma-wayland-protocols power-profiles-daemon powerdevil powerline powerline-fonts print-manager python-pyqt6 python-reportlab qbittorrent qt6-imageformats qt6-scxml qt6-virtualkeyboard realtime-privileges reflector rng-tools sddm-kcm skanlite sof-firmware sox spectacle sshfs system-config-printer terminus-font timidity++ ttf-ubuntu-font-family unarchiver unrar unzip usb_modeswitch usbutils vdpauinfo vlc vorbis-tools wget xdg-desktop-portal xdg-desktop-portal-gtk xdg-desktop-portal-kde zip zsh zsh-autosuggestions zsh-completions zsh-syntax-highlighting ${nrg_plc}" ;;
 
         3)  # Gnome Desktop:
             deskpkgs="${basepkgs} gnome networkmanager"
@@ -5196,7 +5196,7 @@ ${magenta}###${nc}-------------------------------------${magenta}[ ${bwhite}Pacs
             network="NetworkManager" ;;
 
         4)  # Minimal Gnome & Apps:
-            deskpkgs="${basepkgs} evince file-roller gdm gnome-calculator gnome-clocks gnome-console gnome-control-center gnome-disk-utility gnome-keyring gnome-menus gnome-session gnome-shell-extensions gnome-shell-extension-appindicator gnome-system-monitor gnome-text-editor gnome-tweaks gvfs gvfs-afc gvfs-mtp loupe malcontent nautilus networkmanager power-profiles-daemon simple-scan sushi system-config-printer xdg-desktop-portal-gnome xdg-user-dirs-gtk alsa-firmware alsa-utils ccache cups-pdf e2fsprogs efibootmgr exfatprogs fdkaac git glib2-devel glibc-locales gnome-browser-connector gparted 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 libfido2 libva-utils lrzip mac man-db man-pages meld mesa-utils mold nano-syntax-highlighting nss-mdns ntfs-3g p7zip pacman-contrib pbzip2 pdfmixtool pigz pipewire-alsa pipewire-jack pipewire-pulse powerline powerline-fonts qbittorrent realtime-privileges reflector rng-tools sof-firmware sox terminus-font ttf-ubuntu-font-family unrar unzip usb_modeswitch usbutils vdpauinfo vlc wget zip zsh zsh-autosuggestions zsh-completions zsh-syntax-highlighting ${nrg_plc}" ;;
+            deskpkgs="${basepkgs} evince file-roller gdm gnome-calculator gnome-clocks gnome-console gnome-control-center gnome-disk-utility gnome-keyring gnome-menus gnome-session gnome-shell-extensions gnome-system-monitor gnome-text-editor gnome-tweaks gvfs gvfs-afc gvfs-mtp loupe malcontent nautilus networkmanager power-profiles-daemon simple-scan sushi system-config-printer xdg-desktop-portal-gnome xdg-user-dirs-gtk alsa-firmware alsa-utils ccache cups-pdf efibootmgr exfatprogs fdkaac git glib2-devel glibc-locales gnome-browser-connector gparted 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 libfido2 libva-utils lrzip mac man-db man-pages meld mesa-utils nano-syntax-highlighting nss-mdns ntfs-3g p7zip pacman-contrib pbzip2 pigz pipewire-alsa pipewire-jack pipewire-pulse powerline powerline-fonts qbittorrent realtime-privileges reflector rng-tools sof-firmware sox terminus-font ttf-ubuntu-font-family unrar unzip usb_modeswitch usbutils vdpauinfo vlc wget zip zsh zsh-autosuggestions zsh-completions zsh-syntax-highlighting ${nrg_plc}" ;;
             
         5)  # Xfce Desktop:
             deskpkgs="${basepkgs} xfce4 lightdm-gtk-greeter network-manager-applet"
@@ -5551,7 +5551,7 @@ mkinitcpio_preset() {
         fi
         	if arch-chroot /mnt <<-UKI > /dev/null 2>&1 ; then
         	    mkdir /etc/cmdline.d || exit
-        	    echo "rw ${boot_opts}" | tee /etc/cmdline.d/cmdline.conf || exit
+        	    echo "rw ${boot_opts}" | tee /etc/cmdline.d/cmdlined.conf || exit
             cp /etc/mkinitcpio.d/${kernel}.preset /etc/mkinitcpio.d/${kernel}.preset.bak
         	    cat <<-MKINITPRESET > /etc/mkinitcpio.d/${kernel}.preset || exit
 				ALL_kver="/boot/vmlinuz-${kernel}"
@@ -5966,6 +5966,7 @@ NRG
             export LANG=${SETLOCALE} || exit
             echo KEYMAP=${SETKBD} > /etc/vconsole.conf || exit
             sed -i 's/^#Color/Color\nILoveCandy/' /etc/pacman.conf || exit
+            sed -i "/^#ParallelDownloads = 5/s/^#//" /etc/pacman.conf || exit
             update-pciids || exit
             cat <<-MKINITCPIO > /etc/mkinitcpio.conf.d/mkinitcpiod.conf || exit
 				${mkinitcpio_mods}
@@ -5980,7 +5981,7 @@ MKINITCPIO
 				-Wp,-D_FORTIFY_SOURCE=3 -Wformat -Werror=format-security \
 				-fstack-clash-protection -fcf-protection \
 				-fno-omit-frame-pointer -mno-omit-leaf-frame-pointer"
-				MAKEFLAGS="-$(nproc)"
+				MAKEFLAGS="-j$(nproc)"
 				BUILDENV=(!distcc color ccache check !sign)
 				OPTIONS=(strip docs !libtool !staticlibs emptydirs zipman purge !debug lto)
 				COMPRESSGZ=(pigz -c -f -n)
@@ -6025,7 +6026,7 @@ HOSTS
 				net.ipv4.conf.all.rp_filter = 1
 				vm.vfs_cache_pressure = 50
 				vm.mmap_min_addr = 65536
-				vm.max_map_count=1048576
+				vm.max_map_count = 1048576
 				kernel.printk = 0 0 0 0
 				${perf_stream}
 SYSCTL
@@ -6079,8 +6080,8 @@ USER
             sed -i 's|^hosts.*|hosts: mymachines mdns_minimal resolve [!UNAVAIL=return] files myhostname dns|g' /etc/nsswitch.conf || exit
             sed -i 's/ interface = [^ ]*/ interface = all/g' /etc/ipp-usb/ipp-usb.conf || exit
             sed -i "/# set linenumbers/"'s/^#//' /etc/nanorc || exit
-            sed -i "s/^# set minibar/set minibar/" /etc/nanorc || exit
-            sed -i "s/^# set mouse/set mouse/" /etc/nanorc || exit
+            sed -i "/# set minibar/"'s/^#//' /etc/nanorc || exit
+            sed -i "/# set mouse/"'s/^#//' /etc/nanorc || exit
             echo tcp_bbr | tee /etc/modules-load.d/modulesd.conf || exit
             cat <<-SUPPLICANT > /etc/wpa_supplicant/wpa_supplicant.conf || exit
 				country=${REGDOM}