Move packages each into a separate line to make lists cleaner. Remove duplicates and sort them alphabetically (#3063)

cat packages | tr ' ' '\n' | sed '/^\s*$/d' | uniq | sort
2025-09-24 19:47:06 +07:00 · 2021-07-26 20:26:40 +02:00
parent e3ebc15275
commit 60f7a32728
66 changed files with 4290 additions and 629 deletions
--- a/config/cli/bullseye/debootstrap/packages
+++ b/config/cli/bullseye/debootstrap/packages
@@ -1,4 +1,34 @@
-locales gnupg ifupdown apt-utils ca-certificates bzip2 console-setup 
-cpio cron dbus init initramfs-tools iputils-ping isc-dhcp-client kmod less libpam-systemd 
-linux-base logrotate netbase netcat-openbsd rsyslog systemd sudo ucf udev whiptail 
-wireless-regdb crda dmsetup rsync tzdata haveged fdisk
+apt-utils
+bzip2
+ca-certificates
+console-setup
+cpio
+crda
+cron
+dbus
+dmsetup
+fdisk
+gnupg
+haveged
+ifupdown
+init
+initramfs-tools
+iputils-ping
+isc-dhcp-client
+kmod
+less
+libpam-systemd
+linux-base
+locales
+logrotate
+netbase
+netcat-openbsd
+rsync
+rsyslog
+sudo
+systemd
+tzdata
+ucf
+udev
+whiptail
+wireless-regdb
--- a/config/cli/bullseye/main/config_cli_standard/packages
+++ b/config/cli/bullseye/main/config_cli_standard/packages
@@ -1,5 +1,35 @@
-bridge-utils build-essential fbset iw wpasupplicant sudo linux-base crda wireless-regdb 
-unattended-upgrades console-setup unicode-data initramfs-tools ca-certificates expect 
-iptables automake html2text bison flex libwrap0-dev libssl-dev libnl-3-dev libnl-genl-3-dev 
-keyboard-configuration gnupg2 networkd-dispatcher man-db hping3 command-not-found apt-file 
-dkms python3-distutils python3-lib2to3 vnstat
+apt-file
+automake
+bison
+bridge-utils
+build-essential
+ca-certificates
+command-not-found
+console-setup
+crda
+dkms
+expect
+fbset
+flex
+gnupg2
+hping3
+html2text
+initramfs-tools
+iptables
+iw
+keyboard-configuration
+libnl-3-dev
+libnl-genl-3-dev
+libssl-dev
+libwrap0-dev
+linux-base
+man-db
+networkd-dispatcher
+python3-distutils
+python3-lib2to3
+sudo
+unattended-upgrades
+unicode-data
+vnstat
+wireless-regdb
+wpasupplicant
--- a/config/cli/bullseye/main/config_cli_standard/packages.additional
+++ b/config/cli/bullseye/main/config_cli_standard/packages.additional
@@ -1,5 +1,38 @@
-software-properties-common alsa-utils btrfs-progs dosfstools iotop stress screen 
-ntfs-3g vim pciutils evtest pv libfuse2 libdigest-sha-perl 
-libproc-processtable-perl aptitude dnsutils f3 haveged hdparm rfkill vlan bash-completion 
-hostapd git ethtool unzip ifenslave libpam-systemd iperf3 nfs-common
-libnss-myhostname f2fs-tools avahi-autoipd iputils-arping qrencode sunxi-tools i2c-tools
+alsa-utils
+aptitude
+avahi-autoipd
+bash-completion
+btrfs-progs
+dnsutils
+dosfstools
+ethtool
+evtest
+f2fs-tools
+f3
+git
+haveged
+hdparm
+hostapd
+i2c-tools
+ifenslave
+iotop
+iperf3
+iputils-arping
+libdigest-sha-perl
+libfuse2
+libnss-myhostname
+libpam-systemd
+libproc-processtable-perl
+nfs-common
+ntfs-3g
+pciutils
+pv
+qrencode
+rfkill
+screen
+software-properties-common
+stress
+sunxi-tools
+unzip
+vim
+vlan
--- a/config/cli/bullseye/main/config_desktop/packages
+++ b/config/cli/bullseye/main/config_desktop/packages
@@ -1,4 +1,25 @@
-bridge-utils build-essential fbset iw wpasupplicant sudo linux-base crda 
-wireless-regdb unattended-upgrades console-setup unicode-data initramfs-tools 
-ca-certificates expect iptables automake html2text bison flex libwrap0-dev 
-libssl-dev libnl-3-dev libnl-genl-3-dev keyboard-configuration 
+automake
+bison
+bridge-utils
+build-essential
+ca-certificates
+console-setup
+crda
+expect
+fbset
+flex
+html2text
+initramfs-tools
+iptables
+iw
+keyboard-configuration
+libnl-3-dev
+libnl-genl-3-dev
+libssl-dev
+libwrap0-dev
+linux-base
+sudo
+unattended-upgrades
+unicode-data
+wireless-regdb
+wpasupplicant
--- a/config/cli/bullseye/main/config_desktop/packages.additional
+++ b/config/cli/bullseye/main/config_desktop/packages.additional
@@ -1,5 +1,36 @@
-software-properties-common alsa-utils btrfs-progs dosfstools iotop stress screen 
-ntfs-3g vim pciutils evtest pv libfuse2 libdigest-sha-perl 
-libproc-processtable-perl aptitude dnsutils f3 haveged hdparm rfkill vlan bash-completion 
-hostapd git ethtool unzip ifenslave libpam-systemd iperf3 
-libnss-myhostname f2fs-tools avahi-autoipd iputils-arping qrencode sunxi-tools
+alsa-utils
+aptitude
+avahi-autoipd
+bash-completion
+btrfs-progs
+dnsutils
+dosfstools
+ethtool
+evtest
+f2fs-tools
+f3
+git
+haveged
+hdparm
+hostapd
+ifenslave
+iotop
+iperf3
+iputils-arping
+libdigest-sha-perl
+libfuse2
+libnss-myhostname
+libpam-systemd
+libproc-processtable-perl
+ntfs-3g
+pciutils
+pv
+qrencode
+rfkill
+screen
+software-properties-common
+stress
+sunxi-tools
+unzip
+vim
+vlan
--- a/config/cli/bullseye/main/packages
+++ b/config/cli/bullseye/main/packages
@@ -1,3 +1,20 @@
-bc cpufrequtils device-tree-compiler fping fake-hwclock psmisc chrony parted dialog 
-ncurses-term sysfsutils toilet figlet u-boot-tools usbutils openssh-server nocache 
-debconf-utils python3-apt smartmontools 
+bc
+chrony
+cpufrequtils
+debconf-utils
+device-tree-compiler
+dialog
+fake-hwclock
+figlet
+fping
+ncurses-term
+nocache
+openssh-server
+parted
+psmisc
+python3-apt
+smartmontools
+sysfsutils
+toilet
+u-boot-tools
+usbutils
--- a/config/cli/bullseye/main/packages.additional
+++ b/config/cli/bullseye/main/packages.additional
@@ -1,2 +1,18 @@
-network-manager network-manager-openvpn wireless-tools lsof htop mmc-utils wget nano sysstat net-tools resolvconf 
-iozone3 jq libcrack2 cracklib-runtime curl mc i2c-tools
+cracklib-runtime
+curl
+htop
+i2c-tools
+iozone3
+jq
+libcrack2
+lsof
+mc
+mmc-utils
+nano
+net-tools
+network-manager
+network-manager-openvpn
+resolvconf
+sysstat
+wget
+wireless-tools
--- a/config/cli/buster/debootstrap/packages
+++ b/config/cli/buster/debootstrap/packages
@@ -1,4 +1,34 @@
-locales gnupg ifupdown apt-utils ca-certificates bzip2 console-setup 
-cpio cron dbus init initramfs-tools iputils-ping isc-dhcp-client kmod less libpam-systemd 
-linux-base logrotate netbase netcat-openbsd rsyslog systemd sudo ucf udev whiptail 
-wireless-regdb crda dmsetup rsync tzdata haveged fdisk
+apt-utils
+bzip2
+ca-certificates
+console-setup
+cpio
+crda
+cron
+dbus
+dmsetup
+fdisk
+gnupg
+haveged
+ifupdown
+init
+initramfs-tools
+iputils-ping
+isc-dhcp-client
+kmod
+less
+libpam-systemd
+linux-base
+locales
+logrotate
+netbase
+netcat-openbsd
+rsync
+rsyslog
+sudo
+systemd
+tzdata
+ucf
+udev
+whiptail
+wireless-regdb
--- a/config/cli/buster/main/config_cli_standard/packages
+++ b/config/cli/buster/main/config_cli_standard/packages
@@ -1,5 +1,37 @@
-bridge-utils build-essential fbset iw wpasupplicant sudo linux-base crda wireless-regdb 
-unattended-upgrades console-setup unicode-data initramfs-tools ca-certificates expect 
-iptables automake html2text bison flex libwrap0-dev libssl-dev libnl-3-dev libnl-genl-3-dev 
-keyboard-configuration gnupg2 networkd-dispatcher man-db hping3 selinux-policy-default 
-rng-tools command-not-found apt-file dkms python3-distutils python3-lib2to3 vnstat
+apt-file
+automake
+bison
+bridge-utils
+build-essential
+ca-certificates
+command-not-found
+console-setup
+crda
+dkms
+expect
+fbset
+flex
+gnupg2
+hping3
+html2text
+initramfs-tools
+iptables
+iw
+keyboard-configuration
+libnl-3-dev
+libnl-genl-3-dev
+libssl-dev
+libwrap0-dev
+linux-base
+man-db
+networkd-dispatcher
+python3-distutils
+python3-lib2to3
+rng-tools
+selinux-policy-default
+sudo
+unattended-upgrades
+unicode-data
+vnstat
+wireless-regdb
+wpasupplicant
--- a/config/cli/buster/main/config_cli_standard/packages.additional
+++ b/config/cli/buster/main/config_cli_standard/packages.additional
@@ -1,5 +1,38 @@
-software-properties-common alsa-utils btrfs-progs dosfstools iotop stress screen 
-ntfs-3g vim pciutils evtest pv libfuse2 libdigest-sha-perl 
-libproc-processtable-perl aptitude dnsutils f3 haveged hdparm rfkill vlan bash-completion 
-hostapd git ethtool unzip ifenslave libpam-systemd iperf3 nfs-common
-libnss-myhostname f2fs-tools avahi-autoipd iputils-arping qrencode sunxi-tools i2c-tools
+alsa-utils
+aptitude
+avahi-autoipd
+bash-completion
+btrfs-progs
+dnsutils
+dosfstools
+ethtool
+evtest
+f2fs-tools
+f3
+git
+haveged
+hdparm
+hostapd
+i2c-tools
+ifenslave
+iotop
+iperf3
+iputils-arping
+libdigest-sha-perl
+libfuse2
+libnss-myhostname
+libpam-systemd
+libproc-processtable-perl
+nfs-common
+ntfs-3g
+pciutils
+pv
+qrencode
+rfkill
+screen
+software-properties-common
+stress
+sunxi-tools
+unzip
+vim
+vlan
--- a/config/cli/buster/main/config_desktop/packages
+++ b/config/cli/buster/main/config_desktop/packages
@@ -1,4 +1,25 @@
-bridge-utils build-essential fbset iw wpasupplicant sudo linux-base crda 
-wireless-regdb unattended-upgrades console-setup unicode-data initramfs-tools 
-ca-certificates expect iptables automake html2text bison flex libwrap0-dev 
-libssl-dev libnl-3-dev libnl-genl-3-dev keyboard-configuration 
+automake
+bison
+bridge-utils
+build-essential
+ca-certificates
+console-setup
+crda
+expect
+fbset
+flex
+html2text
+initramfs-tools
+iptables
+iw
+keyboard-configuration
+libnl-3-dev
+libnl-genl-3-dev
+libssl-dev
+libwrap0-dev
+linux-base
+sudo
+unattended-upgrades
+unicode-data
+wireless-regdb
+wpasupplicant
--- a/config/cli/buster/main/config_desktop/packages.additional
+++ b/config/cli/buster/main/config_desktop/packages.additional
@@ -1,5 +1,36 @@
-software-properties-common alsa-utils btrfs-progs dosfstools iotop stress screen 
-ntfs-3g vim pciutils evtest pv libfuse2 libdigest-sha-perl 
-libproc-processtable-perl aptitude dnsutils f3 haveged hdparm rfkill vlan bash-completion 
-hostapd git ethtool unzip ifenslave libpam-systemd iperf3 
-libnss-myhostname f2fs-tools avahi-autoipd iputils-arping qrencode sunxi-tools
+alsa-utils
+aptitude
+avahi-autoipd
+bash-completion
+btrfs-progs
+dnsutils
+dosfstools
+ethtool
+evtest
+f2fs-tools
+f3
+git
+haveged
+hdparm
+hostapd
+ifenslave
+iotop
+iperf3
+iputils-arping
+libdigest-sha-perl
+libfuse2
+libnss-myhostname
+libpam-systemd
+libproc-processtable-perl
+ntfs-3g
+pciutils
+pv
+qrencode
+rfkill
+screen
+software-properties-common
+stress
+sunxi-tools
+unzip
+vim
+vlan
--- a/config/cli/buster/main/packages
+++ b/config/cli/buster/main/packages
@@ -1,3 +1,20 @@
-bc cpufrequtils device-tree-compiler fping fake-hwclock psmisc chrony parted dialog 
-ncurses-term sysfsutils toilet figlet u-boot-tools usbutils openssh-server nocache 
-debconf-utils python3-apt smartmontools 
+bc
+chrony
+cpufrequtils
+debconf-utils
+device-tree-compiler
+dialog
+fake-hwclock
+figlet
+fping
+ncurses-term
+nocache
+openssh-server
+parted
+psmisc
+python3-apt
+smartmontools
+sysfsutils
+toilet
+u-boot-tools
+usbutils
--- a/config/cli/buster/main/packages.additional
+++ b/config/cli/buster/main/packages.additional
@@ -1,2 +1,18 @@
-network-manager network-manager-openvpn wireless-tools lsof htop mmc-utils wget nano sysstat net-tools 
-resolvconf iozone3 jq libcrack2 cracklib-runtime curl mc i2c-tools
+cracklib-runtime
+curl
+htop
+i2c-tools
+iozone3
+jq
+libcrack2
+lsof
+mc
+mmc-utils
+nano
+net-tools
+network-manager
+network-manager-openvpn
+resolvconf
+sysstat
+wget
+wireless-tools
--- a/config/cli/focal/debootstrap/config_desktop/packages
+++ b/config/cli/focal/debootstrap/config_desktop/packages
@@ -1 +1,3 @@
-libgtk2.0-bin dconf-cli libglib2.0-dev
+dconf-cli
+libglib2.0-dev
+libgtk2.0-bin
--- a/config/cli/focal/debootstrap/packages
+++ b/config/cli/focal/debootstrap/packages
@@ -1,4 +1,34 @@
-locales gnupg ifupdown apt-utils ca-certificates bzip2 console-setup 
-cpio cron dbus init initramfs-tools iputils-ping isc-dhcp-client kmod less libpam-systemd 
-linux-base logrotate netbase netcat-openbsd rsyslog systemd sudo ucf udev whiptail 
-wireless-regdb crda dmsetup rsync tzdata rng-tools fdisk
+apt-utils
+bzip2
+ca-certificates
+console-setup
+cpio
+crda
+cron
+dbus
+dmsetup
+fdisk
+gnupg
+ifupdown
+init
+initramfs-tools
+iputils-ping
+isc-dhcp-client
+kmod
+less
+libpam-systemd
+linux-base
+locales
+logrotate
+netbase
+netcat-openbsd
+rng-tools
+rsync
+rsyslog
+sudo
+systemd
+tzdata
+ucf
+udev
+whiptail
+wireless-regdb
--- a/config/cli/focal/main/config_cli_standard/packages
+++ b/config/cli/focal/main/config_cli_standard/packages
@@ -1,5 +1,34 @@
-bridge-utils build-essential fbset iw wpasupplicant sudo linux-base crda wireless-regdb 
-unattended-upgrades console-setup unicode-data initramfs-tools ca-certificates expect 
-iptables automake html2text bison flex libwrap0-dev libssl-dev libnl-3-dev libnl-genl-3-dev 
-keyboard-configuration gnupg2 networkd-dispatcher man-db hping3 selinux-policy-default 
-dkms python3-distutils python3-lib2to3 vnstat
+automake
+bison
+bridge-utils
+build-essential
+ca-certificates
+console-setup
+crda
+dkms
+expect
+fbset
+flex
+gnupg2
+hping3
+html2text
+initramfs-tools
+iptables
+iw
+keyboard-configuration
+libnl-3-dev
+libnl-genl-3-dev
+libssl-dev
+libwrap0-dev
+linux-base
+man-db
+networkd-dispatcher
+python3-distutils
+python3-lib2to3
+selinux-policy-default
+sudo
+unattended-upgrades
+unicode-data
+vnstat
+wireless-regdb
+wpasupplicant
--- a/config/cli/focal/main/config_cli_standard/packages.additional
+++ b/config/cli/focal/main/config_cli_standard/packages.additional
@@ -1,5 +1,37 @@
-software-properties-common alsa-utils btrfs-progs dosfstools iotop stress screen 
-ntfs-3g vim pciutils evtest pv libfuse2 libdigest-sha-perl 
-libproc-processtable-perl aptitude dnsutils f3 haveged hdparm rfkill vlan bash-completion 
-hostapd git ethtool unzip ifenslave libpam-systemd iperf3 nfs-common
-libnss-myhostname f2fs-tools avahi-autoipd iputils-arping qrencode sunxi-tools
+alsa-utils
+aptitude
+avahi-autoipd
+bash-completion
+btrfs-progs
+dnsutils
+dosfstools
+ethtool
+evtest
+f2fs-tools
+f3
+git
+haveged
+hdparm
+hostapd
+ifenslave
+iotop
+iperf3
+iputils-arping
+libdigest-sha-perl
+libfuse2
+libnss-myhostname
+libpam-systemd
+libproc-processtable-perl
+nfs-common
+ntfs-3g
+pciutils
+pv
+qrencode
+rfkill
+screen
+software-properties-common
+stress
+sunxi-tools
+unzip
+vim
+vlan
--- a/config/cli/focal/main/config_desktop/packages
+++ b/config/cli/focal/main/config_desktop/packages
@@ -1,4 +1,26 @@
-bridge-utils build-essential fbset iw wpasupplicant sudo linux-base crda 
-wireless-regdb unattended-upgrades console-setup unicode-data initramfs-tools 
-ca-certificates expect iptables automake html2text bison flex libwrap0-dev 
-libssl-dev libnl-3-dev libnl-genl-3-dev keyboard-configuration emacs-nox
+automake
+bison
+bridge-utils
+build-essential
+ca-certificates
+console-setup
+crda
+emacs-nox
+expect
+fbset
+flex
+html2text
+initramfs-tools
+iptables
+iw
+keyboard-configuration
+libnl-3-dev
+libnl-genl-3-dev
+libssl-dev
+libwrap0-dev
+linux-base
+sudo
+unattended-upgrades
+unicode-data
+wireless-regdb
+wpasupplicant
--- a/config/cli/focal/main/config_desktop/packages.additional
+++ b/config/cli/focal/main/config_desktop/packages.additional
@@ -1,5 +1,36 @@
-software-properties-common alsa-utils btrfs-progs dosfstools iotop stress screen 
-ntfs-3g vim pciutils evtest pv libfuse2 libdigest-sha-perl 
-libproc-processtable-perl aptitude dnsutils f3 haveged hdparm rfkill vlan bash-completion 
-hostapd git ethtool unzip ifenslave libpam-systemd iperf3 
-libnss-myhostname f2fs-tools avahi-autoipd iputils-arping qrencode sunxi-tools
+alsa-utils
+aptitude
+avahi-autoipd
+bash-completion
+btrfs-progs
+dnsutils
+dosfstools
+ethtool
+evtest
+f2fs-tools
+f3
+git
+haveged
+hdparm
+hostapd
+ifenslave
+iotop
+iperf3
+iputils-arping
+libdigest-sha-perl
+libfuse2
+libnss-myhostname
+libpam-systemd
+libproc-processtable-perl
+ntfs-3g
+pciutils
+pv
+qrencode
+rfkill
+screen
+software-properties-common
+stress
+sunxi-tools
+unzip
+vim
+vlan
--- a/config/cli/focal/main/packages
+++ b/config/cli/focal/main/packages
@@ -1,3 +1,20 @@
-bc cpufrequtils device-tree-compiler fping fake-hwclock psmisc chrony parted dialog 
-ncurses-term sysfsutils toilet figlet u-boot-tools usbutils openssh-server nocache 
-debconf-utils python3-apt smartmontools 
+bc
+chrony
+cpufrequtils
+debconf-utils
+device-tree-compiler
+dialog
+fake-hwclock
+figlet
+fping
+ncurses-term
+nocache
+openssh-server
+parted
+psmisc
+python3-apt
+smartmontools
+sysfsutils
+toilet
+u-boot-tools
+usbutils
--- a/config/cli/focal/main/packages.additional
+++ b/config/cli/focal/main/packages.additional
@@ -1,2 +1,18 @@
-network-manager network-manager-openvpn wireless-tools lsof htop mmc-utils wget nano sysstat net-tools 
-resolvconf iozone3 jq libcrack2 cracklib-runtime curl mc i2c-tools
+cracklib-runtime
+curl
+htop
+i2c-tools
+iozone3
+jq
+libcrack2
+lsof
+mc
+mmc-utils
+nano
+net-tools
+network-manager
+network-manager-openvpn
+resolvconf
+sysstat
+wget
+wireless-tools
--- a/config/cli/impish/main/packages.additional
+++ b/config/cli/impish/main/packages.additional
@@ -1,2 +1,17 @@
-network-manager network-manager-openvpn wireless-tools lsof htop mmc-utils wget nano sysstat net-tools 
-resolvconf jq libcrack2 cracklib-runtime curl mc i2c-tools
+cracklib-runtime
+curl
+htop
+i2c-tools
+jq
+libcrack2
+lsof
+mc
+mmc-utils
+nano
+net-tools
+network-manager
+network-manager-openvpn
+resolvconf
+sysstat
+wget
+wireless-tools
--- a/config/desktop/bullseye/environments/gnome/config_base/packages
+++ b/config/desktop/bullseye/environments/gnome/config_base/packages
@@ -1,24 +1,204 @@
-xserver-xorg xserver-xorg-video-fbdev gvfs-backends xfonts-base xinit bubblewrap dbus-x11 dictionaries-common evolution-data-server 
-evolution-data-server-common gcr geoclue-2.0 gir1.2-accountsservice-1.0 gir1.2-atspi-2.0 gir1.2-gck-1 gir1.2-gcr-3 gir1.2-gdesktopenums-3.0 
-gir1.2-gdm-1.0 gir1.2-geoclue-2.0 gir1.2-gnomebluetooth-1.0 gir1.2-gnomedesktop-3.0 gir1.2-graphene-1.0 gir1.2-gweather-3.0 gir1.2-ibus-1.0 
-gir1.2-json-1.0 gir1.2-mutter-7 gir1.2-nm-1.0 gir1.2-nma-1.0 gir1.2-polkit-1.0 gir1.2-rsvg-2.0 gir1.2-soup-2.4 gir1.2-upowerglib-1.0 gjs 
-gnome-desktop3-data gnome-keyring gnome-session-bin gnome-session-common gnome-settings-daemon gnome-settings-daemon-common gnome-shell 
-gnome-shell-common hunspell-en-us libaccountsservice0 libaspell15 libcamel-1.2-62 libebackend-1.2-10 libebook-1.2-20 libebook-contacts-1.2-3 
-libecal-2.0-1 libedata-book-1.2-26 libedata-cal-2.0-1 libedataserver-1.2-25 libedataserverui-1.2-2 libenchant-2-2 libfontenc1 libgck-1-0 
-libgcr-base-3-1 libgcr-ui-3-1 libgdata-common libgdata22 libgdm1 libgeoclue-2-0 libgeocode-glib0 libgjs0g libgnome-autoar-0-0 
-libgnome-bluetooth13 libgnome-desktop-3-19 libgoa-1.0-0b libgoa-1.0-common libgraphene-1.0-0 libgweather-3-16 libgweather-common libibus-1.0-5 
-libical3 libimobiledevice6 libjavascriptcoregtk-4.0-18 libmutter-7-0 libnma0 libphonenumber8 libplist3 libprotobuf23 libtext-iconv-perl 
-libunwind8 libupower-glib3 libusbmuxd6 libwebkit2gtk-4.0-37 libxaw7 libxfont2 libxkbfile1 libxmu6 libxmuu1 libxtst6 mutter mutter-common 
-p11-kit p11-kit-modules pinentry-gnome3 upower x11-xkb-utils x11-xserver-utils xdg-dbus-proxy xserver-common xwayland zenity zenity-common 
-gnome-session gdm3 terminator gnome-control-center libasound2 anacron at-spi2-core dmz-cursor-theme fonts-freefont-ttf fonts-urw-base35 
-foomatic-db-compressed-ppds genisoimage ghostscript ghostscript-x gir1.2-goa-1.0 gir1.2-snapd-1 gnome-menus gnome-shell-extension-appindicator 
-gnome-shell-extension-desktop-icons gvfs-bin inputattach libasound2-plugins libatk-adaptor libcairo-gobject-perl libcairo-perl libcue2 
-libdee-1.0-4 libexempi8 libexiv2-27 libextutils-depends-perl libextutils-pkgconfig-perl libgexiv2-2 libglib-object-introspection-perl 
-libglib-perl libglu1-mesa libgs9 libgs9-common libgsf-1-114 libgsf-1-common libgtk3-perl libgxps2 libidn11 libijs-0.35 libjbig2dec0 
-libnautilus-extension1a libnotify-bin libpaper1 libpoppler-glib8 libpulsedsp libsasl2-modules libspeexdsp1 libtotem-plparser-common 
-libtotem-plparser18 libtracker-control-2.0-0 libtracker-miner-2.0-0 libtracker-sparql-2.0-0 libu2f-udev libxxf86dga1 libyelp0 nautilus 
-nautilus-data openprinting-ppds poppler-data printer-driver-pnm2ppa pulseaudio pulseaudio-utils python3-click python3-colorama python3-dateutil 
-python3-debconf python3-debian python3-distutils python3-distutils-extra python3-yaml software-properties-gtk spice-vdagent tracker tracker-extract 
-tracker-miner-fs gnome-packagekit apt-config-auto-update x11-apps x11-session-utils x11-utils xdg-desktop-portal xdg-user-dirs xdg-user-dirs-gtk 
-xinput xorg xorg-docs-core yelp yelp-xsl pulseaudio-module-bluetooth pavucontrol gnome-shell-extension-trash cups system-config-printer-common 
-system-config-printer gdebi
+anacron
+apt-config-auto-update
+at-spi2-core
+bubblewrap
+cups
+dbus-x11
+dictionaries-common
+dmz-cursor-theme
+evolution-data-server
+evolution-data-server-common
+fonts-freefont-ttf
+fonts-urw-base35
+foomatic-db-compressed-ppds
+gcr
+gdebi
+gdm3
+genisoimage
+geoclue-2.0
+ghostscript
+ghostscript-x
+gir1.2-accountsservice-1.0
+gir1.2-atspi-2.0
+gir1.2-gck-1
+gir1.2-gcr-3
+gir1.2-gdesktopenums-3.0
+gir1.2-gdm-1.0
+gir1.2-geoclue-2.0
+gir1.2-gnomebluetooth-1.0
+gir1.2-gnomedesktop-3.0
+gir1.2-goa-1.0
+gir1.2-graphene-1.0
+gir1.2-gweather-3.0
+gir1.2-ibus-1.0
+gir1.2-json-1.0
+gir1.2-mutter-7
+gir1.2-nm-1.0
+gir1.2-nma-1.0
+gir1.2-polkit-1.0
+gir1.2-rsvg-2.0
+gir1.2-snapd-1
+gir1.2-soup-2.4
+gir1.2-upowerglib-1.0
+gjs
+gnome-control-center
+gnome-desktop3-data
+gnome-keyring
+gnome-menus
+gnome-packagekit
+gnome-session
+gnome-session-bin
+gnome-session-common
+gnome-settings-daemon
+gnome-settings-daemon-common
+gnome-shell
+gnome-shell-common
+gnome-shell-extension-appindicator
+gnome-shell-extension-desktop-icons
+gnome-shell-extension-trash
+gvfs-backends
+gvfs-bin
+hunspell-en-us
+inputattach
+libaccountsservice0
+libasound2
+libasound2-plugins
+libaspell15
+libatk-adaptor
+libcairo-gobject-perl
+libcairo-perl
+libcamel-1.2-62
+libcue2
+libdee-1.0-4
+libebackend-1.2-10
+libebook-1.2-20
+libebook-contacts-1.2-3
+libecal-2.0-1
+libedata-book-1.2-26
+libedata-cal-2.0-1
+libedataserver-1.2-25
+libedataserverui-1.2-2
+libenchant-2-2
+libexempi8
+libexiv2-27
+libextutils-depends-perl
+libextutils-pkgconfig-perl
+libfontenc1
+libgck-1-0
+libgcr-base-3-1
+libgcr-ui-3-1
+libgdata22
+libgdata-common
+libgdm1
+libgeoclue-2-0
+libgeocode-glib0
+libgexiv2-2
+libgjs0g
+libglib-object-introspection-perl
+libglib-perl
+libglu1-mesa
+libgnome-autoar-0-0
+libgnome-bluetooth13
+libgnome-desktop-3-19
+libgoa-1.0-0b
+libgoa-1.0-common
+libgraphene-1.0-0
+libgs9
+libgs9-common
+libgsf-1-114
+libgsf-1-common
+libgtk3-perl
+libgweather-3-16
+libgweather-common
+libgxps2
+libibus-1.0-5
+libical3
+libidn11
+libijs-0.35
+libimobiledevice6
+libjavascriptcoregtk-4.0-18
+libjbig2dec0
+libmutter-7-0
+libnautilus-extension1a
+libnma0
+libnotify-bin
+libpaper1
+libphonenumber8
+libplist3
+libpoppler-glib8
+libprotobuf23
+libpulsedsp
+libsasl2-modules
+libspeexdsp1
+libtext-iconv-perl
+libtotem-plparser18
+libtotem-plparser-common
+libtracker-control-2.0-0
+libtracker-miner-2.0-0
+libtracker-sparql-2.0-0
+libu2f-udev
+libunwind8
+libupower-glib3
+libusbmuxd6
+libwebkit2gtk-4.0-37
+libxaw7
+libxfont2
+libxkbfile1
+libxmu6
+libxmuu1
+libxtst6
+libxxf86dga1
+libyelp0
+mutter
+mutter-common
+nautilus
+nautilus-data
+openprinting-ppds
+p11-kit
+p11-kit-modules
+pavucontrol
+pinentry-gnome3
+poppler-data
+printer-driver-pnm2ppa
+pulseaudio
+pulseaudio-module-bluetooth
+pulseaudio-utils
+python3-click
+python3-colorama
+python3-dateutil
+python3-debconf
+python3-debian
+python3-distutils
+python3-distutils-extra
+python3-yaml
+software-properties-gtk
+spice-vdagent
+system-config-printer
+system-config-printer-common
+terminator
+tracker
+tracker-extract
+tracker-miner-fs
+upower
+x11-apps
+x11-session-utils
+x11-utils
+x11-xkb-utils
+x11-xserver-utils
+xdg-dbus-proxy
+xdg-desktop-portal
+xdg-user-dirs
+xdg-user-dirs-gtk
+xfonts-base
+xinit
+xinput
+xorg
+xorg-docs-core
+xserver-common
+xserver-xorg
+xserver-xorg-video-fbdev
+xwayland
+yelp
+yelp-xsl
+zenity
+zenity-common
--- a/config/desktop/bullseye/environments/mate/config_base/packages
+++ b/config/desktop/bullseye/environments/mate/config_base/packages
@@ -1,25 +1,113 @@
-xserver-xorg xserver-xorg-video-fbdev gvfs-backends gvfs-fuse xfonts-base xinit 
-x11-xserver-utils mate-applets mate-applets-common mate-applet-brisk-menu mate-backgrounds 
-mate-calc mate-calc-common mate-common mate-control-center mate-control-center-common 
-mate-core mate-desktop mate-desktop-common mate-desktop-environment 
-mate-desktop-environment-core mate-desktop-environment-extra 
-mate-desktop-environment-extras mate-dock-applet mate-equake-applet mate-icon-theme 
-mate-indicator-applet mate-indicator-applet-common mate-media mate-media-common mate-menu 
-mate-menus mate-netbook mate-netbook-common mate-notification-daemon 
-mate-notification-daemon-common mate-panel mate-panel-common mate-polkit mate-polkit-bin 
-mate-polkit-common mate-power-manager mate-power-manager-common mate-screensaver 
-mate-screensaver-common mate-sensors-applet mate-sensors-applet-common 
-debian-mate-default-settings mate-session-manager mate-settings-daemon 
-mate-settings-daemon-common mate-settings-daemon-dev mate-system-monitor 
-mate-system-monitor-common mate-terminal mate-terminal-common mate-themes mate-tweak 
-mate-user-guide mate-user-share mate-user-share-common mate-utils mate-utils-common 
-mate-window-applets-common mate-window-buttons-applet mate-window-menu-applet 
-mate-window-title-applet mate-applet-appmenu mate-sntray-plugin gtk2-engines 
-gtk2-engines-murrine gtk2-engines-pixbuf libgtk2.0-bin network-manager-gnome 
-gnome-keyring gcr libgck-1-0 p11-kit pasystray pavucontrol pulseaudio pavumeter 
-bluez bluez-tools pulseaudio-module-bluetooth blueman libpam-gnome-keyring 
-libgl1-mesa-dri profile-sync-daemon gnome-orca numix-gtk-theme synaptic apt-xapian-index 
-lightdm lightdm-gtk-greeter-settings numix-gtk-theme dbus-x11 dictionaries-common 
-hunspell-en-us tracker tracker-extract tracker-miner-fs gnome-packagekit 
-apt-config-auto-update policykit-1 profile-sync-daemon software-properties-common 
-system-config-printer system-config-printer-common printer-driver-all smbclient cifs-utils gdebi
+apt-config-auto-update
+apt-xapian-index
+blueman
+bluez
+bluez-tools
+cifs-utils
+dbus-x11
+debian-mate-default-settings
+dictionaries-common
+gcr
+gdebi
+gnome-keyring
+gnome-orca
+gnome-packagekit
+gtk2-engines
+gtk2-engines-murrine
+gtk2-engines-pixbuf
+gvfs-backends
+gvfs-fuse
+hunspell-en-us
+libgck-1-0
+libgl1-mesa-dri
+libgtk2.0-bin
+libpam-gnome-keyring
+lightdm
+lightdm-gtk-greeter-settings
+mate-applet-appmenu
+mate-applet-brisk-menu
+mate-applets
+mate-applets-common
+mate-backgrounds
+mate-calc
+mate-calc-common
+mate-common
+mate-control-center
+mate-control-center-common
+mate-core
+mate-desktop
+mate-desktop-common
+mate-desktop-environment
+mate-desktop-environment-core
+mate-desktop-environment-extra
+mate-desktop-environment-extras
+mate-dock-applet
+mate-equake-applet
+mate-icon-theme
+mate-indicator-applet
+mate-indicator-applet-common
+mate-media
+mate-media-common
+mate-menu
+mate-menus
+mate-netbook
+mate-netbook-common
+mate-notification-daemon
+mate-notification-daemon-common
+mate-panel
+mate-panel-common
+mate-polkit
+mate-polkit-bin
+mate-polkit-common
+mate-power-manager
+mate-power-manager-common
+mate-screensaver
+mate-screensaver-common
+mate-sensors-applet
+mate-sensors-applet-common
+mate-session-manager
+mate-settings-daemon
+mate-settings-daemon-common
+mate-settings-daemon-dev
+mate-sntray-plugin
+mate-system-monitor
+mate-system-monitor-common
+mate-terminal
+mate-terminal-common
+mate-themes
+mate-tweak
+mate-user-guide
+mate-user-share
+mate-user-share-common
+mate-utils
+mate-utils-common
+mate-window-applets-common
+mate-window-buttons-applet
+mate-window-menu-applet
+mate-window-title-applet
+network-manager-gnome
+numix-gtk-theme
+numix-gtk-theme
+p11-kit
+pasystray
+pavucontrol
+pavumeter
+policykit-1
+printer-driver-all
+profile-sync-daemon
+profile-sync-daemon
+pulseaudio
+pulseaudio-module-bluetooth
+smbclient
+software-properties-common
+synaptic
+system-config-printer
+system-config-printer-common
+tracker
+tracker-extract
+tracker-miner-fs
+x11-xserver-utils
+xfonts-base
+xinit
+xserver-xorg
+xserver-xorg-video-fbdev
--- a/config/desktop/buster/appgroups/browsers/packages
+++ b/config/desktop/buster/appgroups/browsers/packages
@@ -1 +1,2 @@
-chromium firefox-esr
+chromium
+firefox-esr
--- a/config/desktop/buster/appgroups/chat/packages
+++ b/config/desktop/buster/appgroups/chat/packages
@@ -1 +1,2 @@
-hexchat telegram-desktop
+hexchat
+telegram-desktop
--- a/config/desktop/buster/appgroups/desktop_tools/packages
+++ b/config/desktop/buster/appgroups/desktop_tools/packages
@@ -1 +1,4 @@
-bleachbit fbi kazam gparted
+bleachbit
+fbi
+gparted
+kazam
--- a/config/desktop/buster/appgroups/editors/packages
+++ b/config/desktop/buster/appgroups/editors/packages
@@ -1 +1,4 @@
-vim emacs geany code
+code
+emacs
+geany
+vim
--- a/config/desktop/buster/appgroups/internet/packages
+++ b/config/desktop/buster/appgroups/internet/packages
@@ -1 +1,5 @@
-qbittorrent transmission transmission-remote-gtk filezilla putty
+filezilla
+putty
+qbittorrent
+transmission
+transmission-remote-gtk
--- a/config/desktop/buster/appgroups/multimedia/packages
+++ b/config/desktop/buster/appgroups/multimedia/packages
@@ -1 +1,3 @@
-mpv pithos gimp
+gimp
+mpv
+pithos
--- a/config/desktop/buster/appgroups/office/packages
+++ b/config/desktop/buster/appgroups/office/packages
@@ -1 +1,2 @@
-libreoffice libreoffice-style-tango
+libreoffice
+libreoffice-style-tango
--- a/config/desktop/buster/appgroups/programming/packages
+++ b/config/desktop/buster/appgroups/programming/packages
@@ -1 +1,3 @@
-build-essential clang meld
+build-essential
+clang
+meld
--- a/config/desktop/buster/environments/gnome/config_base/packages
+++ b/config/desktop/buster/environments/gnome/config_base/packages
@@ -1,24 +1,204 @@
-xserver-xorg xserver-xorg-video-fbdev gvfs-backends xfonts-base xinit bubblewrap dbus-x11 dictionaries-common evolution-data-server 
-evolution-data-server-common gcr geoclue-2.0 gir1.2-accountsservice-1.0 gir1.2-atspi-2.0 gir1.2-gck-1 gir1.2-gcr-3 gir1.2-gdesktopenums-3.0 
-gir1.2-gdm-1.0 gir1.2-geoclue-2.0 gir1.2-gnomebluetooth-1.0 gir1.2-gnomedesktop-3.0 gir1.2-graphene-1.0 gir1.2-gweather-3.0 gir1.2-ibus-1.0 
-gir1.2-json-1.0 gir1.2-mutter-3 gir1.2-nm-1.0 gir1.2-nma-1.0 gir1.2-polkit-1.0 gir1.2-rsvg-2.0 gir1.2-soup-2.4 gir1.2-upowerglib-1.0 gjs 
-gnome-desktop3-data gnome-keyring gnome-session-bin gnome-session-common gnome-settings-daemon gnome-settings-daemon-common gnome-shell 
-gnome-shell-common hunspell-en-us libaccountsservice0 libaspell15 libcamel-1.2-62 libebackend-1.2-10 libebook-1.2-19 libebook-contacts-1.2-2 
-libecal-1.2-19 libedata-book-1.2-25 libedata-cal-1.2-29 libedataserver-1.2-23 libedataserverui-1.2-2 libenchant1c2a libfontenc1 libgck-1-0 
-libgcr-base-3-1 libgcr-ui-3-1 libgdata-common libgdata22 libgdm1 libgeoclue-2-0 libgeocode-glib0 libgjs0g libgnome-autoar-0-0 
-libgnome-bluetooth13 libgnome-desktop-3-17 libgoa-1.0-0b libgoa-1.0-common libgraphene-1.0-0 libgweather-3-15 libgweather-common libibus-1.0-5 
-libical3 libimobiledevice6 libjavascriptcoregtk-4.0-18 libmutter-3-0 libnma0 libphonenumber7 libplist3 libprotobuf17 libtext-iconv-perl 
-libunwind8 libupower-glib3 libusbmuxd4 libwebkit2gtk-4.0-37 libxaw7 libxfont2 libxkbfile1 libxmu6 libxmuu1 libxtst6 mutter mutter-common 
-p11-kit p11-kit-modules pinentry-gnome3 upower x11-xkb-utils x11-xserver-utils xdg-dbus-proxy xserver-common xwayland zenity zenity-common 
-gnome-session gdm3 terminator gnome-control-center libasound2 anacron at-spi2-core dmz-cursor-theme fonts-freefont-ttf fonts-urw-base35 
-foomatic-db-compressed-ppds genisoimage ghostscript ghostscript-x gir1.2-goa-1.0 gir1.2-snapd-1 gnome-menus gnome-shell-extension-appindicator 
-gnome-shell-extension-desktop-icons gvfs-bin inputattach libasound2-plugins libatk-adaptor libcairo-gobject-perl libcairo-perl libcue2 
-libdee-1.0-4 libexempi8 libexiv2-14 libextutils-depends-perl libextutils-pkgconfig-perl libgexiv2-2 libglib-object-introspection-perl 
-libglib-perl libglu1-mesa libgs9 libgs9-common libgsf-1-114 libgsf-1-common libgtk3-perl libgxps2 libidn11 libijs-0.35 libjbig2dec0 
-libnautilus-extension1a libnotify-bin libpaper1 libpoppler-glib8 libpulsedsp libsasl2-modules libspeexdsp1 libtotem-plparser-common 
-libtotem-plparser18 libtracker-control-2.0-0 libtracker-miner-2.0-0 libtracker-sparql-2.0-0 libu2f-udev libxxf86dga1 libyelp0 nautilus 
-nautilus-data openprinting-ppds poppler-data printer-driver-pnm2ppa pulseaudio pulseaudio-utils python3-click python3-colorama python3-dateutil 
-python3-debconf python3-debian python3-distutils python3-distutils-extra python3-yaml software-properties-gtk spice-vdagent tracker tracker-extract 
-tracker-miner-fs gnome-packagekit apt-config-auto-update x11-apps x11-session-utils x11-utils xdg-desktop-portal xdg-user-dirs xdg-user-dirs-gtk 
-xinput xorg xorg-docs-core yelp yelp-xsl pulseaudio-module-bluetooth pavucontrol gnome-shell-extension-trash cups system-config-printer-common 
-system-config-printer gdebi
+anacron
+apt-config-auto-update
+at-spi2-core
+bubblewrap
+cups
+dbus-x11
+dictionaries-common
+dmz-cursor-theme
+evolution-data-server
+evolution-data-server-common
+fonts-freefont-ttf
+fonts-urw-base35
+foomatic-db-compressed-ppds
+gcr
+gdebi
+gdm3
+genisoimage
+geoclue-2.0
+ghostscript
+ghostscript-x
+gir1.2-accountsservice-1.0
+gir1.2-atspi-2.0
+gir1.2-gck-1
+gir1.2-gcr-3
+gir1.2-gdesktopenums-3.0
+gir1.2-gdm-1.0
+gir1.2-geoclue-2.0
+gir1.2-gnomebluetooth-1.0
+gir1.2-gnomedesktop-3.0
+gir1.2-goa-1.0
+gir1.2-graphene-1.0
+gir1.2-gweather-3.0
+gir1.2-ibus-1.0
+gir1.2-json-1.0
+gir1.2-mutter-3
+gir1.2-nm-1.0
+gir1.2-nma-1.0
+gir1.2-polkit-1.0
+gir1.2-rsvg-2.0
+gir1.2-snapd-1
+gir1.2-soup-2.4
+gir1.2-upowerglib-1.0
+gjs
+gnome-control-center
+gnome-desktop3-data
+gnome-keyring
+gnome-menus
+gnome-packagekit
+gnome-session
+gnome-session-bin
+gnome-session-common
+gnome-settings-daemon
+gnome-settings-daemon-common
+gnome-shell
+gnome-shell-common
+gnome-shell-extension-appindicator
+gnome-shell-extension-desktop-icons
+gnome-shell-extension-trash
+gvfs-backends
+gvfs-bin
+hunspell-en-us
+inputattach
+libaccountsservice0
+libasound2
+libasound2-plugins
+libaspell15
+libatk-adaptor
+libcairo-gobject-perl
+libcairo-perl
+libcamel-1.2-62
+libcue2
+libdee-1.0-4
+libebackend-1.2-10
+libebook-1.2-19
+libebook-contacts-1.2-2
+libecal-1.2-19
+libedata-book-1.2-25
+libedata-cal-1.2-29
+libedataserver-1.2-23
+libedataserverui-1.2-2
+libenchant1c2a
+libexempi8
+libexiv2-14
+libextutils-depends-perl
+libextutils-pkgconfig-perl
+libfontenc1
+libgck-1-0
+libgcr-base-3-1
+libgcr-ui-3-1
+libgdata22
+libgdata-common
+libgdm1
+libgeoclue-2-0
+libgeocode-glib0
+libgexiv2-2
+libgjs0g
+libglib-object-introspection-perl
+libglib-perl
+libglu1-mesa
+libgnome-autoar-0-0
+libgnome-bluetooth13
+libgnome-desktop-3-17
+libgoa-1.0-0b
+libgoa-1.0-common
+libgraphene-1.0-0
+libgs9
+libgs9-common
+libgsf-1-114
+libgsf-1-common
+libgtk3-perl
+libgweather-3-15
+libgweather-common
+libgxps2
+libibus-1.0-5
+libical3
+libidn11
+libijs-0.35
+libimobiledevice6
+libjavascriptcoregtk-4.0-18
+libjbig2dec0
+libmutter-3-0
+libnautilus-extension1a
+libnma0
+libnotify-bin
+libpaper1
+libphonenumber7
+libplist3
+libpoppler-glib8
+libprotobuf17
+libpulsedsp
+libsasl2-modules
+libspeexdsp1
+libtext-iconv-perl
+libtotem-plparser18
+libtotem-plparser-common
+libtracker-control-2.0-0
+libtracker-miner-2.0-0
+libtracker-sparql-2.0-0
+libu2f-udev
+libunwind8
+libupower-glib3
+libusbmuxd4
+libwebkit2gtk-4.0-37
+libxaw7
+libxfont2
+libxkbfile1
+libxmu6
+libxmuu1
+libxtst6
+libxxf86dga1
+libyelp0
+mutter
+mutter-common
+nautilus
+nautilus-data
+openprinting-ppds
+p11-kit
+p11-kit-modules
+pavucontrol
+pinentry-gnome3
+poppler-data
+printer-driver-pnm2ppa
+pulseaudio
+pulseaudio-module-bluetooth
+pulseaudio-utils
+python3-click
+python3-colorama
+python3-dateutil
+python3-debconf
+python3-debian
+python3-distutils
+python3-distutils-extra
+python3-yaml
+software-properties-gtk
+spice-vdagent
+system-config-printer
+system-config-printer-common
+terminator
+tracker
+tracker-extract
+tracker-miner-fs
+upower
+x11-apps
+x11-session-utils
+x11-utils
+x11-xkb-utils
+x11-xserver-utils
+xdg-dbus-proxy
+xdg-desktop-portal
+xdg-user-dirs
+xdg-user-dirs-gtk
+xfonts-base
+xinit
+xinput
+xorg
+xorg-docs-core
+xserver-common
+xserver-xorg
+xserver-xorg-video-fbdev
+xwayland
+yelp
+yelp-xsl
+zenity
+zenity-common
--- a/config/desktop/buster/environments/lxde/config_base/packages
+++ b/config/desktop/buster/environments/lxde/config_base/packages
@@ -1,14 +1,124 @@
-xserver-xorg xserver-xorg-video-fbdev gvfs-backends xfonts-base xinit x11-xserver-utils lxappearance lxappearance-obconf lxde-common 
-openbox-lxde-session lxde-icon-theme lxde lxde-core lxdm lxinput lxlauncher lxmenu-data lxmusic lxpanel lxpanel-data lxrandr 
-lxde-settings-daemon lxlock lxpolkit lxsession lxsession-edit lxsession-logout lxtask lxterminal libmenu-cache-bin libmenu-cache-doc 
-libmenu-cache3 task-lxde-desktop xinit xorg-docs-core x11-apps xorg-docs xscreensaver xfonts-100dpi xfonts-75dpi xfonts-scalable 
-xcursor-themes xdg-user-dirs xdg-user-dirs-gtk keyutils redshift bluez bluez-tools bluez-cups brltty orca network-manager-pptp 
-network-manager-l2tp network-manager-openconnect network-manager-openvpn-gnome network-manager-vpnc cups 
-cups-bsd cups-filters liblouisutdml-bin liblouis-bin blueman pulseaudio pulseaudio-module-bluetooth pamix pasystray pavucontrol 
-pavumeter pavucontrol-qt gstreamer1.0-packagekit gstreamer1.0-plugins-base-apps libproxy1-plugin-gsettings libproxy1-plugin-networkmanager 
-libu2f-udev libwmf0.2-7-gtk openprinting-ppds p7zip-full anacron doc-base foomatic-db-compressed-ppds ghostscript-x inputattach libatk-adaptor 
-libgail-common libnotify-bin software-properties-gtk speech-dispatcher spice-vdagent zip lightdm lightdm-gtk-greeter lightdm-gtk-greeter-settings 
-numix-gtk-theme terminator bubblewrap dbus-x11 dictionaries-common hunspell-en-us tracker tracker-extract tracker-miner-fs libgl1-mesa-dri 
-policykit-1 profile-sync-daemon system-config-printer system-config-printer-common printer-driver-all software-properties-common samba 
-smbclient cifs-utils synaptic apt-xapian-index gtk2-engines gtk2-engines-murrine gtk2-engines-pixbuf libgtk2.0-bin network-manager-gnome 
-gnome-keyring gcr libgck-1-0 p11-kit libpam-gnome-keyring gdebi
+anacron
+apt-xapian-index
+blueman
+bluez
+bluez-cups
+bluez-tools
+brltty
+bubblewrap
+cifs-utils
+cups
+cups-bsd
+cups-filters
+dbus-x11
+dictionaries-common
+doc-base
+foomatic-db-compressed-ppds
+gcr
+gdebi
+ghostscript-x
+gnome-keyring
+gstreamer1.0-packagekit
+gstreamer1.0-plugins-base-apps
+gtk2-engines
+gtk2-engines-murrine
+gtk2-engines-pixbuf
+gvfs-backends
+hunspell-en-us
+inputattach
+keyutils
+libatk-adaptor
+libgail-common
+libgck-1-0
+libgl1-mesa-dri
+libgtk2.0-bin
+liblouis-bin
+liblouisutdml-bin
+libmenu-cache3
+libmenu-cache-bin
+libmenu-cache-doc
+libnotify-bin
+libpam-gnome-keyring
+libproxy1-plugin-gsettings
+libproxy1-plugin-networkmanager
+libu2f-udev
+libwmf0.2-7-gtk
+lightdm
+lightdm-gtk-greeter
+lightdm-gtk-greeter-settings
+lxappearance
+lxappearance-obconf
+lxde
+lxde-common
+lxde-core
+lxde-icon-theme
+lxde-settings-daemon
+lxdm
+lxinput
+lxlauncher
+lxlock
+lxmenu-data
+lxmusic
+lxpanel
+lxpanel-data
+lxpolkit
+lxrandr
+lxsession
+lxsession-edit
+lxsession-logout
+lxtask
+lxterminal
+network-manager-gnome
+network-manager-l2tp
+network-manager-openconnect
+network-manager-openvpn-gnome
+network-manager-pptp
+network-manager-vpnc
+numix-gtk-theme
+openbox-lxde-session
+openprinting-ppds
+orca
+p11-kit
+p7zip-full
+pamix
+pasystray
+pavucontrol
+pavucontrol-qt
+pavumeter
+policykit-1
+printer-driver-all
+profile-sync-daemon
+pulseaudio
+pulseaudio-module-bluetooth
+redshift
+samba
+smbclient
+software-properties-common
+software-properties-gtk
+speech-dispatcher
+spice-vdagent
+synaptic
+system-config-printer
+system-config-printer-common
+task-lxde-desktop
+terminator
+tracker
+tracker-extract
+tracker-miner-fs
+x11-apps
+x11-xserver-utils
+xcursor-themes
+xdg-user-dirs
+xdg-user-dirs-gtk
+xfonts-100dpi
+xfonts-75dpi
+xfonts-base
+xfonts-scalable
+xinit
+xinit
+xorg-docs
+xorg-docs-core
+xscreensaver
+xserver-xorg
+xserver-xorg-video-fbdev
+zip
--- a/config/desktop/buster/environments/mate/config_base/packages
+++ b/config/desktop/buster/environments/mate/config_base/packages
@@ -1,15 +1,114 @@
-xserver-xorg xserver-xorg-video-fbdev gvfs-backends gvfs-fuse xfonts-base xinit x11-xserver-utils mate-applets mate-applets-common 
-mate-applet-brisk-menu mate-backgrounds mate-calc mate-calc-common mate-common mate-control-center mate-control-center-common mate-core 
-mate-desktop mate-desktop-common mate-desktop-environment mate-desktop-environment-core mate-desktop-environment-extra 
-mate-desktop-environment-extras mate-dock-applet mate-equake-applet mate-icon-theme mate-icon-theme-faenza mate-indicator-applet 
-mate-indicator-applet-common mate-media mate-media-common mate-menu mate-menus mate-netbook mate-netbook-common mate-notification-daemon 
-mate-notification-daemon-common mate-panel mate-panel-common mate-polkit mate-polkit-bin mate-polkit-common mate-power-manager 
-mate-power-manager-common mate-screensaver mate-screensaver-common mate-sensors-applet mate-sensors-applet-common debian-mate-default-settings 
-mate-session-manager mate-settings-daemon mate-settings-daemon-common mate-settings-daemon-dev mate-system-monitor mate-system-monitor-common 
-mate-terminal mate-terminal-common mate-themes mate-tweak mate-user-guide mate-user-share mate-user-share-common mate-utils mate-utils-common 
-mate-window-applets-common mate-window-buttons-applet mate-window-menu-applet mate-window-title-applet mate-applet-appmenu mate-sntray-plugin 
-gtk2-engines gtk2-engines-murrine gtk2-engines-pixbuf libgtk2.0-bin network-manager-gnome gnome-keyring gcr libgck-1-0 p11-kit pasystray 
-pavucontrol pulseaudio pavumeter bluez bluez-tools pulseaudio-module-bluetooth blueman libpam-gnome-keyring libgl1-mesa-dri profile-sync-daemon 
-gnome-orca numix-gtk-theme synaptic apt-xapian-index lightdm lightdm-gtk-greeter-settings numix-gtk-theme dbus-x11 dictionaries-common 
-hunspell-en-us tracker tracker-extract tracker-miner-fs gnome-packagekit apt-config-auto-update policykit-1 profile-sync-daemon 
-software-properties-common system-config-printer system-config-printer-common printer-driver-all smbclient cifs-utils gdebi
+apt-config-auto-update
+apt-xapian-index
+blueman
+bluez
+bluez-tools
+cifs-utils
+dbus-x11
+debian-mate-default-settings
+dictionaries-common
+gcr
+gdebi
+gnome-keyring
+gnome-orca
+gnome-packagekit
+gtk2-engines
+gtk2-engines-murrine
+gtk2-engines-pixbuf
+gvfs-backends
+gvfs-fuse
+hunspell-en-us
+libgck-1-0
+libgl1-mesa-dri
+libgtk2.0-bin
+libpam-gnome-keyring
+lightdm
+lightdm-gtk-greeter-settings
+mate-applet-appmenu
+mate-applet-brisk-menu
+mate-applets
+mate-applets-common
+mate-backgrounds
+mate-calc
+mate-calc-common
+mate-common
+mate-control-center
+mate-control-center-common
+mate-core
+mate-desktop
+mate-desktop-common
+mate-desktop-environment
+mate-desktop-environment-core
+mate-desktop-environment-extra
+mate-desktop-environment-extras
+mate-dock-applet
+mate-equake-applet
+mate-icon-theme
+mate-icon-theme-faenza
+mate-indicator-applet
+mate-indicator-applet-common
+mate-media
+mate-media-common
+mate-menu
+mate-menus
+mate-netbook
+mate-netbook-common
+mate-notification-daemon
+mate-notification-daemon-common
+mate-panel
+mate-panel-common
+mate-polkit
+mate-polkit-bin
+mate-polkit-common
+mate-power-manager
+mate-power-manager-common
+mate-screensaver
+mate-screensaver-common
+mate-sensors-applet
+mate-sensors-applet-common
+mate-session-manager
+mate-settings-daemon
+mate-settings-daemon-common
+mate-settings-daemon-dev
+mate-sntray-plugin
+mate-system-monitor
+mate-system-monitor-common
+mate-terminal
+mate-terminal-common
+mate-themes
+mate-tweak
+mate-user-guide
+mate-user-share
+mate-user-share-common
+mate-utils
+mate-utils-common
+mate-window-applets-common
+mate-window-buttons-applet
+mate-window-menu-applet
+mate-window-title-applet
+network-manager-gnome
+numix-gtk-theme
+numix-gtk-theme
+p11-kit
+pasystray
+pavucontrol
+pavumeter
+policykit-1
+printer-driver-all
+profile-sync-daemon
+profile-sync-daemon
+pulseaudio
+pulseaudio-module-bluetooth
+smbclient
+software-properties-common
+synaptic
+system-config-printer
+system-config-printer-common
+tracker
+tracker-extract
+tracker-miner-fs
+x11-xserver-utils
+xfonts-base
+xinit
+xserver-xorg
+xserver-xorg-video-fbdev
--- a/config/desktop/buster/environments/xfce/config_base/packages
+++ b/config/desktop/buster/environments/xfce/config_base/packages
@@ -1,25 +1,140 @@
-xserver-xorg xserver-xorg-video-fbdev xfonts-base xinit x11-xserver-utils xinit xorg-docs-core x11-apps xscreensaver xfonts-100dpi 
-xfonts-75dpi xfonts-base xfonts-encodings xfonts-scalable xfonts-utils xcursor-themes xdg-user-dirs xdg-user-dirs-gtk keyutils redshift dbus-x11 
-xwallpaper xterm xtermcontrol xtermset libxcursor1 xcursor-themes mousetweaks xbacklight brltty brltty-x11 libgl1-mesa-dri mesa-utils 
-lightdm numix-gtk-theme slick-greeter 
-bluez bluez-tools bluez-cups blueman 
-policykit-1 profile-sync-daemon  
-xfce4 xfce4-notifyd lxtask xfce4-terminal xfce4-screenshooter thunar-volman profile-sync-daemon network-manager-gnome
-terminator mousepad numix-icon-theme numix-icon-theme-circle numix-gtk-theme viewnior 
-gtk2-engines gtk2-engines-murrine gtk2-engines-pixbuf libgtk2.0-bin 
-libpam-gnome-keyring fonts-arphic-ukai fonts-arphic-uming fonts-dejavu-core fonts-freefont-ttf fonts-guru fonts-guru-extra fonts-kacst fonts-kacst-one 
-fonts-liberation fonts-opensymbol fonts-nanum fonts-stix fonts-symbola  ttf-ubuntu-font-family fonts-ubuntu-font-family-console 
-libfont-afm-perl libfontconfig1 libfontembed1 libfontenc1 gnome-font-viewer fontconfig fontconfig-config 
-network-manager-pptp network-manager-l2tp network-manager-openconnect network-manager-openvpn network-manager-vpnc network-manager-ssh 
-libproxy1-plugin-gsettings libproxy1-plugin-networkmanager libproxy1-plugin-gsettings 
-pamix pasystray pavucontrol pavumeter pavucontrol-qt pulseaudio-module-bluetooth 
-gstreamer1.0-pulseaudio gstreamer1.0-packagekit gstreamer1.0-plugins-base-apps 
-libu2f-udev libwmf0.2-7-gtk 
-p7zip-full zip anacron doc-base foomatic-db-compressed-ppds spice-vdagent dictionaries-common hunspell-en-us 
-ghostscript-x inputattach libatk-adaptor libgail-common libnotify-bin software-properties-gtk 
-cups cups-bsd cups-client cups-filters system-config-printer system-config-printer-common printer-driver-all openprinting-ppds hplip  
-smbclient cifs-utils 
-tracker tracker-extract tracker-miner-fs update-inetd 
-laptop-detect gnome-orca evince evince-common caffeine gdebi 
-dmz-cursor-theme libgsettings-qt1
-
+anacron
+blueman
+bluez
+bluez-cups
+bluez-tools
+brltty
+brltty-x11
+caffeine
+cifs-utils
+cups
+cups-bsd
+cups-client
+cups-filters
+dbus-x11
+dictionaries-common
+dmz-cursor-theme
+doc-base
+evince
+evince-common
+fontconfig
+fontconfig-config
+fonts-arphic-ukai
+fonts-arphic-uming
+fonts-dejavu-core
+fonts-freefont-ttf
+fonts-guru
+fonts-guru-extra
+fonts-kacst
+fonts-kacst-one
+fonts-liberation
+fonts-nanum
+fonts-opensymbol
+fonts-stix
+fonts-symbola
+fonts-ubuntu-font-family-console
+foomatic-db-compressed-ppds
+gdebi
+ghostscript-x
+gnome-font-viewer
+gnome-orca
+gstreamer1.0-packagekit
+gstreamer1.0-plugins-base-apps
+gstreamer1.0-pulseaudio
+gtk2-engines
+gtk2-engines-murrine
+gtk2-engines-pixbuf
+hplip
+hunspell-en-us
+inputattach
+keyutils
+laptop-detect
+libatk-adaptor
+libfont-afm-perl
+libfontconfig1
+libfontembed1
+libfontenc1
+libgail-common
+libgl1-mesa-dri
+libgsettings-qt1
+libgtk2.0-bin
+libnotify-bin
+libpam-gnome-keyring
+libproxy1-plugin-gsettings
+libproxy1-plugin-gsettings
+libproxy1-plugin-networkmanager
+libu2f-udev
+libwmf0.2-7-gtk
+libxcursor1
+lightdm
+lxtask
+mesa-utils
+mousepad
+mousetweaks
+network-manager-gnome
+network-manager-l2tp
+network-manager-openconnect
+network-manager-openvpn
+network-manager-pptp
+network-manager-ssh
+network-manager-vpnc
+numix-gtk-theme
+numix-gtk-theme
+numix-icon-theme
+numix-icon-theme-circle
+openprinting-ppds
+p7zip-full
+pamix
+pasystray
+pavucontrol
+pavucontrol-qt
+pavumeter
+policykit-1
+printer-driver-all
+profile-sync-daemon
+profile-sync-daemon
+pulseaudio-module-bluetooth
+redshift
+slick-greeter
+smbclient
+software-properties-gtk
+spice-vdagent
+system-config-printer
+system-config-printer-common
+terminator
+thunar-volman
+tracker
+tracker-extract
+tracker-miner-fs
+ttf-ubuntu-font-family
+update-inetd
+viewnior
+x11-apps
+x11-xserver-utils
+xbacklight
+xcursor-themes
+xcursor-themes
+xdg-user-dirs
+xdg-user-dirs-gtk
+xfce4
+xfce4-notifyd
+xfce4-screenshooter
+xfce4-terminal
+xfonts-100dpi
+xfonts-75dpi
+xfonts-base
+xfonts-base
+xfonts-encodings
+xfonts-scalable
+xfonts-utils
+xinit
+xinit
+xorg-docs-core
+xscreensaver
+xserver-xorg
+xserver-xorg-video-fbdev
+xterm
+xtermcontrol
+xtermset
+xwallpaper
+zip
--- a/config/desktop/focal/appgroups/3dsupport/packages
+++ b/config/desktop/focal/appgroups/3dsupport/packages
@@ -1 +1,3 @@
-mesa-utils mesa-utils-extra glmark2
+glmark2
+mesa-utils
+mesa-utils-extra
--- a/config/desktop/focal/appgroups/browsers/packages
+++ b/config/desktop/focal/appgroups/browsers/packages
@@ -1 +1,2 @@
-chromium-browser firefox
+chromium-browser
+firefox
--- a/config/desktop/focal/appgroups/chat/packages
+++ b/config/desktop/focal/appgroups/chat/packages
@@ -1 +1 @@
-hexchat
+hexchat
--- a/config/desktop/focal/appgroups/desktop_tools/packages
+++ b/config/desktop/focal/appgroups/desktop_tools/packages
@@ -1 +1,4 @@
-bleachbit fbi kazam gparted
+bleachbit
+fbi
+gparted
+kazam
--- a/config/desktop/focal/appgroups/editors/packages
+++ b/config/desktop/focal/appgroups/editors/packages
@@ -1 +1,3 @@
-vim emacs notepadqq
+emacs
+notepadqq
+vim
--- a/config/desktop/focal/appgroups/internet/packages
+++ b/config/desktop/focal/appgroups/internet/packages
@@ -1 +1,4 @@
-transmission transmission-remote-gtk filezilla putty
+filezilla
+putty
+transmission
+transmission-remote-gtk
--- a/config/desktop/focal/appgroups/multimedia/packages
+++ b/config/desktop/focal/appgroups/multimedia/packages
@@ -1 +1,3 @@
-mpv gimp celluloid
+celluloid
+gimp
+mpv
--- a/config/desktop/focal/appgroups/office/packages
+++ b/config/desktop/focal/appgroups/office/packages
@@ -1 +1,3 @@
-libreoffice libreoffice-style-elementary simple-scan
+libreoffice
+libreoffice-style-elementary
+simple-scan
--- a/config/desktop/focal/appgroups/programming/custom/desktops/cinnamon/packages
+++ b/config/desktop/focal/appgroups/programming/custom/desktops/cinnamon/packages
@@ -1 +1,2 @@
-gnome-builder sysprof
+gnome-builder
+sysprof
--- a/config/desktop/focal/appgroups/programming/custom/desktops/gnome/packages
+++ b/config/desktop/focal/appgroups/programming/custom/desktops/gnome/packages
@@ -1 +1,2 @@
-gnome-builder geany
+geany
+gnome-builder
--- a/config/desktop/focal/appgroups/programming/custom/desktops/kde/packages
+++ b/config/desktop/focal/appgroups/programming/custom/desktops/kde/packages
@@ -1 +1,2 @@
-kdevelop qtcreator
+kdevelop
+qtcreator
--- a/config/desktop/focal/appgroups/programming/packages
+++ b/config/desktop/focal/appgroups/programming/packages
@@ -1 +1,5 @@
-build-essential clang meld regexxer geany 
+build-essential
+clang
+geany
+meld
+regexxer
--- a/config/desktop/focal/environments/budgie/config_base/packages
+++ b/config/desktop/focal/environments/budgie/config_base/packages
@@ -1,37 +1,228 @@
-xserver-xorg xserver-xorg-video-fbdev xfonts-base xinit x11-xserver-utils xinit xorg-docs-core x11-apps xscreensaver xfonts-100dpi 
-xfonts-75dpi xfonts-base xfonts-encodings xfonts-scalable xfonts-utils xcursor-themes xdg-user-dirs xdg-user-dirs-gtk keyutils redshift dbus-x11 
-xwallpaper xterm xtermcontrol xtermset libxcursor1 xcursor-themes mousetweaks xbacklight brltty brltty-x11 libgl1-mesa-dri mesa-utils 
-lightdm lightdm-settings numix-gtk-theme slick-greeter 
-bluez bluez-tools bluez-cups blueman 
-policykit-1 profile-sync-daemon policykit-desktop-privileges policykit-1-gnome
-budgie-desktop budgie-app-launcher-applet budgie-applications-menu-applet budgie-appmenu-applet budgie-brightness-controller-applet 
-budgie-clockworks-applet budgie-countdown-applet budgie-desktop-doc budgie-desktop-environment budgie-dropby-applet budgie-extras-common 
-budgie-extras-daemon budgie-fuzzyclock-applet budgie-hotcorners-applet budgie-indicator-applet budgie-kangaroo-applet 
-budgie-keyboard-autoswitch-applet budgie-network-manager-applet budgie-previews budgie-previews-applet budgie-quickchar budgie-quicknote-applet 
-budgie-recentlyused-applet budgie-rotation-lock-applet budgie-showtime-applet budgie-sntray-plugin budgie-takeabreak-applet budgie-trash-applet 
-budgie-visualspace-applet budgie-wallpapers-focal budgie-wallstreet budgie-weathershow-applet budgie-welcome budgie-window-mover-applet 
-budgie-window-shuffler budgie-workspace-overview-applet budgie-workspace-stopwatch-applet plank libplank1 libplank-common
-nemo nemo-data nemo-fileroller nemo-font-manager nemo-gtkhash 
-libcvc0 gtk2-engines gtk2-engines-murrine gtk2-engines-pixbuf libgtk2.0-bin 
-fonts-noto-cjk fonts-noto-cjk-extra fonts-noto-color-emoji  fonts-noto-core fonts-noto-extra fonts-noto-hinted fonts-noto-mono fonts-noto-ui-core 
-fonts-noto-ui-extra fonts-noto-unhinted fonts-noto-unhinted fonts-arphic-ukai fonts-arphic-uming fonts-dejavu-core fonts-freefont-ttf fonts-guru 
-fonts-guru-extra fonts-kacst fonts-kacst-one fonts-khmeros-core fonts-liberation fonts-opensymbol fonts-nanum fonts-stix fonts-symbola 
-ttf-ubuntu-font-family fonts-ubuntu-font-family-console libfont-afm-perl 
-libfontconfig1 libfontembed1 libfontenc1 fontconfig fontconfig-config 
-terminator pinta scrcpy mousepad numix-icon-theme numix-icon-theme-circle numix-blue-gtk-theme numix-gtk-theme viewnior gnome-screenshot
-gnome-orca gnome-tweak-tool evince evince-common caffeine gdebi 
-network-manager-pptp network-manager-l2tp network-manager-openconnect network-manager-openvpn network-manager-vpnc network-manager-ssh
-network-manager-config-connectivity-ubuntu libproxy1-plugin-gsettings libproxy1-plugin-networkmanager libproxy1-plugin-gsettings 
-pamix pasystray pavucontrol pavumeter pavucontrol-qt pulseaudio-module-bluetooth 
-gstreamer1.0-pulseaudio gstreamer1.0-packagekit gstreamer1.0-plugins-base-apps 
-libu2f-udev libwmf0.2-7-gtk apport-gtk libgsettings-qt1 libappindicator3-1 gir1.2-appindicator3-0.1 
-p7zip-full zip anacron doc-base foomatic-db-compressed-ppds spice-vdagent dictionaries-common hunspell-en-us 
-ghostscript-x inputattach kerneloops  libatk-adaptor libgail-common libnotify-bin software-properties-gtk 
-cups cups-bsd cups-client cups-filters system-config-printer system-config-printer-common printer-driver-all openprinting-ppds hplip indicator-printers 
-samba smbclient cifs-utils 
-tracker tracker-extract tracker-miner-fs update-inetd update-manager update-manager-core update-notifier update-notifier-common 
-laptop-detect ubuntu-drivers-common
-language-pack-gnome-de language-pack-gnome-en language-pack-gnome-es language-pack-gnome-fr language-pack-gnome-it language-pack-gnome-pt 
-language-pack-gnome-ru language-pack-gnome-sl 
-gnome-user-docs-de gnome-user-docs-es gnome-user-docs-it gnome-user-docs-pt gnome-user-docs-ru gnome-user-docs-sl
-wamerican wbrazilian wbritish wfrench witalian wportuguese wspanish wswiss 
+anacron
+apport-gtk
+blueman
+bluez
+bluez-cups
+bluez-tools
+brltty
+brltty-x11
+budgie-app-launcher-applet
+budgie-applications-menu-applet
+budgie-appmenu-applet
+budgie-brightness-controller-applet
+budgie-clockworks-applet
+budgie-countdown-applet
+budgie-desktop
+budgie-desktop-doc
+budgie-desktop-environment
+budgie-dropby-applet
+budgie-extras-common
+budgie-extras-daemon
+budgie-fuzzyclock-applet
+budgie-hotcorners-applet
+budgie-indicator-applet
+budgie-kangaroo-applet
+budgie-keyboard-autoswitch-applet
+budgie-network-manager-applet
+budgie-previews
+budgie-previews-applet
+budgie-quickchar
+budgie-quicknote-applet
+budgie-recentlyused-applet
+budgie-rotation-lock-applet
+budgie-showtime-applet
+budgie-sntray-plugin
+budgie-takeabreak-applet
+budgie-trash-applet
+budgie-visualspace-applet
+budgie-wallpapers-focal
+budgie-wallstreet
+budgie-weathershow-applet
+budgie-welcome
+budgie-window-mover-applet
+budgie-window-shuffler
+budgie-workspace-overview-applet
+budgie-workspace-stopwatch-applet
+caffeine
+cifs-utils
+cups
+cups-bsd
+cups-client
+cups-filters
+dbus-x11
+dictionaries-common
+doc-base
+evince
+evince-common
+fontconfig
+fontconfig-config
+fonts-arphic-ukai
+fonts-arphic-uming
+fonts-dejavu-core
+fonts-freefont-ttf
+fonts-guru
+fonts-guru-extra
+fonts-kacst
+fonts-kacst-one
+fonts-khmeros-core
+fonts-liberation
+fonts-nanum
+fonts-noto-cjk
+fonts-noto-cjk-extra
+fonts-noto-color-emoji
+fonts-noto-core
+fonts-noto-extra
+fonts-noto-hinted
+fonts-noto-mono
+fonts-noto-ui-core
+fonts-noto-ui-extra
+fonts-noto-unhinted
+fonts-opensymbol
+fonts-stix
+fonts-symbola
+fonts-ubuntu-font-family-console
+foomatic-db-compressed-ppds
+gdebi
+ghostscript-x
+gir1.2-appindicator3-0.1
+gnome-orca
+gnome-screenshot
+gnome-tweak-tool
+gnome-user-docs-de
+gnome-user-docs-es
+gnome-user-docs-it
+gnome-user-docs-pt
+gnome-user-docs-ru
+gnome-user-docs-sl
+gstreamer1.0-packagekit
+gstreamer1.0-plugins-base-apps
+gstreamer1.0-pulseaudio
+gtk2-engines
+gtk2-engines-murrine
+gtk2-engines-pixbuf
+hplip
+hunspell-en-us
+indicator-printers
+inputattach
+kerneloops
+keyutils
+language-pack-gnome-de
+language-pack-gnome-en
+language-pack-gnome-es
+language-pack-gnome-fr
+language-pack-gnome-it
+language-pack-gnome-pt
+language-pack-gnome-ru
+language-pack-gnome-sl
+laptop-detect
+libappindicator3-1
+libatk-adaptor
+libcvc0
+libfont-afm-perl
+libfontconfig1
+libfontembed1
+libfontenc1
+libgail-common
+libgl1-mesa-dri
+libgsettings-qt1
+libgtk2.0-bin
+libnotify-bin
+libplank1
+libplank-common
+libproxy1-plugin-gsettings
+libproxy1-plugin-gsettings
+libproxy1-plugin-networkmanager
+libu2f-udev
+libwmf0.2-7-gtk
+libxcursor1
+lightdm
+lightdm-settings
+mesa-utils
+mousepad
+mousetweaks
+nemo
+nemo-data
+nemo-fileroller
+nemo-font-manager
+nemo-gtkhash
+network-manager-config-connectivity-ubuntu
+network-manager-l2tp
+network-manager-openconnect
+network-manager-openvpn
+network-manager-pptp
+network-manager-ssh
+network-manager-vpnc
+numix-blue-gtk-theme
+numix-gtk-theme
+numix-gtk-theme
+numix-icon-theme
+numix-icon-theme-circle
+openprinting-ppds
+p7zip-full
+pamix
+pasystray
+pavucontrol
+pavucontrol-qt
+pavumeter
+pinta
+plank
+policykit-1
+policykit-1-gnome
+policykit-desktop-privileges
+printer-driver-all
+profile-sync-daemon
+pulseaudio-module-bluetooth
+redshift
+samba
+scrcpy
+slick-greeter
+smbclient
+software-properties-gtk
+spice-vdagent
+system-config-printer
+system-config-printer-common
+terminator
+tracker
+tracker-extract
+tracker-miner-fs
+ttf-ubuntu-font-family
+ubuntu-drivers-common
+update-inetd
+update-manager
+update-manager-core
+update-notifier
+update-notifier-common
+viewnior
+wamerican
+wbrazilian
+wbritish
+wfrench
+witalian
+wportuguese
+wspanish
+wswiss
+x11-apps
+x11-xserver-utils
+xbacklight
+xcursor-themes
+xcursor-themes
+xdg-user-dirs
+xdg-user-dirs-gtk
+xfonts-100dpi
+xfonts-75dpi
+xfonts-base
+xfonts-base
+xfonts-encodings
+xfonts-scalable
+xfonts-utils
+xinit
+xinit
+xorg-docs-core
+xscreensaver
+xserver-xorg
+xserver-xorg-video-fbdev
+xterm
+xtermcontrol
+xtermset
+xwallpaper
+zip
--- a/config/desktop/focal/environments/cinnamon/config_base/packages
+++ b/config/desktop/focal/environments/cinnamon/config_base/packages
@@ -1,30 +1,194 @@
-xserver-xorg xserver-xorg-video-fbdev xfonts-base xinit x11-xserver-utils xinit xorg-docs-core x11-apps xscreensaver xfonts-100dpi 
-xfonts-75dpi xfonts-base xfonts-encodings xfonts-scalable xfonts-utils xcursor-themes xdg-user-dirs xdg-user-dirs-gtk keyutils redshift dbus-x11 
-xwallpaper xterm xtermcontrol xtermset libxcursor1 xcursor-themes mousetweaks xbacklight brltty brltty-x11 libgl1-mesa-dri mesa-utils 
-lightdm lightdm-settings numix-gtk-theme slick-greeter 
-bluez bluez-tools bluez-cups blueman 
-policykit-1 profile-sync-daemon policykit-desktop-privileges 
-cinnamon cinnamon-common cinnamon-core cinnamon-control-center cinnamon-control-center-data cinnamon-desktop-data cinnamon-screensaver 
-cinnamon-session cinnamon-screensaver cinnamon-session-common cinnamon-settings-daemon nemo nemo-data nemo-fileroller nemo-font-manager 
-nemo-gtkhash gir1.2-cinnamondesktop-3.0 gir1.2-cmenu-3.0 gir1.2-cvc-1.0 libcinnamon-desktop4 libcinnamon-menu-3-0 libcscreensaver0 
-libcvc0 gtk2-engines gtk2-engines-murrine gtk2-engines-pixbuf libgtk2.0-bin 
-fonts-arphic-ukai fonts-arphic-uming fonts-dejavu-core fonts-freefont-ttf fonts-guru fonts-guru-extra fonts-kacst fonts-kacst-one fonts-khmeros-core 
-fonts-liberation fonts-opensymbol fonts-nanum fonts-stix fonts-symbola ttf-ubuntu-font-family fonts-ubuntu-font-family-console libfont-afm-perl 
-libfontconfig1 libfontembed1 libfontenc1 fontconfig fontconfig-config 
-terminator pinta scrcpy mousepad numix-icon-theme numix-icon-theme-circle numix-blue-gtk-theme numix-gtk-theme viewnior gnome-screenshot
-gnome-orca evince evince-common caffeine gdebi lxtask
-network-manager-pptp network-manager-l2tp network-manager-openconnect network-manager-openvpn network-manager-vpnc network-manager-ssh
-network-manager-config-connectivity-ubuntu libproxy1-plugin-gsettings libproxy1-plugin-networkmanager libproxy1-plugin-gsettings 
-pamix pasystray pavucontrol pavumeter pavucontrol-qt pulseaudio-module-bluetooth 
-gstreamer1.0-pulseaudio gstreamer1.0-packagekit gstreamer1.0-plugins-base-apps 
-libu2f-udev libwmf0.2-7-gtk apport-gtk libgsettings-qt1 libappindicator3-1 gir1.2-appindicator3-0.1 
-p7zip-full zip anacron doc-base foomatic-db-compressed-ppds spice-vdagent dictionaries-common hunspell-en-us 
-ghostscript-x inputattach kerneloops  libatk-adaptor libgail-common libnotify-bin software-properties-gtk 
-cups cups-bsd cups-client cups-filters system-config-printer system-config-printer-common printer-driver-all openprinting-ppds hplip indicator-printers 
-samba smbclient cifs-utils 
- tracker tracker-extract tracker-miner-fs update-inetd update-manager update-manager-core update-notifier update-notifier-common 
-laptop-detect ubuntu-drivers-common
- language-pack-gnome-de language-pack-gnome-en language-pack-gnome-es language-pack-gnome-fr language-pack-gnome-it language-pack-gnome-pt 
-language-pack-gnome-ru language-pack-gnome-sl 
-gnome-user-docs-de gnome-user-docs-es gnome-user-docs-it gnome-user-docs-pt gnome-user-docs-ru gnome-user-docs-sl
-wamerican wbrazilian wbritish wfrench witalian wportuguese wspanish wswiss 
+anacron
+apport-gtk
+blueman
+bluez
+bluez-cups
+bluez-tools
+brltty
+brltty-x11
+caffeine
+cifs-utils
+cinnamon
+cinnamon-common
+cinnamon-control-center
+cinnamon-control-center-data
+cinnamon-core
+cinnamon-desktop-data
+cinnamon-screensaver
+cinnamon-screensaver
+cinnamon-session
+cinnamon-session-common
+cinnamon-settings-daemon
+cups
+cups-bsd
+cups-client
+cups-filters
+dbus-x11
+dictionaries-common
+doc-base
+evince
+evince-common
+fontconfig
+fontconfig-config
+fonts-arphic-ukai
+fonts-arphic-uming
+fonts-dejavu-core
+fonts-freefont-ttf
+fonts-guru
+fonts-guru-extra
+fonts-kacst
+fonts-kacst-one
+fonts-khmeros-core
+fonts-liberation
+fonts-nanum
+fonts-opensymbol
+fonts-stix
+fonts-symbola
+fonts-ubuntu-font-family-console
+foomatic-db-compressed-ppds
+gdebi
+ghostscript-x
+gir1.2-appindicator3-0.1
+gir1.2-cinnamondesktop-3.0
+gir1.2-cmenu-3.0
+gir1.2-cvc-1.0
+gnome-orca
+gnome-screenshot
+gnome-user-docs-de
+gnome-user-docs-es
+gnome-user-docs-it
+gnome-user-docs-pt
+gnome-user-docs-ru
+gnome-user-docs-sl
+gstreamer1.0-packagekit
+gstreamer1.0-plugins-base-apps
+gstreamer1.0-pulseaudio
+gtk2-engines
+gtk2-engines-murrine
+gtk2-engines-pixbuf
+hplip
+hunspell-en-us
+indicator-printers
+inputattach
+kerneloops
+keyutils
+language-pack-gnome-de
+language-pack-gnome-en
+language-pack-gnome-es
+language-pack-gnome-fr
+language-pack-gnome-it
+language-pack-gnome-pt
+language-pack-gnome-ru
+language-pack-gnome-sl
+laptop-detect
+libappindicator3-1
+libatk-adaptor
+libcinnamon-desktop4
+libcinnamon-menu-3-0
+libcscreensaver0
+libcvc0
+libfont-afm-perl
+libfontconfig1
+libfontembed1
+libfontenc1
+libgail-common
+libgl1-mesa-dri
+libgsettings-qt1
+libgtk2.0-bin
+libnotify-bin
+libproxy1-plugin-gsettings
+libproxy1-plugin-gsettings
+libproxy1-plugin-networkmanager
+libu2f-udev
+libwmf0.2-7-gtk
+libxcursor1
+lightdm
+lightdm-settings
+lxtask
+mesa-utils
+mousepad
+mousetweaks
+nemo
+nemo-data
+nemo-fileroller
+nemo-font-manager
+nemo-gtkhash
+network-manager-config-connectivity-ubuntu
+network-manager-l2tp
+network-manager-openconnect
+network-manager-openvpn
+network-manager-pptp
+network-manager-ssh
+network-manager-vpnc
+numix-blue-gtk-theme
+numix-gtk-theme
+numix-gtk-theme
+numix-icon-theme
+numix-icon-theme-circle
+openprinting-ppds
+p7zip-full
+pamix
+pasystray
+pavucontrol
+pavucontrol-qt
+pavumeter
+pinta
+policykit-1
+policykit-desktop-privileges
+printer-driver-all
+profile-sync-daemon
+pulseaudio-module-bluetooth
+redshift
+samba
+scrcpy
+slick-greeter
+smbclient
+software-properties-gtk
+spice-vdagent
+system-config-printer
+system-config-printer-common
+terminator
+tracker
+tracker-extract
+tracker-miner-fs
+ttf-ubuntu-font-family
+ubuntu-drivers-common
+update-inetd
+update-manager
+update-manager-core
+update-notifier
+update-notifier-common
+viewnior
+wamerican
+wbrazilian
+wbritish
+wfrench
+witalian
+wportuguese
+wspanish
+wswiss
+x11-apps
+x11-xserver-utils
+xbacklight
+xcursor-themes
+xcursor-themes
+xdg-user-dirs
+xdg-user-dirs-gtk
+xfonts-100dpi
+xfonts-75dpi
+xfonts-base
+xfonts-base
+xfonts-encodings
+xfonts-scalable
+xfonts-utils
+xinit
+xinit
+xorg-docs-core
+xscreensaver
+xserver-xorg
+xserver-xorg-video-fbdev
+xterm
+xtermcontrol
+xtermset
+xwallpaper
+zip
--- a/config/desktop/focal/environments/deepin/config_base/packages
+++ b/config/desktop/focal/environments/deepin/config_base/packages
@@ -1,33 +1,215 @@
-xserver-xorg xserver-xorg-video-fbdev xfonts-base xinit x11-xserver-utils xinit xorg-docs-core x11-apps xscreensaver xfonts-100dpi 
-xfonts-75dpi xfonts-base xfonts-encodings xfonts-scalable xfonts-utils xcursor-themes xdg-user-dirs xdg-user-dirs-gtk keyutils redshift dbus-x11 
-xwallpaper xterm xtermcontrol xtermset libxcursor1 xcursor-themes mousetweaks xbacklight brltty brltty-x11 libgl1-mesa-dri mesa-utils 
-lightdm lightdm-settings numix-gtk-theme slick-greeter 
-bluez bluez-tools bluez-cups blueman 
-policykit-1 profile-sync-daemon policykit-desktop-privileges 
-deepin-desktop-base dde-desktop dde-api dde-dock dde-dock-onboard-plugin dde-launcher dde-control-center deepin-metacity deepin-wm 
-startdde dde-session-ui dde-file-manager dde-qt5integration dde-disk-mount-plugin deepin-gtk-theme deepin-sound-theme deepin-icon-theme 
-deepin-menu dde-daemon dde-account-faces deepin-desktop-schemas deepin-mutter dde-polkit-agent deepin-wm deepin-turbo deepin-turbo-booster 
-ubuntudde-default-settings ubuntudde-icon-theme deepin-voice-recorder deepin-screenshot dde-calendar deepin-music deepin-picker 
-deepin-gettext-tools deepin-image-viewer deepin-movie deepin-calculator deepin-shortcut-viewer deepin-system-monitor deepin-terminal 
-deepin-topbar deepin-deb-installer deepin-screensaver
-libcvc0 gtk2-engines gtk2-engines-murrine gtk2-engines-pixbuf libgtk2.0-bin 
-fonts-arphic-ukai fonts-arphic-uming fonts-dejavu-core fonts-freefont-ttf fonts-guru fonts-guru-extra fonts-kacst fonts-kacst-one fonts-khmeros-core 
-fonts-liberation fonts-opensymbol fonts-nanum fonts-stix fonts-symbola ttf-ubuntu-font-family fonts-ubuntu-font-family-console libfont-afm-perl 
-libfontconfig1 libfontembed1 libfontenc1 fontconfig fontconfig-config 
-terminator pinta scrcpy mousepad numix-icon-theme numix-icon-theme-circle numix-blue-gtk-theme numix-gtk-theme viewnior gnome-screenshot
-gnome-orca evince evince-common caffeine gdebi lxtask
-network-manager-pptp network-manager-l2tp network-manager-openconnect network-manager-openvpn network-manager-vpnc network-manager-ssh
-network-manager-config-connectivity-ubuntu libproxy1-plugin-gsettings libproxy1-plugin-networkmanager libproxy1-plugin-gsettings 
-pamix pasystray pavucontrol pavumeter pavucontrol-qt pulseaudio-module-bluetooth 
-gstreamer1.0-pulseaudio gstreamer1.0-packagekit gstreamer1.0-plugins-base-apps 
-libu2f-udev libwmf0.2-7-gtk apport-gtk libgsettings-qt1 libappindicator3-1 gir1.2-appindicator3-0.1 
-p7zip-full zip anacron doc-base foomatic-db-compressed-ppds spice-vdagent dictionaries-common hunspell-en-us 
-ghostscript-x inputattach kerneloops  libatk-adaptor libgail-common libnotify-bin software-properties-gtk 
-cups cups-bsd cups-client cups-filters system-config-printer system-config-printer-common printer-driver-all openprinting-ppds hplip indicator-printers 
-samba smbclient cifs-utils 
- tracker tracker-extract tracker-miner-fs update-inetd update-manager update-manager-core update-notifier update-notifier-common 
-laptop-detect ubuntu-drivers-common
- language-pack-gnome-de language-pack-gnome-en language-pack-gnome-es language-pack-gnome-fr language-pack-gnome-it language-pack-gnome-pt 
-language-pack-gnome-ru language-pack-gnome-sl 
-gnome-user-docs-de gnome-user-docs-es gnome-user-docs-it gnome-user-docs-pt gnome-user-docs-ru gnome-user-docs-sl
-wamerican wbrazilian wbritish wfrench witalian wportuguese wspanish wswiss 
+anacron
+apport-gtk
+blueman
+bluez
+bluez-cups
+bluez-tools
+brltty
+brltty-x11
+caffeine
+cifs-utils
+cups
+cups-bsd
+cups-client
+cups-filters
+dbus-x11
+dde-account-faces
+dde-api
+dde-calendar
+dde-control-center
+dde-daemon
+dde-desktop
+dde-disk-mount-plugin
+dde-dock
+dde-dock-onboard-plugin
+dde-file-manager
+dde-launcher
+dde-polkit-agent
+dde-qt5integration
+dde-session-ui
+deepin-calculator
+deepin-deb-installer
+deepin-desktop-base
+deepin-desktop-schemas
+deepin-gettext-tools
+deepin-gtk-theme
+deepin-icon-theme
+deepin-image-viewer
+deepin-menu
+deepin-metacity
+deepin-movie
+deepin-music
+deepin-mutter
+deepin-picker
+deepin-screensaver
+deepin-screenshot
+deepin-shortcut-viewer
+deepin-sound-theme
+deepin-system-monitor
+deepin-terminal
+deepin-topbar
+deepin-turbo
+deepin-turbo-booster
+deepin-voice-recorder
+deepin-wm
+deepin-wm
+dictionaries-common
+doc-base
+evince
+evince-common
+fontconfig
+fontconfig-config
+fonts-arphic-ukai
+fonts-arphic-uming
+fonts-dejavu-core
+fonts-freefont-ttf
+fonts-guru
+fonts-guru-extra
+fonts-kacst
+fonts-kacst-one
+fonts-khmeros-core
+fonts-liberation
+fonts-nanum
+fonts-opensymbol
+fonts-stix
+fonts-symbola
+fonts-ubuntu-font-family-console
+foomatic-db-compressed-ppds
+gdebi
+ghostscript-x
+gir1.2-appindicator3-0.1
+gnome-orca
+gnome-screenshot
+gnome-user-docs-de
+gnome-user-docs-es
+gnome-user-docs-it
+gnome-user-docs-pt
+gnome-user-docs-ru
+gnome-user-docs-sl
+gstreamer1.0-packagekit
+gstreamer1.0-plugins-base-apps
+gstreamer1.0-pulseaudio
+gtk2-engines
+gtk2-engines-murrine
+gtk2-engines-pixbuf
+hplip
+hunspell-en-us
+indicator-printers
+inputattach
+kerneloops
+keyutils
+language-pack-gnome-de
+language-pack-gnome-en
+language-pack-gnome-es
+language-pack-gnome-fr
+language-pack-gnome-it
+language-pack-gnome-pt
+language-pack-gnome-ru
+language-pack-gnome-sl
+laptop-detect
+libappindicator3-1
+libatk-adaptor
+libcvc0
+libfont-afm-perl
+libfontconfig1
+libfontembed1
+libfontenc1
+libgail-common
+libgl1-mesa-dri
+libgsettings-qt1
+libgtk2.0-bin
+libnotify-bin
+libproxy1-plugin-gsettings
+libproxy1-plugin-gsettings
+libproxy1-plugin-networkmanager
+libu2f-udev
+libwmf0.2-7-gtk
+libxcursor1
+lightdm
+lightdm-settings
+lxtask
+mesa-utils
+mousepad
+mousetweaks
+network-manager-config-connectivity-ubuntu
+network-manager-l2tp
+network-manager-openconnect
+network-manager-openvpn
+network-manager-pptp
+network-manager-ssh
+network-manager-vpnc
+numix-blue-gtk-theme
+numix-gtk-theme
+numix-gtk-theme
+numix-icon-theme
+numix-icon-theme-circle
+openprinting-ppds
+p7zip-full
+pamix
+pasystray
+pavucontrol
+pavucontrol-qt
+pavumeter
+pinta
+policykit-1
+policykit-desktop-privileges
+printer-driver-all
+profile-sync-daemon
+pulseaudio-module-bluetooth
+redshift
+samba
+scrcpy
+slick-greeter
+smbclient
+software-properties-gtk
+spice-vdagent
+startdde
+system-config-printer
+system-config-printer-common
+terminator
+tracker
+tracker-extract
+tracker-miner-fs
+ttf-ubuntu-font-family
+ubuntudde-default-settings
+ubuntudde-icon-theme
+ubuntu-drivers-common
+update-inetd
+update-manager
+update-manager-core
+update-notifier
+update-notifier-common
+viewnior
+wamerican
+wbrazilian
+wbritish
+wfrench
+witalian
+wportuguese
+wspanish
+wswiss
+x11-apps
+x11-xserver-utils
+xbacklight
+xcursor-themes
+xcursor-themes
+xdg-user-dirs
+xdg-user-dirs-gtk
+xfonts-100dpi
+xfonts-75dpi
+xfonts-base
+xfonts-base
+xfonts-encodings
+xfonts-scalable
+xfonts-utils
+xinit
+xinit
+xorg-docs-core
+xscreensaver
+xserver-xorg
+xserver-xorg-video-fbdev
+xterm
+xtermcontrol
+xtermset
+xwallpaper
+zip
--- a/config/desktop/focal/environments/enlightenment/config_base/packages
+++ b/config/desktop/focal/environments/enlightenment/config_base/packages
@@ -1,28 +1,180 @@
-xserver-xorg xserver-xorg-video-fbdev xfonts-base xinit x11-xserver-utils xinit xorg-docs-core x11-apps xscreensaver xfonts-100dpi 
-xfonts-75dpi xfonts-base xfonts-encodings xfonts-scalable xfonts-utils xcursor-themes xdg-user-dirs xdg-user-dirs-gtk keyutils redshift dbus-x11 
-xwallpaper xterm xtermcontrol xtermset libxcursor1 xcursor-themes mousetweaks xbacklight brltty brltty-x11 libgl1-mesa-dri mesa-utils 
-lightdm lightdm-settings numix-gtk-theme slick-greeter 
-bluez bluez-tools bluez-cups blueman 
-policykit-1 profile-sync-daemon policykit-desktop-privileges 
-enlightenment enlightenment-data libevas-loaders terminology terminology-data plank libplank-common libplank1
-libcvc0 gtk2-engines gtk2-engines-murrine gtk2-engines-pixbuf libgtk2.0-bin 
-fonts-arphic-ukai fonts-arphic-uming fonts-dejavu-core fonts-freefont-ttf fonts-guru fonts-guru-extra fonts-kacst fonts-kacst-one fonts-khmeros-core 
-fonts-liberation fonts-opensymbol fonts-nanum fonts-stix fonts-symbola ttf-ubuntu-font-family fonts-ubuntu-font-family-console libfont-afm-perl 
-libfontconfig1 libfontembed1 libfontenc1 fontconfig fontconfig-config 
-terminator pinta scrcpy mousepad numix-icon-theme numix-icon-theme-circle numix-blue-gtk-theme numix-gtk-theme viewnior gnome-screenshot
-gnome-orca evince evince-common caffeine gdebi lxtask
-network-manager-pptp network-manager-l2tp network-manager-openconnect network-manager-openvpn network-manager-vpnc network-manager-ssh
-network-manager-config-connectivity-ubuntu libproxy1-plugin-gsettings libproxy1-plugin-networkmanager libproxy1-plugin-gsettings 
-pamix pasystray pavucontrol pavumeter pavucontrol-qt pulseaudio-module-bluetooth 
-gstreamer1.0-pulseaudio gstreamer1.0-packagekit gstreamer1.0-plugins-base-apps 
-libu2f-udev libwmf0.2-7-gtk apport-gtk libgsettings-qt1 libappindicator3-1 gir1.2-appindicator3-0.1 
-p7zip-full zip anacron doc-base foomatic-db-compressed-ppds spice-vdagent dictionaries-common hunspell-en-us 
-ghostscript-x inputattach kerneloops  libatk-adaptor libgail-common libnotify-bin software-properties-gtk 
-cups cups-bsd cups-client cups-filters system-config-printer system-config-printer-common printer-driver-all openprinting-ppds hplip indicator-printers 
-samba smbclient cifs-utils 
-tracker tracker-extract tracker-miner-fs update-inetd update-manager update-manager-core update-notifier update-notifier-common 
-laptop-detect ubuntu-drivers-common
-language-pack-gnome-de language-pack-gnome-en language-pack-gnome-es language-pack-gnome-fr language-pack-gnome-it language-pack-gnome-pt 
-language-pack-gnome-ru language-pack-gnome-sl 
-gnome-user-docs-de gnome-user-docs-es gnome-user-docs-it gnome-user-docs-pt gnome-user-docs-ru gnome-user-docs-sl
-wamerican wbrazilian wbritish wfrench witalian wportuguese wspanish wswiss
+anacron
+apport-gtk
+blueman
+bluez
+bluez-cups
+bluez-tools
+brltty
+brltty-x11
+caffeine
+cifs-utils
+cups
+cups-bsd
+cups-client
+cups-filters
+dbus-x11
+dictionaries-common
+doc-base
+enlightenment
+enlightenment-data
+evince
+evince-common
+fontconfig
+fontconfig-config
+fonts-arphic-ukai
+fonts-arphic-uming
+fonts-dejavu-core
+fonts-freefont-ttf
+fonts-guru
+fonts-guru-extra
+fonts-kacst
+fonts-kacst-one
+fonts-khmeros-core
+fonts-liberation
+fonts-nanum
+fonts-opensymbol
+fonts-stix
+fonts-symbola
+fonts-ubuntu-font-family-console
+foomatic-db-compressed-ppds
+gdebi
+ghostscript-x
+gir1.2-appindicator3-0.1
+gnome-orca
+gnome-screenshot
+gnome-user-docs-de
+gnome-user-docs-es
+gnome-user-docs-it
+gnome-user-docs-pt
+gnome-user-docs-ru
+gnome-user-docs-sl
+gstreamer1.0-packagekit
+gstreamer1.0-plugins-base-apps
+gstreamer1.0-pulseaudio
+gtk2-engines
+gtk2-engines-murrine
+gtk2-engines-pixbuf
+hplip
+hunspell-en-us
+indicator-printers
+inputattach
+kerneloops
+keyutils
+language-pack-gnome-de
+language-pack-gnome-en
+language-pack-gnome-es
+language-pack-gnome-fr
+language-pack-gnome-it
+language-pack-gnome-pt
+language-pack-gnome-ru
+language-pack-gnome-sl
+laptop-detect
+libappindicator3-1
+libatk-adaptor
+libcvc0
+libevas-loaders
+libfont-afm-perl
+libfontconfig1
+libfontembed1
+libfontenc1
+libgail-common
+libgl1-mesa-dri
+libgsettings-qt1
+libgtk2.0-bin
+libnotify-bin
+libplank1
+libplank-common
+libproxy1-plugin-gsettings
+libproxy1-plugin-gsettings
+libproxy1-plugin-networkmanager
+libu2f-udev
+libwmf0.2-7-gtk
+libxcursor1
+lightdm
+lightdm-settings
+lxtask
+mesa-utils
+mousepad
+mousetweaks
+network-manager-config-connectivity-ubuntu
+network-manager-l2tp
+network-manager-openconnect
+network-manager-openvpn
+network-manager-pptp
+network-manager-ssh
+network-manager-vpnc
+numix-blue-gtk-theme
+numix-gtk-theme
+numix-gtk-theme
+numix-icon-theme
+numix-icon-theme-circle
+openprinting-ppds
+p7zip-full
+pamix
+pasystray
+pavucontrol
+pavucontrol-qt
+pavumeter
+pinta
+plank
+policykit-1
+policykit-desktop-privileges
+printer-driver-all
+profile-sync-daemon
+pulseaudio-module-bluetooth
+redshift
+samba
+scrcpy
+slick-greeter
+smbclient
+software-properties-gtk
+spice-vdagent
+system-config-printer
+system-config-printer-common
+terminator
+terminology
+terminology-data
+tracker
+tracker-extract
+tracker-miner-fs
+ttf-ubuntu-font-family
+ubuntu-drivers-common
+update-inetd
+update-manager
+update-manager-core
+update-notifier
+update-notifier-common
+viewnior
+wamerican
+wbrazilian
+wbritish
+wfrench
+witalian
+wportuguese
+wspanish
+wswiss
+x11-apps
+x11-xserver-utils
+xbacklight
+xcursor-themes
+xcursor-themes
+xdg-user-dirs
+xdg-user-dirs-gtk
+xfonts-100dpi
+xfonts-75dpi
+xfonts-base
+xfonts-base
+xfonts-encodings
+xfonts-scalable
+xfonts-utils
+xinit
+xinit
+xorg-docs-core
+xscreensaver
+xserver-xorg
+xserver-xorg-video-fbdev
+xterm
+xtermcontrol
+xtermset
+xwallpaper
+zip
--- a/config/desktop/focal/environments/gnome/config_base/packages
+++ b/config/desktop/focal/environments/gnome/config_base/packages
@@ -1,28 +1,244 @@
-xserver-xorg xserver-xorg-video-fbdev gvfs-backends xfonts-base xinit bubblewrap dbus-x11 dictionaries-common evolution-data-server 
-evolution-data-server-common gcr geoclue-2.0 gir1.2-accountsservice-1.0 gir1.2-atspi-2.0 gir1.2-gck-1 gir1.2-gcr-3 gir1.2-gdesktopenums-3.0 
-gir1.2-gdm-1.0 gir1.2-geoclue-2.0 gir1.2-gnomebluetooth-1.0 gir1.2-gnomedesktop-3.0 gir1.2-graphene-1.0 gir1.2-gweather-3.0 gir1.2-ibus-1.0 
-gir1.2-json-1.0 gir1.2-mutter-6 gir1.2-nm-1.0 gir1.2-nma-1.0 gir1.2-polkit-1.0 gir1.2-rsvg-2.0 gir1.2-soup-2.4 gir1.2-upowerglib-1.0 gjs 
-gnome-desktop3-data gnome-keyring gnome-session-bin gnome-session-common gnome-settings-daemon gnome-settings-daemon-common gnome-shell 
-gnome-shell-common hunspell-en-us libaccountsservice0 libaspell15 libcamel-1.2-62 libebackend-1.2-10 libebook-1.2-20 libebook-contacts-1.2-3 
-libecal-2.0-1 libedata-book-1.2-26 libedata-cal-2.0-1 libedataserver-1.2-24 libedataserverui-1.2-2 libenchant-2-2 libfontenc1 libgck-1-0 
-libgcr-base-3-1 libgcr-ui-3-1 libgdata-common libgdata22 libgdm1 libgeoclue-2-0 libgeocode-glib0 libgjs0g libgnome-autoar-0-0 libgnome-bluetooth13 
-libgnome-desktop-3-19 libgoa-1.0-0b libgoa-1.0-common libgraphene-1.0-0 libgweather-3-16 libgweather-common libibus-1.0-5 libical3 libimobiledevice6 
-libjavascriptcoregtk-4.0-18 libmutter-6-0 libnma0 libphonenumber7 libplist3 libprotobuf17 libtext-iconv-perl libunwind8 libupower-glib3 libusbmuxd6 
-libwebkit2gtk-4.0-37 libxaw7 libxfont2 libxkbfile1 libxmu6 libxmuu1 libxtst6 mutter mutter-common p11-kit p11-kit-modules pinentry-gnome3 upower 
-x11-xkb-utils x11-xserver-utils xdg-dbus-proxy xserver-common xwayland zenity zenity-common gnome-session gdm3 terminator gnome-control-center 
-alsa-base anacron at-spi2-core dmz-cursor-theme fonts-freefont-ttf fonts-urw-base35 foomatic-db-compressed-ppds genisoimage ghostscript ghostscript-x 
-gir1.2-goa-1.0 gir1.2-snapd-1 gnome-menus gnome-shell-extension-appindicator gnome-shell-extension-desktop-icons gvfs-bin inputattach 
-libasound2-plugins libatk-adaptor libcairo-gobject-perl libcairo-perl libcue2 libdee-1.0-4 libexempi8 libexiv2-27 libextutils-depends-perl 
-libextutils-pkgconfig-perl libgexiv2-2 libglib-object-introspection-perl libglib-perl libglu1-mesa libgs9 libgs9-common libgsf-1-114 
-libgsf-1-common libgtk3-perl libgxps2 libidn11 libijs-0.35 libjbig2dec0 libnautilus-extension1a libnotify-bin libpaper1 libpoppler-glib8 
-libpulsedsp libsasl2-modules libspeexdsp1 libtotem-plparser-common libtotem-plparser18 libtracker-control-2.0-0 libtracker-miner-2.0-0 
-libtracker-sparql-2.0-0 libu2f-udev libunity-protocol-private0 libunity-scopes-json-def-desktop libunity9 libxxf86dga1 libyelp0 linux-sound-base 
-nautilus nautilus-data openprinting-ppds poppler-data printer-driver-pnm2ppa pulseaudio pulseaudio-utils python3-click python3-colorama 
-python3-dateutil python3-debconf python3-debian python3-distupgrade python3-update-manager python3-xkit python3-yaml software-properties-gtk 
-spice-vdagent tracker tracker-extract tracker-miner-fs update-manager update-manager-core update-notifier update-notifier-common x11-apps 
-x11-session-utils x11-utils xdg-desktop-portal xdg-user-dirs xdg-user-dirs-gtk xinput xorg xorg-docs-core yaru-theme-gnome-shell yelp yelp-xsl 
-pulseaudio-module-bluetooth pavucontrol gnome-shell-extension-trash cups system-config-printer-gnome ubuntu-desktop-minimal ubuntu-session 
-ubuntu-settings gnome-terminal synaptic gnome-packagekit gnome-system-tools gnome-tweak-tool gedit gpaste gnome-tweaks gnome-system-log 
-gnome-power-manager gnome-screensaver gnome-screenshot gnome-todo gnome-photos gpaint lightdm lightdm-gtk-greeter lightdm-gtk-greeter-settings 
-gdebi gnome-screenshot fonts-ubuntu network-manager-openvpn-gnome eject language-pack-gnome-sl language-pack-gnome-de language-pack-gnome-fr 
-language-pack-gnome-it language-pack-gnome-es language-pack-gnome-pt language-pack-gnome-ru slick-greeter
+alsa-base
+anacron
+at-spi2-core
+bubblewrap
+cups
+dbus-x11
+dictionaries-common
+dmz-cursor-theme
+eject
+evolution-data-server
+evolution-data-server-common
+fonts-freefont-ttf
+fonts-ubuntu
+fonts-urw-base35
+foomatic-db-compressed-ppds
+gcr
+gdebi
+gdm3
+gedit
+genisoimage
+geoclue-2.0
+ghostscript
+ghostscript-x
+gir1.2-accountsservice-1.0
+gir1.2-atspi-2.0
+gir1.2-gck-1
+gir1.2-gcr-3
+gir1.2-gdesktopenums-3.0
+gir1.2-gdm-1.0
+gir1.2-geoclue-2.0
+gir1.2-gnomebluetooth-1.0
+gir1.2-gnomedesktop-3.0
+gir1.2-goa-1.0
+gir1.2-graphene-1.0
+gir1.2-gweather-3.0
+gir1.2-ibus-1.0
+gir1.2-json-1.0
+gir1.2-mutter-6
+gir1.2-nm-1.0
+gir1.2-nma-1.0
+gir1.2-polkit-1.0
+gir1.2-rsvg-2.0
+gir1.2-snapd-1
+gir1.2-soup-2.4
+gir1.2-upowerglib-1.0
+gjs
+gnome-control-center
+gnome-desktop3-data
+gnome-keyring
+gnome-menus
+gnome-packagekit
+gnome-photos
+gnome-power-manager
+gnome-screensaver
+gnome-screenshot
+gnome-screenshot
+gnome-session
+gnome-session-bin
+gnome-session-common
+gnome-settings-daemon
+gnome-settings-daemon-common
+gnome-shell
+gnome-shell-common
+gnome-shell-extension-appindicator
+gnome-shell-extension-desktop-icons
+gnome-shell-extension-trash
+gnome-system-log
+gnome-system-tools
+gnome-terminal
+gnome-todo
+gnome-tweaks
+gnome-tweak-tool
+gpaint
+gpaste
+gvfs-backends
+gvfs-bin
+hunspell-en-us
+inputattach
+language-pack-gnome-de
+language-pack-gnome-es
+language-pack-gnome-fr
+language-pack-gnome-it
+language-pack-gnome-pt
+language-pack-gnome-ru
+language-pack-gnome-sl
+libaccountsservice0
+libasound2-plugins
+libaspell15
+libatk-adaptor
+libcairo-gobject-perl
+libcairo-perl
+libcamel-1.2-62
+libcue2
+libdee-1.0-4
+libebackend-1.2-10
+libebook-1.2-20
+libebook-contacts-1.2-3
+libecal-2.0-1
+libedata-book-1.2-26
+libedata-cal-2.0-1
+libedataserver-1.2-24
+libedataserverui-1.2-2
+libenchant-2-2
+libexempi8
+libexiv2-27
+libextutils-depends-perl
+libextutils-pkgconfig-perl
+libfontenc1
+libgck-1-0
+libgcr-base-3-1
+libgcr-ui-3-1
+libgdata22
+libgdata-common
+libgdm1
+libgeoclue-2-0
+libgeocode-glib0
+libgexiv2-2
+libgjs0g
+libglib-object-introspection-perl
+libglib-perl
+libglu1-mesa
+libgnome-autoar-0-0
+libgnome-bluetooth13
+libgnome-desktop-3-19
+libgoa-1.0-0b
+libgoa-1.0-common
+libgraphene-1.0-0
+libgs9
+libgs9-common
+libgsf-1-114
+libgsf-1-common
+libgtk3-perl
+libgweather-3-16
+libgweather-common
+libgxps2
+libibus-1.0-5
+libical3
+libidn11
+libijs-0.35
+libimobiledevice6
+libjavascriptcoregtk-4.0-18
+libjbig2dec0
+libmutter-6-0
+libnautilus-extension1a
+libnma0
+libnotify-bin
+libpaper1
+libphonenumber7
+libplist3
+libpoppler-glib8
+libprotobuf17
+libpulsedsp
+libsasl2-modules
+libspeexdsp1
+libtext-iconv-perl
+libtotem-plparser18
+libtotem-plparser-common
+libtracker-control-2.0-0
+libtracker-miner-2.0-0
+libtracker-sparql-2.0-0
+libu2f-udev
+libunity9
+libunity-protocol-private0
+libunity-scopes-json-def-desktop
+libunwind8
+libupower-glib3
+libusbmuxd6
+libwebkit2gtk-4.0-37
+libxaw7
+libxfont2
+libxkbfile1
+libxmu6
+libxmuu1
+libxtst6
+libxxf86dga1
+libyelp0
+lightdm
+lightdm-gtk-greeter
+lightdm-gtk-greeter-settings
+linux-sound-base
+mutter
+mutter-common
+nautilus
+nautilus-data
+network-manager-openvpn-gnome
+openprinting-ppds
+p11-kit
+p11-kit-modules
+pavucontrol
+pinentry-gnome3
+poppler-data
+printer-driver-pnm2ppa
+pulseaudio
+pulseaudio-module-bluetooth
+pulseaudio-utils
+python3-click
+python3-colorama
+python3-dateutil
+python3-debconf
+python3-debian
+python3-distupgrade
+python3-update-manager
+python3-xkit
+python3-yaml
+slick-greeter
+software-properties-gtk
+spice-vdagent
+synaptic
+system-config-printer-gnome
+terminator
+tracker
+tracker-extract
+tracker-miner-fs
+ubuntu-desktop-minimal
+ubuntu-session
+ubuntu-settings
+update-manager
+update-manager-core
+update-notifier
+update-notifier-common
+upower
+x11-apps
+x11-session-utils
+x11-utils
+x11-xkb-utils
+x11-xserver-utils
+xdg-dbus-proxy
+xdg-desktop-portal
+xdg-user-dirs
+xdg-user-dirs-gtk
+xfonts-base
+xinit
+xinput
+xorg
+xorg-docs-core
+xserver-common
+xserver-xorg
+xserver-xorg-video-fbdev
+xwayland
+yaru-theme-gnome-shell
+yelp
+yelp-xsl
+zenity
+zenity-common
--- a/config/desktop/focal/environments/i3-wm/config_base/packages
+++ b/config/desktop/focal/environments/i3-wm/config_base/packages
@@ -1,28 +1,175 @@
-xserver-xorg xserver-xorg-video-fbdev xfonts-base xinit x11-xserver-utils xinit xorg-docs-core x11-apps xorg-docs xscreensaver xfonts-100dpi 
-xfonts-75dpi xfonts-base xfonts-encodings xfonts-scalable xfonts-utils xcursor-themes xdg-user-dirs xdg-user-dirs-gtk keyutils redshift dbus-x11 
-xwallpaper xterm xtermcontrol xtermset arandr libxcursor1 xcursor-themes mousetweaks xbacklight brltty brltty-x11 
-lightdm lightdm-gtk-greeter lightdm-settings lightdm-gtk-greeter-settings numix-gtk-theme slick-greeter
-bluez bluez-tools bluez-cups blueman gnome-bluetooth libgnome-bluetooth13 
-libgl1-mesa-dri policykit-1 profile-sync-daemon nitrogen thunar 
-i3 i3-wm libev4 libxcb-cursor0 i3lock i3status dunst libanyevent-i3-perl libjson-xs-perl 
-xtitle xttitle vifm terminator conky conky-all rofi compton feh 
-fonts-arphic-ukai fonts-arphic-uming fonts-dejavu-core fonts-freefont-ttf fonts-guru fonts-guru-extra fonts-kacst fonts-kacst-one fonts-khmeros-core 
-fonts-liberation fonts-opensymbol fonts-nanum fonts-stix fonts-symbola 
-libfont-afm-perl libfontconfig1 libfontembed1 libfontenc1 gnome-font-viewer fontconfig fontconfig-config 
-policykit-desktop-privileges policykit-1-gnome 
-network-manager-pptp network-manager-l2tp network-manager-openconnect network-manager-openvpn-gnome network-manager-vpnc 
-libproxy1-plugin-gsettings libproxy1-plugin-networkmanager libproxy1-plugin-gsettings 
-pamix pasystray pavucontrol pavumeter pavucontrol-qt pulseaudio-module-bluetooth gstreamer1.0-pulseaudio gstreamer1.0-packagekit 
-gstreamer1.0-plugins-base-apps 
-libu2f-udev libwmf0.2-7-gtk openprinting-ppds hplip system-config-printer-gnome indicator-printers 
-p7zip-full zip anacron doc-base foomatic-db-compressed-ppds 
-ghostscript-x inputattach kerneloops language-pack-en libatk-adaptor libgail-common libnotify-bin software-properties-gtk speech-dispatcher 
-spice-vdagent dictionaries-common hunspell-en-us 
-cups cups-bsd cups-client cups-filters system-config-printer system-config-printer-common printer-driver-all 
-samba smbclient cifs-utils 
-ubuntu-drivers-common ubuntu-docs ubuntu-wallpapers ttf-ubuntu-font-family fonts-ubuntu-font-family-console 
-tracker tracker-extract tracker-miner-fs update-inetd update-manager update-manager-core update-notifier update-notifier-common 
-laptop-detect overlay-scrollbar overlay-scrollbar-gtk2 
-gnome-system-monitor gnome-system-tools gnome-power-manager gnome-orca evince evince-common caffeine lxappearance gdebi 
-apport-gtk dmz-cursor-theme libgsettings-qt1 libappindicator3-1 gir1.2-appindicator3-0.1 gromit 
-totem totem-common totem-plugins
+anacron
+apport-gtk
+arandr
+blueman
+bluez
+bluez-cups
+bluez-tools
+brltty
+brltty-x11
+caffeine
+cifs-utils
+compton
+conky
+conky-all
+cups
+cups-bsd
+cups-client
+cups-filters
+dbus-x11
+dictionaries-common
+dmz-cursor-theme
+doc-base
+dunst
+evince
+evince-common
+feh
+fontconfig
+fontconfig-config
+fonts-arphic-ukai
+fonts-arphic-uming
+fonts-dejavu-core
+fonts-freefont-ttf
+fonts-guru
+fonts-guru-extra
+fonts-kacst
+fonts-kacst-one
+fonts-khmeros-core
+fonts-liberation
+fonts-nanum
+fonts-opensymbol
+fonts-stix
+fonts-symbola
+fonts-ubuntu-font-family-console
+foomatic-db-compressed-ppds
+gdebi
+ghostscript-x
+gir1.2-appindicator3-0.1
+gnome-bluetooth
+gnome-font-viewer
+gnome-orca
+gnome-power-manager
+gnome-system-monitor
+gnome-system-tools
+gromit
+gstreamer1.0-packagekit
+gstreamer1.0-plugins-base-apps
+gstreamer1.0-pulseaudio
+hplip
+hunspell-en-us
+i3
+i3lock
+i3status
+i3-wm
+indicator-printers
+inputattach
+kerneloops
+keyutils
+language-pack-en
+laptop-detect
+libanyevent-i3-perl
+libappindicator3-1
+libatk-adaptor
+libev4
+libfont-afm-perl
+libfontconfig1
+libfontembed1
+libfontenc1
+libgail-common
+libgl1-mesa-dri
+libgnome-bluetooth13
+libgsettings-qt1
+libjson-xs-perl
+libnotify-bin
+libproxy1-plugin-gsettings
+libproxy1-plugin-gsettings
+libproxy1-plugin-networkmanager
+libu2f-udev
+libwmf0.2-7-gtk
+libxcb-cursor0
+libxcursor1
+lightdm
+lightdm-gtk-greeter
+lightdm-gtk-greeter-settings
+lightdm-settings
+lxappearance
+mousetweaks
+network-manager-l2tp
+network-manager-openconnect
+network-manager-openvpn-gnome
+network-manager-pptp
+network-manager-vpnc
+nitrogen
+numix-gtk-theme
+openprinting-ppds
+overlay-scrollbar
+overlay-scrollbar-gtk2
+p7zip-full
+pamix
+pasystray
+pavucontrol
+pavucontrol-qt
+pavumeter
+policykit-1
+policykit-1-gnome
+policykit-desktop-privileges
+printer-driver-all
+profile-sync-daemon
+pulseaudio-module-bluetooth
+redshift
+rofi
+samba
+slick-greeter
+smbclient
+software-properties-gtk
+speech-dispatcher
+spice-vdagent
+system-config-printer
+system-config-printer-common
+system-config-printer-gnome
+terminator
+thunar
+totem
+totem-common
+totem-plugins
+tracker
+tracker-extract
+tracker-miner-fs
+ttf-ubuntu-font-family
+ubuntu-docs
+ubuntu-drivers-common
+ubuntu-wallpapers
+update-inetd
+update-manager
+update-manager-core
+update-notifier
+update-notifier-common
+vifm
+x11-apps
+x11-xserver-utils
+xbacklight
+xcursor-themes
+xcursor-themes
+xdg-user-dirs
+xdg-user-dirs-gtk
+xfonts-100dpi
+xfonts-75dpi
+xfonts-base
+xfonts-base
+xfonts-encodings
+xfonts-scalable
+xfonts-utils
+xinit
+xinit
+xorg-docs
+xorg-docs-core
+xscreensaver
+xserver-xorg
+xserver-xorg-video-fbdev
+xterm
+xtermcontrol
+xtermset
+xtitle
+xttitle
+xwallpaper
+zip
--- a/config/desktop/focal/environments/kde-plasma/config_base/packages
+++ b/config/desktop/focal/environments/kde-plasma/config_base/packages
@@ -1,29 +1,172 @@
-xserver-xorg xserver-xorg-video-fbdev xfonts-base xinit x11-xserver-utils xinit xorg-docs-core x11-apps xscreensaver xfonts-100dpi
-xfonts-75dpi xfonts-base xfonts-encodings xfonts-scalable xfonts-utils xcursor-themes xdg-user-dirs xdg-user-dirs-gtk keyutils
-redshift dbus-x11 xwallpaper xterm xtermcontrol xtermset libxcursor1 xcursor-themes mousetweaks xbacklight brltty brltty-x11
-libgl1-mesa-dri mesa-utils
-lightdm lightdm-settings numix-gtk-theme slick-greeter
-bluez bluez-tools bluez-cups blueman
-policykit-1 profile-sync-daemon policykit-desktop-privileges
+anacron
+apport-gtk
+blueman
+bluez
+bluez-cups
+bluez-tools
+brltty
+brltty-x11
+caffeine
+cifs-utils
+cups
+cups-bsd
+cups-client
+cups-filters
+dbus-x11
+dictionaries-common
+doc-base
+evince
+evince-common
+fontconfig
+fontconfig-config
+fonts-arphic-ukai
+fonts-arphic-uming
+fonts-dejavu-core
+fonts-freefont-ttf
+fonts-guru
+fonts-guru-extra
+fonts-kacst
+fonts-kacst-one
+fonts-khmeros-core
+fonts-liberation
+fonts-nanum
+fonts-opensymbol
+fonts-stix
+fonts-symbola
+fonts-ubuntu-font-family-console
+foomatic-db-compressed-ppds
+gdebi
+ghostscript-x
+gir1.2-appindicator3-0.1
+gnome-orca
+gnome-screenshot
+gnome-user-docs-de
+gnome-user-docs-es
+gnome-user-docs-it
+gnome-user-docs-pt
+gnome-user-docs-ru
+gnome-user-docs-sl
+gstreamer1.0-packagekit
+gstreamer1.0-plugins-base-apps
+gstreamer1.0-pulseaudio
+gtk2-engines
+gtk2-engines-murrine
+gtk2-engines-pixbuf
+hplip
+hunspell-en-us
+indicator-printers
+inputattach
 kde-plasma-desktop
-libcvc0 gtk2-engines gtk2-engines-murrine gtk2-engines-pixbuf libgtk2.0-bin
-fonts-arphic-ukai fonts-arphic-uming fonts-dejavu-core fonts-freefont-ttf fonts-guru fonts-guru-extra fonts-kacst fonts-kacst-one
-fonts-khmeros-core fonts-liberation fonts-opensymbol fonts-nanum fonts-stix fonts-symbola ttf-ubuntu-font-family fonts-ubuntu-font-family-console
-libfont-afm-perl libfontconfig1 libfontembed1 libfontenc1 fontconfig fontconfig-config
-terminator pinta scrcpy mousepad numix-icon-theme numix-icon-theme-circle numix-blue-gtk-theme numix-gtk-theme viewnior gnome-screenshot
-gnome-orca evince evince-common caffeine gdebi
-network-manager-pptp network-manager-l2tp network-manager-openconnect network-manager-openvpn network-manager-vpnc network-manager-ssh
-network-manager-config-connectivity-ubuntu libproxy1-plugin-gsettings libproxy1-plugin-networkmanager libproxy1-plugin-gsettings
-pamix pasystray pavucontrol pavumeter pavucontrol-qt pulseaudio-module-bluetooth
-gstreamer1.0-pulseaudio gstreamer1.0-packagekit gstreamer1.0-plugins-base-apps
-libu2f-udev libwmf0.2-7-gtk apport-gtk libgsettings-qt1 libappindicator3-1 gir1.2-appindicator3-0.1
-p7zip-full zip anacron doc-base foomatic-db-compressed-ppds spice-vdagent dictionaries-common hunspell-en-us
-ghostscript-x inputattach kerneloops libatk-adaptor libgail-common libnotify-bin software-properties-gtk
-cups cups-bsd cups-client cups-filters system-config-printer system-config-printer-common printer-driver-all openprinting-ppds hplip indicator-printers
-samba smbclient cifs-utils
-tracker tracker-extract tracker-miner-fs update-inetd update-manager update-manager-core update-notifier update-notifier-common
-laptop-detect ubuntu-drivers-common
-language-pack-gnome-de language-pack-gnome-en language-pack-gnome-es language-pack-gnome-fr language-pack-gnome-it language-pack-gnome-pt
-language-pack-gnome-ru language-pack-gnome-sl
-gnome-user-docs-de gnome-user-docs-es gnome-user-docs-it gnome-user-docs-pt gnome-user-docs-ru gnome-user-docs-sl
-wamerican wbrazilian wbritish wfrench witalian wportuguese wspanish wswiss
+kerneloops
+keyutils
+language-pack-gnome-de
+language-pack-gnome-en
+language-pack-gnome-es
+language-pack-gnome-fr
+language-pack-gnome-it
+language-pack-gnome-pt
+language-pack-gnome-ru
+language-pack-gnome-sl
+laptop-detect
+libappindicator3-1
+libatk-adaptor
+libcvc0
+libfont-afm-perl
+libfontconfig1
+libfontembed1
+libfontenc1
+libgail-common
+libgl1-mesa-dri
+libgsettings-qt1
+libgtk2.0-bin
+libnotify-bin
+libproxy1-plugin-gsettings
+libproxy1-plugin-gsettings
+libproxy1-plugin-networkmanager
+libu2f-udev
+libwmf0.2-7-gtk
+libxcursor1
+lightdm
+lightdm-settings
+mesa-utils
+mousepad
+mousetweaks
+network-manager-config-connectivity-ubuntu
+network-manager-l2tp
+network-manager-openconnect
+network-manager-openvpn
+network-manager-pptp
+network-manager-ssh
+network-manager-vpnc
+numix-blue-gtk-theme
+numix-gtk-theme
+numix-gtk-theme
+numix-icon-theme
+numix-icon-theme-circle
+openprinting-ppds
+p7zip-full
+pamix
+pasystray
+pavucontrol
+pavucontrol-qt
+pavumeter
+pinta
+policykit-1
+policykit-desktop-privileges
+printer-driver-all
+profile-sync-daemon
+pulseaudio-module-bluetooth
+redshift
+samba
+scrcpy
+slick-greeter
+smbclient
+software-properties-gtk
+spice-vdagent
+system-config-printer
+system-config-printer-common
+terminator
+tracker
+tracker-extract
+tracker-miner-fs
+ttf-ubuntu-font-family
+ubuntu-drivers-common
+update-inetd
+update-manager
+update-manager-core
+update-notifier
+update-notifier-common
+viewnior
+wamerican
+wbrazilian
+wbritish
+wfrench
+witalian
+wportuguese
+wspanish
+wswiss
+x11-apps
+x11-xserver-utils
+xbacklight
+xcursor-themes
+xcursor-themes
+xdg-user-dirs
+xdg-user-dirs-gtk
+xfonts-100dpi
+xfonts-75dpi
+xfonts-base
+xfonts-base
+xfonts-encodings
+xfonts-scalable
+xfonts-utils
+xinit
+xinit
+xorg-docs-core
+xscreensaver
+xserver-xorg
+xserver-xorg-video-fbdev
+xterm
+xtermcontrol
+xtermset
+xwallpaper
+zip
--- a/config/desktop/focal/environments/mate/config_base/packages
+++ b/config/desktop/focal/environments/mate/config_base/packages
@@ -1,36 +1,229 @@
-xserver-xorg xserver-xorg-video-fbdev xfonts-base xinit x11-xserver-utils xinit xorg-docs-core x11-apps xscreensaver xfonts-100dpi 
-xfonts-75dpi xfonts-base xfonts-encodings xfonts-scalable xfonts-utils xcursor-themes xdg-user-dirs xdg-user-dirs-gtk keyutils redshift dbus-x11 
-xwallpaper xterm xtermcontrol xtermset libxcursor1 xcursor-themes mousetweaks xbacklight brltty brltty-x11 libgl1-mesa-dri mesa-utils 
-lightdm lightdm-settings numix-gtk-theme slick-greeter 
-bluez bluez-tools bluez-cups blueman 
- mate-accessibility-profiles mate-applet-appmenu mate-applet-brisk-menu mate-applets mate-applets-common mate-backgrounds mate-calc 
- mate-calc-common mate-common mate-control-center mate-control-center-common mate-core mate-desktop mate-desktop-common 
- mate-desktop-environment mate-desktop-environment-core mate-desktop-environment-extra mate-desktop-environment-extras mate-dock-applet 
- mate-equake-applet mate-hud mate-icon-theme mate-indicator-applet mate-indicator-applet-common mate-media mate-media-common mate-menu 
- mate-menus mate-notification-daemon mate-notification-daemon-common mate-panel mate-panel-common mate-polkit mate-polkit-bin 
-mate-polkit-common mate-power-manager mate-power-manager-common mate-screensaver mate-screensaver-common mate-sensors-applet 
-mate-sensors-applet-common mate-session-manager mate-settings-daemon mate-settings-daemon-common mate-sntray-plugin 
-mate-system-monitor mate-system-monitor-common mate-terminal mate-terminal-common mate-themes mate-tweak mate-user-guide mate-user-share 
-mate-user-share-common mate-utils mate-utils-common mate-window-applets-common mate-window-buttons-applet mate-window-menu-applet 
-mate-window-title-applet  
-libcvc0 gtk2-engines gtk2-engines-murrine gtk2-engines-pixbuf libgtk2.0-bin 
-fonts-arphic-ukai fonts-arphic-uming fonts-dejavu-core fonts-freefont-ttf fonts-guru fonts-guru-extra fonts-kacst fonts-kacst-one fonts-khmeros-core 
-fonts-liberation fonts-opensymbol fonts-nanum fonts-stix fonts-symbola ttf-ubuntu-font-family fonts-ubuntu-font-family-console libfont-afm-perl 
-libfontconfig1 libfontembed1 libfontenc1 fontconfig fontconfig-config 
-terminator pinta scrcpy mousepad numix-icon-theme numix-icon-theme-circle numix-blue-gtk-theme numix-gtk-theme viewnior gnome-screenshot
-gnome-orca evince evince-common caffeine gdebi lxtask
-network-manager-pptp network-manager-l2tp network-manager-openconnect network-manager-openvpn network-manager-vpnc network-manager-ssh
-network-manager-config-connectivity-ubuntu libproxy1-plugin-gsettings libproxy1-plugin-networkmanager libproxy1-plugin-gsettings 
-pamix pasystray pavucontrol pavumeter pavucontrol-qt pulseaudio-module-bluetooth 
-gstreamer1.0-pulseaudio gstreamer1.0-packagekit gstreamer1.0-plugins-base-apps 
-libu2f-udev libwmf0.2-7-gtk apport-gtk libgsettings-qt1 libappindicator3-1 gir1.2-appindicator3-0.1 
-p7zip-full zip anacron doc-base foomatic-db-compressed-ppds spice-vdagent dictionaries-common hunspell-en-us 
-ghostscript-x inputattach kerneloops  libatk-adaptor libgail-common libnotify-bin software-properties-gtk 
-cups cups-bsd cups-client cups-filters system-config-printer system-config-printer-common printer-driver-all openprinting-ppds hplip indicator-printers 
-samba smbclient cifs-utils 
- tracker tracker-extract tracker-miner-fs update-inetd update-manager update-manager-core update-notifier update-notifier-common 
-laptop-detect ubuntu-drivers-common
- language-pack-gnome-de language-pack-gnome-en language-pack-gnome-es language-pack-gnome-fr language-pack-gnome-it language-pack-gnome-pt 
-language-pack-gnome-ru language-pack-gnome-sl 
-gnome-user-docs-de gnome-user-docs-es gnome-user-docs-it gnome-user-docs-pt gnome-user-docs-ru gnome-user-docs-sl
-wamerican wbrazilian wbritish wfrench witalian wportuguese wspanish wswiss 
+anacron
+apport-gtk
+blueman
+bluez
+bluez-cups
+bluez-tools
+brltty
+brltty-x11
+caffeine
+cifs-utils
+cups
+cups-bsd
+cups-client
+cups-filters
+dbus-x11
+dictionaries-common
+doc-base
+evince
+evince-common
+fontconfig
+fontconfig-config
+fonts-arphic-ukai
+fonts-arphic-uming
+fonts-dejavu-core
+fonts-freefont-ttf
+fonts-guru
+fonts-guru-extra
+fonts-kacst
+fonts-kacst-one
+fonts-khmeros-core
+fonts-liberation
+fonts-nanum
+fonts-opensymbol
+fonts-stix
+fonts-symbola
+fonts-ubuntu-font-family-console
+foomatic-db-compressed-ppds
+gdebi
+ghostscript-x
+gir1.2-appindicator3-0.1
+gnome-orca
+gnome-screenshot
+gnome-user-docs-de
+gnome-user-docs-es
+gnome-user-docs-it
+gnome-user-docs-pt
+gnome-user-docs-ru
+gnome-user-docs-sl
+gstreamer1.0-packagekit
+gstreamer1.0-plugins-base-apps
+gstreamer1.0-pulseaudio
+gtk2-engines
+gtk2-engines-murrine
+gtk2-engines-pixbuf
+hplip
+hunspell-en-us
+indicator-printers
+inputattach
+kerneloops
+keyutils
+language-pack-gnome-de
+language-pack-gnome-en
+language-pack-gnome-es
+language-pack-gnome-fr
+language-pack-gnome-it
+language-pack-gnome-pt
+language-pack-gnome-ru
+language-pack-gnome-sl
+laptop-detect
+libappindicator3-1
+libatk-adaptor
+libcvc0
+libfont-afm-perl
+libfontconfig1
+libfontembed1
+libfontenc1
+libgail-common
+libgl1-mesa-dri
+libgsettings-qt1
+libgtk2.0-bin
+libnotify-bin
+libproxy1-plugin-gsettings
+libproxy1-plugin-gsettings
+libproxy1-plugin-networkmanager
+libu2f-udev
+libwmf0.2-7-gtk
+libxcursor1
+lightdm
+lightdm-settings
+lxtask
+mate-accessibility-profiles
+mate-applet-appmenu
+mate-applet-brisk-menu
+mate-applets
+mate-applets-common
+mate-backgrounds
+mate-calc
+mate-calc-common
+mate-common
+mate-control-center
+mate-control-center-common
+mate-core
+mate-desktop
+mate-desktop-common
+mate-desktop-environment
+mate-desktop-environment-core
+mate-desktop-environment-extra
+mate-desktop-environment-extras
+mate-dock-applet
+mate-equake-applet
+mate-hud
+mate-icon-theme
+mate-indicator-applet
+mate-indicator-applet-common
+mate-media
+mate-media-common
+mate-menu
+mate-menus
+mate-notification-daemon
+mate-notification-daemon-common
+mate-panel
+mate-panel-common
+mate-polkit
+mate-polkit-bin
+mate-polkit-common
+mate-power-manager
+mate-power-manager-common
+mate-screensaver
+mate-screensaver-common
+mate-sensors-applet
+mate-sensors-applet-common
+mate-session-manager
+mate-settings-daemon
+mate-settings-daemon-common
+mate-sntray-plugin
+mate-system-monitor
+mate-system-monitor-common
+mate-terminal
+mate-terminal-common
+mate-themes
+mate-tweak
+mate-user-guide
+mate-user-share
+mate-user-share-common
+mate-utils
+mate-utils-common
+mate-window-applets-common
+mate-window-buttons-applet
+mate-window-menu-applet
+mate-window-title-applet
+mesa-utils
+mousepad
+mousetweaks
+network-manager-config-connectivity-ubuntu
+network-manager-l2tp
+network-manager-openconnect
+network-manager-openvpn
+network-manager-pptp
+network-manager-ssh
+network-manager-vpnc
+numix-blue-gtk-theme
+numix-gtk-theme
+numix-gtk-theme
+numix-icon-theme
+numix-icon-theme-circle
+openprinting-ppds
+p7zip-full
+pamix
+pasystray
+pavucontrol
+pavucontrol-qt
+pavumeter
+pinta
+printer-driver-all
+pulseaudio-module-bluetooth
+redshift
+samba
+scrcpy
+slick-greeter
+smbclient
+software-properties-gtk
+spice-vdagent
+system-config-printer
+system-config-printer-common
+terminator
+tracker
+tracker-extract
+tracker-miner-fs
+ttf-ubuntu-font-family
+ubuntu-drivers-common
+update-inetd
+update-manager
+update-manager-core
+update-notifier
+update-notifier-common
+viewnior
+wamerican
+wbrazilian
+wbritish
+wfrench
+witalian
+wportuguese
+wspanish
+wswiss
+x11-apps
+x11-xserver-utils
+xbacklight
+xcursor-themes
+xcursor-themes
+xdg-user-dirs
+xdg-user-dirs-gtk
+xfonts-100dpi
+xfonts-75dpi
+xfonts-base
+xfonts-base
+xfonts-encodings
+xfonts-scalable
+xfonts-utils
+xinit
+xinit
+xorg-docs-core
+xscreensaver
+xserver-xorg
+xserver-xorg-video-fbdev
+xterm
+xtermcontrol
+xtermset
+xwallpaper
+zip
--- a/config/desktop/focal/environments/xfce/appgroups/programming/packages
+++ b/config/desktop/focal/environments/xfce/appgroups/programming/packages
@@ -1 +1,2 @@
-gnome-builder geany
+geany
+gnome-builder
--- a/config/desktop/focal/environments/xfce/config_base/packages
+++ b/config/desktop/focal/environments/xfce/config_base/packages
@@ -1,30 +1,179 @@
-xserver-xorg xserver-xorg-video-fbdev xfonts-base xinit x11-xserver-utils xinit xorg-docs-core x11-apps xscreensaver xfonts-100dpi 
-xfonts-75dpi xfonts-base xfonts-encodings xfonts-scalable xfonts-utils xcursor-themes xdg-user-dirs xdg-user-dirs-gtk keyutils redshift dbus-x11 
-xwallpaper xterm xtermcontrol xtermset libxcursor1 xcursor-themes mousetweaks xbacklight brltty brltty-x11 libgl1-mesa-dri mesa-utils 
-lightdm lightdm-settings numix-gtk-theme slick-greeter 
-bluez bluez-tools bluez-cups blueman 
-policykit-1 profile-sync-daemon policykit-desktop-privileges 
-xfce4 xfce4-notifyd lxtask xfce4-terminal xfce4-screenshooter thunar-volman profile-sync-daemon 
-terminator pinta scrcpy mousepad numix-icon-theme numix-icon-theme-circle numix-blue-gtk-theme numix-gtk-theme viewnior gnome-screenshot
-gtk2-engines gtk2-engines-murrine gtk2-engines-pixbuf libgtk2.0-bin
-libpam-gnome-keyring fonts-arphic-ukai fonts-arphic-uming fonts-dejavu-core fonts-freefont-ttf fonts-guru fonts-guru-extra fonts-kacst fonts-kacst-one 
-fonts-khmeros-core fonts-liberation fonts-opensymbol fonts-nanum fonts-stix fonts-symbola  ttf-ubuntu-font-family fonts-ubuntu-font-family-console 
-libfont-afm-perl libfontconfig1 libfontembed1 libfontenc1 gnome-font-viewer fontconfig fontconfig-config 
-network-manager-pptp network-manager-l2tp network-manager-openconnect network-manager-openvpn network-manager-vpnc network-manager-ssh
+anacron
+apport-gtk
+blueman
+bluez
+bluez-cups
+bluez-tools
+brltty
+brltty-x11
+caffeine
+cifs-utils
+cups
+cups-bsd
+cups-client
+cups-filters
+dbus-x11
+dictionaries-common
+dmz-cursor-theme
+doc-base
+evince
+evince-common
+fontconfig
+fontconfig-config
+fonts-arphic-ukai
+fonts-arphic-uming
+fonts-dejavu-core
+fonts-freefont-ttf
+fonts-guru
+fonts-guru-extra
+fonts-kacst
+fonts-kacst-one
+fonts-khmeros-core
+fonts-liberation
+fonts-nanum
+fonts-opensymbol
+fonts-stix
+fonts-symbola
+fonts-ubuntu-font-family-console
+foomatic-db-compressed-ppds
+gdebi
+ghostscript-x
+gir1.2-appindicator3-0.1
+gnome-font-viewer
+gnome-screenshot
+gnome-user-docs-de
+gnome-user-docs-es
+gnome-user-docs-it
+gnome-user-docs-pt
+gnome-user-docs-ru
+gnome-user-docs-sl
+gstreamer1.0-packagekit
+gstreamer1.0-plugins-base-apps
+gstreamer1.0-pulseaudio
+gtk2-engines
+gtk2-engines-murrine
+gtk2-engines-pixbuf
+hplip
+hunspell-en-us
+indicator-printers
+inputattach
+kerneloops
+keyutils
+language-pack-gnome-de
+language-pack-gnome-en
+language-pack-gnome-es
+language-pack-gnome-fr
+language-pack-gnome-it
+language-pack-gnome-pt
+language-pack-gnome-ru
+language-pack-gnome-sl
+laptop-detect
+libappindicator3-1
+libatk-adaptor
+libfont-afm-perl
+libfontconfig1
+libfontembed1
+libfontenc1
+libgail-common
+libgl1-mesa-dri
+libgsettings-qt1
+libgtk2.0-bin
+libnotify-bin
+libpam-gnome-keyring
+libproxy1-plugin-gsettings
+libproxy1-plugin-gsettings
+libproxy1-plugin-networkmanager
+libu2f-udev
+libwmf0.2-7-gtk
+libxcursor1
+lightdm
+lightdm-settings
+lxtask
+mesa-utils
+mousepad
+mousetweaks
 network-manager-gnome
-libproxy1-plugin-gsettings libproxy1-plugin-networkmanager libproxy1-plugin-gsettings 
-pamix pasystray pavucontrol pavumeter pavucontrol-qt pulseaudio-module-bluetooth 
-gstreamer1.0-pulseaudio gstreamer1.0-packagekit gstreamer1.0-plugins-base-apps 
-libu2f-udev libwmf0.2-7-gtk 
-p7zip-full zip anacron doc-base foomatic-db-compressed-ppds spice-vdagent dictionaries-common hunspell-en-us 
-ghostscript-x inputattach kerneloops libatk-adaptor libgail-common libnotify-bin software-properties-gtk 
-cups cups-bsd cups-client cups-filters system-config-printer system-config-printer-common printer-driver-all openprinting-ppds hplip indicator-printers 
-smbclient cifs-utils 
-tracker tracker-extract tracker-miner-fs update-inetd update-manager update-manager-core update-notifier update-notifier-common 
-laptop-detect ubuntu-drivers-common orca evince evince-common caffeine gdebi 
-apport-gtk dmz-cursor-theme libgsettings-qt1 libappindicator3-1 gir1.2-appindicator3-0.1 
- language-pack-gnome-de language-pack-gnome-en language-pack-gnome-es language-pack-gnome-fr language-pack-gnome-it language-pack-gnome-pt 
-language-pack-gnome-ru language-pack-gnome-sl 
-gnome-user-docs-de gnome-user-docs-es gnome-user-docs-it gnome-user-docs-pt gnome-user-docs-ru gnome-user-docs-sl 
-wamerican wbrazilian wbritish wfrench witalian wportuguese wspanish wswiss 
-
+network-manager-l2tp
+network-manager-openconnect
+network-manager-openvpn
+network-manager-pptp
+network-manager-ssh
+network-manager-vpnc
+numix-blue-gtk-theme
+numix-gtk-theme
+numix-gtk-theme
+numix-icon-theme
+numix-icon-theme-circle
+openprinting-ppds
+orca
+p7zip-full
+pamix
+pasystray
+pavucontrol
+pavucontrol-qt
+pavumeter
+pinta
+policykit-1
+policykit-desktop-privileges
+printer-driver-all
+profile-sync-daemon
+profile-sync-daemon
+pulseaudio-module-bluetooth
+redshift
+scrcpy
+slick-greeter
+smbclient
+software-properties-gtk
+spice-vdagent
+system-config-printer
+system-config-printer-common
+terminator
+thunar-volman
+tracker
+tracker-extract
+tracker-miner-fs
+ttf-ubuntu-font-family
+ubuntu-drivers-common
+update-inetd
+update-manager
+update-manager-core
+update-notifier
+update-notifier-common
+viewnior
+wamerican
+wbrazilian
+wbritish
+wfrench
+witalian
+wportuguese
+wspanish
+wswiss
+x11-apps
+x11-xserver-utils
+xbacklight
+xcursor-themes
+xcursor-themes
+xdg-user-dirs
+xdg-user-dirs-gtk
+xfce4
+xfce4-notifyd
+xfce4-screenshooter
+xfce4-terminal
+xfonts-100dpi
+xfonts-75dpi
+xfonts-base
+xfonts-base
+xfonts-encodings
+xfonts-scalable
+xfonts-utils
+xinit
+xinit
+xorg-docs-core
+xscreensaver
+xserver-xorg
+xserver-xorg-video-fbdev
+xterm
+xtermcontrol
+xtermset
+xwallpaper
+zip
--- a/config/desktop/focal/environments/xmonad/config_base/packages
+++ b/config/desktop/focal/environments/xmonad/config_base/packages
@@ -1,32 +1,159 @@
-xserver-xorg xserver-xorg-video-fbdev xfonts-base xinit x11-xserver-utils xinit x11-apps xscreensaver xfonts-100dpi xfonts-75dpi xfonts-base 
-xfonts-encodings xfonts-scalable xfonts-utils xcursor-themes xdg-user-dirs xdg-user-dirs-gtk keyutils dbus-x11 xwallpaper xterm xtermcontrol 
-xtermset arandr libxcursor1 xcursor-themes mousetweaks xbacklight brltty brltty-x11 orca 
-lightdm lightdm-gtk-greeter lightdm-settings lightdm-gtk-greeter-settings numix-gtk-theme slick-greeter
-bluez bluez-tools bluez-cups blueman gnome-bluetooth libgnome-bluetooth13 
-policykit-1 profile-sync-daemon  
-xmonad xmobar libghc-xmonad-contrib-dev libghc-xmonad-wallpaper-dev 
-dmenu xtitle xttitle vifm terminator conky-all rofi compton feh nitrogen thunar nitrogen thunar
-fonts-arphic-ukai fonts-arphic-uming fonts-dejavu-core fonts-freefont-ttf fonts-guru fonts-guru-extra fonts-kacst fonts-kacst-one 
-fonts-khmeros-core fonts-liberation fonts-opensymbol fonts-nanum fonts-stix fonts-symbola libfont-afm-perl libfontconfig1 libfontembed1 
-ttf-ubuntu-font-family fonts-ubuntu-font-family-console libfontenc1 gnome-font-viewer fontconfig fontconfig-config 
-policykit-desktop-privileges policykit-1-gnome 
-network-manager-pptp network-manager-l2tp network-manager-openconnect network-manager-openvpn-gnome network-manager-vpnc 
-libproxy1-plugin-gsettings libproxy1-plugin-networkmanager libproxy1-plugin-gsettings 
-pamix pasystray pavucontrol pavumeter pavucontrol-qt pulseaudio-module-bluetooth 
-gstreamer1.0-pulseaudio gstreamer1.0-packagekit gstreamer1.0-plugins-base-apps 
-libu2f-udev libwmf0.2-7-gtk  
-p7zip-full zip anacron doc-base foomatic-db-compressed-ppds 
-ghostscript-x inputattach kerneloops libatk-adaptor libgail-common libnotify-bin software-properties-gtk 
-spice-vdagent dictionaries-common hunspell-en-us 
-cups cups-bsd cups-client cups-filters system-config-printer system-config-printer-common printer-driver-all openprinting-ppds hplip 
-system-config-printer-gnome indicator-printers
-samba smbclient cifs-utils 
-ubuntu-drivers-common laptop-detect
-tracker tracker-extract tracker-miner-fs update-inetd update-manager update-manager-core update-notifier update-notifier-common 
-apport-gtk dmz-cursor-theme libgsettings-qt1 libappindicator3-1 gir1.2-appindicator3-0.1 gromit 
-language-pack-en language-pack-sl language-pack-de language-pack-fr-base language-pack-it language-pack-es language-pack-pt language-pack-ru
-
-
-
-
-
+anacron
+apport-gtk
+arandr
+blueman
+bluez
+bluez-cups
+bluez-tools
+brltty
+brltty-x11
+cifs-utils
+compton
+conky-all
+cups
+cups-bsd
+cups-client
+cups-filters
+dbus-x11
+dictionaries-common
+dmenu
+dmz-cursor-theme
+doc-base
+feh
+fontconfig
+fontconfig-config
+fonts-arphic-ukai
+fonts-arphic-uming
+fonts-dejavu-core
+fonts-freefont-ttf
+fonts-guru
+fonts-guru-extra
+fonts-kacst
+fonts-kacst-one
+fonts-khmeros-core
+fonts-liberation
+fonts-nanum
+fonts-opensymbol
+fonts-stix
+fonts-symbola
+fonts-ubuntu-font-family-console
+foomatic-db-compressed-ppds
+ghostscript-x
+gir1.2-appindicator3-0.1
+gnome-bluetooth
+gnome-font-viewer
+gromit
+gstreamer1.0-packagekit
+gstreamer1.0-plugins-base-apps
+gstreamer1.0-pulseaudio
+hplip
+hunspell-en-us
+indicator-printers
+inputattach
+kerneloops
+keyutils
+language-pack-de
+language-pack-en
+language-pack-es
+language-pack-fr-base
+language-pack-it
+language-pack-pt
+language-pack-ru
+language-pack-sl
+laptop-detect
+libappindicator3-1
+libatk-adaptor
+libfont-afm-perl
+libfontconfig1
+libfontembed1
+libfontenc1
+libgail-common
+libghc-xmonad-contrib-dev
+libghc-xmonad-wallpaper-dev
+libgnome-bluetooth13
+libgsettings-qt1
+libnotify-bin
+libproxy1-plugin-gsettings
+libproxy1-plugin-gsettings
+libproxy1-plugin-networkmanager
+libu2f-udev
+libwmf0.2-7-gtk
+libxcursor1
+lightdm
+lightdm-gtk-greeter
+lightdm-gtk-greeter-settings
+lightdm-settings
+mousetweaks
+network-manager-l2tp
+network-manager-openconnect
+network-manager-openvpn-gnome
+network-manager-pptp
+network-manager-vpnc
+nitrogen
+nitrogen
+numix-gtk-theme
+openprinting-ppds
+orca
+p7zip-full
+pamix
+pasystray
+pavucontrol
+pavucontrol-qt
+pavumeter
+policykit-1
+policykit-1-gnome
+policykit-desktop-privileges
+printer-driver-all
+profile-sync-daemon
+pulseaudio-module-bluetooth
+rofi
+samba
+slick-greeter
+smbclient
+software-properties-gtk
+spice-vdagent
+system-config-printer
+system-config-printer-common
+system-config-printer-gnome
+terminator
+thunar
+thunar
+tracker
+tracker-extract
+tracker-miner-fs
+ttf-ubuntu-font-family
+ubuntu-drivers-common
+update-inetd
+update-manager
+update-manager-core
+update-notifier
+update-notifier-common
+vifm
+x11-apps
+x11-xserver-utils
+xbacklight
+xcursor-themes
+xcursor-themes
+xdg-user-dirs
+xdg-user-dirs-gtk
+xfonts-100dpi
+xfonts-75dpi
+xfonts-base
+xfonts-base
+xfonts-encodings
+xfonts-scalable
+xfonts-utils
+xinit
+xinit
+xmobar
+xmonad
+xscreensaver
+xserver-xorg
+xserver-xorg-video-fbdev
+xterm
+xtermcontrol
+xtermset
+xtitle
+xttitle
+xwallpaper
+zip
--- a/config/desktop/hirsute/environments/gnome/config_base/packages
+++ b/config/desktop/hirsute/environments/gnome/config_base/packages
@@ -1,24 +1,215 @@
-xserver-xorg xserver-xorg-video-fbdev gvfs-backends xfonts-base xinit bubblewrap dbus-x11 dictionaries-common evolution-data-server 
-evolution-data-server-common gcr geoclue-2.0 gir1.2-accountsservice-1.0 gir1.2-atspi-2.0 gir1.2-gck-1 gir1.2-gcr-3 gir1.2-gdesktopenums-3.0 
-gir1.2-gdm-1.0 gir1.2-geoclue-2.0 gir1.2-gnomebluetooth-1.0 gir1.2-gnomedesktop-3.0 gir1.2-graphene-1.0 gir1.2-gweather-3.0 gir1.2-ibus-1.0 
-gir1.2-json-1.0 gir1.2-mutter-7 gir1.2-nm-1.0 gir1.2-nma-1.0 gir1.2-polkit-1.0 gir1.2-rsvg-2.0 gir1.2-soup-2.4 gir1.2-upowerglib-1.0 gjs 
-gnome-desktop3-data gnome-keyring gnome-session-bin gnome-session-common gnome-settings-daemon gnome-settings-daemon-common gnome-shell 
-gnome-shell-common hunspell-en-us libaccountsservice0 libaspell15 libcamel-1.2-62 libebackend-1.2-10 libebook-1.2-20 libebook-contacts-1.2-3 
-libecal-2.0-1 libedata-book-1.2-26 libedata-cal-2.0-1 libedataserver-1.2-26 libedataserverui-1.2-3 libenchant-2-2 libfontenc1 libgck-1-0 
-libgcr-base-3-1 libgcr-ui-3-1 libgdata-common libgdata22 libgdm1 libgeoclue-2-0 libgeocode-glib0 libgjs0g libgnome-autoar-0-0 libgnome-bluetooth13 
-libgnome-desktop-3-19 libgoa-1.0-0b libgoa-1.0-common libgraphene-1.0-0 libgweather-3-16 libgweather-common libibus-1.0-5 libical3 libimobiledevice6 
-libjavascriptcoregtk-4.0-18 libmutter-7-0 libnma0 libphonenumber8 libplist3 libprotobuf23 libtext-iconv-perl libunwind8 libupower-glib3 libusbmuxd6 
-libwebkit2gtk-4.0-37 libxaw7 libxfont2 libxkbfile1 libxmu6 libxmuu1 libxtst6 mutter mutter-common p11-kit p11-kit-modules pinentry-gnome3 upower 
-x11-xkb-utils x11-xserver-utils xdg-dbus-proxy xserver-common xwayland zenity zenity-common gnome-session gdm3 terminator gnome-control-center 
-alsa-base anacron at-spi2-core dmz-cursor-theme fonts-freefont-ttf fonts-urw-base35 foomatic-db-compressed-ppds genisoimage ghostscript ghostscript-x 
-gir1.2-goa-1.0 gir1.2-snapd-1 gnome-menus gnome-shell-extension-appindicator gnome-shell-extension-desktop-icons inputattach libasound2-plugins 
-libatk-adaptor libcairo-gobject-perl libcairo-perl libcue2 libdee-1.0-4 libexempi8 libexiv2-27 libextutils-depends-perl libextutils-pkgconfig-perl 
-libgexiv2-2 libglib-object-introspection-perl libglib-perl libglu1-mesa libgs9 libgs9-common libgsf-1-114 libgsf-1-common libgtk3-perl libgxps2 
-libidn11 libijs-0.35 libjbig2dec0 libnautilus-extension1a libnotify-bin libpaper1 libpoppler-glib8 libpulsedsp libsasl2-modules libspeexdsp1 
-libtotem-plparser-common libtotem-plparser18 libtracker-control-2.0-0 libtracker-miner-2.0-0 libtracker-sparql-2.0-0 libu2f-udev 
-libunity-protocol-private0 libunity-scopes-json-def-desktop libunity9 libxxf86dga1 libyelp0 linux-sound-base nautilus nautilus-data openprinting-ppds 
-poppler-data printer-driver-pnm2ppa pulseaudio pulseaudio-utils python3-click python3-colorama python3-dateutil python3-debconf python3-debian 
-python3-distupgrade python3-update-manager python3-xkit python3-yaml software-properties-gtk spice-vdagent tracker tracker-extract tracker-miner-fs 
-update-manager update-manager-core update-notifier update-notifier-common x11-apps x11-session-utils x11-utils xdg-desktop-portal xdg-user-dirs 
-xdg-user-dirs-gtk xinput xorg xorg-docs-core yaru-theme-gnome-shell yelp yelp-xsl pulseaudio-module-bluetooth pavucontrol gnome-shell-extension-trash 
-cups system-config-printer-gnome ubuntu-desktop-minimal ubuntu-session ubuntu-settings ubuntu-business-defaults gconf2 gdebi
+alsa-base
+anacron
+at-spi2-core
+bubblewrap
+cups
+dbus-x11
+dictionaries-common
+dmz-cursor-theme
+evolution-data-server
+evolution-data-server-common
+fonts-freefont-ttf
+fonts-urw-base35
+foomatic-db-compressed-ppds
+gconf2
+gcr
+gdebi
+gdm3
+genisoimage
+geoclue-2.0
+ghostscript
+ghostscript-x
+gir1.2-accountsservice-1.0
+gir1.2-atspi-2.0
+gir1.2-gck-1
+gir1.2-gcr-3
+gir1.2-gdesktopenums-3.0
+gir1.2-gdm-1.0
+gir1.2-geoclue-2.0
+gir1.2-gnomebluetooth-1.0
+gir1.2-gnomedesktop-3.0
+gir1.2-goa-1.0
+gir1.2-graphene-1.0
+gir1.2-gweather-3.0
+gir1.2-ibus-1.0
+gir1.2-json-1.0
+gir1.2-mutter-7
+gir1.2-nm-1.0
+gir1.2-nma-1.0
+gir1.2-polkit-1.0
+gir1.2-rsvg-2.0
+gir1.2-snapd-1
+gir1.2-soup-2.4
+gir1.2-upowerglib-1.0
+gjs
+gnome-control-center
+gnome-desktop3-data
+gnome-keyring
+gnome-menus
+gnome-session
+gnome-session-bin
+gnome-session-common
+gnome-settings-daemon
+gnome-settings-daemon-common
+gnome-shell
+gnome-shell-common
+gnome-shell-extension-appindicator
+gnome-shell-extension-desktop-icons
+gnome-shell-extension-trash
+gvfs-backends
+hunspell-en-us
+inputattach
+libaccountsservice0
+libasound2-plugins
+libaspell15
+libatk-adaptor
+libcairo-gobject-perl
+libcairo-perl
+libcamel-1.2-62
+libcue2
+libdee-1.0-4
+libebackend-1.2-10
+libebook-1.2-20
+libebook-contacts-1.2-3
+libecal-2.0-1
+libedata-book-1.2-26
+libedata-cal-2.0-1
+libedataserver-1.2-26
+libedataserverui-1.2-3
+libenchant-2-2
+libexempi8
+libexiv2-27
+libextutils-depends-perl
+libextutils-pkgconfig-perl
+libfontenc1
+libgck-1-0
+libgcr-base-3-1
+libgcr-ui-3-1
+libgdata22
+libgdata-common
+libgdm1
+libgeoclue-2-0
+libgeocode-glib0
+libgexiv2-2
+libgjs0g
+libglib-object-introspection-perl
+libglib-perl
+libglu1-mesa
+libgnome-autoar-0-0
+libgnome-bluetooth13
+libgnome-desktop-3-19
+libgoa-1.0-0b
+libgoa-1.0-common
+libgraphene-1.0-0
+libgs9
+libgs9-common
+libgsf-1-114
+libgsf-1-common
+libgtk3-perl
+libgweather-3-16
+libgweather-common
+libgxps2
+libibus-1.0-5
+libical3
+libidn11
+libijs-0.35
+libimobiledevice6
+libjavascriptcoregtk-4.0-18
+libjbig2dec0
+libmutter-7-0
+libnautilus-extension1a
+libnma0
+libnotify-bin
+libpaper1
+libphonenumber8
+libplist3
+libpoppler-glib8
+libprotobuf23
+libpulsedsp
+libsasl2-modules
+libspeexdsp1
+libtext-iconv-perl
+libtotem-plparser18
+libtotem-plparser-common
+libtracker-control-2.0-0
+libtracker-miner-2.0-0
+libtracker-sparql-2.0-0
+libu2f-udev
+libunity9
+libunity-protocol-private0
+libunity-scopes-json-def-desktop
+libunwind8
+libupower-glib3
+libusbmuxd6
+libwebkit2gtk-4.0-37
+libxaw7
+libxfont2
+libxkbfile1
+libxmu6
+libxmuu1
+libxtst6
+libxxf86dga1
+libyelp0
+linux-sound-base
+mutter
+mutter-common
+nautilus
+nautilus-data
+openprinting-ppds
+p11-kit
+p11-kit-modules
+pavucontrol
+pinentry-gnome3
+poppler-data
+printer-driver-pnm2ppa
+pulseaudio
+pulseaudio-module-bluetooth
+pulseaudio-utils
+python3-click
+python3-colorama
+python3-dateutil
+python3-debconf
+python3-debian
+python3-distupgrade
+python3-update-manager
+python3-xkit
+python3-yaml
+software-properties-gtk
+spice-vdagent
+system-config-printer-gnome
+terminator
+tracker
+tracker-extract
+tracker-miner-fs
+ubuntu-business-defaults
+ubuntu-desktop-minimal
+ubuntu-session
+ubuntu-settings
+update-manager
+update-manager-core
+update-notifier
+update-notifier-common
+upower
+x11-apps
+x11-session-utils
+x11-utils
+x11-xkb-utils
+x11-xserver-utils
+xdg-dbus-proxy
+xdg-desktop-portal
+xdg-user-dirs
+xdg-user-dirs-gtk
+xfonts-base
+xinit
+xinput
+xorg
+xorg-docs-core
+xserver-common
+xserver-xorg
+xserver-xorg-video-fbdev
+xwayland
+yaru-theme-gnome-shell
+yelp
+yelp-xsl
+zenity
+zenity-common
--- a/config/desktop/sid/appgroups/browsers/packages
+++ b/config/desktop/sid/appgroups/browsers/packages
@@ -1 +1,2 @@
-chromium firefox-esr
+chromium
+firefox-esr
--- a/config/desktop/sid/environments/gnome/config_base/packages
+++ b/config/desktop/sid/environments/gnome/config_base/packages
@@ -1,24 +1,204 @@
-xserver-xorg xserver-xorg-video-fbdev gvfs-backends xfonts-base xinit bubblewrap dbus-x11 dictionaries-common evolution-data-server 
-evolution-data-server-common gcr geoclue-2.0 gir1.2-accountsservice-1.0 gir1.2-atspi-2.0 gir1.2-gck-1 gir1.2-gcr-3 gir1.2-gdesktopenums-3.0 
-gir1.2-gdm-1.0 gir1.2-geoclue-2.0 gir1.2-gnomebluetooth-1.0 gir1.2-gnomedesktop-3.0 gir1.2-graphene-1.0 gir1.2-gweather-3.0 gir1.2-ibus-1.0 
-gir1.2-json-1.0 gir1.2-mutter-7 gir1.2-nm-1.0 gir1.2-nma-1.0 gir1.2-polkit-1.0 gir1.2-rsvg-2.0 gir1.2-soup-2.4 gir1.2-upowerglib-1.0 gjs 
-gnome-desktop3-data gnome-keyring gnome-session-bin gnome-session-common gnome-settings-daemon gnome-settings-daemon-common gnome-shell 
-gnome-shell-common hunspell-en-us libaccountsservice0 libaspell15 libcamel-1.2-62 libebackend-1.2-10 libebook-1.2-20 libebook-contacts-1.2-3 
-libecal-2.0-1 libedata-book-1.2-26 libedata-cal-2.0-1 libedataserver-1.2-25 libedataserverui-1.2-2 libenchant-2-2 libfontenc1 libgck-1-0 
-libgcr-base-3-1 libgcr-ui-3-1 libgdata-common libgdata22 libgdm1 libgeoclue-2-0 libgeocode-glib0 libgjs0g libgnome-autoar-0-0 
-libgnome-bluetooth13 libgnome-desktop-3-19 libgoa-1.0-0b libgoa-1.0-common libgraphene-1.0-0 libgweather-3-16 libgweather-common libibus-1.0-5 
-libical3 libimobiledevice6 libjavascriptcoregtk-4.0-18 libmutter-6-0 libnma0 libphonenumber8 libplist3 libprotobuf17 libtext-iconv-perl 
-libunwind8 libupower-glib3 libusbmuxd6 libwebkit2gtk-4.0-37 libxaw7 libxfont2 libxkbfile1 libxmu6 libxmuu1 libxtst6 mutter mutter-common 
-p11-kit p11-kit-modules pinentry-gnome3 upower x11-xkb-utils x11-xserver-utils xdg-dbus-proxy xserver-common xwayland zenity zenity-common 
-gnome-session gdm3 terminator gnome-control-center libasound2 anacron at-spi2-core dmz-cursor-theme fonts-freefont-ttf fonts-urw-base35 
-foomatic-db-compressed-ppds genisoimage ghostscript ghostscript-x gir1.2-goa-1.0 gir1.2-snapd-1 gnome-menus gnome-shell-extension-appindicator 
-gnome-shell-extension-desktop-icons gvfs-bin inputattach libasound2-plugins libatk-adaptor libcairo-gobject-perl libcairo-perl libcue2 
-libdee-1.0-4 libexempi8 libexiv2-27 libextutils-depends-perl libextutils-pkgconfig-perl libgexiv2-2 libglib-object-introspection-perl 
-libglib-perl libglu1-mesa libgs9 libgs9-common libgsf-1-114 libgsf-1-common libgtk3-perl libgxps2 libidn11 libijs-0.35 libjbig2dec0 
-libnautilus-extension1a libnotify-bin libpaper1 libpoppler-glib8 libpulsedsp libsasl2-modules libspeexdsp1 libtotem-plparser-common 
-libtotem-plparser18 libtracker-control-2.0-0 libtracker-miner-2.0-0 libtracker-sparql-2.0-0 libu2f-udev libxxf86dga1 libyelp0 nautilus 
-nautilus-data openprinting-ppds poppler-data printer-driver-pnm2ppa pulseaudio pulseaudio-utils python3-click python3-colorama python3-dateutil 
-python3-debconf python3-debian python3-distutils python3-distutils-extra python3-yaml software-properties-gtk spice-vdagent tracker tracker-extract 
-tracker-miner-fs gnome-packagekit apt-config-auto-update x11-apps x11-session-utils x11-utils xdg-desktop-portal xdg-user-dirs xdg-user-dirs-gtk 
-xinput xorg xorg-docs-core yelp yelp-xsl pulseaudio-module-bluetooth pavucontrol gnome-shell-extension-trash cups system-config-printer-common 
-system-config-printer gdebi
+anacron
+apt-config-auto-update
+at-spi2-core
+bubblewrap
+cups
+dbus-x11
+dictionaries-common
+dmz-cursor-theme
+evolution-data-server
+evolution-data-server-common
+fonts-freefont-ttf
+fonts-urw-base35
+foomatic-db-compressed-ppds
+gcr
+gdebi
+gdm3
+genisoimage
+geoclue-2.0
+ghostscript
+ghostscript-x
+gir1.2-accountsservice-1.0
+gir1.2-atspi-2.0
+gir1.2-gck-1
+gir1.2-gcr-3
+gir1.2-gdesktopenums-3.0
+gir1.2-gdm-1.0
+gir1.2-geoclue-2.0
+gir1.2-gnomebluetooth-1.0
+gir1.2-gnomedesktop-3.0
+gir1.2-goa-1.0
+gir1.2-graphene-1.0
+gir1.2-gweather-3.0
+gir1.2-ibus-1.0
+gir1.2-json-1.0
+gir1.2-mutter-7
+gir1.2-nm-1.0
+gir1.2-nma-1.0
+gir1.2-polkit-1.0
+gir1.2-rsvg-2.0
+gir1.2-snapd-1
+gir1.2-soup-2.4
+gir1.2-upowerglib-1.0
+gjs
+gnome-control-center
+gnome-desktop3-data
+gnome-keyring
+gnome-menus
+gnome-packagekit
+gnome-session
+gnome-session-bin
+gnome-session-common
+gnome-settings-daemon
+gnome-settings-daemon-common
+gnome-shell
+gnome-shell-common
+gnome-shell-extension-appindicator
+gnome-shell-extension-desktop-icons
+gnome-shell-extension-trash
+gvfs-backends
+gvfs-bin
+hunspell-en-us
+inputattach
+libaccountsservice0
+libasound2
+libasound2-plugins
+libaspell15
+libatk-adaptor
+libcairo-gobject-perl
+libcairo-perl
+libcamel-1.2-62
+libcue2
+libdee-1.0-4
+libebackend-1.2-10
+libebook-1.2-20
+libebook-contacts-1.2-3
+libecal-2.0-1
+libedata-book-1.2-26
+libedata-cal-2.0-1
+libedataserver-1.2-25
+libedataserverui-1.2-2
+libenchant-2-2
+libexempi8
+libexiv2-27
+libextutils-depends-perl
+libextutils-pkgconfig-perl
+libfontenc1
+libgck-1-0
+libgcr-base-3-1
+libgcr-ui-3-1
+libgdata22
+libgdata-common
+libgdm1
+libgeoclue-2-0
+libgeocode-glib0
+libgexiv2-2
+libgjs0g
+libglib-object-introspection-perl
+libglib-perl
+libglu1-mesa
+libgnome-autoar-0-0
+libgnome-bluetooth13
+libgnome-desktop-3-19
+libgoa-1.0-0b
+libgoa-1.0-common
+libgraphene-1.0-0
+libgs9
+libgs9-common
+libgsf-1-114
+libgsf-1-common
+libgtk3-perl
+libgweather-3-16
+libgweather-common
+libgxps2
+libibus-1.0-5
+libical3
+libidn11
+libijs-0.35
+libimobiledevice6
+libjavascriptcoregtk-4.0-18
+libjbig2dec0
+libmutter-6-0
+libnautilus-extension1a
+libnma0
+libnotify-bin
+libpaper1
+libphonenumber8
+libplist3
+libpoppler-glib8
+libprotobuf17
+libpulsedsp
+libsasl2-modules
+libspeexdsp1
+libtext-iconv-perl
+libtotem-plparser18
+libtotem-plparser-common
+libtracker-control-2.0-0
+libtracker-miner-2.0-0
+libtracker-sparql-2.0-0
+libu2f-udev
+libunwind8
+libupower-glib3
+libusbmuxd6
+libwebkit2gtk-4.0-37
+libxaw7
+libxfont2
+libxkbfile1
+libxmu6
+libxmuu1
+libxtst6
+libxxf86dga1
+libyelp0
+mutter
+mutter-common
+nautilus
+nautilus-data
+openprinting-ppds
+p11-kit
+p11-kit-modules
+pavucontrol
+pinentry-gnome3
+poppler-data
+printer-driver-pnm2ppa
+pulseaudio
+pulseaudio-module-bluetooth
+pulseaudio-utils
+python3-click
+python3-colorama
+python3-dateutil
+python3-debconf
+python3-debian
+python3-distutils
+python3-distutils-extra
+python3-yaml
+software-properties-gtk
+spice-vdagent
+system-config-printer
+system-config-printer-common
+terminator
+tracker
+tracker-extract
+tracker-miner-fs
+upower
+x11-apps
+x11-session-utils
+x11-utils
+x11-xkb-utils
+x11-xserver-utils
+xdg-dbus-proxy
+xdg-desktop-portal
+xdg-user-dirs
+xdg-user-dirs-gtk
+xfonts-base
+xinit
+xinput
+xorg
+xorg-docs-core
+xserver-common
+xserver-xorg
+xserver-xorg-video-fbdev
+xwayland
+yelp
+yelp-xsl
+zenity
+zenity-common
--- a/config/desktop/sid/environments/lxde/config_base/packages
+++ b/config/desktop/sid/environments/lxde/config_base/packages
@@ -1,14 +1,124 @@
-xserver-xorg xserver-xorg-video-fbdev gvfs-backends xfonts-base xinit x11-xserver-utils lxappearance lxappearance-obconf lxde-common 
-openbox-lxde-session lxde-icon-theme lxde lxde-core lxdm lxinput lxlauncher lxmenu-data lxmusic lxpanel lxpanel-data lxrandr 
-lxde-settings-daemon lxlock lxpolkit lxsession lxsession-edit lxsession-logout lxtask lxterminal libmenu-cache-bin libmenu-cache-doc 
-libmenu-cache3 task-lxde-desktop xinit xorg-docs-core x11-apps xorg-docs xscreensaver xfonts-100dpi xfonts-75dpi xfonts-scalable 
-xcursor-themes xdg-user-dirs xdg-user-dirs-gtk keyutils redshift bluez bluez-tools bluez-cups brltty orca network-manager-pptp 
-network-manager-l2tp network-manager-openconnect network-manager-openvpn-gnome network-manager-vpnc cups 
-cups-bsd cups-filters liblouisutdml-bin liblouis-bin blueman pulseaudio pulseaudio-module-bluetooth pamix pasystray pavucontrol 
-pavumeter pavucontrol-qt gstreamer1.0-packagekit gstreamer1.0-plugins-base-apps libproxy1-plugin-gsettings libproxy1-plugin-networkmanager 
-libu2f-udev libwmf0.2-7-gtk openprinting-ppds p7zip-full anacron doc-base foomatic-db-compressed-ppds ghostscript-x inputattach libatk-adaptor 
-libgail-common libnotify-bin software-properties-gtk speech-dispatcher spice-vdagent zip lightdm lightdm-gtk-greeter lightdm-gtk-greeter-settings 
-numix-gtk-theme terminator bubblewrap dbus-x11 dictionaries-common hunspell-en-us tracker tracker-extract tracker-miner-fs libgl1-mesa-dri 
-policykit-1 profile-sync-daemon system-config-printer system-config-printer-common printer-driver-all software-properties-common samba 
-smbclient cifs-utils synaptic apt-xapian-index gtk2-engines gtk2-engines-murrine gtk2-engines-pixbuf libgtk2.0-bin network-manager-gnome 
-gnome-keyring gcr libgck-1-0 p11-kit libpam-gnome-keyring gdebi
+anacron
+apt-xapian-index
+blueman
+bluez
+bluez-cups
+bluez-tools
+brltty
+bubblewrap
+cifs-utils
+cups
+cups-bsd
+cups-filters
+dbus-x11
+dictionaries-common
+doc-base
+foomatic-db-compressed-ppds
+gcr
+gdebi
+ghostscript-x
+gnome-keyring
+gstreamer1.0-packagekit
+gstreamer1.0-plugins-base-apps
+gtk2-engines
+gtk2-engines-murrine
+gtk2-engines-pixbuf
+gvfs-backends
+hunspell-en-us
+inputattach
+keyutils
+libatk-adaptor
+libgail-common
+libgck-1-0
+libgl1-mesa-dri
+libgtk2.0-bin
+liblouis-bin
+liblouisutdml-bin
+libmenu-cache3
+libmenu-cache-bin
+libmenu-cache-doc
+libnotify-bin
+libpam-gnome-keyring
+libproxy1-plugin-gsettings
+libproxy1-plugin-networkmanager
+libu2f-udev
+libwmf0.2-7-gtk
+lightdm
+lightdm-gtk-greeter
+lightdm-gtk-greeter-settings
+lxappearance
+lxappearance-obconf
+lxde
+lxde-common
+lxde-core
+lxde-icon-theme
+lxde-settings-daemon
+lxdm
+lxinput
+lxlauncher
+lxlock
+lxmenu-data
+lxmusic
+lxpanel
+lxpanel-data
+lxpolkit
+lxrandr
+lxsession
+lxsession-edit
+lxsession-logout
+lxtask
+lxterminal
+network-manager-gnome
+network-manager-l2tp
+network-manager-openconnect
+network-manager-openvpn-gnome
+network-manager-pptp
+network-manager-vpnc
+numix-gtk-theme
+openbox-lxde-session
+openprinting-ppds
+orca
+p11-kit
+p7zip-full
+pamix
+pasystray
+pavucontrol
+pavucontrol-qt
+pavumeter
+policykit-1
+printer-driver-all
+profile-sync-daemon
+pulseaudio
+pulseaudio-module-bluetooth
+redshift
+samba
+smbclient
+software-properties-common
+software-properties-gtk
+speech-dispatcher
+spice-vdagent
+synaptic
+system-config-printer
+system-config-printer-common
+task-lxde-desktop
+terminator
+tracker
+tracker-extract
+tracker-miner-fs
+x11-apps
+x11-xserver-utils
+xcursor-themes
+xdg-user-dirs
+xdg-user-dirs-gtk
+xfonts-100dpi
+xfonts-75dpi
+xfonts-base
+xfonts-scalable
+xinit
+xinit
+xorg-docs
+xorg-docs-core
+xscreensaver
+xserver-xorg
+xserver-xorg-video-fbdev
+zip
--- a/config/desktop/sid/environments/mate/config_base/packages
+++ b/config/desktop/sid/environments/mate/config_base/packages
@@ -1,15 +1,114 @@
-xserver-xorg xserver-xorg-video-fbdev gvfs-backends gvfs-fuse xfonts-base xinit x11-xserver-utils mate-applets mate-applets-common 
-mate-applet-brisk-menu mate-backgrounds mate-calc mate-calc-common mate-common mate-control-center mate-control-center-common mate-core 
-mate-desktop mate-desktop-common mate-desktop-environment mate-desktop-environment-core mate-desktop-environment-extra 
-mate-desktop-environment-extras mate-dock-applet mate-equake-applet mate-icon-theme mate-icon-theme-faenza mate-indicator-applet 
-mate-indicator-applet-common mate-media mate-media-common mate-menu mate-menus mate-netbook mate-netbook-common mate-notification-daemon 
-mate-notification-daemon-common mate-panel mate-panel-common mate-polkit mate-polkit-bin mate-polkit-common mate-power-manager 
-mate-power-manager-common mate-screensaver mate-screensaver-common mate-sensors-applet mate-sensors-applet-common debian-mate-default-settings 
-mate-session-manager mate-settings-daemon mate-settings-daemon-common mate-settings-daemon-dev mate-system-monitor mate-system-monitor-common 
-mate-terminal mate-terminal-common mate-themes mate-tweak mate-user-guide mate-user-share mate-user-share-common mate-utils mate-utils-common 
-mate-window-applets-common mate-window-buttons-applet mate-window-menu-applet mate-window-title-applet mate-applet-appmenu mate-sntray-plugin 
-gtk2-engines gtk2-engines-murrine gtk2-engines-pixbuf libgtk2.0-bin network-manager-gnome gnome-keyring gcr libgck-1-0 p11-kit pasystray 
-pavucontrol pulseaudio pavumeter bluez bluez-tools pulseaudio-module-bluetooth blueman libpam-gnome-keyring libgl1-mesa-dri profile-sync-daemon 
-gnome-orca numix-gtk-theme synaptic apt-xapian-index lightdm lightdm-gtk-greeter-settings numix-gtk-theme dbus-x11 dictionaries-common 
-hunspell-en-us tracker tracker-extract tracker-miner-fs gnome-packagekit apt-config-auto-update policykit-1 profile-sync-daemon 
-software-properties-common system-config-printer system-config-printer-common printer-driver-all smbclient cifs-utils gdebi
+apt-config-auto-update
+apt-xapian-index
+blueman
+bluez
+bluez-tools
+cifs-utils
+dbus-x11
+debian-mate-default-settings
+dictionaries-common
+gcr
+gdebi
+gnome-keyring
+gnome-orca
+gnome-packagekit
+gtk2-engines
+gtk2-engines-murrine
+gtk2-engines-pixbuf
+gvfs-backends
+gvfs-fuse
+hunspell-en-us
+libgck-1-0
+libgl1-mesa-dri
+libgtk2.0-bin
+libpam-gnome-keyring
+lightdm
+lightdm-gtk-greeter-settings
+mate-applet-appmenu
+mate-applet-brisk-menu
+mate-applets
+mate-applets-common
+mate-backgrounds
+mate-calc
+mate-calc-common
+mate-common
+mate-control-center
+mate-control-center-common
+mate-core
+mate-desktop
+mate-desktop-common
+mate-desktop-environment
+mate-desktop-environment-core
+mate-desktop-environment-extra
+mate-desktop-environment-extras
+mate-dock-applet
+mate-equake-applet
+mate-icon-theme
+mate-icon-theme-faenza
+mate-indicator-applet
+mate-indicator-applet-common
+mate-media
+mate-media-common
+mate-menu
+mate-menus
+mate-netbook
+mate-netbook-common
+mate-notification-daemon
+mate-notification-daemon-common
+mate-panel
+mate-panel-common
+mate-polkit
+mate-polkit-bin
+mate-polkit-common
+mate-power-manager
+mate-power-manager-common
+mate-screensaver
+mate-screensaver-common
+mate-sensors-applet
+mate-sensors-applet-common
+mate-session-manager
+mate-settings-daemon
+mate-settings-daemon-common
+mate-settings-daemon-dev
+mate-sntray-plugin
+mate-system-monitor
+mate-system-monitor-common
+mate-terminal
+mate-terminal-common
+mate-themes
+mate-tweak
+mate-user-guide
+mate-user-share
+mate-user-share-common
+mate-utils
+mate-utils-common
+mate-window-applets-common
+mate-window-buttons-applet
+mate-window-menu-applet
+mate-window-title-applet
+network-manager-gnome
+numix-gtk-theme
+numix-gtk-theme
+p11-kit
+pasystray
+pavucontrol
+pavumeter
+policykit-1
+printer-driver-all
+profile-sync-daemon
+profile-sync-daemon
+pulseaudio
+pulseaudio-module-bluetooth
+smbclient
+software-properties-common
+synaptic
+system-config-printer
+system-config-printer-common
+tracker
+tracker-extract
+tracker-miner-fs
+x11-xserver-utils
+xfonts-base
+xinit
+xserver-xorg
+xserver-xorg-video-fbdev
--- a/config/desktop/sid/environments/xfce/config_base/packages
+++ b/config/desktop/sid/environments/xfce/config_base/packages
@@ -1,7 +1,59 @@
-xserver-xorg xserver-xorg-video-fbdev gvfs-backends gvfs-fuse xfonts-base xinit x11-xserver-utils xfce4 lxtask xfce4-terminal 
-thunar-volman gtk2-engines gtk2-engines-murrine gtk2-engines-pixbuf libgtk2.0-bin network-manager-gnome xfce4-notifyd gnome-keyring 
-gcr libgck-1-0 p11-kit pasystray pavucontrol pulseaudio pavumeter bluez bluez-tools pulseaudio-module-bluetooth blueman libpam-gnome-keyring 
-libgl1-mesa-dri policykit-1 profile-sync-daemon gnome-orca numix-gtk-theme synaptic apt-xapian-index lightdm lightdm-gtk-greeter 
-lightdm-gtk-greeter-settings numix-gtk-theme system-config-printer system-config-printer-common printer-driver-all dbus-x11 dbus-x11 
-dictionaries-common hunspell-en-us tracker tracker-extract tracker-miner-fs policykit-1 profile-sync-daemon software-properties-common 
-samba smbclient cifs-utils xfce4-screenshooter gdebi terminator
+apt-xapian-index
+blueman
+bluez
+bluez-tools
+cifs-utils
+dbus-x11
+dictionaries-common
+gcr
+gdebi
+gnome-keyring
+gnome-orca
+gtk2-engines
+gtk2-engines-murrine
+gtk2-engines-pixbuf
+gvfs-backends
+gvfs-fuse
+hunspell-en-us
+libgck-1-0
+libgl1-mesa-dri
+libgtk2.0-bin
+libpam-gnome-keyring
+lightdm
+lightdm-gtk-greeter
+lightdm-gtk-greeter-settings
+lxtask
+network-manager-gnome
+numix-gtk-theme
+numix-gtk-theme
+p11-kit
+pasystray
+pavucontrol
+pavumeter
+policykit-1
+policykit-1
+printer-driver-all
+profile-sync-daemon
+profile-sync-daemon
+pulseaudio
+pulseaudio-module-bluetooth
+samba
+smbclient
+software-properties-common
+synaptic
+system-config-printer
+system-config-printer-common
+terminator
+thunar-volman
+tracker
+tracker-extract
+tracker-miner-fs
+x11-xserver-utils
+xfce4
+xfce4-notifyd
+xfce4-screenshooter
+xfce4-terminal
+xfonts-base
+xinit
+xserver-xorg
+xserver-xorg-video-fbdev