diff --git a/src/modules/netinstall/netinstall.yaml b/src/modules/netinstall/netinstall.yaml
index a45db5098..2c733cfbc 100644
--- a/src/modules/netinstall/netinstall.yaml
+++ b/src/modules/netinstall/netinstall.yaml
@@ -201,528 +201,7 @@
           - nano
           - vim
           - openssh
-- name: "KDE-Desktop"
-  description: "KDE-Plasma Desktop - Simple by default, powerful when needed."
-  hidden: false
-  selected: false
-  critical: true
-  packages:
-    - ark
-    - bluedevil
-    - breeze-gtk
-    - cachyos-emerald-kde-theme-git
-    - cachyos-iridescent-kde
-    - cachyos-kde-settings
-    - cachyos-nord-kde-theme-git
-    - cachyos-themes-sddm
-    - char-white
-    - dolphin
-    - egl-wayland
-    - ffmpegthumbs
-    - filelight
-    - fwupd
-    - gwenview
-    - haruna
-    - kate
-    - kcalc
-    - kde-gtk-config
-    - kdeconnect
-    - kdegraphics-thumbnailers
-    - kdeplasma-addons
-    - kdialog
-    - kinfocenter
-    - kio-admin
-    - konsole
-    - kscreen
-    - kwallet-pam
-    - kwalletmanager
-    - libplasma
-    - phonon-qt6-vlc
-    - plasma-browser-integration
-    - plasma-desktop
-    - plasma-firewall
-    - plasma-integration
-    - plasma-nm
-    - plasma-pa
-    - plasma-systemmonitor
-    - plasma-thunderbolt
-    - plasma-workspace
-    - plymouth-kcm
-    - powerdevil
-    - qt6-wayland
-    - sddm
-    - sddm-kcm
-    - spectacle
-    - xdg-desktop-portal
-    - xdg-desktop-portal-kde
-    - xsettingsd
-- name: "GNOME-Desktop"
-  description: "GNOME Desktop - designed to put you in control and get things done."
-  hidden: false
-  selected: false
-  critical: true
-  packages:
-    - adwaita-icon-theme
-    - eog
-    - evince
-    - file-roller
-    - fwupd
-    - gdm
-    - gedit
-    - gnome
-    - gnome-backgrounds
-    - gnome-calculator
-    - gnome-control-center
-    - gnome-disk-utility
-    - gnome-keyring
-    - gnome-nettool
-    - gnome-power-manager
-    - gnome-screenshot
-    - gnome-shell
-    - gnome-terminal
-    - gnome-themes-extra
-    - gnome-tweaks
-    - gnome-usage
-    - malcontent
-    - libnma
-    - gvfs
-    - gvfs-afc
-    - gvfs-gphoto2
-    - gvfs-mtp
-    - gvfs-nfs
-    - gvfs-smb
-    - nautilus
-    - sushi
-    - totem
-    - qt6-wayland
-    - xdg-user-dirs-gtk
-    - xdg-desktop-portal-gnome
-- name: "Xfce4"
-  description: "Xfce is a lightweight desktop environment for UNIX-like operating systems. It aims to be fast and low on system resources, while still being visually appealing and user friendly."
-  hidden: false
-  selected: false
-  critical: true
-  packages:
-    - blueman
-    - file-roller
-    - galculator
-    - gvfs
-    - gvfs-afc
-    - gvfs-gphoto2
-    - gvfs-mtp
-    - gvfs-nfs
-    - gvfs-smb
-    - lightdm
-    - lightdm-gtk-greeter
-    - lightdm-gtk-greeter-settings
-    - network-manager-applet
-    - parole
-    - ristretto
-    - thunar-archive-plugin
-    - thunar-media-tags-plugin
-    - xdg-user-dirs-gtk
-    - xed
-    - xfce4
-    - xfce4-battery-plugin
-    - xfce4-datetime-plugin
-    - xfce4-mount-plugin
-    - xfce4-netload-plugin
-    - xfce4-notifyd
-    - xfce4-pulseaudio-plugin
-    - xfce4-screensaver
-    - xfce4-screenshooter
-    - xfce4-taskmanager
-    - xfce4-wavelan-plugin
-    - xfce4-weather-plugin
-    - xfce4-whiskermenu-plugin
-    - xfce4-xkb-plugin
-- name: "bspwm"
-  description: "bspwm is a tiling window manager that represents windows as the leaves of a full binary tree. bspwm supports multiple monitors and is configured and controlled through messages."
-  hidden: false
-  selected: false
-  critical: true
-  packages:
-    - cachyos-picom-config
-    - bspwm
-    - sxhkd
-    - polybar
-    - ly
-    - alacritty
-    - openssh
-- name: "Budgie-Desktop"
-  description: "Budgie - an independent, familiar, and modern desktop."
-  hidden: false
-  selected: false
-  critical: true
-  packages:
-    - budgie-control-center
-    - budgie-desktop
-    - budgie-desktop-view
-    - budgie-extras
-    - budgie-screensaver
-    - eog
-    - evince
-    - file-roller
-    - gedit
-    - gnome-keyring
-    - gnome-screenshot
-    - gnome-terminal
-    - gvfs
-    - gvfs-afc
-    - gvfs-gphoto2
-    - gvfs-mtp
-    - gvfs-nfs
-    - gvfs-smb
-    - lightdm
-    - lightdm-slick-greeter
-    - nemo
-    - nemo-fileroller
-    - nemo-preview
-    - network-manager-applet
-    - sushi
-    - totem
-    - xdg-user-dirs-gtk
-- name: "Cinnamon"
-  description: "Linux desktop which provides advanced innovative features and a traditional user experience."
-  hidden: false
-  selected: false
-  critical: true
-  packages:
-    - cinnamon
-    - system-config-printer
-    - gnome-keyring
-    - gnome-terminal
-    - blueberry
-    - metacity
-    - lightdm
-    - lightdm-gtk-greeter
-- name: "Cosmic"
-  description: "Linux desktop, which provides an environment that features advanced functionality and a responsive design."
-  hidden: false
-  selected: false
-  critical: true
-  packages:
-    - cosmic-app-library
-    - cosmic-applets
-    - cosmic-bg
-    - cosmic-comp
-    - cosmic-files
-    - cosmic-greeter
-    - cosmic-icon-theme
-    - cosmic-launcher
-    - cosmic-notifications
-    - cosmic-osd
-    - cosmic-panel
-    - cosmic-player
-    - cosmic-randr
-    - cosmic-screenshot
-    - cosmic-session
-    - cosmic-settings
-    - cosmic-settings-daemon
-    - cosmic-terminal
-    - cosmic-text-editor
-    - cosmic-wallpapers
-    - cosmic-workspaces
-    - notification-daemon
-    - cosmic-greeter
-    - xdg-desktop-portal-cosmic
-    - xorg-xwayland
-- name: "i3-Window-Manager"
-  description: "i3 tiling window manager, primarily targeted at developers and advanced users."
-  hidden: false
-  selected: false
-  expanded: false
-  critical: true
-  packages:
-    - cachyos-i3wm-settings
-    - cachyos-picom-config
-    - i3-wm
-    - i3blocks
-    - i3lock-color
-    - i3status
-    - rofi
-    - polybar
-    - ly
-    - dunst
-- name: "Hyprland"
-  description: "Hyprland is a highly customizable dynamic tiling Wayland compositor that doesn't sacrifice on its looks."
-  hidden: false
-  selected: false
-  expanded: false
-  critical: true
-  packages:
-    - hyprland
-    - sddm
-    - xdg-desktop-portal-hyprland
-    - playerctl
-    - wofi
-    - dolphin
-    - kitty
-    - uwsm
-    - wl-clipboard
-    - polkit-kde-agent
-    - xorg-xwayland
-- name: "Niri"
-  description: "A scrollable-tiling Wayland compositor."
-  hidden: false
-  selected: false
-  expanded: false
-  critical: true
-  packages:
-    - cachyos-alacritty-config
-    - cachyos-niri-settings
-    - sddm
-    - ttf-fantasque-nerd
-    - ttf-font-awesome
-    - otf-font-awesome
-    - awesome-terminal-fonts
-    - noto-fonts
-    - noto-fonts-emoji
-    - ttf-fira-sans
-    - ttf-hack
-    - kvantum
-    - qt5ct
-    - swaybg
-    - swaylock-effects-git
-    - swaylock-fancy-git
-    - niri
-    - waybar
-    - xdg-desktop-portal-gnome
-    - xwayland-satellite
-    - mako
-    - wob
-    - pamixer
-    - wofi
-    - wlogout
-    - wl-clipboard
-    - polkit-kde-agent
-    - bemenu
-    - bemenu-wayland
-    - xorg-xwayland
-    - capitaine-cursors
-    - cachyos-wallpapers
-    - kvantum-theme-nordic-git
-    - brightnessctl
-    - cachyos-nord-gtk-theme-git
-- name: "LXDE-Desktop"
-  description: "The Lightweight Desktop Environment."
-  hidden: false
-  selected: false
-  critical: true
-  packages:
-    - celluloid
-    - file-roller
-    - galculator
-    - gnome-screenshot
-    - gpicview
-    - gvfs
-    - gvfs-afc
-    - gvfs-gphoto2
-    - gvfs-mtp
-    - gvfs-nfs
-    - gvfs-smb
-    - lxappearance
-    - obconf-qt
-    - lxde
-    - lxde-icon-theme
-    - lxterminal
-    - lightdm
-    - lightdm-slick-greeter
-    - notification-daemon
-    - openbox
-    - pcmanfm
-    - lxmusic
-    - network-manager-applet
-    - xdg-user-dirs-gtk
-    - xed
-- name: "LXQT-Desktop"
-  description: "The Lightweight Qt Desktop Environment."
-  hidden: false
-  selected: false
-  critical: true
-  packages:
-    - audiocd-kio
-    - baka-mplayer
-    - breeze
-    - breeze-gtk
-    - featherpad
-    - gvfs
-    - gvfs-mtp
-    - kio-fuse
-    - libstatgrab
-    - libsysstat
-    - lm_sensors
-    - lxqt
-    - lxqt-archiver
-    - network-manager-applet
-    - oxygen-icons
-    - pavucontrol-qt
-    - print-manager
-    - qt5-translations
-    - sddm
-    - xdg-utils
-    - xscreensaver
-    - xsettingsd
-- name: "MATE-Desktop"
-  description: "MATE Desktop - the continuation of GNOME 2"
-  hidden: false
-  selected: false
-  critical: true
-  packages:
-    - celluloid
-    - gvfs
-    - gvfs-afc
-    - gvfs-gphoto2
-    - gvfs-mtp
-    - gvfs-nfs
-    - gvfs-smb
-    - lightdm
-    - lightdm-slick-greeter
-    - mate
-    - mate-extra
-    - network-manager-applet
-    - xdg-user-dirs-gtk
-- name: "Openbox"
-  description: "Openbox is a highly configurable, floating window manager with extensive standards support."
-  hidden: false
-  selected: false
-  critical: true
-  packages:
-    - obconf-qt
-    - libwnck3
-    - acpi
-    - arandr
-    - archlinux-xdg-menu
-    - dex
-    - dmenu
-    - dunst
-    - feh
-    - gvfs
-    - gvfs-afc
-    - gvfs-gphoto2
-    - gvfs-mtp
-    - gvfs-nfs
-    - gvfs-smb
-    - jgmenu
-    - jq
-    - lightdm
-    - lightdm-slick-greeter
-    - lxappearance
-    - mpv
-    - network-manager-applet
-    - openbox
-    - pasystray
-    - picom
-    - polkit-gnome
-    - rofi
-    - scrot
-    - slock
-    - sysstat
-    - thunar
-    - thunar-archive-plugin
-    - thunar-media-tags-plugin
-    - thunar-volman
-    - tint2
-    - ttf-nerd-fonts-symbols
-    - tumbler
-    - xbindkeys
-    - xcursor-neutral
-    - xdg-user-dirs-gtk
-    - xed
-    - xfce4-terminal
-- name: "Qtile"
-  description: "Qtile is a X11 window manager that is configured with the Python programming language."
-  hidden: false
-  selected: false
-  critical: true
-  packages:
-    - cachyos-qtile-settings
-    - ttf-nerd-fonts-symbols
-    - qtile
-    - ttf-cascadia-code
-    - wired
-    - rofi
-    - thunar
-    - polkit-gnome
-    - qt5ct
-    - noto-fonts
-    - flameshot
-    - gnome-themes-extra
-    - ttf-jetbrains-mono
-    - ttf-font-awesome
-    - picom
-    - ly
-- name: "Sway"
-  description: "Sway is a tiling Wayland compositor and a drop-in replacement for the i3 window manager for X11. It works with your existing i3 configuration and supports most of i3's features, plus a few extras."
-  hidden: false
-  selected: false
-  critical: true
-  packages:
-    - sway
-    - waybar
-    - wl-clipboard
-    - egl-wayland
-    - wayland-protocols
-    - wofi
-    - foot
-    - wmenu
-    - ly
-    - xorg-xwayland
-    - xdg-desktop-portal
-    - xdg-desktop-portal-wlr
-- name: "UKUI"
-  description: "It is a lightweight desktop environment, which consumes few resources and works with older computers. It has been developed with GTK and Qt technologies. Its visual appearance is similar to Windows 7, making it easier for new users of Linux."
-  hidden: false
-  selected: false
-  critical: true
-  packages:
-    - sddm
-    - thunar
-    - thunar-archive-plugin
-    - thunar-volman
-    - peony
-    - xfce4-terminal
-    - qt5-ukui-platformtheme
-    - ukui-biometric-auth
-    - ukui-control-center
-    - ukui-interface
-    - ukui-media
-    - ukui-menu
-    - ukui-menus
-    - ukui-notebook
-    - ukui-panel
-    - ukui-power-manager
-    - ukui-screensaver
-    - ukui-session-manager
-    - ukui-settings-daemon
-    - ukui-sidebar
-    - ukui-system-monitor
-    - ukui-themes
-    - ukui-wallpapers
-    - ukui-window-switch
-    - mate-terminal
-    - mate-system-monitor
-    - mate-control-center
-    - redshift
-    - gnome-screenshot
-    - accountsservice
-    - gvfs
-    - qt5-quickcontrols
-- name: "Wayfire"
-  description: "Wayfire is a wayland compositor based on wlroots. It aims to create a customizable, extendable and lightweight environment without sacrificing its appearance."
-  hidden: false
-  selected: false
-  expanded: false
-  critical: true
-  packages:
-    - cachyos-wayfire-settings
-    - wayfire-desktop-git
-    - egl-wayland
-    - wayland-protocols
-    - wofi
-    - ly
-    - xorg-xhost
-    - xorg-xwayland
+
 - name: "CPU specific Microcode update packages"
   description: "Microcode update image for AMD and Intel CPU"
   hidden: false
