diff --git a/manjaro/gnome/Packages-Desktop b/manjaro/gnome/Packages-Desktop
index ef9fb97..ea50dd9 100644
--- a/manjaro/gnome/Packages-Desktop
+++ b/manjaro/gnome/Packages-Desktop
@@ -1,6 +1,6 @@
 adwaita-icon-theme
 alsa-firmware
-apparmor
+>extra apparmor
 baobab
 dconf-editor
 dmidecode
@@ -102,10 +102,10 @@ nss-mdns
 numlockx
 openresolv
 #gnome-software-snap
-flatpak
-fpakman
+>extra flatpak
+>extra fpakman
 pamac
-snapd
+>extra snapd
 polkit-gnome
 powertop
 pulseaudio-bluetooth
@@ -149,8 +149,9 @@ xorg-xinit
 >extra xf86-input-wacom #support for tablet and pen display ( wacom ecc. )
 yelp
 
-ms-office-online
-freeoffice
+#>extra ms-office-online
+#>extra freeoffice
+#>extra libreoffice-still
 
 #extra depends for file-roller
 >extra gnome-getting-started-docs
@@ -193,4 +194,4 @@ freeoffice
 #>extra patch
 #>extra subversion
 #>extra yaourt
-manjaro-aur-support #introduce for testing in community
+>extra manjaro-aur-support #introduce for testing in community
diff --git a/manjaro/gnome/profile.conf b/manjaro/gnome/profile.conf
index 0b619f9..c25af8b 100644
--- a/manjaro/gnome/profile.conf
+++ b/manjaro/gnome/profile.conf
@@ -34,7 +34,8 @@ 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' 'ufw'  'apparmor' 'snapd.apparmor' 'snapd')
+enable_systemd=('bluetooth' 'ModemManager' 'NetworkManager' 'org.cups.cupsd' 'tlp' 'tlp-sleep' 'avahi-demon' 'haveged' 'ufw' 'apparmor' 'snapd.apparmor' 'snapd')
+#enable_systemd=('bluetooth' 'ModemManager' 'NetworkManager' 'org.cups.cupsd' 'tlp' 'tlp-sleep' 'avahi-demon' 'haveged' 'ufw')
 disable_systemd=('pacman-init')
 
 # unset defaults to given values,
diff --git a/manjaro/kde/Packages-Desktop b/manjaro/kde/Packages-Desktop
index 16403c2..849062e 100644
--- a/manjaro/kde/Packages-Desktop
+++ b/manjaro/kde/Packages-Desktop
@@ -52,21 +52,21 @@ udisks2
 
 ## AUR Support/Development
 # Missing base-devel packages
-autoconf
-automake
-binutils
-bison
-fakeroot
-flex
-gcc
->multilib gcc-libs-multilib
->multilib gcc-multilib
-libtool
-m4
-make
-patch
-pkg-config
->multilib lib32-flex
+>extra autoconf
+>extra automake
+>extra binutils
+>extra bison
+>extra fakeroot
+>extra flex
+>extra gcc
+>extra >multilib gcc-libs-multilib
+>extra >multilib gcc-multilib
+>extra libtool
+>extra m4
+>extra make
+>extra patch
+>extra pkg-config
+>extra >multilib lib32-flex
 # Extra packages for AUR support
 >extra git
 >extra patchutils
@@ -94,14 +94,14 @@ terminus-font
 #appimagelauncher
 pamac
 #pamac-cli
-apparmor
-snapd
+>extra apparmor
+>extra snapd
 #discover-snap
 #discover
 #packagekit-qt5
-flatpak
-fpakman
-fwupd 
+>extra flatpak
+>extra fpakman
+>extra fwupd 
 #octopi
 #octopi-cachecleaner
 #octopi-repoeditor
@@ -262,8 +262,8 @@ inxi
 >extra firefox
 >basic falkon
 #ms-office-online
-freeoffice
-#>extra libreoffice-fresh
+#>extra freeoffice
+#>extra libreoffice-still
 #>extra calligra
 manjaro-hello
 manjaro-settings-manager-kcm
@@ -273,7 +273,7 @@ powertop
 screenfetch
 systemd-kcm
 >extra thunderbird
-vlc
+>extra vlc
 #vlc-nightly
 yakuake
 
