diff --git a/archiso/airootfs/usr/local/bin/calamares-online.sh b/archiso/airootfs/usr/local/bin/calamares-online.sh
index 31776c4..7b8b1b5 100755
--- a/archiso/airootfs/usr/local/bin/calamares-online.sh
+++ b/archiso/airootfs/usr/local/bin/calamares-online.sh
@@ -44,10 +44,11 @@ Main() {
 --text "Choose Bootloader:" ; echo $?)
 
     if [[ "${_exitcode}" -eq 2 ]]; then
-        echo "GRUB!"
+        echo "USING GRUB!"
+        yes | sudo pacman -Sy --needed cachyos-calamares cachyos-calamares-config
     elif [[ "${_exitcode}" -eq 3 ]]; then
-        echo "SYSTEMD-BOOT!"
-        sudo pacman -Sy cachyos-calamares-systemd cachyos-calamares-systemd-config
+        echo "USING SYSTEMD-BOOT!"
+        yes | sudo pacman -Sy --needed cachyos-calamares-systemd cachyos-calamares-systemd-config
     else
         exit
     fi
diff --git a/archiso/packages_gnome.x86_64 b/archiso/packages_gnome.x86_64
index d83292c..4ad003a 100644
--- a/archiso/packages_gnome.x86_64
+++ b/archiso/packages_gnome.x86_64
@@ -1,3 +1,4 @@
+#network
 accountsservice
 alacritty
 alsa-firmware
@@ -21,10 +22,10 @@ btrfs-progs
 cachy-browser
 cachyos-calamares
 cachyos-calamares-config
+cachyos-gnome-settings
 cachyos-grub-theme
 cachyos-hello
 cachyos-hooks
-cachyos-settings
 cachyos-kernel-manager
 cachyos-keyring
 cachyos-mirrorlist
@@ -32,15 +33,14 @@ cachyos-nord-gtk-theme-git
 cachyos-packageinstaller
 cachyos-picom-config
 cachyos-rate-mirrors
+cachyos-settings
 cachyos-v3-mirrorlist
-cachyos-gnome-settings
 cantarell-fonts
 capitaine-cursors
 char-white
 ckbcomp
 clonezilla
 cloud-init
-cmake
 cryptsetup
 darkhttpd
 ddrescue
@@ -53,7 +53,6 @@ diffutils
 dmidecode
 dmraid
 dnsmasq
-nautilus
 dosfstools
 downgrade
 doxygen
@@ -65,14 +64,15 @@ espeakup
 ethtool
 exfatprogs
 f2fs-tools
-fastfetch-git
 fakeroot
+fastfetch-git
 fatresize
 ffmpegthumbnailer
 file-roller
 fmt
 fsarchiver
 galculator
+gdm
 git
 glances
 gnome-autoar
@@ -106,7 +106,7 @@ gst-plugin-pipewire
 gst-plugins-bad
 gst-plugins-ugly
 gtk-engine-murrine
-gtkmm3
+gtk3
 haveged
 hdparm
 hwdetect
@@ -162,11 +162,11 @@ modemmanager
 mtools
 nano
 nano-syntax-highlighting
+nautilus
 nbd
 ndisc6
-netctl
 net-tools
-#network
+netctl
 networkmanager
 nfs-utils
 nilfs-utils
@@ -177,11 +177,11 @@ ntfs-3g
 ntp
 nvme-cli
 octopi
+open-iscsi
+open-vm-tools
 openconnect
 opendesktop-fonts
-open-iscsi
 openssh
-open-vm-tools
 openvpn
 os-prober
 packagekit-qt5
@@ -205,9 +205,9 @@ pv
 python
 python-defusedxml
 qemu-guest-agent
-qt5ct
 qt5-tools
 qt5-xmlpatterns
+qt5ct
 realtime-privileges
 refind
 reflector
@@ -217,7 +217,6 @@ rsync
 rtkit
 rxvt-unicode-terminfo
 screen
-gdm
 sdparm
 sg3_utils
 smartmontools
@@ -274,5 +273,6 @@ xorg-xinput
 xorg-xkill
 xorg-xrandr
 xorg-xrdb
+yad
 zfs-utils
 zsh
diff --git a/archiso/packages_kde.x86_64 b/archiso/packages_kde.x86_64
index aab59ce..2c96fe0 100644
--- a/archiso/packages_kde.x86_64
+++ b/archiso/packages_kde.x86_64
@@ -1,16 +1,16 @@
 alacritty
 alsa-utils
 amd-ucode
-archinstall
 arch-install-scripts
+archinstall
 archlinux-keyring
 avahi
 b43-fwcutter
 base
-micro
 bash-completion
 bind
 boost-libs
+breeze-gtk
 brltty
 broadcom-wl-dkms
 btrfs-progs
@@ -20,7 +20,6 @@ cachyos-calamares-config
 cachyos-grub-theme
 cachyos-hello
 cachyos-hooks
-cachyos-settings
 cachyos-kde-settings
 cachyos-kernel-manager
 cachyos-keyring
@@ -29,6 +28,7 @@ cachyos-nord-gtk-theme-git
 cachyos-nord-kde-theme-git
 cachyos-packageinstaller
 cachyos-rate-mirrors