@@ -731,6 +210,7 @@
   packages:
     - amd-ucode
     - intel-ucode
+
 - name: "Firefox and language package"
   description: "Add firefox and language pack if possible"
   hidden: false
@@ -739,6 +219,7 @@
   packages:
     - firefox
     - firefox-i18n-$LOCALE
+
 - name: "Printing-Support"
   description: "Support for printing (Cups)"
   hidden: false
@@ -759,6 +240,7 @@
     - gutenprint
     - splix
     - system-config-printer
+
 - name: "Support for HP Printer/Scanner"
   description: "Extra Packages for HP Printer/Scanner"
   hidden: false
@@ -771,6 +253,7 @@
     - cups
     - cups-filters
     - cups-pdf
+
 - name: "Accessibility Tools"
   description: "Screen reader and mouse tweaks (impaired vision)"
   hidden: false
diff --git a/src/modules/packagechooser/packagechooser.conf b/src/modules/packagechooser/packagechooser.conf
index f9245f423..3f49d6498 100644
--- a/src/modules/packagechooser/packagechooser.conf
+++ b/src/modules/packagechooser/packagechooser.conf
@@ -5,7 +5,7 @@
 ---
 mode: required
 
-method: netinstall-select
+method: packages
 
 labels:
     step: "Desktop"
