diff --git a/shared/Packages-Live b/shared/Packages-Live
index c7ff0f66..2abec7c2 100644
--- a/shared/Packages-Live
+++ b/shared/Packages-Live
@@ -1,4 +1,4 @@
-calamares-git
+calamares
 gsmartcontrol
 manjaro-architect
 manjaro-live-skel
diff --git a/shared/Packages-Mhwd b/shared/Packages-Mhwd
index 56e16c03..4ddfde7c 100644
--- a/shared/Packages-Mhwd
+++ b/shared/Packages-Mhwd
@@ -21,18 +21,12 @@ mesa-vdpau
 >multilib lib32-mesa-vdpau
 >multilib lib32-libxvmc
 >multilib lib32-primus
-#>nonfree_default catalyst-utils
-#>nonfree_default KERNEL-catalyst
-#>nonfree_default KERNEL-nvidia-340xx
-#>nonfree_default KERNEL-nvidia-390xx
-#>nonfree_x86_64 KERNEL-nvidia-455xx
-#>nonfree_default nvidia-340xx-utils
-#>nonfree_default nvidia-390xx-utils
-#>nonfree_x86_64 nvidia-455xx-utils
-#>nonfree_multilib lib32-catalyst-utils
-#>nonfree_multilib lib32-nvidia-455xx-utils
-#>nonfree_multilib lib32-nvidia-340xx-utils
-#>nonfree_multilib lib32-nvidia-390xx-utils
+>nonfree_default KERNEL-nvidia-390xx
+>nonfree_x86_64 KERNEL-nvidia
+>nonfree_default nvidia-390xx-utils
+>nonfree_x86_64 nvidia-utils
+>nonfree_multilib lib32-nvidia-utils
+>nonfree_multilib lib32-nvidia-390xx-utils
 opencl-mesa
 open-vm-tools
 primus
diff --git a/shared/Packages-Root b/shared/Packages-Root
index b50a97fb..3afff802 100644
--- a/shared/Packages-Root
+++ b/shared/Packages-Root
@@ -1,5 +1,3 @@
-linux54-zfs
-
 #sonar sonar-release
 >i686 archlinux32-keyring
 >multilib gcc-libs-multilib
@@ -51,6 +49,7 @@ man-db
 man-pages
 manjaro-firmware
 manjaro-system
+manjaro-zsh-config
 mdadm
 memtest86+
 mhwd
diff --git a/tromjaro/gnome/Packages-Desktop b/tromjaro/gnome/Packages-Desktop
index 9ff8c818..60fe212e 100644
--- a/tromjaro/gnome/Packages-Desktop
+++ b/tromjaro/gnome/Packages-Desktop
@@ -6,7 +6,6 @@ vimix-kde-git
 vimix-gtk-themes-git
 kvantum-theme-vimix-git
 imageburner
-dat-fox-helper-git
 feathernotes-git
 bitmask
 
@@ -37,7 +36,6 @@ gnome-weather
 
 #SYSTEM
 broadcom-wl-dkms
-hplip-minimal
 iio-sensor-proxy
 downgrade
 kvantum-qt5
@@ -50,9 +48,11 @@ frei0r-plugins
 appimagelauncher
 chrome-gnome-shell
 ffmpegthumbnailer
-linux54-headers
+linux510-headers
 gnome-firmware
-cups
+manjaro-printer
+linux-latest
+rebuild-detector
 
 
 
@@ -80,26 +80,14 @@ xcursor-breeze
 ttf-roboto
 breeze-icons
 adwaita-icon-theme
-
-xorg-mkfontscale
-
-
-
-
-
-
-
-
-web-installer-url-handler
+adwaita-maia
 alsa-firmware
 apparmor
 baobab
-base-devel
 dconf-editor
 dmidecode
 gdm
-alsa-firmware
-gedit 
+gedit
 gtksourceview-pkgbuild #highlight for PKGBUILD
 gnome-calculator
 gnome-control-center
@@ -181,6 +169,11 @@ terminus-font-otb
 tracker
 tracker-miners
 qgnomeplatform
+ttf-dejavu
+ttf-droid
+ttf-inconsolata
+ttf-indic-otf
+ttf-liberation
 usb_modeswitch
 vino
 xdg-user-dirs
@@ -190,6 +183,7 @@ xf86-input-elographics
 xf86-input-evdev
 xf86-input-libinput
 xf86-input-void
+xorg-mkfontscale
 xorg-server
 xorg-twm
 xorg-xinit