+cachyos-settings
 cachyos-v3-mirrorlist
 cantarell-fonts
 capitaine-cursors
@@ -36,7 +36,6 @@ char-white
 ckbcomp
 clonezilla
 cloud-init
-cmake
 cronie
 cryptsetup
 darkhttpd
@@ -88,7 +87,9 @@ irssi
 iw
 iwd
 jfsutils
+kde-gtk-config
 kinit
+kio
 kitty-terminfo
 konsole
 kpmcore
@@ -120,6 +121,7 @@ memtest86+
 mesa
 mhwd-cachyos
 mhwd-nvidia-390xx
+micro
 mkinitcpio
 mkinitcpio-archiso
 mkinitcpio-nfs-utils
@@ -141,13 +143,12 @@ nss-mdns
 ntfs-3g
 ntp
 nvme-cli
-kio
 octopi
+open-iscsi
+open-vm-tools
 openconnect
 opendesktop-fonts
-open-iscsi
 openssh
-open-vm-tools
 openvpn
 os-prober
 packagekit-qt5
@@ -163,8 +164,8 @@ pipewire-jack
 pipewire-pulse
 plasma-desktop
 plasma-framework
-plasma-nm
 plasma-integration
+plasma-nm
 plasma-pa
 plasma-workspace
 polkit
@@ -179,9 +180,9 @@ pv
 python
 python-defusedxml
 qemu-guest-agent
-qt5ct
 qt5-tools
 qt5-xmlpatterns
+qt5ct
 realtime-privileges
 refind
 reflector
@@ -229,8 +230,6 @@ wvdial
 xdg-user-dirs-gtk
 xdg-utils
 xed
-kde-gtk-config
-breeze-gtk
 xf86-input-elographics
 xf86-input-evdev
 xf86-input-libinput
@@ -248,5 +247,6 @@ xorg-server
 xorg-xinit
 xorg-xkill
 xorg-xrdb
+yad
 zfs-utils
 zsh
diff --git a/archiso/packages_xfce.x86_64 b/archiso/packages_xfce.x86_64
index ce605ff..47ecd48 100644
--- a/archiso/packages_xfce.x86_64
+++ b/archiso/packages_xfce.x86_64
@@ -1,3 +1,4 @@
+#network
 accountsservice
 adobe-source-han-sans-cn-fonts
 adobe-source-han-sans-jp-fonts
@@ -8,18 +9,18 @@ alsa-firmware
 alsa-plugins
 alsa-utils
 amd-ucode
-archlinux-keyring
 arch-install-scripts
+archlinux-keyring
 b43-fwcutter
 base
 base-devel
 bash-completion
 bind
 bind-tools
-brltty
 bluez
 bluez-utils
 boost-libs
+brltty
 broadcom-wl-dkms
 btrfs-progs
 cachy-browser
@@ -27,14 +28,14 @@ cachyos-calamares
 cachyos-calamares-config
 cachyos-hello
 cachyos-hooks
-cachyos-settings
 cachyos-kernel-manager
-cachyos-packageinstaller
 cachyos-keyring
 cachyos-mirrorlist
 cachyos-nord-gtk-theme-git
+cachyos-packageinstaller
 cachyos-picom-config
 cachyos-rate-mirrors
+cachyos-settings
 cachyos-v3-mirrorlist
 cachyos-xfce-settings
 cantarell-fonts
@@ -43,11 +44,10 @@ char-white
 ckbcomp
 clonezilla
 cloud-init
-cmake
 cryptsetup
-device-mapper
 darkhttpd
 ddrescue
+device-mapper
 dex
 dhclient
 dhcpcd
@@ -89,11 +89,11 @@ gst-plugin-pipewire
 gst-plugins-bad
 gst-plugins-ugly
 gtk-engine-murrine
-gtkmm3
+gtk3
 hdparm
-hyperv
 hwdetect
 hwinfo
+hyperv
 inetutils
 intel-ucode
 inxi
@@ -135,9 +135,9 @@ mdadm
 meld
 memtest86+
 mesa
+mesa-utils
 mhwd-cachyos
 mhwd-nvidia-390xx
-mesa-utils
 mkinitcpio
 mkinitcpio-archiso
 mkinitcpio-busybox
@@ -151,11 +151,10 @@ nano-syntax-highlighting
 nbd
 ndisc6
 neofetch
-netctl
 net-tools
-#network
-networkmanager
+netctl
 network-manager-applet
+networkmanager
 networkmanager-openvpn
 networkmanager-qt
 networkmanager-vpnc
@@ -170,11 +169,11 @@ nvidia-dkms
 nvidia-utils
 nvme-cli
 octopi
+open-iscsi
+open-vm-tools
 openconnect
 opendesktop-fonts
-open-iscsi
 openssh
-open-vm-tools
 openvpn
 os-prober
 parole
@@ -202,9 +201,9 @@ pv
 python
 python-defusedxml
 qemu-guest-agent
-qt5ct
 qt5-tools
 qt5-xmlpatterns
+qt5ct
 realtime-privileges
 refind
 reflector
@@ -309,5 +308,6 @@ xorg-xinput
 xorg-xkill
 xorg-xrandr
 xorg-xrdb
+yad
 zfs-utils
 zsh