@@ -44,6 +44,56 @@ items:
       description[zh_CN]: "您可以使用 Plasma 桌面环境轻松浏览网页，与同事、朋友和家人保持联系，管理文件，欣赏音乐和视频，并在工作中发挥创意和提高效率。 Plasma 是自由开源软件界的明星产品，它的界面美观、安全可靠、尊重隐私且可按需定制，让您可以安心愉悦地每日使用。"
       description[ja]: "Plasma を使ってネットサーフィンをしたり、同僚や友人、家族と連絡を取ったり、ファイルを管理したり、音楽やビデオを楽しんだり、仕事で創造性や生産性を発揮することができます。そのすべてを、あなたのニーズに合わせた美しい環境と、最高のフリー・オープンソース・ソフトウェアが提供する安全性、プライバシー保護、安心感の中で行うことができるのです。"
       screenshot: "/etc/calamares/images/kde.png"
+      packages:
+        - ark
+        - bluedevil
+        - breeze-gtk
+        - cachyos-emerald-kde-theme-git
+        - cachyos-iridescent-kde
+        - cachyos-kde-settings
+        - cachyos-nord-kde-theme-git
+        - cachyos-themes-sddm
+        - char-white
+        - dolphin
+        - egl-wayland
+        - ffmpegthumbs
+        - filelight
+        - fwupd
+        - gwenview
+        - haruna
+        - kate
+        - kcalc
+        - kde-gtk-config
+        - kdeconnect
+        - kdegraphics-thumbnailers
+        - kdeplasma-addons
+        - kdialog
+        - kinfocenter
+        - kio-admin
+        - konsole
+        - kscreen
+        - kwallet-pam
+        - kwalletmanager
+        - libplasma
+        - phonon-qt6-vlc
+        - plasma-browser-integration
+        - plasma-desktop
+        - plasma-firewall
+        - plasma-integration
+        - plasma-nm
+        - plasma-pa
+        - plasma-systemmonitor
+        - plasma-thunderbolt
+        - plasma-workspace
+        - plymouth-kcm
+        - powerdevil
+        - qt6-wayland
+        - sddm
+        - sddm-kcm
+        - spectacle
+        - xdg-desktop-portal
+        - xdg-desktop-portal-kde
+        - xsettingsd
 
     - id: GNOME-Desktop
       name: "GNOME"
