diff --git a/community/awesome/Packages-Desktop b/community/awesome/Packages-Desktop
index 40f5f1a..df12c29 100644
--- a/community/awesome/Packages-Desktop
+++ b/community/awesome/Packages-Desktop
@@ -1,21 +1,20 @@
-###################################
 ## Network
-###################################
 avahi
-network-manager-applet
 networkmanager
 networkmanager-openconnect
 networkmanager-openvpn
 networkmanager-pptp
 networkmanager-vpnc
-nss-mdns
+nss-mdns # NSS support for mDNS (optdepend for avahi)
+ntp
+mobile-broadband-provider-info
 modemmanager
-usb_modeswitch
 openresolv
+openssh
+samba
+usb_modeswitch
 
-###################################
 ## Libraries for Sound/Audio/Video
-###################################
 alsa-firmware
 alsa-utils
 ffmpeg
@@ -25,13 +24,14 @@ gst-plugins-base
 gst-plugins-good
 gst-plugins-ugly
 libdvdcss
+>multilib manjaro-alsa
 manjaro-pulse
+pulseaudio-bluetooth
 pulseaudio-ctl
 pulseaudio-zeroconf
 
-###################################
 ## Connect Packages
-###################################
+android-tools
 android-udev
 gvfs
 gvfs-afc
@@ -43,108 +43,224 @@ mtpfs
 udiskie
 udisks2
 
-###################################
-## Xorg
-###################################
+## AUR Support/Development
+# Missing base-devel packages
+>extra base-devel
+autoconf
+automake
+binutils
+bison
+fakeroot
+flex
+gcc
+>multilib gcc-libs-multilib
+>multilib gcc-multilib
+libtool
+m4
+make
+patch
+pkg-config
+>multilib lib32-flex
+# Extra packages for AUR support
+>extra git
+>extra patchutils
+>extra subversion
+
+## Fonts
+cantarell-fonts
+noto-fonts               # default font
+noto-fonts-cjk           # asian fonts - needed big package, ~76 mb compressed
+# >extra noto-fonts-emoji
+terminus-font
+ttf-bitstream-vera       # xfce4-terminal default Monospace
+# ttf-dejavu             # Installed as gnome-themes-standard dependency
+>extra ttf-inconsolata
+>extra ttf-indic-otf
+>extra ttf-liberation
+>extra ttf-droid
+
+## Games
+>extra steam-manjaro
+
+## Package management
+gnome-software-snap
+pamac
+flatpak
+apparmor
+appimagelauncher
+
+## Java
+>extra jdk8-openjdk
+>extra jre8-openjdk-headless
+>extra jre8-openjdk
+
+## Printing
+>extra manjaro-printer
+>extra cups
+>extra cups-pdf
+>extra cups-pk-helper
+>extra ghostscript
+>extra gsfonts
+>extra gtk3-print-backends
+>extra hplip
+>extra splix
+>extra system-config-printer
+
+## Optional dependencies for hplip
+>extra pyqt5-common # For hplip
+>extra python-pillow # For hplip
+>extra python-pip # For hplip
+>extra python-pyqt5  # For hplip gui
+>extra python-reportlab # For hplip
+
+## Display manager
+lightdm
+lightdm-slick-greeter
+accountsservice  # Enhanced user accounts handling
+
+## GTK3
+gtk3-classic
+>multilib lib32-gtk3-classic
+
+## XFCE Group
+exo-gtk3
+garcon-gtk3
+thunar-gtk3
+thunar-volman
+tumbler
+xfce4-power-manager-gtk3
+xfce4-settings-gtk3
+lxterminal
+xfconf-gtk3
+
+## XFCE Extras
+blueman
+ffmpegthumbnailer  # tumbler - for video thumbnails
+freetype2          # tumbler - for font thumbnails
+gksu
+gnome-keyring      # fix wlan segfault
+libgsf             # tumbler - for ODF thumbnails
+libopenraw         # tumbler - for RAW thumbnails
+light-locker
+network-manager-applet
+menulibre
+orage
+poppler-glib       # tumbler - for PDF thumbnails
+thunar-archive-plugin
+>extra thunar-shares-plugin
+file-roller
+thunar-media-tags-plugin
+i3-scrot
+xfce4-screenshooter
+xfce4-taskmanager
+pavucontrol
+
+## Themes
+>extra manjaro-wallpapers-18.0
+>extra wallpapers-2018
+gnome-icon-theme
+gnome-themes-standard
+grub-theme-manjaro
+matcha-gtk-theme
+xcursor-simpleandsoft
+xcursor-vanilla-dmz-aa
+kvantum-manjaro
+
+## Applications
+catfish
+dmidecode # optional dependency inxi
+engrampa
+>extra firefox
+# >extra flashplugin
+>extra galculator-gtk2
+gcolor2
+>extra gimp
+gparted
+gufw
+>extra audacious
+>extra hexchat
+htop
+zathura-pdf-poppler
+zathura-djvu
+inxi
+>extra libreoffice-still
+ms-office-online
+manjaro-hello
+manjaro-application-utility
+manjaro-settings-manager
+manjaro-settings-manager-notifier
+>basic midori
+>extra mlocate
+mousepad
+mugshot
+>basic parole # media player
+>extra pidgin
+powertop
+screenfetch
+>extra poppler-data  # CKJ support for pdf
+>basic sylpheed # mail client
+>extra thunderbird
+>extra mpv
+ristretto
+>extra xfburn
+>extra yelp
+
+# Optional dependencies engrampa
+p7zip  # 7Z and ARJ archive support
+unace  # ACE archive support
+unrar  # RAR archive support
+
+## Documentation
+# manjaro-documentation-en  # no use for Awesome edition
+
+## Settings packages
+manjaro-awesome-settings-18.0
+manjaro-browser-settings
+>extra manjaro-settings-samba
+manjaro-zsh-config
+
+## Xorg Input Drivers
 xf86-input-elographics
 xf86-input-evdev
 xf86-input-keyboard
 xf86-input-libinput
 xf86-input-mouse
 xf86-input-void
