diff --git a/debian-gnome/debian-gnome.sh b/debian-gnome/debian-gnome.sh
index 2f3e776..7523308 100644
--- a/debian-gnome/debian-gnome.sh
+++ b/debian-gnome/debian-gnome.sh
@@ -59,15 +59,27 @@ sudo apt autoremove -y
 # Debloat
 
 # Remove unnecessary stuff from the Qubes template
-sudo apt purge gnome-software thunderbird keepassxc rygel
+sudo apt purge gnome-software thunderbird keepassxc
+
+# Remove Network + hardware tools packages
+sudo apt purge -y cups* '*nfs*' rygel '*smtp*' '*telnet*'
+
+# Remove support for some languages and spelling
+sudo apt purge -y '*speech*'
+
+# Remove codec + image + printers
+sudo apt purge -y ImageMagick* sane* simple-scan
+
+# Remove Active Directory + Sysadmin + reporting tools
+sudo apt purge -y realmd
+
+# Remove Gnome apps
+sudo apt purge -y baobab chrome-gnome-shell eog gnome-calculator gnome-calendar gnome-charaters gnome-clocks gnome-disk-utility gnome-font-viewer gnome-maps gnome-music gnome-remote-desktop gnome-tweaks gnome-user-share gnome-weather totem
 
 # Remove apps
 sudo apt purge -y cheese evince file-roller* firefox* libreoffice* yelp
 
-# Remove Network + hardware tools packages
-sudo apt purge -y remove '*cups' dmidecode mtr '*nfs*' '*smtp*' '*snmp*' '*telnet*' '*teamd*'
-
-sudo apt purge -y emacs emacs-gtk emacs-bin-common emacs-common cups* system-config-printer* xsettingsd
+sudo apt purge -y system-config-printer* xsettingsd
 sudo apt autoremove -y
 sudo apt autoclean
 
diff --git a/fedora-gnome/fedora-gnome.sh b/fedora-gnome/fedora-gnome.sh
index 9fa47bc..71dab23 100644
--- a/fedora-gnome/fedora-gnome.sh
+++ b/fedora-gnome/fedora-gnome.sh
@@ -90,16 +90,16 @@ echo 'XDG_CURRENT_DESKTOP=GNOME' | sudo tee -a /etc/environment
 sudo dnf mark install flatpak gnome-menus qubes-menus
 
 # Remove unnecessary stuff from the Qubes template
-sudo dnf -y remove gnome-software httpd keepassxc thunderbird rygel
+sudo dnf -y remove gnome-software httpd keepassxc thunderbird
 
 # Remove firefox packages
 sudo dnf -y remove fedora-bookmarks fedora-chromium-config firefox mozilla-filesystem
 
 # Remove Network + hardware tools packages
-sudo dnf -y remove dmidecode '*cups' geolite2* mtr net-snmp-libs net-tools nfs-utils nmap-ncat nmap-ncat opensc openssh-server rsync sgpio tcpdump teamd traceroute
+sudo dnf -y remove avahi cifs* '*cups' dmidecode dnsmasq geolite2* mtr net-snmp-libs net-tools nfs-utils nmap-ncat nmap-ncat opensc openssh-server rsync rygel sgpio tcpdump teamd traceroute usb_modeswitch
 
 # Remove support for some languages and spelling
-sudo dnf -y remove ibus-typing-booster '*speech*' '*zhuyin*' '*pinyin*' '*m17n*' '*hangul*' '*anthy*' words
+sudo dnf -y remove '*anthy*' '*hangul*' ibus-typing-booster '*m17n*' '*pinyin*' '*speech*' texlive-libs words '*zhuyin*'
 
 # Remove codec + image + printers
 sudo dnf -y remove openh264 ImageMagick* sane* simple-scan
@@ -114,10 +114,10 @@ sudo dnf -y remove 'podman*' '*libvirt*' 'open-vm*' qemu-guest-agent 'hyperv*' s
 sudo dnf -y remove NetworkManager-pptp-gnome NetworkManager-ssh-gnome NetworkManager-openconnect-gnome NetworkManager-openvpn-gnome NetworkManager-vpnc-gnome ppp* ModemManager
 
 # Remove Gnome apps
-sudo dnf remove -y chrome-gnome-shell eog gnome-photos gnome-connections gnome-tour gnome-themes-extra gnome-screenshot gnome-remote-desktop gnome-font-viewer gnome-calculator gnome-calendar gnome-contacts \
-    gnome-maps gnome-weather gnome-logs gnome-boxes gnome-disk-utility gnome-clocks gnome-color-manager gnome-characters baobab totem \
+sudo dnf remove -y baobab chrome-gnome-shell eog gnome-photos gnome-connections gnome-tour gnome-themes-extra gnome-screenshot gnome-remote-desktop gnome-font-viewer gnome-calculator gnome-calendar gnome-contacts \
+    gnome-maps gnome-weather gnome-logs gnome-boxes gnome-disk-utility gnome-clocks gnome-color-manager gnome-characters \
     gnome-shell-extension-background-logo gnome-shell-extension-apps-menu gnome-shell-extension-launch-new-instance gnome-shell-extension-places-menu gnome-shell-extension-window-list \
-    gnome-classic* gnome-user* gnome-text-editor loupe snapshot
+    gnome-classic* gnome-user* gnome-text-editor loupe snapshot totem
 
 # Remove apps
 sudo dnf remove -y rhythmbox yelp evince libreoffice* cheese file-roller* mediawriter