diff --git a/community/bspwm/Packages-Desktop b/community/bspwm/Packages-Desktop
index 913c176f..c22385bc 100644
--- a/community/bspwm/Packages-Desktop
+++ b/community/bspwm/Packages-Desktop
@@ -1,4 +1,47 @@
+>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 dunstify
+>extra ffmpegthumbnailer
+>extra file-roller
+>extra firefox
+>extra gestures
+>extra gnome-disk-utility
+>extra gtk3-classic
+>extra gufw
+>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 lxrandr-gtk3
+>extra lxinput-gtk3
+>extra manjaro-browser-settings
+>extra manjaro-bspwm-settings
+>extra manjaro-pulse
+>extra mate-notification-daemon
+>extra mate-polkit
+>extra mygtkmenui
+>extra pavucontrol
+>extra pcmanfm-gtk3
+>extra pulseaudio-ctl
+>extra timeshift
+>extra zathura-pdf-poppler
+>extra xreader
+>multilib manjaro-alsa
 alsa-firmware
 alsa-plugins
 alsa-utils
@@ -11,58 +54,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
 grub-theme-manjaro-dev
->extra gufw
->basic ufw
->extra gvfs
+gtk-theme-breath
+gtop
 hibernator
 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
+nerd-fonts-noto-sans-mono
 networkmanager
 networkmanager-dmenu
 networkmanager-openconnect
@@ -72,16 +90,15 @@ networkmanager-vpnc
 openresolv
 yay
 pacui
->extra pavucontrol
+papirus-maia-icon-theme
 perl-file-mimeinfo
 poppler
 ps_mem
->extra pulseaudio-ctl
 ranger
+manjaro-ranger-settings
 rofi
 rofi-scripts
 rootmenu
->extra spacefm
 speedtest-cli
 sterminal
 sxhkd
@@ -90,7 +107,6 @@ testdisk
 thermald
 tree
 udevil
-w3m
 xcape
 xcursor-breeze
 xdg-su
@@ -102,24 +118,11 @@ 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
 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
diff --git a/community/bspwm/desktop-overlay/etc/lightdm/slick-greeter.conf b/community/bspwm/desktop-overlay/etc/lightdm/slick-greeter.conf
index ddd71685..e482ac3c 100644
--- a/community/bspwm/desktop-overlay/etc/lightdm/slick-greeter.conf
+++ b/community/bspwm/desktop-overlay/etc/lightdm/slick-greeter.conf
@@ -1,5 +1,10 @@
 [Greeter]
 background=/usr/share/backgrounds/illyria-bspwm-dark.png
-theme-name=Breath-Dark
-icon-theme-name=Breeze-Maia-Dark
+theme-name=Adapta-Nokto-Eta-Maia
+icon-theme-name=Papirus-Adapta-Nokto-Maia
+font-name='Noto Sans 11'
+xft-antialias=true
+xft-hintstyle=hintfull
+enable-hidpi=auto
+cursor-theme-name=xcursor-breeze
 draw-grid=false
