diff --git a/community/bspwm/Packages-Desktop b/community/bspwm/Packages-Desktop
index 913c176..2e8ddac 100644
--- a/community/bspwm/Packages-Desktop
+++ b/community/bspwm/Packages-Desktop
@@ -1,4 +1,46 @@
+>basic dunst
+>basic i3lock
+>basic links
+>basic manjaro-alsa
+>basic manjaro-bspwm-settings-minimal
+>basic ufw
+>basic xlogin
+>extra accountsservice
+>extra adapta-maia-theme
 >extra adwaita-maia-gtk3
+>extra compton
+>extra dconf
+>extra file-roller
+>extra firefox
+>extra gnome-disk-utility
+>extra gtk2-compatibility
+>extra gtk3-classic
+>extra gufw
+>extra gvfs
+>extra gvfs
+>extra gvfs-afc
+>extra gvfs-gphoto2
+>extra gvfs-mtp
+>extra gvfs-smb
+>extra light-locker
+>extra lightdm
+>extra lightdm-slick-greeter
+>extra lxappearance-gtk3
+>extra lxsession-gtk3
+>extra manjaro-browser-settings
+>extra manjaro-bspwm-settings
+>extra manjaro-pulse
+>extra mate-notification-daemon
+>extra mate-polkit
+>extra morc_menu
+>extra mygtkmenui
+>extra papirus-maia-icon-theme
+>extra pavucontrol
+>extra pcmanfm-gtk3
+>extra pulseaudio-ctl
+>extra timeshift
+>extra zathura-pdf-poppler
+>multilib manjaro-alsa
 alsa-firmware
 alsa-plugins
 alsa-utils
@@ -11,56 +53,33 @@ bspwm-manjaro
 bspwm-ruler
 bspwm-scripts
 bspwm-wallpapers
->extra firefox
->basic links
 clonezilla
->extra compton
 dash
 dbus-x11
->extra dconf
 delayed-hibernation
 desktop-file-utils
 dfc
 downgrade
 dunstify
 feh
->extra file-roller
->extra gedit
->basic micro-manjaro
->extra gnome-disk-utility
->extra gtk3-classic
->extra gtk2-compatibility
-gtk-theme-breath
+ffmpegthumbnailer
 grub-theme-manjaro-dev
->extra gufw
->basic ufw
->extra gvfs
+gtk-theme-breath
 hibernator
+highlight
 htop
->basic i3lock
 inxi
 libdnet
 libnotify
+light
 limepanel
->extra lxappearance-gtk3
->extra lxsession-gtk3
 maia-console
 manjaro-architect
->extra manjaro-browser-settings
->extra manjaro-bspwm-settings
->basic manjaro-bspwm-settings-minimal
->extra manjaro-pulse
->basic manjaro-alsa
 manjaro-zsh-config
->extra mate-notification-daemon
->extra mate-polki
->basic dunst
 mhwd-tui
+micro-manjaro
 moc
->extra morc_menu
 mpv
->multilib manjaro-alsa
->extra mygtkmenui
 ncdu
 nerd-fonts-terminus
 networkmanager
@@ -70,18 +89,14 @@ networkmanager-openvpn
 networkmanager-pptp
 networkmanager-vpnc
 openresolv
-yay
 pacui
->extra pavucontrol
 perl-file-mimeinfo
 poppler
 ps_mem
->extra pulseaudio-ctl
 ranger
 rofi
 rofi-scripts
 rootmenu
->extra spacefm
 speedtest-cli
 sterminal
 sxhkd
@@ -102,24 +117,10 @@ xf86-input-keyboard
 xf86-input-libinput
 xf86-input-mouse
 xf86-input-void
->basic xlogin
-light
 xorg-server
 xorg-xinit
 xorg-xprop
 xorg-xsetroot
->extra zathura-pdf-poppler
+yay
 zensu
-zsh-completions
-ffmpegthumbnailer
-highlight
-
->extra lightdm
->extra lightdm-slick-greeter
->extra accountsservice
->extra light-locker
->extra gvfs
->extra gvfs-afc
->extra gvfs-gphoto2
->extra gvfs-mtp
->extra gvfs-smb
+zsh-completions
\ No newline at end of file
diff --git a/community/bspwm/desktop-overlay/etc/mhwd-x86_64.conf b/community/bspwm/desktop-overlay/etc/mhwd-x86_64.conf
new file mode 100644
index 0000000..e69de29
diff --git a/community/bspwm/desktop-overlay/etc/spacefm/spacefm.conf b/community/bspwm/desktop-overlay/etc/spacefm/spacefm.conf
deleted file mode 100644
index 34eb16b..0000000
--- a/community/bspwm/desktop-overlay/etc/spacefm/spacefm.conf
+++ /dev/null
@@ -1,17 +0,0 @@
-# spacefm.conf
-# This file affects all users of SpaceFM on this system.
-
-# Documentation: /usr/share/doc/spacefm/spacefm-manual-en.html#programfiles-etc
-# http://ignorantguru.github.io/spacefm/spacefm-manual-en.html#programfiles-etc
-
-# tmp_dir must be a root-protected user-writable dir like /tmp
-# ALL users must be able to write to this dir.
-# tmp_dir must NOT contain spaces or special chars - keep it simple
-#tmp_dir=/tmp
-
-# Specify an absolute path to an additional terminal su or sudo program:
-#terminal_su=/bin/su
-
-# Specify an absolute path to an additional graphical su program:
-graphical_su=/usr/bin/zensu
-
diff --git a/community/bspwm/desktop-overlay/usr/share/gtk-3.0/gtk.css b/community/bspwm/desktop-overlay/usr/share/gtk-3.0/gtk.css
deleted file mode 100755
index 33c658d..0000000
--- a/community/bspwm/desktop-overlay/usr/share/gtk-3.0/gtk.css
+++ /dev/null
@@ -1,10 +0,0 @@
-.window-frame, .window-frame:backdrop {
-  box-shadow: 0 0 0 black;
-  border-style: none;
-  margin: 0;
-  border-radius: 0;
-}
-    
-.titlebar {
-  border-radius: 0;
-}
\ No newline at end of file
diff --git a/community/bspwm/desktop-overlay/usr/share/gtk-3.0/settings.ini b/community/bspwm/desktop-overlay/usr/share/gtk-3.0/settings.ini
deleted file mode 100644
index d2a9741..0000000
--- a/community/bspwm/desktop-overlay/usr/share/gtk-3.0/settings.ini
+++ /dev/null
@@ -1,17 +0,0 @@
-[Settings]
-gtk-theme-name=Adwaita-Maia
-gtk-icon-theme-name=Breeze-Maia-Dark
-gtk-font-name=xos4 Terminus 13
-gtk-cursor-theme-name=xcursor-breeze
-gtk-cursor-theme-size=0
-gtk-toolbar-style=GTK_TOOLBAR_ICONS
-gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR
-gtk-button-images=1
-gtk-menu-images=1
-gtk-enable-event-sounds=1
-gtk-enable-input-feedback-sounds=1
-gtk-xft-antialias=0
-gtk-xft-hinting=0
-gtk-xft-hintstyle=hintmedium
-gtk-application-prefer-dark-theme=1
-gtk-decoration-layout=:menu,appmenu,close