@@ -56,6 +106,42 @@ items:
       description[zh_CN]: "以轻松、舒适和控制的方式完成事情。作为使用计算机的一种简单而优雅的方式，GNOME被设计用来帮助您获得最佳的计算体验。"
       description[ja]: "簡単で、快適で、コントロールしやすい。コンピュータを使うための簡単でエレガントな方法である GNOME は、あなたが可能な限り最高のコンピュータ体験をできるように設計されています。"
       screenshot: "/etc/calamares/images/gnome.png"
+      packages:
+        - adwaita-icon-theme
+        - eog
+        - evince
+        - file-roller
+        - fwupd
+        - gdm
+        - gedit
+        - gnome
+        - gnome-backgrounds
+        - gnome-calculator
+        - gnome-control-center
+        - gnome-disk-utility
+        - gnome-keyring
+        - gnome-nettool
+        - gnome-power-manager
+        - gnome-screenshot
+        - gnome-shell
+        - gnome-terminal
+        - gnome-themes-extra
+        - gnome-tweaks
+        - gnome-usage
+        - malcontent
+        - libnma
+        - gvfs
+        - gvfs-afc
+        - gvfs-gphoto2
+        - gvfs-mtp
+        - gvfs-nfs
+        - gvfs-smb
+        - nautilus
+        - sushi
+        - totem
+        - qt6-wayland
+        - xdg-user-dirs-gtk
+        - xdg-desktop-portal-gnome
 
     - id: Xfce4
       name: "Xfce4"
