diff --git a/community/budgie/Packages-Desktop b/community/budgie/Packages-Desktop
index e856fd2..0c72ff9 100644
--- a/community/budgie/Packages-Desktop
+++ b/community/budgie/Packages-Desktop
@@ -61,6 +61,8 @@ gvfs-mtp
 gvfs-smb
 inxi
 imagewriter
+kvantum-theme-matcha
+kvantum-theme-matchama
 mc # Midnight Commander
 #pacui
 mhwd-tui
@@ -92,7 +94,8 @@ networkmanager-vpnc
 nss-mdns
 numlockx
 openresolv
-pamac
+pamac-gtk
+pamac-snap-plugin
 polkit-gnome
 powertop
 pulseaudio-bluetooth
diff --git a/community/budgie/live-overlay b/community/budgie/live-overlay
deleted file mode 120000
index 27b9d2a..0000000
--- a/community/budgie/live-overlay
+++ /dev/null
@@ -1 +0,0 @@
-../../shared/manjaro/live-overlay
\ No newline at end of file
diff --git a/community/budgie/live-overlay/etc b/community/budgie/live-overlay/etc
new file mode 120000
index 0000000..caab87d
--- /dev/null
+++ b/community/budgie/live-overlay/etc
@@ -0,0 +1 @@
+../../../shared/manjaro/live-overlay/etc
\ No newline at end of file
diff --git a/community/budgie/live-overlay/root/.config/Kvantum/kvantum.kvconfig b/community/budgie/live-overlay/root/.config/Kvantum/kvantum.kvconfig
new file mode 100644
index 0000000..c470e30
--- /dev/null
+++ b/community/budgie/live-overlay/root/.config/Kvantum/kvantum.kvconfig
@@ -0,0 +1,2 @@
+[General]
+theme=Matchama
diff --git a/community/budgie/live-overlay/root/.config/qt5ct/qt5ct.conf b/community/budgie/live-overlay/root/.config/qt5ct/qt5ct.conf
new file mode 100644
index 0000000..372a44a
--- /dev/null
+++ b/community/budgie/live-overlay/root/.config/qt5ct/qt5ct.conf
@@ -0,0 +1,24 @@
+[Appearance]
+color_scheme_path=
+custom_palette=false
+icon_theme=Papirus-Adapta-Maia
+style=kvantum
+
+[Fonts]
+fixed=@Variant(\0\0\0@\0\0\0\x12\0\x43\0\x61\0n\0t\0\x61\0r\0\x65\0l\0l@$\0\0\0\0\0\0\xff\xff\xff\xff\x5\x1\0\x32\x10)
+general=@Variant(\0\0\0@\0\0\0\x12\0\x43\0\x61\0n\0t\0\x61\0r\0\x65\0l\0l@$\0\0\0\0\0\0\xff\xff\xff\xff\x5\x1\0\x32\x10)
+
+[Interface]
+activate_item_on_single_click=1
+buttonbox_layout=0
+cursor_flash_time=1000
+dialog_buttons_have_icons=1
+double_click_interval=400
+gui_effects=@Invalid()
+menus_have_icons=true
+stylesheets=@Invalid()
+toolbutton_style=4
+wheel_scroll_lines=3
+
+[SettingsWindow]
+geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x2\0\0\0\0\x1\x9a\0\0\0\x80\0\0\x3\xd6\0\0\x2\xff\0\0\x1\x9a\0\0\0\xa2\0\0\x3\xd6\0\0\x2\xff\0\0\0\0\0\0\0\0\x5V)
diff --git a/manjaro/gnome/Packages-Desktop b/manjaro/gnome/Packages-Desktop
index d135695..46c09a0 100644
--- a/manjaro/gnome/Packages-Desktop
+++ b/manjaro/gnome/Packages-Desktop
@@ -2,10 +2,10 @@ adwaita-icon-theme
 adwaita-maia
 alsa-firmware
 >extra apparmor
-baobab
-dconf-editor
+>extra baobab
+>extra dconf-editor
 dmidecode
-hexchat
+>extra hexchat
 gthumb
 evince
 >basic epiphany
@@ -14,7 +14,7 @@ evince
 >extra rygel
 gdm
 manjaro-gdm-tweak
-manjaro-gdm-theme-19.0 #branding theme for GDM: 19.0 
+manjaro-gdm-theme
 gedit
 gtksourceview-pkgbuild #highlight for PKGBUILD
 #manjaro-gnome-vanilla
@@ -23,7 +23,7 @@ gnome-calculator
 gnome-control-center
 gnome-desktop
 gnome-disk-utility
-gnome-font-viewer
+>extra gnome-font-viewer
 gnome-keyring
 fprintd #need for finger id reader
 >extra gnome-online-accounts
@@ -40,9 +40,10 @@ gnome-system-monitor
 gnome-terminal
 gnome-themes-standard
 gnome-tweak-tool
-gnome-user-docs
-gnome-user-share
+>extra gnome-user-docs
+>extra gnome-user-share
 gnome-wallpapers
+gparted
 papirus-maia-icon-theme
 >extra gnome-calendar
 >extra bijiben
@@ -51,10 +52,9 @@ papirus-maia-icon-theme
 >extra gnome-weather
 >extra gnome-maps
 >extra gnome-todo
-gtkhash-nautilus
+>extra gtkhash-nautilus
 >extra seahorse
 file-roller
