diff --git a/manjaro/kde/Packages-Desktop b/manjaro/kde/Packages-Desktop
index 3c2c535..164d0bc 100644
--- a/manjaro/kde/Packages-Desktop
+++ b/manjaro/kde/Packages-Desktop
@@ -71,7 +71,6 @@ udisks2
 >extra git
 >extra patchutils
 >extra subversion
-#yaourt
 
 ## Fonts
 # cantarell-fonts        # Installed as gnome-themes-standard dependency
@@ -91,7 +90,7 @@ terminus-font
 >x86_64 >extra steam-manjaro
 
 ## Package management
-#appimagelauncher
+>extra appimagelauncher
 pamac
 pamac-tray-appindicator
 pamac-cli
@@ -156,6 +155,7 @@ milou
 plasma-desktop
 plasma-nm
 plasma-pa
+plasma-simplemenu
 plasma-workspace
 >extra plasma-workspace-wallpapers
 powerdevil
@@ -167,7 +167,6 @@ gnome-icon-theme
 gnome-themes-standard
 oxygen # needed to provide KDE system sounds
 oxygen-icons
-plasma5-themes-breath2
 sddm-breath2-theme
 grub-theme-manjaro
 illyria-wallpaper
@@ -175,16 +174,13 @@ illyria-wallpaper
 >extra wallpapers-2018
 >extra manjaro-wallpapers-18.0
 
-## Better systray/notifications support
-#>extra sni-qt  # A Qt plugin that enables tray icons in qt4 applications
-
 ## KDE Applications
 ark
 #>extra digikam
 dolphin
 dolphin-plugins
 >extra filelight
-#>extra k3b
+>extra k3b
 kate
 kcalc
 >extra keditbookmarks
@@ -253,7 +249,7 @@ sshfs  # remote filesystem browser
 poppler-data  # encoding data to display PDF documents containing CJK characters
 
 ## Applications
-#>extra cantata
+>extra cantata
 dmidecode # for inxi -m output
 htop
 imagewriter
@@ -263,22 +259,20 @@ firefox
 #ms-office-online
 #>extra freeoffice
 #>extra libreoffice-still
-#>extra calligra
 manjaro-hello
 manjaro-settings-manager-kcm
 manjaro-settings-manager-knotifier
 powertop
-#>extra qbittorrent
+>extra qbittorrent
 screenfetch
 systemd-kcm
 >extra thunderbird
 >extra vlc
-#vlc-nightly
 yakuake
 
 ## Optional dependencis for cantata
-#>extra mpd       # playback
-#>extra perl-uri  # dynamic playlist
+>extra mpd       # playback
+>extra perl-uri  # dynamic playlist
 
 ## Optional dependencies for libreoffice
 #>extra jre8-openjdk
@@ -288,8 +282,7 @@ yakuake
 manjaro-documentation-en
 
 ## Settings packages
->extra manjaro-kde-settings-dev
->basic manjaro-kde-minimal-settings-dev
+manjaro-kde-settings-dev
 manjaro-browser-settings
 
 ## Xorg Input Drivers