@@ -68,6 +154,40 @@ items:
       description[zh_CN]: "Xfce 是类 UNIX 操作系统上的轻量级桌面环境。虽然它致力于快速与低资源消耗，但仍然具有视觉吸引力且易于使用。"
       description[ja]: "Xfce は UNIX ライクなオペレーティングシステム用の軽量デスクトップ環境です。魅力的なヴィジュアルと使い勝手の良さを保ちつつ、高速でシステムリソースの使用が少ないことを目指しています。"
       screenshot: "/etc/calamares/images/xfce.png"
+      packages:
+        - blueman
+        - file-roller
+        - galculator
+        - gvfs
+        - gvfs-afc
+        - gvfs-gphoto2
+        - gvfs-mtp
+        - gvfs-nfs
+        - gvfs-smb
+        - lightdm
+        - lightdm-gtk-greeter
+        - lightdm-gtk-greeter-settings
+        - network-manager-applet
+        - parole
+        - ristretto
+        - thunar-archive-plugin
+        - thunar-media-tags-plugin
+        - xdg-user-dirs-gtk
+        - xed
+        - xfce4
+        - xfce4-battery-plugin
+        - xfce4-datetime-plugin
+        - xfce4-mount-plugin
+        - xfce4-netload-plugin
+        - xfce4-notifyd
+        - xfce4-pulseaudio-plugin
+        - xfce4-screensaver
+        - xfce4-screenshooter
+        - xfce4-taskmanager
+        - xfce4-wavelan-plugin
+        - xfce4-weather-plugin
+        - xfce4-whiskermenu-plugin
+        - xfce4-xkb-plugin
 
     - id: bspwm
       name: "bspwm"
@@ -80,6 +200,14 @@ items:
       description[zh_CN]: "bspwm 是一个平铺窗口管理器，它将窗口表示为完整二叉树的叶子。 bspwm 支持多个监视器，并通过消息进行配置和控制。"
       description[ja]: "bspwmは、ウィンドウを完全な二分木の葉として表すタイル型ウィンドウマネージャーです。 bspwmは複数のモニターをサポートし、メッセージを介して構成および制御されます。"
       screenshot: "/etc/calamares/images/bspwm.png"
+      packages:
+        - cachyos-picom-config
+        - bspwm
+        - sxhkd
+        - polybar
+        - ly
+        - alacritty
+        - openssh
 
     - id: Budgie-Desktop
       name: "Budgie"
@@ -95,6 +223,34 @@ items:
       description[sv]: "Budgie Skrivbordet är ett funktionsrikt, modernert Skrivbord. Budgies design betonar enkelhet, minimalism och elegans."
       description[pt_BR]: "Budgie Desktop é um ambiente moderno rico em funcionalidade. O design do Budgie enfatiza a simplicidade, o minimalismo e a elegância."
       screenshot: "/etc/calamares/images/budgie.png"
+      packages:
+        - budgie-control-center
+        - budgie-desktop
+        - budgie-desktop-view
+        - budgie-extras
+        - budgie-screensaver
+        - eog
+        - evince
+        - file-roller
+        - gedit
+        - gnome-keyring
+        - gnome-screenshot
+        - gnome-terminal
+        - gvfs
+        - gvfs-afc
+        - gvfs-gphoto2
+        - gvfs-mtp
+        - gvfs-nfs
+        - gvfs-smb
+        - lightdm
+        - lightdm-slick-greeter
+        - nemo
+        - nemo-fileroller
+        - nemo-preview
+        - network-manager-applet
+        - sushi
+        - totem
+        - xdg-user-dirs-gtk
 
     - id: Cinnamon
       name: "Cinnamon"