+
+## Xorg Server and Graphics
+>multilib lib32-libva-intel-driver
+>multilib lib32-libva-mesa-driver
+>multilib lib32-libva-vdpau-driver
+libva-intel-driver
+libva-mesa-driver
+libva-vdpau-driver
+mesa-demos
+>multilib lib32-mesa-demos
+numlockx
+xdg-user-dirs
 xorg-server
+xorg-twm
 xorg-xinit
 xorg-xprop
+xorg-xkill
 
-###################################
-## Misc
-###################################
->basic ufw
-gtk3-classic
-lightdm
-lightdm-slick-greeter
-libappindicator-gtk3
-accountsservice  # Enhanced user accounts
-python-dbus
-gnome-keyring
-grub-theme-manjaro
-light-locker
-mate-polkit
-gksu-polkit
+## Desktop Utils
 perl-file-mimeinfo
-pavucontrol
+xdg-utils
+xdg-su
+
+## Misc
+gtkhash-thunar
+manjaro-hotfixes
+>basic ufw
+libappindicator-gtk3
+mate-polkit
 pa-applet
 rofi
 xcape
-xdg-su
-xdg-user-dirs
-xdg-utils
-xfce4-settings-gtk3
-xfce4-power-manager-gtk3
-manjaro-zsh-config
-manjaro-browser-settings
-manjaro-hotfixes
-manjaro-settings-manager
-manjaro-awesome-settings-18.0
 qt5ct
-kvantum-manjaro
-
-###################################
-## Apps and Optional dependencies
-###################################
-appimagelauncher
 downgrade
-inxi
-i3-scrot
-htop
-lxterminal
-firefox
-galculator
-mousepad
-pamac
-ristretto
-thunar-gtk3
-thunar-volman-gtk3
-thunar-archive-plugin-gtk3
-catfish
-file-roller
-p7zip
-unrar
-unace
-tumbler
-ffmpegthumbnailer
-libgsf
-libopenraw
-zathura-pdf-poppler
-zathura-djvu
-
-###################################
-############## EXTRA ##############
-
-###################################
-## AUR Support
-## Missing base-devel packages
-###################################
->extra base-devel
->extra git
->extra yay
-
-###################################
-## Extra Misc and Apps
-###################################
 >extra bmenu
 >extra compton
 >extra compton-conf
->extra gimp
->extra gufw
->extra libreoffice-fresh
->extra mpv
->extra thunderbird
 >extra transmission-gtk
