diff --git a/tromjaro/xfce/Packages-Desktop b/tromjaro/xfce/Packages-Desktop
index 54dc050a..909d7dd6 100644
--- a/tromjaro/xfce/Packages-Desktop
+++ b/tromjaro/xfce/Packages-Desktop
@@ -15,6 +15,7 @@ chaotic-mirrorlist
 powerpill
 
 #Main apps
+tblock-gui
 firefox
 g4music
 warp
@@ -146,6 +147,8 @@ emote
 davfs2
 fprintd
 tesseract-data-eng
+xdg-desktop-portal-gtk
+
 
 
 ## Network
diff --git a/tromjaro/xfce/Packages-Live b/tromjaro/xfce/Packages-Live
index 104420a3..36c9a43f 100644
--- a/tromjaro/xfce/Packages-Live
+++ b/tromjaro/xfce/Packages-Live
@@ -1,12 +1,19 @@
+btrfs-assistant
 calamares
+clonezilla
+gparted
 gsmartcontrol
+#manjaro-architect
 manjaro-live-skel
 manjaro-live-systemd
+manjaro-rescue
 mkinitcpio-nfs-utils
 nbd
-clonezilla
+snapper-gui
+timeshift
 virtualbox-guest-utils
 
+
 #TROM
 tromjaro-calamares-theme
 grub-theme-live-common   
diff --git a/tromjaro/xfce/Packages-Mhwd b/tromjaro/xfce/Packages-Mhwd
index 45b9220a..60347420 100644
--- a/tromjaro/xfce/Packages-Mhwd
+++ b/tromjaro/xfce/Packages-Mhwd
@@ -7,12 +7,12 @@
 KERNEL-bbswitch
 KERNEL-broadcom-wl
 #KERNEL-r8168
-KERNEL-zfs
-zfs-utils
+#KERNEL-zfs
+#zfs-utils
 #KERNEL-rt3562sta
 #KERNEL-virtualbox-guest-modules
 KERNEL-headers
-zfs-dkms
+#zfs-dkms
 libva-intel-driver
 libva-mesa-driver
 libva-vdpau-driver
diff --git a/tromjaro/xfce/Packages-Root b/tromjaro/xfce/Packages-Root
index 3bfaa8bc..75c97500 100644
--- a/tromjaro/xfce/Packages-Root
+++ b/tromjaro/xfce/Packages-Root
@@ -1,30 +1,5 @@
 # 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
+base
 
 # Manjaro
 >multilib gcc-libs-multilib
diff --git a/tromjaro/xfce/desktop-overlay/etc/skel/.local/share/applications/tblock-gui.desktop b/tromjaro/xfce/desktop-overlay/etc/skel/.local/share/applications/tblock-gui.desktop
new file mode 100644
index 00000000..2fd94d5f
--- /dev/null
+++ b/tromjaro/xfce/desktop-overlay/etc/skel/.local/share/applications/tblock-gui.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Name=Internet Content Blocker
+Comment=Systemwide ads/trackers blocker
+Exec=/usr/bin/tblockg
+Icon=tblock
+Terminal=false
+Type=Application
+Categories=Settings;System;X-XFCE-SettingsDialog;X-XFCE-SystemSettings;
+Path=
+StartupNotify=false
diff --git a/tromjaro/xfce/desktop-overlay/etc/skel/.zshrc b/tromjaro/xfce/desktop-overlay/etc/skel/.zshrc
index 215e2b5e..c39207b1 100644
--- a/tromjaro/xfce/desktop-overlay/etc/skel/.zshrc
+++ b/tromjaro/xfce/desktop-overlay/etc/skel/.zshrc
@@ -5,7 +5,7 @@
 autoload -U colors && colors    # Load colors
 # Maia prompt
 PROMPT="%B%{$fg[cyan]%}%(4~|%-1~/.../%2~|%~)%u%b >%{$fg[cyan]%}>%B%(?.%{$fg[cyan]%}.%{$fg[red]%})>%{$reset_color%}%b "
-RPROMPT="%{$fg[red]%} %(?..[%?])"
+RPROMPT="%{$fg[red]%} %(?..[%?])%{$reset_color%}"
 
 setopt autocd        # Automatically cd into typed directory.
 stty stop undef        # Disable ctrl-s to freeze terminal.