diff --git a/manjaro/kde/profile.conf b/manjaro/kde/profile.conf
index 3b364e5..ac24813 100644
--- a/manjaro/kde/profile.conf
+++ b/manjaro/kde/profile.conf
@@ -15,7 +15,7 @@ displaymanager="sddm"
 
 # use extra packages as defined in pkglist to activate a full profile
 # extra="false"
-extra="true"
+# extra="true"
 
 ################ install ################
 
@@ -41,6 +41,7 @@ extra="true"
 # 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' 'haveged' 'apparmor' 'snapd.apparmor' 'snapd')
+#enable_systemd=('avahi-daemon' 'bluetooth' 'cronie' 'ModemManager' 'NetworkManager' 'org.cups.cupsd' 'tlp' 'tlp-sleep' 'haveged')
 disable_systemd=('pacman-init')
 
 # unset defaults to given values,
diff --git a/manjaro/xfce/Packages-Desktop b/manjaro/xfce/Packages-Desktop
index f1d8117..2ca7b8d 100644
--- a/manjaro/xfce/Packages-Desktop
+++ b/manjaro/xfce/Packages-Desktop
@@ -45,21 +45,21 @@ udisks2
 
 ## AUR Support/Development
 # Missing base-devel packages
-autoconf
-automake
-binutils
-bison
-fakeroot
-flex
-gcc
->multilib gcc-libs-multilib
->multilib gcc-multilib
-libtool
-m4
-make
-patch
-pkg-config
->multilib lib32-flex
+>extra autoconf
+>extra automake
+>extra binutils
+>extra bison
+>extra fakeroot
+>extra flex
+>extra gcc
+>extra >multilib gcc-libs-multilib
+>extra >multilib gcc-multilib
+>extra libtool
+>extra m4
+>extra make
+>extra patch
+>extra pkg-config
+>extra >multilib lib32-flex
 # Extra packages for AUR support
 >extra git
 >extra patchutils
@@ -82,12 +82,12 @@ ttf-bitstream-vera       # xfce4-terminal default Monospace
 >extra steam-manjaro
 
 ## Package management
-apparmor
-#gnome-software-snap
-flatpak
-fpakman
+>extra apparmor
+#>extra gnome-software-snap
+>extra flatpak
+>extra fpakman
 pamac
-snapd
+>extra snapd
 
 ## Java
 >extra jdk8-openjdk
@@ -212,8 +212,8 @@ htop
 qpdfview
 inxi
 #>extra libreoffice-still
-microsoft-office-online-jak
->extra freeoffice
+#>extra microsoft-office-online-jak
+#>extra freeoffice
 manjaro-hello
 manjaro-application-utility
 manjaro-settings-manager
@@ -227,7 +227,7 @@ mugshot
 powertop
 screenfetch
 >extra poppler-data  # CKJ support for pdf
->basic sylpheed # mail client
+#>basic sylpheed # mail client
 >extra thunderbird
 >extra vlc
 >extra viewnior
diff --git a/manjaro/xfce/profile.conf b/manjaro/xfce/profile.conf
index d0558ef..5468507 100644
--- a/manjaro/xfce/profile.conf
+++ b/manjaro/xfce/profile.conf
@@ -33,6 +33,7 @@ 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' 'haveged' 'ufw' 'apparmor' 'snapd.apparmor' 'snapd')
+#enable_systemd=('avahi-daemon' 'bluetooth' 'cronie' 'ModemManager' 'NetworkManager' 'org.cups.cupsd' 'tlp' 'tlp-sleep' 'haveged' 'ufw')
 disable_systemd=('pacman-init')
 
 # add strict snaps: strict_snaps="snapd core core18 gnome-3-28-1804 gtk-common-themes snap-store"
diff --git a/shared/Packages-Live b/shared/Packages-Live
index aae61d0..0b20b0a 100644
--- a/shared/Packages-Live
+++ b/shared/Packages-Live
@@ -1,4 +1,4 @@
-calamares
+calamares-git
 >manjaro grub-theme-live-manjaro
 gsmartcontrol
 manjaro-architect
diff --git a/shared/Packages-Mhwd b/shared/Packages-Mhwd
index 3d1cfba..b0f1293 100644
--- a/shared/Packages-Mhwd
+++ b/shared/Packages-Mhwd
@@ -1,3 +1,9 @@
+## The following is only temp for 18.1-rc7
+libreoffice-still
+freeoffice
+
+## Normal MHWD package list
+
 KERNEL-bbswitch
 KERNEL-broadcom-wl
 #KERNEL-r8168