diff --git a/manjaro/gnome/Packages-Desktop b/manjaro/gnome/Packages-Desktop
index 3d506d87..2046e13a 100644
--- a/manjaro/gnome/Packages-Desktop
+++ b/manjaro/gnome/Packages-Desktop
@@ -1,5 +1,6 @@
 adwaita-icon-theme
 alsa-firmware
+apparmor
 baobab
 dconf-editor
 dmidecode
@@ -100,6 +101,7 @@ networkmanager-vpnc
 nss-mdns
 numlockx
 openresolv
+gnome-software-snap
 pamac
 flatpak
 polkit-gnome
@@ -128,7 +130,6 @@ ttf-inconsolata
 ttf-indic-otf
 ttf-liberation
 usb_modeswitch
-haveged
 vino
 xdg-su
 xdg-user-dirs
diff --git a/manjaro/gnome/desktop-overlay/etc/gdm/PostLogin/Default b/manjaro/gnome/desktop-overlay/etc/gdm/PostLogin/Default
new file mode 100755
index 00000000..23a2394f
--- /dev/null
+++ b/manjaro/gnome/desktop-overlay/etc/gdm/PostLogin/Default
@@ -0,0 +1,2 @@
+#!/bin/sh
+grep -q "^AutomaticLoginEnable=True" /etc/gdm/custom.conf || pkill -KILL -u gdm
diff --git a/manjaro/gnome/profile.conf b/manjaro/gnome/profile.conf
index 0085d41a..0b619f9c 100644
--- a/manjaro/gnome/profile.conf
+++ b/manjaro/gnome/profile.conf
@@ -34,7 +34,7 @@ displaymanager="gdm"
 
 # unset defaults to given values
 # names must match systemd service names
-enable_systemd=('bluetooth' 'ModemManager' 'NetworkManager' 'org.cups.cupsd' 'tlp' 'tlp-sleep' 'avahi-demon' 'haveged')
+enable_systemd=('bluetooth' 'ModemManager' 'NetworkManager' 'org.cups.cupsd' 'tlp' 'tlp-sleep' 'avahi-demon' 'haveged' 'ufw'  'apparmor' 'snapd.apparmor' 'snapd')
 disable_systemd=('pacman-init')
 
 # unset defaults to given values,
@@ -45,6 +45,13 @@ disable_systemd=('pacman-init')
 # unset defaults to given values
 # addgroups="lp,network,power,wheel"
 
+# add strict snaps: strict_snaps="core core18 gnome-3-28-1804 gtk-common-themes snap-store"
+# strict_snaps=""
+# add classic snaps: classic_snaps="code"
+# classic_snaps=""
+# choose the snap channel. Possible options are: stable, candidate, beta, edge
+# snap_channel="candidate"
+
 # the same workgroup name if samba is used
 # smb_workgroup=""
 
diff --git a/manjaro/kde/Packages-Desktop b/manjaro/kde/Packages-Desktop
index 713b34f5..92fdcaa1 100644
--- a/manjaro/kde/Packages-Desktop
+++ b/manjaro/kde/Packages-Desktop
@@ -92,15 +92,19 @@ terminus-font
 
 ## Package management
 appimagelauncher
-#packagekit-qt5
+pamac-cli
+packagekit-qt5
+apparmor
+snapd
+discover-snap
 #discover
-flatpak
-#fwupd 
-#octopi
+#flatpak
+fwupd 
+octopi
 #octopi-cachecleaner
 #octopi-repoeditor
 #octopi-notifier-frameworks
-pamac-qt
+#pamac-qt
 #manjaro-application-utility
 
 ## Printing
@@ -319,6 +323,6 @@ xdg-su
 manjaro-hotfixes
 
 ## Flatpak support
-#>extra flatpak
-#>extra xdg-desktop-portal
-#>extra xdg-desktop-portal-kde
+>extra flatpak
+>extra xdg-desktop-portal
+>extra xdg-desktop-portal-kde
diff --git a/manjaro/kde/profile.conf b/manjaro/kde/profile.conf
index 7fa44c38..3b364e50 100644
--- a/manjaro/kde/profile.conf
+++ b/manjaro/kde/profile.conf
@@ -31,9 +31,16 @@ extra="true"
 # use geoip for localization
 # geoip='true'
 
+# add strict snaps: strict_snaps="core core18 gnome-3-28-1804 gtk-common-themes snap-store"
+# strict_snaps=""
+# add classic snaps: classic_snaps="code"
+# classic_snaps=""
+# choose the snap channel. Possible options are: stable, candidate, beta, edge
+# snap_channel="candidate"
+
 # unset defaults to given values
 # names must match systemd service names
-enable_systemd=('avahi-daemon' 'bluetooth' 'cronie' 'ModemManager' 'NetworkManager' 'org.cups.cupsd' 'tlp' 'tlp-sleep')
+enable_systemd=('avahi-daemon' 'bluetooth' 'cronie' 'ModemManager' 'NetworkManager' 'org.cups.cupsd' 'tlp' 'tlp-sleep' 'haveged' 'apparmor' 'snapd.apparmor' 'snapd')
 disable_systemd=('pacman-init')
 
 # unset defaults to given values,
diff --git a/manjaro/xfce/Packages-Desktop b/manjaro/xfce/Packages-Desktop
index 9ab40713..fde369ee 100644
--- a/manjaro/xfce/Packages-Desktop
+++ b/manjaro/xfce/Packages-Desktop
@@ -82,9 +82,10 @@ ttf-bitstream-vera       # xfce4-terminal default Monospace
 >extra steam-manjaro
 
 ## Package management
+gnome-software-snap
 pamac
 flatpak
-snapd
+apparmor
 
 ## Java
 >extra jdk8-openjdk
diff --git a/manjaro/xfce/profile.conf b/manjaro/xfce/profile.conf
index 40a48477..d0558efd 100644
--- a/manjaro/xfce/profile.conf
+++ b/manjaro/xfce/profile.conf
@@ -32,15 +32,15 @@ displaymanager="lightdm"
 
 # unset defaults to given values
 # names must match systemd service names
-enable_systemd=('avahi-daemon' 'bluetooth' 'cronie' 'ModemManager' 'NetworkManager' 'org.cups.cupsd' 'tlp' 'tlp-sleep' 'ufw' 'apparmor' 'snapd.apparmor' 'snapd')
+enable_systemd=('avahi-daemon' 'bluetooth' 'cronie' 'ModemManager' 'NetworkManager' 'org.cups.cupsd' 'tlp' 'tlp-sleep' 'haveged' 'ufw' 'apparmor' 'snapd.apparmor' 'snapd')
 disable_systemd=('pacman-init')
 
-# add strict snaps: strict_snaps="core core18 gnome-3-28-1804 gtk-common-themes snap-store"
-strict_snaps="snapd core18 snap-store core gnome-3-28-1804 gtk-common-themes"
+# add strict snaps: strict_snaps="snapd core core18 gnome-3-28-1804 gtk-common-themes snap-store"
+# strict_snaps=""
 # add classic snaps: classic_snaps="code"
 # classic_snaps=""
 # choose the snap channel. Possible options are: stable, candidate, beta, edge
-# snap_channel="stable"
+# snap_channel="candidate"
 
 # the same workgroup name if samba is used
 # smb_workgroup=""