diff --git a/tromjaro/xfce/Packages-Desktop b/tromjaro/xfce/Packages-Desktop
index 0c6472c0..dea5b2bb 100644
--- a/tromjaro/xfce/Packages-Desktop
+++ b/tromjaro/xfce/Packages-Desktop
@@ -112,7 +112,6 @@ capitaine-cursors
 #Useful packages
 tlp
 libadwaita-without-adwaita-git
-python-pynput
 hunspell
 hunspell-en_US
 timeshift-autosnap-manjaro
@@ -214,7 +213,6 @@ ttf-pacifico
 # cantarell-fonts        # Installed as gnome-themes-standard dependency
 noto-fonts               # default font
 #noto-fonts-cjk           # asian fonts - needed big package, ~76 mb compressed
-adobe-source-sans-pro-fonts
 adobe-source-han-sans-jp-fonts
 adobe-source-han-sans-kr-fonts
 adobe-source-han-sans-cn-fonts
diff --git a/tromjaro/xfce/Packages-Live b/tromjaro/xfce/Packages-Live
index 471c1047..104420a3 100644
--- a/tromjaro/xfce/Packages-Live
+++ b/tromjaro/xfce/Packages-Live
@@ -5,11 +5,9 @@ manjaro-live-systemd
 mkinitcpio-nfs-utils
 nbd
 clonezilla
-KERNEL-zfs
-zfs-utils
+virtualbox-guest-utils
 
 #TROM
-
 tromjaro-calamares-theme
 grub-theme-live-common   
 grub-theme-live-tromjaro
\ No newline at end of file
diff --git a/tromjaro/xfce/Packages-Mhwd b/tromjaro/xfce/Packages-Mhwd
index 395cc254..e7668b42 100644
--- a/tromjaro/xfce/Packages-Mhwd
+++ b/tromjaro/xfce/Packages-Mhwd
@@ -1,7 +1,9 @@
+## The following is only temp until we find a better solution
+>office libreoffice-still
+>office freeoffice
 
 ## Normal MHWD package list
 
-qemu-guest-agent
 KERNEL-bbswitch
 KERNEL-broadcom-wl
 #KERNEL-r8168
@@ -26,14 +28,18 @@ mesa-vdpau
 >nonfree_x86_64 KERNEL-nvidia-470xx
 >nonfree_x86_64 KERNEL-nvidia
 >nonfree_default nvidia-390xx-utils
+>nonfree_default libxnvctrl-390xx
 >nonfree_x86_64 nvidia-470xx-utils
+>nonfree_x86_64 libxnvctrl-470xx
 >nonfree_x86_64 nvidia-utils
+>nonfree_x86_64 libxnvctrl
 >nonfree_multilib lib32-nvidia-470xx-utils
 >nonfree_multilib lib32-nvidia-390xx-utils
 >nonfree_multilib lib32-nvidia-utils
 opencl-mesa
 open-vm-tools
 primus
+qemu-guest-agent
 bumblebee
 nvidia-prime
 gtkmm3
diff --git a/tromjaro/xfce/Packages-Root b/tromjaro/xfce/Packages-Root
index a90534f8..5a34c3aa 100644
--- a/tromjaro/xfce/Packages-Root
+++ b/tromjaro/xfce/Packages-Root
@@ -1,13 +1,37 @@
->i686 archlinux32-keyring
->manjaro manjaro-release
->multilib gcc-libs-multilib
-sof-firmware
+# Base
+bash
+bzip2
+coreutils
+file
+filesystem
+findutils
+gawk
+gcc-libs
+gettext
+glibc
+grep
+gzip
+iproute2
+iputils
+licenses
+pacman
+pciutils
+procps-ng
+psmisc
+sed
+shadow
+systemd
+systemd-sysvcompat
+tar
+util-linux
+xz
 
+# Manjaro
+>multilib gcc-libs-multilib
 acpi
 acpid
 amd-ucode
 b43-fwcutter
-bash-completion
 btrfs-progs
 bzip2
 coreutils
@@ -15,7 +39,6 @@ cpupower
 crda
 cronie
 cryptsetup
-dbus-x11
 device-mapper
 dhclient
 dhcpcd
@@ -28,36 +51,23 @@ ecryptfs-utils
 efibootmgr
 exfatprogs
 f2fs-tools
-file
-filesystem
-findutils
-gawk
-gcc-libs
-gettext
-glibc
-grep
+glibc-locales
 grub
 gzip
 haveged
 inetutils
 intel-ucode
-iproute2
-iptables
-iputils
-ipw2100-fw
-ipw2200-fw
 jfsutils
 KERNEL
 less
-licenses
-linux-firmware
 logrotate
-lsb-release
 lvm2
 man-db
-man-pages
-manjaro-firmware
+#manjaro-firmware
+manjaro-release
 manjaro-system
+manjaro-zsh-config
+man-pages
 mdadm
 memtest86+
 mhwd
@@ -68,28 +78,20 @@ nano-syntax-highlighting
 nfs-utils
 ntfs-3g
 os-prober
-pacman
-pciutils
 perl
-procps-ng
-psmisc
 reiserfsprogs
 rsync
 s-nail
-sed
-shadow
+sof-firmware
 spectre-meltdown-checker
 sudo
 sysfsutils
+systemd
 systemd-fsck-silent
-systemd-sysvcompat
-tar
 texinfo
 usbutils
-util-linux
 vi
 wget
 which
 wpa_supplicant
 xfsprogs
-zsh