diff --git a/community/bspwm/desktop-overlay/etc/skel/.config/morc_menu/morc_menu_v1.conf b/community/bspwm/desktop-overlay/etc/skel/.config/morc_menu/morc_menu_v1.conf
deleted file mode 100644
index b06ce494..00000000
--- a/community/bspwm/desktop-overlay/etc/skel/.config/morc_menu/morc_menu_v1.conf
+++ /dev/null
@@ -1,156 +0,0 @@
-# morc_menu_v1.conf
-# configuration file in support of morc_menu
-
-# To begin allowing you to customize the 'look' or 'skin' of the menu,
-# some explanation is called for: By default, the script uses a
-# low-resource front-end application called 'dmenu' to present its
-# menus. In this configuration file, you are be able to change the
-# parameters that the script uses to invoke 'dmenu', or you may
-# replace 'dmenu' with another front-end. The script has been tested
-# with front-ends 'rofi' and 'zenity', and may also work with 'yada'
-# and others. The script also allows you to import 'look' and 'skin'
-# data from definitions in other configuration files, to help you
-# maintain a consistent 'look' across different programs.
-
-# If you wish to import import 'look' and 'skin' data from definitions
-# in other configuration files, you must perform that first, before
-# defining how you wish to invoke your chosen front-end (sensible, as
-# in that situation, the invocation will be using definitions from
-# those files). You may define as many 'external_definition_file's as
-# you like. They will be read in the order you present them here, so
-# in a case of conflicting definitions, the last one wins. If the file
-# does not exist or can't be read, it is ignored, and the script
-# continues. The script will only read lines in the form 'foo=bar'. In
-# our default example we are reading a configuration file meant for
-# 'dmenu' usage.
-external_skin_definition_file=${HOME}/.dmenurc
-
-# Customize where on the screen you wish the menu to appear. If you
-# want the menu to appear at the wherever the mouse pointer is
-# resting, set the variable 'use_mouse_position' to 'TRUE', and you're
-# done - the script will figure out the correct x and y positions at
-# run-time. Otherwise, the script will always place the menu at the
-# 'x_position' and 'y_position' definitions you set below. All the
-# numeric values in this block are measured in pixels.
-# IMPORTANT:
-#   This only works when the 'menu_cmd' definition below correctly
-#   uses the string literals X_POSITION, Y_POSITION, as is the case in
-#   the default and in the examples below. Additionally, MENU_LINES
-#   and MENU_WIDTH must be correctly used, as in the examples below,
-#   in order for dynamically positioned menus not to try to display
-#   beyond the screen edge, and for there not to display unnecessary
-#   whitespace.
-x_position=300
-y_position=20
-# Until we learn how to directly measure font width and height, we
-# need to set 'line_height', 'avg_char_width', and 'menu_width'
-# manually by trial and error. If 'avg_char_width' is not zero, then
-# 'menu_width' will be ignored, and the value will be calculated at
-# run-time.
-line_height=22
-avg_char_width=13
-menu_width=350
-# use_mouse_position=TRUE
-use_mouse_position=TRUE
-
-# The third and final, step in customizing the 'look' or 'skin' of the
-# menu is to modify how the script invokes its menu command
-# ('menu_cmd') and its error notification (error_cmd'). In general,
-# the options available to you are limited by those of your chosen
-# front-end, so refer to its man page and other documentation.
-# Additionally, you may refer to variables defined in one of the
-# 'external_skin_definition_file's you specified above, and you may
-# use variables 'x_position' and 'y_position' to set where on the
-# screen you want your menu. Here are some examples:
-# IMPORTANT:
-#   In order for the script to properly position the menu, these
-#   definitions must include parameters that correctly use the string
-#   literals X_POSITION, Y_POSITION, MENU_LINES, and MENU_WIDTH, as is
-#   the case in the default and in the examples below. Additionally,
-#   MENU_LINES and MENU_WIDTH must be correctly used, as in the
-#   examples below, in order for dynamically positioned menus not to
-#   try to display beyond the screen edge, and for there not to
-#   display unnecessary whitespace.
-#
-# The script's default, using 'dmenu' 
-#menu_cmd="dmenu -i -l MENU_LINES -x X_POSITION -y Y_POSITION -w MENU_WIDTH "
-#menu_cmd="dmenu -i -l MENU_LINES -x X_POSITION -y Y_POSITION -w MENU_WIDTH "
-
-# Using a variable defined in an external_skin_definition_file, in
-# this case ${HOME}/.dmenurc
-menu_cmd="dmenu -i -l MENU_LINES -x X_POSITION -y Y_POSITION -w MENU_WIDTH ${DMENU_OPTIONS}"
-
-# Using 'zenity' and 'rofi'
-# Because there ought to be some reward for reading all this
-# documentation, note the use of the embedded linux command 'uname' to
-# set the zenity column title. 
-# menu_cmd="zenity --list --column=$(uname -no) "
-# menu_cmd="rofi "
-
-
-# Customize the 'look' or 'skin' of the error messages by modifying
-# the following string, which, as above for the menu command, will be
-# used to invoke your choice of menu front end.
-error_cmd="dmenu -i -l 40 -x 500 -y 150 -w 350 -nb red -nf black -fn DejaVu"
-# error_cmd="zenity --error "
-# error_cmd="rofi "
-
-
-# Distinguish between an executable item and a sub-menu selection
-menu_prefix=" "
-menu_suffix=" >"
-# If a 'menu_suffix' is defined, you can have the script align them
-# vertically, but this only works if you are using a fixed width font,
-# so if you've selected a proportional font, set 'align_suffix' to
-# 'FALSE'.
-align_suffix=TRUE
-
-# Desired categories: Any single .desktop definition can include an
-# arbitrarily long list of categories for itself, which would bloat
-# the menu with duplicate clutter, so the following space-delimited
-# variable white-lists the desired categories.
-desired_categories="Favorites Settings Development Documentation Education System Network Utility Graphics Office AudioVideo"
-
-
-# Category aliases: The common convention seems to be to rename some
-# categories, as in the default below. We implement the renaming sing
-# an associative array in which the index is the category as defined
-# in the .desktop file, and the value is the desired output
-declare -A category_aliases=( [Utility]=Accessories [AudioVideo]=Multimedia [Network]=Internet )
-
-
-# Unwanted names and execs: Entries with these names or execution
-# statements should black-listed from the menu.
-unwanted_names=( feh )
-unwanted_execs=( )
-
-
-# Maximum number of backups to keep: because almost no one will notice
-# accumulating cruft. Backups are automatically created in the user's
-# ${HOME}/.config/morc_menu folder, in the form
-# "categorized_menu${ext}_%y-%m-%d-%T" where ${ext} is either ".txt"
-# or "_xml.txt" and the suffix is a timestamp. If you want to keep a
-# particular backup forever, rename it to fail a match against
-# "categorized_menu${ext}_*"
-max_num_backups=5
-
-# Information about the menu and how to customize it are by default
-# presented in a trailng menu entry "about morc_menu". You may exclude
-# presentation of that menu item by setting 'exclude_about' to TRUE
-exclude_about="TRUE"
-#exclude_about="False"
-
-# Adding top-level menu entries for frequently used applications:
-# That's what 'favorites' are. See below for how to do that.
-
-# Adding 'favorites' and custom entries: Neither of those
-# customizations are performed in this configuration file. In both
-# cases, define each extra entry by creating a new ".desktop" file or
-# by editing an existing one. For system-wide customization, this will
-# be performed by a system administrator in the
-# /usr/share/applications folder; For user-personal customizations,
-# this will be performed by the user in the
-# ${HOME}/.local/share/applications folder. Favorites are defined by
-# adding that word to the list of categories in the .desktop file.
-# Other additional entries are made by adding a new .desktop file, or
-# adding a category to an existing one.
\ No newline at end of file
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 34eb16be..00000000
--- 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/root/.bin/scripts.txt b/community/bspwm/desktop-overlay/root/.bin/scripts.txt
deleted file mode 100644
index 6d392eb8..00000000
--- a/community/bspwm/desktop-overlay/root/.bin/scripts.txt
+++ /dev/null
@@ -1 +0,0 @@
-You can put your scripts in this directory and they become available to use in dmenu and command line without specifying the full path.
\ No newline at end of file
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 33c658d7..00000000
--- 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 d2a97412..00000000
--- 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
diff --git a/community/cinnamon/Packages-Desktop b/community/cinnamon/Packages-Desktop
index 822941b3..fb61f358 100644
--- a/community/cinnamon/Packages-Desktop
+++ b/community/cinnamon/Packages-Desktop
@@ -42,6 +42,7 @@ grub-theme-manjaro-dev
 >extra gst-plugins-good
 >extra gst-plugins-ugly
 >extra gstreamer