-gparted
 grilo-plugins
 gst-libav
 gst-plugins-bad
@@ -68,16 +68,16 @@ gvfs-mtp
 gvfs-google
 gvfs-smb
 inxi
-imagewriter
+>extra imagewriter
 #cli tool#
 pacui
 mc
-mhwd-tui
+bmenu
 ########
 manjaro-alsa
 manjaro-artwork
->extra wallpapers-2018
->extra manjaro-wallpapers-18.0
+#>extra wallpapers-2018
+#>extra manjaro-wallpapers-18.0
 >extra wallpapers-juhraya
 illyria-wallpaper
 manjaro-browser-settings
@@ -107,12 +107,13 @@ nss-mdns
 numlockx
 openresolv
 #gnome-software-snap
->extra flatpak
->extra bauh
-pamac
+#>extra flatpak
+#>extra bauh
+pamac-gtk
 >extra snapd
 >extra snapd-glib
 >extra pamac-snap-plugin
+>extra pamac-flatpak-plugin
 polkit-gnome
 powertop
 pulseaudio-bluetooth
@@ -126,13 +127,13 @@ avahi
 networkmanager
 ntp
 openssh
-terminus-font
+terminus-font-otb
 totem
 tracker
 tracker-miners
 >extra noto-fonts-compat
 noto-fonts               # default font
-noto-fonts-cjk           # asian fonts - needed big package, ~76 mb compressed
+>extra noto-fonts-cjk           # asian fonts - needed big package, ~76 mb compressed
 ttf-bitstream-vera
 ttf-dejavu
 ttf-droid
@@ -140,7 +141,7 @@ ttf-inconsolata
 ttf-indic-otf
 ttf-liberation
 usb_modeswitch
-vino
+>extra vino
 xdg-su
 xdg-user-dirs
 xdg-user-dirs-gtk
@@ -153,7 +154,7 @@ xorg-server
 xorg-twm
 xorg-xinit
 >extra xf86-input-wacom #support for tablet and pen display ( wacom ecc. )
-yelp
+>extra yelp
 >extra caffeine-ng
 >extra libappindicator-gtk3
 
@@ -164,15 +165,16 @@ yelp
 >extra unace
 >extra lrzip
 >extra gtk3-print-backends
->extra evolution
+>extra geary
+>extra gnome-calendar
 >extra lollypop
 >extra empathy
 >extra telepathy-accounts-signon
 >extra uget
 >extra transmission-gtk
 >extra manjaro-documentation-en
->extra jre8-openjdk
->extra jre8-openjdk-headless
+#>extra jre8-openjdk
+#>extra jre8-openjdk-headless
 >extra libdvdcss
 >x86_64 >extra steam-manjaro
 >extra manjaro-printer
@@ -183,3 +185,7 @@ yelp
 >extra gnome-shell-extension-gsconnect
 >extra manjaro-aur-support #introduce for testing in community
 
+>basic lighter-gnome
+>basic disable-tracker
+
+gnome-initial-setup # Package to create user account, set keyboard and locale.
diff --git a/manjaro/gnome/desktop-overlay/etc/gdm/custom.conf b/manjaro/gnome/desktop-overlay/etc/gdm/custom.conf
index d255651..e65ee23 100644
--- a/manjaro/gnome/desktop-overlay/etc/gdm/custom.conf
+++ b/manjaro/gnome/desktop-overlay/etc/gdm/custom.conf
@@ -1,8 +1,10 @@
 # GDM configuration storage
 
 [daemon]
+InitialSetupEnable=True
+
 # Uncoment the line below to force the login screen to use Xorg
-WaylandEnable=false
+#WaylandEnable=false
 
 [security]
 
diff --git a/manjaro/gnome/live-overlay/etc/gdm/custom.conf b/manjaro/gnome/live-overlay/etc/gdm/custom.conf
new file mode 100644
index 0000000..6055fdd
--- /dev/null
+++ b/manjaro/gnome/live-overlay/etc/gdm/custom.conf
@@ -0,0 +1,17 @@
+# GDM configuration storage
+
+[daemon]
+InitialSetupEnable=false
+# Uncoment the line below to force the login screen to use Xorg
+#WaylandEnable=false
+
+[security]
+
+[xdmcp]
+
+[chooser]
+
+[debug]
+# Uncomment the line below to turn on debugging
+#Enable=true
+
diff --git a/shared/Packages-Mhwd b/shared/Packages-Mhwd
index f6eb09b..742af71 100644
--- a/shared/Packages-Mhwd
+++ b/shared/Packages-Mhwd
@@ -8,9 +8,11 @@ KERNEL-bbswitch
 KERNEL-broadcom-wl
 #KERNEL-r8168
 #KERNEL-zfs
-#zfs-utils
+zfs-utils
 #KERNEL-rt3562sta
 KERNEL-virtualbox-guest-modules
+KERNEL-headers
+zfs-dkms
 libva-intel-driver
 libva-mesa-driver
 libva-vdpau-driver
diff --git a/shared/Packages-Root b/shared/Packages-Root
index ca82b7c..e5297a8 100644
--- a/shared/Packages-Root
+++ b/shared/Packages-Root
@@ -86,4 +86,4 @@ which
 wpa_supplicant
 xfsprogs
 xz
-zsh
+manjaro-zsh-config