Merge remote-tracking branch 'upstream/master'

# Conflicts:
#	community/lxde/Packages-Desktop

community/bspwm/Packages-Desktop

@@ -104,7 +104,6 @@ sterminal
 sxhkd
 terminus-font
 testdisk
-thermald
 tree
 udevil
 xcape
@@ -124,5 +123,4 @@ xorg-xprop
 xorg-xsetroot
 zensu
 zsh-completions
-highlight
-
+highlight

community/bspwm/Packages-Root

@@ -51,7 +51,6 @@ man-pages
 memtest86+
 mhwd
 mhwd-db
-mhwd-i2c-syna3602
 mkinitcpio-openswap
 nano
 ntfs-3g
@@ -79,6 +78,7 @@ lvm2
 mdadm
 nfs-utils
 rsync
+systemd-fsck-silent
 systemd-sysvcompat
 tlp
 wpa_supplicant

community/bspwm/profile.conf

@@ -24,7 +24,7 @@ chrootcfg="false"
 
 # unset defaults to given values
 # names must match systemd service names
-enable_systemd=('cronie' 'ModemManager' 'NetworkManager' 'tlp' 'tlp-sleep' 'systemd-fsck@' 'systemd-fsck-root' 'haveged')
+enable_systemd=('ModemManager' 'NetworkManager' 'tlp' 'tlp-sleep' 'systemd-fsck@' 'systemd-fsck-root' 'systemd-timesyncd' 'avahi-daemon' 'haveged' 'ufw')
 disable_systemd=('pacman-init')
 
 # unset defaults to given values,

community/cinnamon/Packages-Desktop

@@ -148,7 +148,6 @@ xf86-input-mouse
 xf86-input-void
 xorg-twm
 xorg-xinit
->extra xplayer
 >extra xreader
 >extra xviewer-plugins
 xdg-user-dirs

community/lxqt/Packages-Desktop

@@ -176,7 +176,6 @@ sddm-qt-manjaro-theme
 #---------=> settings manager
 manjaro-settings-manager
 obconf-qt
-qt5-styleplugins
 qt5ct
 
 #---------=> lxqt not in core
@@ -289,7 +288,6 @@ freetype2
 
 #---------=> system
 accountsservice
-gamin
 gksu-polkit
 gnome-keyring
 gtk3-classic

community/mate/Packages-Desktop

@@ -22,7 +22,6 @@ mate
 marco
 brisk-menu
 mate-notification-theme-slate
-mate-menu
 mate-control-center
 mate-calc
 mate-desktop
@@ -42,6 +41,7 @@ manjaro-application-utility
 mc # Midnight Commander
 pacui
 mhwd-tui
+xterm
 gparted
 grilo-plugins
 gst-libav
@@ -121,7 +121,7 @@ caja-open-terminal
 >extra libreoffice-fresh
 >extra thunderbird
 >extra lollypop
->extra vlc-nightly
+>extra vlc
 >extra empathy
 >extra uget
 >extra transmission-gtk
@@ -129,8 +129,7 @@ caja-open-terminal
 >extra jre8-openjdk
 >extra jre8-openjdk-headless
 timeshift 								#backup utility
->extra kernel-alive 							#after a kernel update this maintain usable the modules
-# >extra flashplugin
+>extra kernel-alive 					#after a kernel update this maintain usable the modules
 >extra libdvdcss
 >extra steam-manjaro
 >extra manjaro-printer
@@ -138,7 +137,6 @@ timeshift 								#backup utility
 >extra vala-panel-appmenu-mate
 >extra mate-applet-dock
 >extra mate-applets
->extra mate-menu
 >extra plank
 >extra ffmpegthumbnailer
 #>extra autoconf

shared/Packages-Mhwd

@@ -1,6 +1,8 @@
 KERNEL-bbswitch
 KERNEL-broadcom-wl
 KERNEL-r8168
+KERNEL-zfs
+zfs-utils
 #KERNEL-rt3562sta
 KERNEL-virtualbox-guest-modules
 libva-intel-driver