diff --git a/community/bspwm-mate/desktop-overlay/etc/skel/.config/bspwm/bspwmrc b/community/bspwm-mate/desktop-overlay/etc/skel/.config/bspwm/bspwmrc
index 24f544f0..08ab384f 100755
--- a/community/bspwm-mate/desktop-overlay/etc/skel/.config/bspwm/bspwmrc
+++ b/community/bspwm-mate/desktop-overlay/etc/skel/.config/bspwm/bspwmrc
@@ -41,10 +41,10 @@ bspc config split_ratio         0.52
 #bspc monitor -d One Two Three Four Five Six Seven Eight Nine Ten
 #bspc monitor -d I II III IV V VI VII VIII IX X
 #bspc monitor -d • • • • • • • • • •
-#bspc monitor -d I II III IV V VI
+bspc monitor -d I II III IV V VI
 
 ###This creates and names desktops for multiple monitors.
-workspaces_multimonitor &
+#workspaces_multimonitor &
 
 bspc rule -a screenkey --unmanage
 bspc rule -a gcolor2 state=floating center=true
diff --git a/community/bspwm-mate/desktop-overlay/usr/lib/chromium/master_preferences b/community/bspwm-mate/desktop-overlay/usr/lib/chromium/master_preferences
deleted file mode 100644
index d4220cca..00000000
--- a/community/bspwm-mate/desktop-overlay/usr/lib/chromium/master_preferences
+++ /dev/null
@@ -1,36 +0,0 @@
-{ 
-  "homepage" : "https://manjaro.org", 
-  "homepage_is_newtabpage" : true, 
-  "browser" : { 
-    "show_home_button" : true,
-    "custom_chrome_frame": true
-  },
-  "session" : {
-    "restore_on_startup" : 4,
-    "startup_urls" : [
-      "https://manjaro.org"
-    ]
-  },
-  "distribution": {
-    "import_bookmarks": false,
-    "import_bookmarks_from_file": "/usr/lib/chromium/bookmarks.html",
-    "skip_first_run_ui": true
-   },
-  "extensions": {
-    "theme": {
-    "id": "",
-    "use_system": true 
-    }
-  },
-  "bookmark_bar" : { 
-    "show_on_all_tabs" : false
-  }, 
-  "sync_promo" : {
-    "show_on_first_run_allowed": false
-  },
-  "first_run_tabs" : [ 
-    "https://manjaro.org", 
-    "welcome_page", 
-    "new_tab_page" 
-  ] 
-}
diff --git a/community/bspwm-mate/desktop-overlay/usr/share/mate-panel/layouts/bspwm-tweak.layout b/community/bspwm-mate/desktop-overlay/usr/share/mate-panel/layouts/bspwm-tweak.layout
index 22732ac9..ab7bf5df 100644
--- a/community/bspwm-mate/desktop-overlay/usr/share/mate-panel/layouts/bspwm-tweak.layout
+++ b/community/bspwm-mate/desktop-overlay/usr/share/mate-panel/layouts/bspwm-tweak.layout
@@ -5,7 +5,7 @@ size=25
 
 [Object workspaceswitcherapplet]
 locked=false
-position=1440
+position=1674
 panel-right-stick=false
 toplevel-id=top
 applet-iid=WnckletFactory::WorkspaceSwitcherApplet
@@ -13,26 +13,10 @@ object-type=applet
 
 [Object notificationarea]
 locked=false
-position=223
-panel-right-stick=true
-toplevel-id=top
-applet-iid=NotificationAreaAppletFactory::NotificationArea
-object-type=applet
-
-[Object clockapplet]
-locked=false
-position=164
-panel-right-stick=true
-toplevel-id=top
-applet-iid=ClockAppletFactory::ClockApplet
-object-type=applet
-
-[Object commandapplet]
-locked=false
-position=252
+position=1739
 panel-right-stick=false
 toplevel-id=top
-applet-iid=CommandAppletFactory::CommandApplet
+applet-iid=NotificationAreaAppletFactory::NotificationArea
 object-type=applet
 
 [Object logout]
@@ -43,14 +27,6 @@ panel-right-stick=true
 toplevel-id=top
 object-type=action
 
