diff --git a/manjaro/xfce/Packages-Desktop b/manjaro/xfce/Packages-Desktop
index 81a8266..a1acbef 100644
--- a/manjaro/xfce/Packages-Desktop
+++ b/manjaro/xfce/Packages-Desktop
@@ -210,8 +210,8 @@ htop
 qpdfview
 inxi
 #>extra libreoffice-still
-#ms-office-online
-freeoffice
+#microsoft-office-online-jak
+>extra freeoffice
 manjaro-hello
 manjaro-application-utility
 manjaro-settings-manager
@@ -278,5 +278,9 @@ xdg-su
 gtkhash-thunar
 manjaro-hotfixes
 
-## Workarounds
-boost-libs # needed to fix systemd-journal on live-boot
+## Handshake tools
+#faucet-tool
+#hnsd-git
+#hsd-git
+#veracrypt
+#cryptoseed
diff --git a/shared/Packages-Mhwd b/shared/Packages-Mhwd
index 56f360c..3d1cfba 100644
--- a/shared/Packages-Mhwd
+++ b/shared/Packages-Mhwd
@@ -16,15 +16,15 @@ mesa-vdpau
 >multilib lib32-mesa-vdpau
 >multilib lib32-libxvmc
 >multilib lib32-primus
->nonfree_default catalyst-utils
->nonfree_default KERNEL-catalyst
+#>nonfree_default catalyst-utils
+#>nonfree_default KERNEL-catalyst
 >nonfree_default KERNEL-nvidia
 >nonfree_default KERNEL-nvidia-340xx
 >nonfree_default KERNEL-nvidia-390xx
 >nonfree_default nvidia-340xx-utils
 >nonfree_default nvidia-390xx-utils
 >nonfree_default nvidia-utils
->nonfree_multilib lib32-catalyst-utils
+#>nonfree_multilib lib32-catalyst-utils
 >nonfree_multilib lib32-nvidia-utils
 >nonfree_multilib lib32-nvidia-340xx-utils
 >nonfree_multilib lib32-nvidia-390xx-utils