@@ -107,6 +263,15 @@ items:
       description[zh_CN]: "Cinnamon是Linux桌面，提供先进的创新功能和传统的用户体验。"
       description[ja]: "Cinnamonは、先進的な革新的機能と伝統的なユーザーエクスペリエンスを提供するLinuxデスクトップです。"
       screenshot: "/etc/calamares/images/cinnamon.png"
+      packages:
+        - cinnamon
+        - system-config-printer
+        - gnome-keyring
+        - gnome-terminal
+        - blueberry
+        - metacity
+        - lightdm
+        - lightdm-gtk-greeter
 
     - id: Cosmic
       name: "Cosmic"
@@ -122,6 +287,32 @@ items:
       description[sv]: "Som helhet är COSMIC en omfattande operativsystem-GUI (grafiskt användargränssnitt) miljö som har avancerad funktionalitet och en responsiv design. Dess modulära arkitektur är specifikt utformad för att underlätta skapandet av unika, varumärkesanpassade användarupplevelser."
       description[pt_BR]: "Como um todo, o COSMIC é um ambiente de sistema operacional GUI (interface gráfica do usuário) abrangente que apresenta funcionalidades avançadas e um design responsivo. Sua arquitetura modular é especificamente projetada para facilitar a criação de experiências de usuário únicas e personalizadas."
       screenshot: "/etc/calamares/images/cosmic.png"
+      packages:
+        - cosmic-app-library
+        - cosmic-applets
+        - cosmic-bg
+        - cosmic-comp
+        - cosmic-files
+        - cosmic-greeter
+        - cosmic-icon-theme
+        - cosmic-launcher
+        - cosmic-notifications
+        - cosmic-osd
+        - cosmic-panel
+        - cosmic-player
+        - cosmic-randr
+        - cosmic-screenshot
+        - cosmic-session
+        - cosmic-settings
+        - cosmic-settings-daemon
+        - cosmic-terminal
+        - cosmic-text-editor
+        - cosmic-wallpapers
+        - cosmic-workspaces
+        - notification-daemon
+        - cosmic-greeter
+        - xdg-desktop-portal-cosmic
+        - xorg-xwayland
 
     - id: i3-Window-Manager
       name: "i3 Window Manager"
@@ -134,6 +325,17 @@ items:
       description[zh_CN]: "i3是一个为X11设计的平铺式窗口管理器，受wmii的启发，用C语言编写。它支持平铺、堆叠和标签布局，并动态处理。配置是通过纯文本文件实现的，扩展i3可以使用它的Unix域套接字和基于JSON的IPC接口，从许多编程语言。"
       description[ja]: "i3 は X11 用に設計されたタイル型ウィンドウマネージャで、wmii に触発されて C で書かれています。 タイル型、スタック型、タブ型のレイアウトをサポートし、これらは動的に処理されます。設定はプレーンテキストファイルで行い、i3 の拡張は Unix ドメインソケットと JSON ベースの IPC インターフェースを用いて多くのプログラミング言語から行うことができます。"
       screenshot: "/etc/calamares/images/i3.png"
+      packages:
+        - cachyos-i3wm-settings
+        - cachyos-picom-config
+        - i3-wm
+        - i3blocks
+        - i3lock-color
+        - i3status
+        - rofi
+        - polybar
+        - ly
+        - dunst
 
     - id: Hyprland
       name: "Hyprland"
@@ -158,6 +360,42 @@ items:
       description[zh_CN]: "一款可滚动平铺的 Wayland 合成器。"
       description[ja]: "スクロール可能なタイリング方式の Wayland コンポジタ。"
       screenshot: "/etc/calamares/images/niri.png"
+      packages:
+        - cachyos-alacritty-config
+        - cachyos-niri-settings
+        - sddm
+        - ttf-fantasque-nerd
+        - ttf-font-awesome
+        - otf-font-awesome
+        - awesome-terminal-fonts
+        - noto-fonts
+        - noto-fonts-emoji
+        - ttf-fira-sans
+        - ttf-hack
+        - kvantum
+        - qt5ct
+        - swaybg
+        - swaylock-effects-git
+        - swaylock-fancy-git
+        - niri
+        - waybar
+        - xdg-desktop-portal-gnome
+        - xwayland-satellite
+        - mako
+        - wob
+        - pamixer
+        - wofi
+        - wlogout
+        - wl-clipboard
+        - polkit-kde-agent
+        - bemenu
+        - bemenu-wayland
+        - xorg-xwayland
+        - capitaine-cursors
+        - cachyos-wallpapers
+        - kvantum-theme-nordic-git
+        - brightnessctl
+        - cachyos-nord-gtk-theme-git
 
     - id: LXDE-Desktop
       name: "LXDE"