-[Object windowmenuapplet]
-locked=false
-position=229
-panel-right-stick=false
-toplevel-id=top
-applet-iid=WnckletFactory::WindowMenuApplet
-object-type=applet
-
 [Object launcher]
 locked=false
 position=263
@@ -68,10 +44,19 @@ toplevel-id=top
 applet-iid=
 object-type=menu-bar
 
-[Object separator]
+[Object matewindowpicker]
 locked=false
 position=219
 panel-right-stick=false
 toplevel-id=top
-object-type=separator
+applet-iid=MateWindowPickerFactory::MateWindowPicker
+object-type=applet
+
+[Object clockapplet]
+locked=false
+position=1852
+panel-right-stick=false
+toplevel-id=top
+applet-iid=ClockAppletFactory::ClockApplet
+object-type=applet
 
diff --git a/community/bspwm-mate/desktop-overlay/usr/share/mate-panel/layouts/bspwm-tweak.panel b/community/bspwm-mate/desktop-overlay/usr/share/mate-panel/layouts/bspwm-tweak.panel
index 65f6feb5..1abeed27 100644
--- a/community/bspwm-mate/desktop-overlay/usr/share/mate-panel/layouts/bspwm-tweak.panel
+++ b/community/bspwm-mate/desktop-overlay/usr/share/mate-panel/layouts/bspwm-tweak.panel
@@ -1,6 +1,6 @@
 [general]
 default-layout='bspwm-tweak'
-object-id-list=['workspaceswitcherapplet', 'notificationarea', 'clockapplet', 'commandapplet', 'logout', 'windowmenuapplet', 'launcher', 'object-0', 'object-1']
+object-id-list=['workspaceswitcherapplet', 'notificationarea', 'logout', 'launcher', 'object-0', 'object-2', 'object-1']
 toplevel-id-list=['top']
 
 [toplevels/top]
@@ -9,45 +9,20 @@ orientation='top'
 screen=0
 size=25
 
-[objects/commandapplet]
-applet-iid='CommandAppletFactory::CommandApplet'
-locked=false
-toplevel-id='top'
-position=252
-object-type='applet'
-panel-right-stick=false
-
-[objects/commandapplet/prefs]
-width=70
-command='xtitle'
-
-[objects/windowmenuapplet]
-applet-iid='WnckletFactory::WindowMenuApplet'
-locked=false
-toplevel-id='top'
-position=229
-object-type='applet'
-panel-right-stick=false
-
 [objects/workspaceswitcherapplet]
 applet-iid='WnckletFactory::WorkspaceSwitcherApplet'
 locked=false
 toplevel-id='top'
-position=1440
+position=1674
 object-type='applet'
 panel-right-stick=false
 
-[objects/clockapplet]
-applet-iid='ClockAppletFactory::ClockApplet'
-locked=false
-toplevel-id='top'
-position=164
-object-type='applet'
-panel-right-stick=true
+[objects/workspaceswitcherapplet/prefs]
+num-rows=2
 
 [objects/clockapplet/prefs]
-format='24-hour'
-custom-format=''
+show-temperature=true
+show-weather=true
 
 [objects/object-0]
 toplevel-id='top'
@@ -59,16 +34,24 @@ panel-right-stick=false
 applet-iid='NotificationAreaAppletFactory::NotificationArea'
 locked=false
 toplevel-id='top'
-position=223
+position=1739
 object-type='applet'
-panel-right-stick=true
+panel-right-stick=false
 
 [objects/object-1]
+applet-iid='ClockAppletFactory::ClockApplet'
 toplevel-id='top'
-position=219
-object-type='separator'
+position=1852
+object-type='applet'
 panel-right-stick=false
 
+[objects/object-1/prefs]
+show-temperature=false
+show-date=false
+format='24-hour'
+custom-format=''
+show-weather=false
+
 [objects/logout]
 locked=false
 toplevel-id='top'
@@ -85,3 +68,13 @@ position=263
 object-type='launcher'
 panel-right-stick=false
 toplevel-id='top'
+
+[objects/object-2]
+applet-iid='MateWindowPickerFactory::MateWindowPicker'
+toplevel-id='top'
+position=219
+object-type='applet'
+panel-right-stick=false
+
+[objects/object-2/prefs]
+show-all-windows=false