diff --git a/community/bspwm/Packages-Desktop b/community/bspwm/Packages-Desktop
index e79bb0f..8f8921b 100644
--- a/community/bspwm/Packages-Desktop
+++ b/community/bspwm/Packages-Desktop
@@ -1,3 +1,4 @@
+dbus-x11
 adwaita-maia-gtk3
 alsa-firmware
 alsa-plugins
@@ -28,6 +29,7 @@ gedit
 gnome-disk-utility
 gtk3-classic
 gtk2-compatibility
+gtk-theme-breath
 gufw
 gvfs
 hibernator
@@ -75,11 +77,13 @@ rootmenu
 spacefm
 speedtest-cli
 st-manjaro
+sterminal
 sxhkd
 terminus-font
 thermald
 tree
 udevil
+w3m
 xcursor-breeze
 xdg-su
 xdg-user-dirs
diff --git a/community/bspwm/Packages-Mhwd b/community/bspwm/Packages-Mhwd
deleted file mode 120000
index 9df3d5e..0000000
--- a/community/bspwm/Packages-Mhwd
+++ /dev/null
@@ -1 +0,0 @@
-../../shared/Packages-Mhwd
\ No newline at end of file
diff --git a/community/bspwm/Packages-Mhwd b/community/bspwm/Packages-Mhwd
new file mode 100644
index 0000000..0d86011
--- /dev/null
+++ b/community/bspwm/Packages-Mhwd
@@ -0,0 +1,50 @@
+#KERNEL-bbswitch
+#KERNEL-broadcom-wl
+#KERNEL-r8168
+#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
+#>nonfree_default KERNEL-nvidia-304xx
+#>nonfree_default KERNEL-nvidia-340xx
+#>nonfree_default nvidia-304xx-utils
+#>nonfree_default nvidia-340xx-utils
+#>nonfree_default nvidia-utils
+#>nonfree_multilib lib32-catalyst-utils
+#>nonfree_multilib lib32-nvidia-304xx-utils
+#>nonfree_multilib lib32-nvidia-340xx-utils
+#>nonfree_multilib lib32-nvidia-utils
+opencl-mesa
+open-vm-tools
+pangox-compat
+#primus
+#bumblebee
+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/community/bspwm/Packages-Root b/community/bspwm/Packages-Root
deleted file mode 120000
index 60cc7bd..0000000
--- a/community/bspwm/Packages-Root
+++ /dev/null
@@ -1 +0,0 @@
-../../shared/Packages-Root
\ No newline at end of file
diff --git a/community/bspwm/Packages-Root b/community/bspwm/Packages-Root
new file mode 100644
index 0000000..1f90806
--- /dev/null
+++ b/community/bspwm/Packages-Root
@@ -0,0 +1,92 @@
+acpi
+b43-fwcutter
+bash
+btrfs-progs
+bzip2
+coreutils
+crda
+dbus-x11
+dhclient
+diffutils
+dmraid
+dnsmasq
+dosfstools
+e2fsprogs
+ecryptfs-utils
+>x86_64 efibootmgr
+exfat-utils
+f2fs-tools
+file
+filesystem
+findutils
+gawk
+gcc-libs
+>multilib gcc-libs-multilib
+gettext
+glibc
+grep
+grub
+gzip
+inetutils
+intel-ucode
+iproute2
+iptables
+iputils
+ipw2100-fw
+ipw2200-fw
+jfsutils
+KERNEL
+less
+licenses
+linux-firmware
+logrotate
+lsb-release
+man-db
+manjaro-firmware
+>manjaro manjaro-release
+manjaro-system
+man-pages
+memtest86+
+mhwd
+mhwd-db
+mkinitcpio-openswap
+nano
+ntfs-3g
+os-prober
+pacman
+pciutils
+pcmciautils
+perl
+procps-ng
+psmisc
+reiserfsprogs
+sed
+shadow
+s-nail
+>sonar sonar-release
+sudo
+sysfsutils
+acpid
+cpupower
+cronie
+cryptsetup
+device-mapper
+dhcpcd
+haveged
+lvm2
+mdadm
+nfs-utils
+rsync
+systemd-sysvcompat
+tlp
+wpa_supplicant
+tar
+texinfo
+usbutils
+util-linux
+vi
+wget
+which
+xfsprogs
+zd1211-firmware
+zsh
diff --git a/community/bspwm/desktop-overlay/etc/environment b/community/bspwm/desktop-overlay/etc/environment
new file mode 100644
index 0000000..701af46
--- /dev/null
+++ b/community/bspwm/desktop-overlay/etc/environment
@@ -0,0 +1,6 @@
+#
+# This file is parsed by pam_env module
+#
+# Syntax: simple "KEY=VAL" pairs on separate lines
+#
+GTK_CSD=1
\ No newline at end of file
diff --git a/shared/community/desktop-overlay/etc/nsswitch.conf b/shared/community/desktop-overlay/etc/nsswitch.conf
new file mode 100644
index 0000000..cdec70e
--- /dev/null
+++ b/shared/community/desktop-overlay/etc/nsswitch.conf
@@ -0,0 +1,19 @@
+# Begin /etc/nsswitch.conf
+
+passwd: compat mymachines systemd
+group: compat mymachines systemd
+shadow: compat
+
+publickey: files
+
+hosts: files mymachines mdns4_minimal [NOTFOUND=return] resolve [!UNAVAIL=return] dns myhostname
+networks: files
+
+protocols: files
+services: files
+ethers: files
+rpc: files
+
+netgroup: files
+
+# End /etc/nsswitch.conf
diff --git a/shared/manjaro/desktop-overlay/etc/nsswitch.conf b/shared/manjaro/desktop-overlay/etc/nsswitch.conf
new file mode 100644
index 0000000..cdec70e
--- /dev/null
+++ b/shared/manjaro/desktop-overlay/etc/nsswitch.conf
@@ -0,0 +1,19 @@
+# Begin /etc/nsswitch.conf
+
+passwd: compat mymachines systemd
+group: compat mymachines systemd
+shadow: compat
+
+publickey: files
+
+hosts: files mymachines mdns4_minimal [NOTFOUND=return] resolve [!UNAVAIL=return] dns myhostname
+networks: files
+
+protocols: files
+services: files
+ethers: files
+rpc: files
+
+netgroup: files
+
+# End /etc/nsswitch.conf