diff --git a/archiso/packages.x86_64 b/archiso/packages.x86_64
index a93e739..56eb3ce 100644
--- a/archiso/packages.x86_64
+++ b/archiso/packages.x86_64
@@ -9,7 +9,6 @@ alsa-utils
 amd-ucode
 archlinux-keyring
 arch-install-scripts
-## Archive
 b43-fwcutter
 base
 base-devel
@@ -20,7 +19,6 @@ brltty
 bluez
 bluez-utils
 boost-libs
-## Boot
 broadcom-wl-dkms
 btrfs-progs
 cachy-browser
@@ -97,7 +95,6 @@ hdparm
 hyperv
 hwdetect
 hwinfo
-## Image viewer
 inetutils
 intel-ucode
 inxi
@@ -193,7 +190,6 @@ pipewire-alsa
 pipewire-jack
 pipewire-media-session
 pipewire-pulse
-# pipewire-support
 pipewire-v4l2
 pipewire-zeroconf
 plasma-browser-integration
diff --git a/archiso/packages_xfce.x86_64 b/archiso/packages_xfce.x86_64
index 7cc889d..db4c563 100644
--- a/archiso/packages_xfce.x86_64
+++ b/archiso/packages_xfce.x86_64
@@ -1,251 +1,262 @@
+adwaita-icon-theme
+alacritty
+alsa-firmware
+alsa-plugins
 alsa-utils
 amd-ucode
+archlinux-keyring
 arch-install-scripts
-archinstall
 b43-fwcutter
 base
+base-devel
+bash-completion
+bind
 bind-tools
 brltty
+bluez
+bluez-utils
+boost-libs
 broadcom-wl-dkms
 btrfs-progs
+cachy-browser
+cachyos-calamares
+cachyos-calamares-config
+cachyos-hello
+cachyos-hooks
+cachyos-xfce-settings
+cachyos-kernel-manager
+cachyos-packageinstaller
+cachyos-keyring
+cachyos-mirrorlist
+cachyos-nord-gtk-theme-git
+cachyos-picom-config
+cachyos-rate-mirrors
+cachyos-v3-mirrorlist
+cachyos-xfce-settings
+cantarell-fonts
+capitaine-cursors
+char-white
+ckbcomp
 clonezilla
 cloud-init
-crda
+cmake
 cryptsetup
+device-mapper
 darkhttpd
 ddrescue
+dex
 dhclient
 dhcpcd
+dialog
 diffutils
+dmidecode
 dmraid
 dnsmasq
 dosfstools
+downgrade
+doxygen
 e2fsprogs
 edk2-shell
 efibootmgr
+efitools
 espeakup
 ethtool
 exfatprogs
 f2fs-tools
+fakeroot
 fatresize
+ffmpegthumbnailer
+file-roller
+fmt
 fsarchiver
+galculator
+git
+glances
+gnome-themes-extra
 gnu-netcat
 gpart
+gparted
 gpm
 gptfdisk
-#grml-zsh-config
+grsync
+grub
+gst-libav
+gst-plugin-pipewire
+gst-plugins-bad
+gst-plugins-ugly
+gtk-engine-murrine
+gtkmm3
 hdparm
+hyperv
+hwdetect
+hwinfo
+inetutils
 intel-ucode
+inxi
+iptables-nft
 ipw2100-fw
 ipw2200-fw
 irssi
 iw
-iwd
 jfsutils
 kitty-terminfo
+konsole
+kparts
+kvantum-qt5
+kwin-scripts-forceblur
 less
 lftp
 libfido2
 libusb-compat
-linux-cachyos
+libwnck3
+libxinerama
+lightdm
+lightdm-gtk-greeter
+lightdm-webkit2-greeter
 linux-atm
+linux-cachyos
+linux-cachyos-headers
+linux-cachyos-zfs
 linux-firmware
 linux-firmware-marvell
+livecd-sounds
 lsscsi
 lvm2
 lynx
+make
 man-db
 man-pages
 mc
 mdadm
+meld
 memtest86+
+mesa
+mhwd-cachyos
+mhwd-nvidia-390xx
+mesa-utils
 mkinitcpio
 mkinitcpio-archiso
+mkinitcpio-busybox
 mkinitcpio-nfs-utils
+mkinitcpio-openswap
+mlocate
 modemmanager
 mtools
 nano
+nano-syntax-highlighting
 nbd
 ndisc6
+neofetch
+netctl
+net-tools
+#network
+networkmanager
+network-manager-applet
+networkmanager-openvpn
+networkmanager-qt
+networkmanager-vpnc
 nfs-utils
 nilfs-utils
 nmap
+cachyos-nord-gtk-theme-git
+noto-fonts
+nss-mdns
 ntfs-3g
+ntp
+nvidia-dkms
+nvidia-utils
 nvme-cli
+octopi
 openconnect
+opendesktop-fonts
+open-iscsi
 openssh
+open-vm-tools
 openvpn
+os-prober
+packagekit-qt5
+parole
 partclone
 parted
 partimage
-pcsclite
+paru
+pavucontrol
+perl
+pipewire-alsa
+pipewire-jack
+pipewire-media-session
+pipewire-pulse
+pipewire-v4l2
+pipewire-zeroconf
+polkit-qt5
+power-profiles-daemon
 ppp
 pptpclient
+profile-sync-daemon
 pv
+python
+python-defusedxml
+pcsclite
 qemu-guest-agent
+qt5ct
+qt5-tools
+qt5-xmlpatterns
+realtime-privileges
+refind
 reflector
+reflector-simple
 reiserfsprogs
