diff --git a/community/bspwm/Packages-Desktop b/community/bspwm/Packages-Desktop
index c22385b..93203c6 100644
--- a/community/bspwm/Packages-Desktop
+++ b/community/bspwm/Packages-Desktop
@@ -104,7 +104,6 @@ sterminal
 sxhkd
 terminus-font
 testdisk
-thermald
 tree
 udevil
 xcape
diff --git a/community/bspwm/Packages-Root b/community/bspwm/Packages-Root
index 06c3daa..a600bd3 100644
--- a/community/bspwm/Packages-Root
+++ b/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
diff --git a/community/bspwm/profile.conf b/community/bspwm/profile.conf
index fe64af6..f68a78f 100755
--- a/community/bspwm/profile.conf
+++ b/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,
diff --git a/shared/Packages-Mhwd b/shared/Packages-Mhwd
index f859c49..2dcbc55 100644
--- a/shared/Packages-Mhwd
+++ b/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