->extra manjaro-settings-samba
->extra thunar-shares-plugin-gtk3
->extra blueman
->extra pulseaudio-bluetooth
->extra manjaro-printer
->extra manjaro-settings-manager-notifier
->extra manjaro-wallpapers-18.0
\ No newline at end of file
diff --git a/community/awesome/profile.conf b/community/awesome/profile.conf
index a6f8516..9b6490c 100644
--- a/community/awesome/profile.conf
+++ b/community/awesome/profile.conf
@@ -5,11 +5,6 @@
 # use multilib packages; x86_64 only
 # multilib="true"
 
-# use extra packages as defined in pkglist to activate a full profile
-extra="false"
-
-################ install ################
-
 # default displaymanager: none
 # supported; lightdm, sddm, gdm, lxdm, mdm
 displaymanager="lightdm"
@@ -17,20 +12,25 @@ displaymanager="lightdm"
 # Set to false to disable autologin in the livecd
 # autologin="true"
 
-# nonfree xorg drivers
+# nonfree mhwd drivers
 # nonfree_mhwd="true"
 
-# possible values: grub;systemd-boot
+# use extra packages as defined in pkglist to activate a full profile
+#extra="true"
+
+################ install ################
+
+# unset defaults to given value
 # efi_boot_loader="grub"
 
 # configure calamares for netinstall
 # netinstall="false"
 
-# configure calamares to use chrootcfg instead of unpackfs; default: unpackfs
+# configure calamares to use chrootcfg instead of unpackfs
 # chrootcfg="false"
 
-# use geoip
-# geoip="true"
+# use geoip for localization
+# geoip='true'
 
 # default system shell is bash
 # use /etc/defaults/useradd by supplying a space " "
@@ -39,16 +39,20 @@ user_shell=/bin/zsh
 
 # unset defaults to given values
 # names must match systemd service names
-# enable_systemd=('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' 'ufw' 'apparmor' 'snapd.apparmor' 'snapd')
 disable_systemd=('pacman-init')
 
-# unset defaults to given values
-# addgroups="lp,network,power,wheel"
+# 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="candidate"
 
 # the same workgroup name if samba is used
-# smb_workgroup="Manjaro"
+# smb_workgroup=""
 
-################# live-session #################
+################# livecd #################
 
 # unset defaults to given value
 hostname="manjaro-awesome"
@@ -59,10 +63,13 @@ hostname="manjaro-awesome"
 # unset defaults to given value
 # password="manjaro"
 
-# the login shell for live image
+# the login shell
 # defaults to bash
 login_shell=/bin/zsh
 
+# unset defaults to given values
+# addgroups="lp,network,power,wheel"
+
 # unset defaults to given values
 # names must match systemd service names
 # services in enable_systemd array don't need to be listed here
diff --git a/community/cinnamon/Packages-Desktop b/community/cinnamon/Packages-Desktop
index a4f2057..96b33a2 100644
--- a/community/cinnamon/Packages-Desktop
+++ b/community/cinnamon/Packages-Desktop
@@ -14,7 +14,6 @@ cinnamon-translations
 >extra dconf-editor
 >extra deluge
 dmidecode
->extra etcher
 fakeroot
 >extra ffmpegthumbnailer
 >extra firefox
diff --git a/community/deepin/Packages-Desktop b/community/deepin/Packages-Desktop
index 63ee776..92febcc 100644
--- a/community/deepin/Packages-Desktop
+++ b/community/deepin/Packages-Desktop
@@ -28,7 +28,6 @@ deepin-turbo
 >extra deluge
 dmidecode
 >extra downgrade
->extra etcher
 >extra evince
 >extra evolution
 fakeroot
diff --git a/community/i3/Packages-Desktop b/community/i3/Packages-Desktop
index 51c1c88..13d5812 100644
--- a/community/i3/Packages-Desktop
+++ b/community/i3/Packages-Desktop
@@ -20,7 +20,6 @@ dfc
 dmidecode
 >extra downgrade
 epdfview
->extra etcher
 fakeroot
 >extra ffmpeg
 >extra ffmpegthumbnailer
diff --git a/manjaro/gnome/Packages-Desktop b/manjaro/gnome/Packages-Desktop
index 3d506d8..2046e13 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 0000000..23a2394
--- /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 0085d41..0b619f9 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 713b34f..92fdcaa 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 7fa44c3..3b364e5 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 9ab4071..fde369e 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 40a4847..d0558ef 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=""