+ristretto
 rp-pppoe
 rsync
 rxvt-unicode-terminfo
 screen
 sdparm
+rtkit
 sg3_utils
 smartmontools
+snapper
 sof-firmware
+solid
 squashfs-tools
 sudo
+sysfsutils
 syslinux
 systemd-resolvconf
 tcpdump
 terminus-font
 testdisk
+tldr
 tmux
 tpm2-tss
+ttf-bitstream-vera
+ttf-dejavu
+ttf-liberation
+ttf-opensans
 udftools
 usb_modeswitch
 usbmuxd
 usbutils
 vim
-#virtualbox-guest-utils-nox
+virtualbox-guest-utils-nox
 vpnc
+wget
+whois
+wireguard-tools
 wireless-regdb
 wireless_tools
 wpa_supplicant
 wvdial
-xfsprogs
-xl2tpd
-zsh
-
-
-# everything above comes from archiso releng folder
-
-cachyos-calamares
-cachyos-calamares-config
-
-#######################################################
-###      PACKAGES THAT STAY AFTER INSTALLATION      ###
-#######################################################
-
-#ly
-bash-completion
-grub
-os-prober
-dex
-libxinerama
-make
-xorg-xinit
-xorg-xkill
-xorg-xrandr
-xorg-xinput
-xorg-xrdb
-mkinitcpio-openswap
-alacritty
-konsole
-kwin-scripts-forceblur
-
-#network
-netctl
-net-tools
-networkmanager
-networkmanager-openvpn
-networkmanager-qt
-networkmanager-vpnc
-nss-mdns
-whois
-wireguard-tools
-openconnect
-openvpn
-
-#live-iso-tools
-gparted
-grsync
-glances
-python-defusedxml
-inxi
-downgrade
-pcurses
-tldr
-
-#welcome-app
-gtkmm3
-fmt
-cachyos-hello
-
-#calamares
-qt5-xmlpatterns
-doxygen
-tcpdump
-dmidecode
-kparts
-polkit-qt5
-python
-solid
-qt5-tools
-
-#######################################################
-###                    EXTRAS                       ###
-#######################################################
-
-##### xorg applications
-
-xorg-server
-xorg-apps
-
-
-# zfs support(not working)
-#zfs-dkms
-#zfs-utils
-
-wget
-
-##### Drivers for graphical cards
-
-#driver for virtualbox - xf86-video-vmware is dependency
-#systemctl enable vboxservice
-#systemctl start vboxservice
-#to have fullscreen
-virtualbox-guest-utils
-
-xf86-video-vesa
-xorg-server
-xorg-xinit
-xorg-xkill
-xorg-xrandr
-xorg-xinput
-mesa
+xdg-user-dirs-gtk
+xdg-utils
+xed
+xf86-input-libinput
+xf86-input-vmmouse
 xf86-video-amdgpu
+xf86-video-ati
 xf86-video-intel
-nvidia-dkms
-nvidia-utils
-
-
-##### lightdm display manager
-
-lightdm
-lightdm-gtk-greeter
-lightdm-webkit2-greeter
-#lightdm-webkit2-theme-arch
-
-##### sddm display manager
-
-#sddm
-
-##### gdm display manager
-
-#gdm
-
-##### want to have base-devel group
-
-base-devel
-
-##### want to have linux-headers
-
-linux-cachyos-headers
-
-
-
-##### want to have a desktop
+xf86-video-vesa
+xf86-video-vmware
 xfce4-appfinder
 xfce4-battery-plugin
 xfce4-clipman-plugin
@@ -282,80 +293,15 @@ xfce4-wavelan-plugin
 xfce4-weather-plugin
 xfce4-whiskermenu-plugin
 xfce4-xkb-plugin
-xed
-parole
-ristretto
-capitaine-cursors
-gtk-engine-murrine
-gnome-themes-extra
-adwaita-icon-theme
-file-roller
-libwnck3
-network-manager-applet
-galculator
-cachy-browser
-kvantum-qt5
-qt5ct
-neofetch
-
-#audio
-alsa-utils
-alsa-plugins
-alsa-firmware
-sof-firmware
-pipewire
-pipewire-alsa
-pipewire-jack
-pipewire-pulse
-pipewire-v4l2
-# pipewire-support
-realtime-privileges
-pipewire-media-session
-pipewire-zeroconf
-profile-sync-daemon
-power-profiles-daemon
-pavucontrol
-ffmpegthumbnailer
-gst-libav
-gst-plugins-bad
-gst-plugins-ugly
-gst-plugin-pipewire
-
-cachyos-mirrorlist
-cachyos-v3-mirrorlist
-cachyos-keyring
-
-#fonts
-ttf-dejavu
-ttf-liberation
-ttf-bitstream-vera
-cantarell-fonts
-noto-fonts
-opendesktop-fonts
-ttf-opensans
-
-efitools
-
-cachyos-hooks
-cachyos-settings
-# cachyos-theming broken
-char-white
-cachyos-nord-gtk-theme-git
-paru
-meld
-reflector-simple
-octopi
-mhwd-cachyos
-mhwd-nvidia-390xx
-cachyos-kernel-manager
-cachyos-packageinstaller
-#cachyos-dnscrypt-proxy
-cachyos-rate-mirrors
-cachyos-picom-config
-cachyos-xfce-settings
-
-
-#vm-support
-open-vm-tools
-xf86-input-vmmouse
-xf86-video-vmware
+xfsprogs
+xl2tpd
+xorg-apps
+xorg-server
+xorg-xdpyinfo
+xorg-xinit
+xorg-xinput
+xorg-xkill
+xorg-xrandr
+xorg-xrdb
+zfs-utils
+zsh