diff --git a/community/openbox/Packages-Desktop b/community/openbox/Packages-Desktop
index 1a2d9cf..6eff82e 100644
--- a/community/openbox/Packages-Desktop
+++ b/community/openbox/Packages-Desktop
@@ -8,6 +8,9 @@ xed
 xreader
 xviewer
 
+## power management
+xfce4-power-manager
+
 ## fonts, theming, icons, cursors
 adwaita-icon-theme
 gnome-icon-theme
@@ -56,13 +59,22 @@ manjaro-application-utility
 manjaro-documentation-en
 manjaro-hello
 
-## GUI file manager
+## file management
+catfish
 engrampa
-thunar
-xfce4-power-manager
-
-## CLI file manager
+ffmpegthumbnailer
 mc
+mlocate
+p7zip
+poppler-data
+poppler-glib
+thunar
+thunar-archive-plugin
+thunar-media-tags-plugin
+thunar-volman
+tumbler
+unarchiver
+unzip
 
 ## disk utilities
 gnome-disk-utility
@@ -155,7 +167,6 @@ accountsservice
 gnome-keyring
 gtk-engine-murrine
 gtk3
-manjaro-hotfixes
 polkit
 polkit-gnome
 python-xdg
@@ -166,7 +177,7 @@ xdg-utils
 zensu
 
 ## xorg
-xf86-input-libinput
+xorg-drivers
 xorg-fonts-100dpi
 xorg-fonts-75dpi
 xorg-fonts-type1
diff --git a/community/openbox/profile.conf b/community/openbox/profile.conf
index 11f51ab..391babb 100644
--- a/community/openbox/profile.conf
+++ b/community/openbox/profile.conf
@@ -12,10 +12,10 @@ displaymanager="lxdm"
 autologin="true"
 
 ## nonfree mhwd drivers
-nonfree_mhwd="false"
+#nonfree_mhwd="true"
 
 # use extra packages as defined in pkglist to activate a full profile
-extra="true"
+#extra="true"
 
 # use calamares office installer
 #office_installer="false"
diff --git a/shared/Packages-Mhwd b/shared/Packages-Mhwd
index 96ef955..742af71 100644
--- a/shared/Packages-Mhwd
+++ b/shared/Packages-Mhwd
@@ -1,6 +1,6 @@
 ## The following is only temp for 18.1-rc7
->extra libreoffice-still
->extra freeoffice
+>office libreoffice-still
+>office freeoffice
 
 ## Normal MHWD package list