diff --git a/community/ukui/Packages-Desktop b/community/ukui/Packages-Desktop
index 207e667..32e902d 100644
--- a/community/ukui/Packages-Desktop
+++ b/community/ukui/Packages-Desktop
@@ -147,6 +147,7 @@ gnome-keyring
 gnome-screenshot
 mate-calc
 pluma
+mate-system-monitor
 mate-terminal
 mate-polkit
 mate-notification-daemon
diff --git a/manjaro/kde/Packages-Desktop b/manjaro/kde/Packages-Desktop
index 527cc8c..4cee2a5 100644
--- a/manjaro/kde/Packages-Desktop
+++ b/manjaro/kde/Packages-Desktop
@@ -98,11 +98,10 @@ pamac-cli
 >extra snapd
 >extra snapd-glib
 >extra pamac-snap-plugin
+>extra pamac-flatpak-plugin
 #discover-snap
 #discover
 #packagekit-qt5
->extra flatpak
->extra bauh
 >extra fwupd 
 #octopi
 #octopi-cachecleaner
@@ -315,6 +314,5 @@ manjaro-hotfixes
 >basic squashfs-tools
 
 ## Flatpak support
->extra flatpak
 >extra xdg-desktop-portal
 >extra xdg-desktop-portal-kde
diff --git a/manjaro/xfce/Packages-Desktop b/manjaro/xfce/Packages-Desktop
index 30b361d..d5b057d 100644
--- a/manjaro/xfce/Packages-Desktop
+++ b/manjaro/xfce/Packages-Desktop
@@ -84,12 +84,11 @@ ttf-bitstream-vera       # xfce4-terminal default Monospace
 ## Package management
 >extra apparmor
 #>extra gnome-software-snap
->extra flatpak
->extra bauh
-pamac
+pamac-gtk
 >extra snapd
 >extra snapd-glib
 >extra pamac-snap-plugin
+>extra pamac-flatpak-plugin
 
 ## Java
 >extra jdk8-openjdk