diff --git a/manjaro/kde/desktop-overlay/etc/X11/xorg.conf.d/30-touchpad.conf b/manjaro/kde/desktop-overlay/etc/X11/xorg.conf.d/30-touchpad.conf
new file mode 100644
index 0000000..4bd1a17
--- /dev/null
+++ b/manjaro/kde/desktop-overlay/etc/X11/xorg.conf.d/30-touchpad.conf
@@ -0,0 +1,6 @@
+Section "InputClass"
+    Identifier "touchpad"
+    Driver "libinput"
+    MatchIsTouchpad "on"
+    Option "Tapping" "on"
+EndSection
diff --git a/manjaro/kde/live-overlay/etc/xdg/kdeglobals b/manjaro/kde/live-overlay/etc/xdg/kdeglobals
deleted file mode 100644
index 7909220..0000000
--- a/manjaro/kde/live-overlay/etc/xdg/kdeglobals
+++ /dev/null
@@ -1,136 +0,0 @@
-[$Version]
-update_info=fonts_global.upd:Fonts_Global
-
-[ColorEffects:Disabled]
-Color=56,56,56
-ColorAmount=0
-ColorEffect=0
-ContrastAmount=0.65
-ContrastEffect=1
-IntensityAmount=0.1
-IntensityEffect=2
-
-[ColorEffects:Inactive]
-ChangeSelectionColor=true
-Color=112,111,110
-ColorAmount=-0.95000000000000007
-ColorEffect=0
-ContrastAmount=0.10000000000000001
-ContrastEffect=0
-Enable=false
-IntensityAmount=0
-IntensityEffect=0
-
-[Colors:Button]
-BackgroundAlternate=224,223,222
-BackgroundNormal=236,236,236
-DecorationFocus=26,188,156
-DecorationHover=54,215,183
-ForegroundActive=155,89,182
-ForegroundInactive=164,166,166
-ForegroundLink=76,107,138
-ForegroundNegative=231,76,60
-ForegroundNeutral=230,126,34
-ForegroundNormal=41,47,52
-ForegroundPositive=52,152,219
-ForegroundVisited=145,61,136
-
-[Colors:Selection]
-BackgroundAlternate=62,138,204
-BackgroundNormal=26,188,156
-DecorationFocus=26,188,156
-DecorationHover=54,215,183
-ForegroundActive=96,55,113
-ForegroundInactive=222,222,222
-ForegroundLink=0,98,218
-ForegroundNegative=231,76,60
-ForegroundNeutral=168,88,23
-ForegroundNormal=255,255,255
-ForegroundPositive=37,116,165
-ForegroundVisited=145,61,136
-
-[Colors:Tooltip]
-BackgroundAlternate=196,224,255
-BackgroundNormal=41,47,52
-DecorationFocus=26,188,156
-DecorationHover=54,215,183
-ForegroundActive=155,89,182
-ForegroundInactive=164,166,166
-ForegroundLink=126,178,230
-ForegroundNegative=231,76,60
-ForegroundNeutral=230,126,34
-ForegroundNormal=247,247,247
-ForegroundPositive=52,152,219
-ForegroundVisited=145,61,136
-
-[Colors:View]
-BackgroundAlternate=248,247,246
-BackgroundNormal=255,255,255
-DecorationFocus=26,188,156
-DecorationHover=54,215,183
-ForegroundActive=155,89,182
-ForegroundInactive=164,166,166
-ForegroundLink=76,107,138
-ForegroundNegative=231,76,60
-ForegroundNeutral=230,126,34
-ForegroundNormal=41,47,52
-ForegroundPositive=52,152,219
-ForegroundVisited=145,61,136
-
-[Colors:Window]
-BackgroundAlternate=218,217,216
-BackgroundNormal=236,236,236
-DecorationFocus=54,215,183
-DecorationHover=26,188,156
-ForegroundActive=155,89,182
-ForegroundInactive=164,166,166
-ForegroundLink=76,107,138
-ForegroundNegative=231,76,60
-ForegroundNeutral=230,126,34
-ForegroundNormal=41,47,52
-ForegroundPositive=52,152,219
-ForegroundVisited=145,61,136
-
-[General]
-shadeSortColumn=true
-BrowserApplication=firefox
-ColorScheme=Breath
-Name=Breath
-fixed=Noto Mono,9,-1,0,50,0,0,0,0,0
-font=Noto Sans,10,-1,5,50,0,0,0,0,0
-menuFont=Noto Sans,10,-1,5,50,0,0,0,0,0
-smallestReadableFont=Noto Sans,8,-1,5,50,0,0,0,0,0
-toolBarFont=Noto Sans,9,-1,5,50,0,0,0,0,0
-XftAntialias=true
-XftHintStyle=hintmedium
-XftSubPixel=none
-
-[Icons]
-Theme=breath
-
-[KDE]
-ChangeCursor=true
-ColorScheme=Breath
-contrast=7
-LookAndFeelPackage=org.kde.breath.desktop
-widgetStyle=breeze
-
-[WM]
-activeBackground=236,236,236
-activeBlend=236,236,236
-activeForeground=41,47,52
-inactiveBackground=236,236,236
-inactiveBlend=236,236,236
-inactiveForeground=159,185,202
-
-[KFileDialog Settings]
-Breadcrumb Navigation=true
-
-[PreviewSettings]
-MaximumSize=3145728
-camera=true
-file=true
-fonts=true
-
-[Directories]
-dir_pixmap=/usr/share/pixmaps
diff --git a/manjaro/kde/live-overlay/usr/bin/calamares_polkit b/manjaro/kde/live-overlay/usr/bin/calamares_polkit
new file mode 100755
index 0000000..7100969
--- /dev/null
+++ b/manjaro/kde/live-overlay/usr/bin/calamares_polkit
@@ -0,0 +1,3 @@
+#!/bin/bash
+ 
+sudo -E /usr/bin/calamares "$@"
diff --git a/manjaro/nxd/Packages-Live b/manjaro/nxd/Packages-Live
deleted file mode 100644
index 4e8518a..0000000
--- a/manjaro/nxd/Packages-Live
+++ /dev/null
@@ -1,9 +0,0 @@
-calamares
->manjaro grub-theme-live-manjaro
-gsmartcontrol
-manjaro-architect
-manjaro-live-skel
-manjaro-live-systemd
-mkinitcpio-nfs-utils
-nbd
-clonezilla
diff --git a/manjaro/nxd/Packages-Live b/manjaro/nxd/Packages-Live
new file mode 120000
index 0000000..5e66e00
--- /dev/null
+++ b/manjaro/nxd/Packages-Live
@@ -0,0 +1 @@
+../../shared/Packages-Live
\ No newline at end of file
diff --git a/manjaro/nxd/Packages-Mhwd b/manjaro/nxd/Packages-Mhwd
deleted file mode 100644
index eda9400..0000000
--- a/manjaro/nxd/Packages-Mhwd
+++ /dev/null
@@ -1,59 +0,0 @@
-## The following is only temp for 18.1-rc7
->extra libreoffice-still
->extra freeoffice
-
-## Normal MHWD package list
-
-KERNEL-bbswitch
-KERNEL-broadcom-wl
-#KERNEL-r8168
-KERNEL-zfs
-zfs-utils
-#KERNEL-rt3562sta
-KERNEL-virtualbox-guest-modules
-libva-intel-driver
-libva-mesa-driver
-libva-vdpau-driver
->multilib lib32-libva-vdpau-driver
-libxaw
-libxpm
-libxvmc
-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-418xx
->nonfree_default nvidia-340xx-utils
->nonfree_default nvidia-390xx-utils
->nonfree_x86_64 nvidia-418xx-utils
-#>nonfree_multilib lib32-catalyst-utils
->nonfree_multilib lib32-nvidia-418xx-utils
-#>nonfree_multilib lib32-nvidia-340xx-utils
->nonfree_multilib lib32-nvidia-390xx-utils
-opencl-mesa
-open-vm-tools
-pangox-compat
-primus
-bumblebee
-gtkmm3
-virtualbox-guest-utils
-vulkan-radeon
->multilib lib32-vulkan-radeon
-vulkan-intel
->multilib lib32-vulkan-intel
-xf86-input-vmmouse
-xf86-video-amdgpu
-xf86-video-ati
-xf86-video-dummy
-xf86-video-fbdev
-xf86-video-intel
-xf86-video-nouveau
-xf86-video-openchrome
-xf86-video-sisusb
-xf86-video-vesa
-xf86-video-vmware
-xf86-video-voodoo
diff --git a/manjaro/nxd/Packages-Mhwd b/manjaro/nxd/Packages-Mhwd
new file mode 120000
index 0000000..9df3d5e
--- /dev/null
+++ b/manjaro/nxd/Packages-Mhwd
@@ -0,0 +1 @@
+../../shared/Packages-Mhwd
\ No newline at end of file
diff --git a/manjaro/nxd/Packages-Root b/manjaro/nxd/Packages-Root
deleted file mode 100644
index 0a02078..0000000
--- a/manjaro/nxd/Packages-Root
+++ /dev/null
@@ -1,92 +0,0 @@
->i686 archlinux32-keyring
->manjaro manjaro-release
->multilib gcc-libs-multilib
-acpi
-acpid
-amd-ucode
-b43-fwcutter
-bash-completion
-btrfs-progs
-bzip2
-coreutils
-cpupower
-crda
-cronie
-cryptsetup
-device-mapper
-dhclient
-dhcpcd
-diffutils
-dmraid
-dnsmasq
-dosfstools
-e2fsprogs
-ecryptfs-utils
-efibootmgr
-exfat-utils
-f2fs-tools
-file
-filesystem
-findutils
-gawk
-gcc-libs
-gettext
-glibc
-grep
-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-system
-mdadm
-memtest86+
-mhwd
-mhwd-db
-mkinitcpio-openswap
-nano
-nfs-utils
-ntfs-3g
-os-prober
-pacman
-pciutils
-perl
-procps-ng
-psmisc
-reiserfsprogs
-rsync
-s-nail
-sed
-shadow
-spectre-meltdown-checker
-sudo
-sysfsutils
-systemd-fsck-silent
-systemd-sysvcompat
-tar
-texinfo
-tlp
-usbutils
-util-linux
-vi
-wget
-which
-wpa_supplicant
-xfsprogs
-zsh
diff --git a/manjaro/nxd/Packages-Root b/manjaro/nxd/Packages-Root
new file mode 120000
index 0000000..60cc7bd
--- /dev/null
+++ b/manjaro/nxd/Packages-Root
@@ -0,0 +1 @@
+../../shared/Packages-Root
\ No newline at end of file
diff --git a/shared/Packages-Mhwd b/shared/Packages-Mhwd
index eda9400..c04c263 100644
--- a/shared/Packages-Mhwd
+++ b/shared/Packages-Mhwd
@@ -26,12 +26,12 @@ mesa-vdpau
 #>nonfree_default KERNEL-catalyst
 #>nonfree_default KERNEL-nvidia-340xx
 >nonfree_default KERNEL-nvidia-390xx
->nonfree_x86_64 KERNEL-nvidia-418xx
+>nonfree_x86_64 KERNEL-nvidia-440xx
 >nonfree_default nvidia-340xx-utils
 >nonfree_default nvidia-390xx-utils
->nonfree_x86_64 nvidia-418xx-utils
+>nonfree_x86_64 nvidia-440xx-utils
 #>nonfree_multilib lib32-catalyst-utils
->nonfree_multilib lib32-nvidia-418xx-utils
+>nonfree_multilib lib32-nvidia-440xx-utils
 #>nonfree_multilib lib32-nvidia-340xx-utils
 >nonfree_multilib lib32-nvidia-390xx-utils
 opencl-mesa
@@ -39,6 +39,7 @@ open-vm-tools
 pangox-compat
 primus
 bumblebee
+nvidia-prime
 gtkmm3
 virtualbox-guest-utils
 vulkan-radeon