@@ -173,6 +411,32 @@ items:
       description[sv]: "LXDE, som står för lättviktig X11 skrivbordsmiljö, är en skrivbordsmiljö som är lättviktig och snabb. Den är designad att vara användarvänlig och smal, samtidigt som resursanvändningen hålls låg. LXDE använder mindre RAM och mindre CPU samtidigt som det är en funktionsrik skrivbordsmiljö. Till skillnad från andra tätt integrerade stationära datorer strävar LXDE efter att vara modulärt, så varje komponent kan användas oberoende med få beroenden."
       description[pt_BR]: "LXDE, que significa Lightweight X11 Desktop Environment (Ambiente de Trabalho Leve para X11), é um ambiente de trabalho que é leve e rápido. Ele foi projetado para ser fácil de usar e rápido, enquanto mantém o uso de recursos baixo. O LXDE usa menos memória RAM e menos CPU, ao mesmo tempo em que é um ambiente de trabalho rico em funcionalidade. Ao contrário de outros ambientes de trabalho firmemente integrados, o LXDE se esforça para ser modular, de modo que cada componente pode ser usado independentemente com poucas dependências."
       screenshot: "/etc/calamares/images/lxde.png"
+      packages:
+        - celluloid
+        - file-roller
+        - galculator
+        - gnome-screenshot
+        - gpicview
+        - gvfs
+        - gvfs-afc
+        - gvfs-gphoto2
+        - gvfs-mtp
+        - gvfs-nfs
+        - gvfs-smb
+        - lxappearance
+        - obconf-qt
+        - lxde
+        - lxde-icon-theme
+        - lxterminal
+        - lightdm
+        - lightdm-slick-greeter
+        - notification-daemon
+        - openbox
+        - pcmanfm
+        - lxmusic
+        - network-manager-applet
+        - xdg-user-dirs-gtk
+        - xed
 
     - id: LXQT-Desktop
       name: "LXQT"
@@ -185,6 +449,29 @@ items:
       description[zh_CN]: "LXQt是一个轻量级的Qt桌面环境。它不会妨碍您的工作。它不会挂起或减慢您的系统。它专注于成为一个具有现代感的经典桌面。"
       description[ja]: "LXQtは、軽量のQtデスクトップ環境です。邪魔になることはありません。ハングアップしたり、システムが遅くなったりすることはありません。モダンなルック＆フィールでクラシックなデスクトップであることに重点を置いています。"
       screenshot: "/etc/calamares/images/lxqt.png"
+      packages:
+        - audiocd-kio
+        - baka-mplayer
+        - breeze
+        - breeze-gtk
+        - featherpad
+        - gvfs
+        - gvfs-mtp
+        - kio-fuse
+        - libstatgrab
+        - libsysstat
+        - lm_sensors
+        - lxqt
+        - lxqt-archiver
+        - network-manager-applet
+        - oxygen-icons
+        - pavucontrol-qt
+        - print-manager
+        - qt5-translations
+        - sddm
+        - xdg-utils
+        - xscreensaver
+        - xsettingsd
 
     - id: MATE-Desktop
       name: "Mate"
@@ -200,6 +487,20 @@ items:
       description[sv]: "MATE Skrivbordsmiljö är en fortsättningen på GNOME 2. Den ger en intuitiv och attraktiv skrivbordsmiljö med traditionella metaforer för Linux och andra Unix-liknande operativsystem. MATE är under aktiv utveckling för att lägga till stöd för ny teknik samtidigt som en traditionell skrivbordsupplevelse bevaras.."
       description[pt_BR]: "O MATE Desktop Environment é a continuação do GNOME 2. Ele fornece um ambiente de trabalho intuitivo e atraente usando convenções tradicionais de Linux e outros sistemas operacionais do tipo Unix"
       screenshot: "/etc/calamares/images/mate.png"
+      packages:
+        - celluloid
+        - gvfs
+        - gvfs-afc
+        - gvfs-gphoto2
+        - gvfs-mtp
+        - gvfs-nfs
+        - gvfs-smb
+        - lightdm
+        - lightdm-slick-greeter
+        - mate
+        - mate-extra
+        - network-manager-applet
+        - xdg-user-dirs-gtk
 
     - id: Openbox
       name: "Openbox"
@@ -212,6 +513,49 @@ items:
       description[zh_CN]: "Openbox 是一個高度可配置的浮動窗口管理器，具有廣泛的標準支持。"
       description[ja]: "Openboxは、高度に構成可能なフローティングウィンドウマネージャーであり、広範な標準をサポートしています。"
       screenshot: "/etc/calamares/images/openbox.png"