+gtkhash-nemo
 gvfs-afc
 gvfs-gphoto2
 gvfs-mtp
@@ -63,6 +64,7 @@ lightdm-slick-greeter
 m4
 make
 manjaro-alsa
+manjaro-application-utility
 manjaro-browser-settings
 manjaro-cinnamon-settings
 >extra manjaro-documentation-en
diff --git a/community/deepin/Packages-Desktop b/community/deepin/Packages-Desktop
index e2049bc7..63ee7767 100644
--- a/community/deepin/Packages-Desktop
+++ b/community/deepin/Packages-Desktop
@@ -70,6 +70,7 @@ make
 manjaro-alsa
 manjaro-browser-settings
 manjaro-deepin-settings
+manjaro-application-utility
 >extra manjaro-documentation-en
 manjaro-hello
 manjaro-hotfixes
diff --git a/community/i3/Packages-Desktop b/community/i3/Packages-Desktop
index 66aa7b31..51c1c880 100644
--- a/community/i3/Packages-Desktop
+++ b/community/i3/Packages-Desktop
@@ -70,6 +70,7 @@ m4
 maia-console
 make
 >multilib manjaro-alsa
+>extra manjaro-application-utility
 manjaro-browser-settings
 >extra manjaro-hello
 manjaro-hotfixes
diff --git a/manjaro/gnome/Packages-Desktop b/manjaro/gnome/Packages-Desktop
index 572cfda5..10d53249 100644
--- a/manjaro/gnome/Packages-Desktop
+++ b/manjaro/gnome/Packages-Desktop
@@ -48,6 +48,7 @@ papirus-maia-icon-theme
 >extra gnome-weather
 >extra gnome-maps
 >extra gnome-todo
+gtkhash-nautilus
 >extra seahorse
 file-roller
 gparted
@@ -118,6 +119,7 @@ terminus-font
 totem
 tracker
 tracker-miners
+>extra noto-fonts-compat
 ttf-bitstream-vera
 ttf-dejavu
 ttf-droid
@@ -158,7 +160,6 @@ ms-office-online
 >extra telepathy-accounts-signon
 >extra uget
 >extra transmission-gtk
-#>extra brasero
 >extra manjaro-documentation-en
 >extra jre8-openjdk
 >extra jre8-openjdk-headless
diff --git a/manjaro/xfce/Packages-Desktop b/manjaro/xfce/Packages-Desktop
index bd010f3c..b924e307 100644
--- a/manjaro/xfce/Packages-Desktop
+++ b/manjaro/xfce/Packages-Desktop
@@ -192,7 +192,7 @@ xcursor-simpleandsoft
 xcursor-vanilla-dmz-aa
 
 ## Applications
->extra catfish
+catfish
 dmidecode # optional dependency inxi
 engrampa
 >extra firefox
@@ -272,4 +272,5 @@ xdg-utils
 xdg-su
 
 ## Misc
+gtkhash-thunar
 manjaro-hotfixes