+      packages:
+        - obconf-qt
+        - libwnck3
+        - acpi
+        - arandr
+        - archlinux-xdg-menu
+        - dex
+        - dmenu
+        - dunst
+        - feh
+        - gvfs
+        - gvfs-afc
+        - gvfs-gphoto2
+        - gvfs-mtp
+        - gvfs-nfs
+        - gvfs-smb
+        - jgmenu
+        - jq
+        - lightdm
+        - lightdm-slick-greeter
+        - lxappearance
+        - mpv
+        - network-manager-applet
+        - openbox
+        - pasystray
+        - picom
+        - polkit-gnome
+        - rofi
+        - scrot
+        - slock
+        - sysstat
+        - thunar
+        - thunar-archive-plugin
+        - thunar-media-tags-plugin
+        - thunar-volman
+        - tint2
+        - ttf-nerd-fonts-symbols
+        - tumbler
+        - xbindkeys
+        - xcursor-neutral
+        - xdg-user-dirs-gtk
+        - xed
+        - xfce4-terminal
 
     - id: Qtile
       name: "Qtile"
@@ -224,6 +568,23 @@ items:
       description[zh_CN]: "Qtile是一个用Python编程语言配置的X11窗口管理器。"
       description[ja]: "Qtileは、プログラミング言語Pythonで構成されるX11ウィンドウマネージャです。"
       screenshot: "/etc/calamares/images/qtile.png"
+      packages:
+        - cachyos-qtile-settings
+        - ttf-nerd-fonts-symbols
+        - qtile
+        - ttf-cascadia-code
+        - wired
+        - rofi
+        - thunar
+        - polkit-gnome
+        - qt5ct
+        - noto-fonts
+        - flameshot
+        - gnome-themes-extra
+        - ttf-jetbrains-mono
+        - ttf-font-awesome
+        - picom
+        - ly
 
     - id: Sway
       name: "Sway"
@@ -231,6 +592,19 @@ items:
       description[de]: "Sway ist ein kachelnder Wayland-Compositor und ein Drop-in-Ersatz für den i3-Fenstermanager für X11. Er arbeitet mit Ihrer bestehenden i3-Konfiguration und unterstützt die meisten Funktionen von i3, plus ein paar Extras."
       description[ru]: "Sway - это тайлинговый Wayland композитор и встроенная замена оконному менеджеру i3 для X11. Он работает с вашей существующей конфигурацией i3 и поддерживает большинство функций i3, а также несколько дополнительных функций."
       screenshot: "/etc/calamares/images/sway.png"
+      packages:
+        - sway
+        - waybar
+        - wl-clipboard
+        - egl-wayland
+        - wayland-protocols
+        - wofi
+        - foot
+        - wmenu
+        - ly
+        - xorg-xwayland
+        - xdg-desktop-portal
+        - xdg-desktop-portal-wlr
 
     - id: UKUI
       name: "UKUI"
@@ -243,6 +617,39 @@ items:
       description[zh_CN]: "UKUI是一个轻量级的桌面环境，它消耗的资源很少，可以在老式电脑上使用。它是用GTK和Qt技术开发的。它的视觉外观与Windows 7相似，使Linux的新用户更容易使用。"
       description[ja]: "UKUIは軽量なデスクトップ環境であり、リソースをほとんど消費せず、古いコンピュータでも動作する。GTKとQtの技術で開発されています。その外観はWindows 7に似ており、Linuxの新規ユーザーにとって使いやすいものとなっています。"
       screenshot: "/etc/calamares/images/ukui.png"
+      packages:
+        - sddm
+        - thunar
+        - thunar-archive-plugin
+        - thunar-volman
+        - peony
+        - xfce4-terminal
+        - qt5-ukui-platformtheme
+        - ukui-biometric-auth
+        - ukui-control-center
+        - ukui-interface
+        - ukui-media
+        - ukui-menu
+        - ukui-menus
+        - ukui-notebook
+        - ukui-panel
+        - ukui-power-manager
+        - ukui-screensaver
+        - ukui-session-manager
+        - ukui-settings-daemon
+        - ukui-sidebar
+        - ukui-system-monitor
+        - ukui-themes
+        - ukui-wallpapers
+        - ukui-window-switch
+        - mate-terminal
+        - mate-system-monitor
+        - mate-control-center
+        - redshift
+        - gnome-screenshot
+        - accountsservice
+        - gvfs
+        - qt5-quickcontrols
 
     - id: Wayfire
       name: "Wayfire"
@@ -250,3 +657,12 @@ items:
       description[de]: "Wayfire ist ein Wayland-Compositor, der auf wlroots basiert. Er zielt darauf ab, eine anpassbare, erweiterbare und leichtgewichtige Umgebung zu schaffen, ohne dabei sein Aussehen zu beeinträchtigen."
       description[ru]: "Wayfire - это композитор wayland, основанный на wlroots. Он направлен на создание настраиваемой, расширяемой и легкой среды без ущерба для ее внешнего вида."
       screenshot: "/etc/calamares/images/wayfire.png"
+      packages:
+        - cachyos-wayfire-settings
+        - wayfire-desktop-git
+        - egl-wayland
+        - wayland-protocols
+        - wofi
+        - ly
+        - xorg-xhost
+        - xorg-xwayland