diff --git a/editions/mate b/editions/mate
index 1927ee49add41e52426d0cae532671b609c42a8f..3fce3151ef2e200cf7a60275cb458a4856b3c2d0 100644
--- a/editions/mate
+++ b/editions/mate
@@ -56,9 +56,11 @@ viewnior
 
 # Themes
 papirus-maia-icon-theme
-breath-icon-theme
-breath-wallpaper
-gtk-theme-breath
+qt5ct
+kvantum-qt5 
+kvantum-theme-matcha
+matcha-gtk-theme
+manjaro-arm-wallpapers
 
 # Browser
 firefox
diff --git a/editions/xfce b/editions/xfce
index 6d1968bedae764018f81d47a2f3a54fea59a87c1..76dc40147959bb9364f2e46e78c59bd83121992d 100644
--- a/editions/xfce
+++ b/editions/xfce
@@ -80,15 +80,13 @@ xfce4-xkb-plugin
 xfce4-pulseaudio-plugin
 
 ## Themes
-# kvantum-qt5
-# kvantum-theme-adapta
+qt5ct
+kvantum-qt5
+kvantum-theme-matcha
+matcha-gtk-theme
+manjaro-arm-wallpapers
 papirus-maia-icon-theme
-breath-icon-theme
-gtk-theme-breath
-breath-wallpaper
-breath-dark-icon-theme
 xcursor-breeze
-manjaro-icons
 
 # Browser
 firefox
diff --git a/overlays/mate/etc/lightdm/lightdm-gtk-greeter.conf b/overlays/mate/etc/lightdm/lightdm-gtk-greeter.conf
index d20178d9e13bdcea630d02844aa94a179eb8d34d..73c54d332917a6af61f41b52285b6ea949b8d524 100644
--- a/overlays/mate/etc/lightdm/lightdm-gtk-greeter.conf
+++ b/overlays/mate/etc/lightdm/lightdm-gtk-greeter.conf
@@ -1,6 +1,6 @@
 [greeter]
-theme-name = Breath-Dark
+theme-name = Matcha-dark-sea
 icon-theme-name = Papirus-Dark-Maia
-background = /usr/share/backgrounds/breath.png
+background = /usr/share/wallpapers/manjaro-arm/generic/manjaro-arm.png
 screensaver-timeout = 0
 
diff --git a/overlays/mate/etc/lightdm/lightdm.conf b/overlays/mate/etc/lightdm/lightdm.conf
deleted file mode 100644
index fd4c5bd2271f2ca5b2ee135db2c177cd509b7586..0000000000000000000000000000000000000000
--- a/overlays/mate/etc/lightdm/lightdm.conf
+++ /dev/null
@@ -1,169 +0,0 @@
-#
-# General configuration
-#
-# start-default-seat = True to always start one seat if none are defined in the configuration
-# greeter-user = User to run greeter as
-# minimum-display-number = Minimum display number to use for X servers
-# minimum-vt = First VT to run displays on
-# lock-memory = True to prevent memory from being paged to disk
-# user-authority-in-system-dir = True if session authority should be in the system location
-# guest-account-script = Script to be run to setup guest account
-# logind-check-graphical = True to on start seats that are marked as graphical by logind
-# log-directory = Directory to log information to
-# run-directory = Directory to put running state in
-# cache-directory = Directory to cache to
-# sessions-directory = Directory to find sessions
-# remote-sessions-directory = Directory to find remote sessions
-# greeters-directory = Directory to find greeters
-# backup-logs = True to move add a .old suffix to old log files when opening new ones
-# dbus-service = True if LightDM provides a D-Bus service to control it
-#
-[LightDM]
-#start-default-seat=true
-#greeter-user=lightdm
-#minimum-display-number=0
-#minimum-vt=7 # Setting this to a value < 7 implies security issues, see FS#46799
-#lock-memory=true
-#user-authority-in-system-dir=false
-#guest-account-script=guest-account
-#logind-check-graphical=false
-#log-directory=/var/log/lightdm
-run-directory=/run/lightdm
-#cache-directory=/var/cache/lightdm
-#sessions-directory=/usr/share/lightdm/sessions:/usr/share/xsessions:/usr/share/wayland-sessions
-#remote-sessions-directory=/usr/share/lightdm/remote-sessions
-#greeters-directory=$XDG_DATA_DIRS/lightdm/greeters:$XDG_DATA_DIRS/xgreeters
-#backup-logs=true
-#dbus-service=true
-
-#
-# Seat configuration
-#
-# Seat configuration is matched against the seat name glob in the section, for example:
-# [Seat:*] matches all seats and is applied first.
-# [Seat:seat0] matches the seat named "seat0".
-# [Seat:seat-thin-client*] matches all seats that have names that start with "seat-thin-client".
-#
-# type = Seat type (local, xremote, unity)
-# pam-service = PAM service to use for login
-# pam-autologin-service = PAM service to use for autologin
-# pam-greeter-service = PAM service to use for greeters
-# xserver-backend = X backend to use (mir)
-# xserver-command = X server command to run (can also contain arguments e.g. X -special-option)
-# xmir-command = Xmir server command to run (can also contain arguments e.g. Xmir -special-option)
-# xserver-config = Config file to pass to X server
-# xserver-layout = Layout to pass to X server
-# xserver-allow-tcp = True if TCP/IP connections are allowed to this X server
-# xserver-share = True if the X server is shared for both greeter and session
-# xserver-hostname = Hostname of X server (only for type=xremote)
-# xserver-display-number = Display number of X server (only for type=xremote)
-# xdmcp-manager = XDMCP manager to connect to (implies xserver-allow-tcp=true)
-# xdmcp-port = XDMCP UDP/IP port to communicate on
-# xdmcp-key = Authentication key to use for XDM-AUTHENTICATION-1 (stored in keys.conf)
-# unity-compositor-command = Unity compositor command to run (can also contain arguments e.g. unity-system-compositor -special-option)
-# unity-compositor-timeout = Number of seconds to wait for compositor to start
-# greeter-session = Session to load for greeter
-# greeter-hide-users = True to hide the user list
-# greeter-allow-guest = True if the greeter should show a guest login option
-# greeter-show-manual-login = True if the greeter should offer a manual login option
-# greeter-show-remote-login = True if the greeter should offer a remote login option
-# user-session = Session to load for users
-# allow-user-switching = True if allowed to switch users
-# allow-guest = True if guest login is allowed
-# guest-session = Session to load for guests (overrides user-session)
-# session-wrapper = Wrapper script to run session with
-# greeter-wrapper = Wrapper script to run greeter with
-# guest-wrapper = Wrapper script to run guest sessions with
-# display-setup-script = Script to run when starting a greeter session (runs as root)
-# display-stopped-script = Script to run after stopping the display server (runs as root)
-# greeter-setup-script = Script to run when starting a greeter (runs as root)
-# session-setup-script = Script to run when starting a user session (runs as root)
-# session-cleanup-script = Script to run when quitting a user session (runs as root)
-# autologin-guest = True to log in as guest by default
-# autologin-user = User to log in with by default (overrides autologin-guest)
-# autologin-user-timeout = Number of seconds to wait before loading default user
-# autologin-session = Session to load for automatic login (overrides user-session)
-# autologin-in-background = True if autologin session should not be immediately activated
-# exit-on-failure = True if the daemon should exit if this seat fails
-#
-[Seat:*]
-#type=local
-#pam-service=lightdm
-#pam-autologin-service=lightdm-autologin
-#pam-greeter-service=lightdm-greeter
-#xserver-backend=
-#xserver-command=X
-#xmir-command=Xmir
-#xserver-config=
-#xserver-layout=
-#xserver-allow-tcp=false
-#xserver-share=true
-#xserver-hostname=
-#xserver-display-number=
-#xdmcp-manager=
-#xdmcp-port=177
-#xdmcp-key=
-#unity-compositor-command=unity-system-compositor
-#unity-compositor-timeout=60
-#greeter-session=example-gtk-gnome
-#greeter-hide-users=false
-#greeter-allow-guest=true
-#greeter-show-manual-login=false
-#greeter-show-remote-login=true
-#user-session=default
-#allow-user-switching=true
-#allow-guest=true
-#guest-session=
-session-wrapper=/etc/lightdm/Xsession
-#greeter-wrapper=
-#guest-wrapper=
-#display-setup-script=
-#display-stopped-script=
-#greeter-setup-script=
-#session-setup-script=
-#session-cleanup-script=
-#autologin-guest=false
-#autologin-user=
-#autologin-user-timeout=0
-#autologin-in-background=false
-#autologin-session=
-#exit-on-failure=false
-
-#
-# XDMCP Server configuration
-#
-# enabled = True if XDMCP connections should be allowed
-# port = UDP/IP port to listen for connections on
-# listen-address = Host/address to listen for XDMCP connections (use all addresses if not present)
-# key = Authentication key to use for XDM-AUTHENTICATION-1 or blank to not use authentication (stored in keys.conf)
-# hostname = Hostname to report to XDMCP clients (defaults to system hostname if unset)
-#
-# The authentication key is a 56 bit DES key specified in hex as 0xnnnnnnnnnnnnnn.  Alternatively
-# it can be a word and the first 7 characters are used as the key.
-#
-[XDMCPServer]
-#enabled=false
-#port=177
-#listen-address=
-#key=
-#hostname=
-
-#
-# VNC Server configuration
-#
-# enabled = True if VNC connections should be allowed
-# command = Command to run Xvnc server with
-# port = TCP/IP port to listen for connections on
-# listen-address = Host/address to listen for VNC connections (use all addresses if not present)
-# width = Width of display to use
-# height = Height of display to use
-# depth = Color depth of display to use
-#
-[VNCServer]
-#enabled=false
-#command=Xvnc
-#port=5900
-#listen-address=
-#width=1024
-#height=768
-#depth=8
diff --git a/overlays/mate/etc/skel/.config/caja/accels b/overlays/mate/etc/skel/.config/caja/accels
index dde4fdc36d9e2df80cfc025613d216039f586d7a..b49762af3518974bc4857798e09b02925e646a68 100644
--- a/overlays/mate/etc/skel/.config/caja/accels
+++ b/overlays/mate/etc/skel/.config/caja/accels
@@ -2,10 +2,12 @@
 ; this file is an automated accelerator map dump
 ;
 ; (gtk_accel_path "<Actions>/DirViewActions/New Empty File" "")
+; (gtk_accel_path "<Actions>/NavigationActions/Show Hide Extra Pane" "F3")
 ; (gtk_accel_path "<Actions>/SpatialActions/Close All Folders" "<Primary>q")
 ; (gtk_accel_path "<Actions>/ShellActions/File" "")
 ; (gtk_accel_path "<Actions>/DirViewActions/Self Format Volume" "")
 ; (gtk_accel_path "<Actions>/DesktopViewActions/Empty Trash Conditional" "")
+; (gtk_accel_path "<Actions>/NavigationActions/Forward" "<Alt>Right")
 ; (gtk_accel_path "<Actions>/IconViewActions/Sort by Size" "")
 ; (gtk_accel_path "<Actions>/DirViewActions/OpenAlternate" "<Primary><Shift>w")
 ; (gtk_accel_path "<Actions>/SpatialActions/Go to Location" "<Primary>l")
@@ -20,6 +22,8 @@
 ; (gtk_accel_path "<Actions>/DirViewActions/OpenAccel" "<Alt>Down")
 ; (gtk_accel_path "<Actions>/DirViewActions/Delete" "")
 ; (gtk_accel_path "<Actions>/DirViewActions/No Templates" "")
+; (gtk_accel_path "<Actions>/NavigationActions/Show Hide Toolbar" "")
+; (gtk_accel_path "<Actions>/NavigationActions/Tab9" "<Alt>0")
 ; (gtk_accel_path "<Actions>/IconViewActions/Unstretch" "")
 ; (gtk_accel_path "<Actions>/DirViewActions/LocationDelete" "")
 ; (gtk_accel_path "<Actions>/ShellActions/Stop" "")
@@ -31,26 +35,40 @@
 ; (gtk_accel_path "<Actions>/IconViewActions/Sort by Extension" "")
 ; (gtk_accel_path "<Actions>/DirViewActions/Stop Volume" "")
 ; (gtk_accel_path "<Actions>/DirViewActions/LocationRestoreFromTrash" "")
+; (gtk_accel_path "<Actions>/NavigationActions/Tab8" "<Alt>9")
+; (gtk_accel_path "<Actions>/NavigationActions/Go" "")
+; (gtk_accel_path "<Actions>/NavigationActions/SplitViewNextPane" "F6")
+; (gtk_accel_path "<Actions>/NavigationActions/Back" "<Alt>Left")
 ; (gtk_accel_path "<Actions>/DesktopViewActions/New Launcher Desktop" "")
+; (gtk_accel_path "<Actions>/NavigationActions/TabsPrevious" "<Primary>Page_Up")
+; (gtk_accel_path "<Actions>/NavigationActions/Tab7" "<Alt>8")
+; (gtk_accel_path "<Actions>/NavigationActions/Tab6" "<Alt>7")
 ; (gtk_accel_path "<Actions>/DirViewActions/Poll" "")
 ; (gtk_accel_path "<Actions>/ShellActions/Edit" "")
 ; (gtk_accel_path "<Actions>/ShellActions/Zoom Out" "<Primary>minus")
+; (gtk_accel_path "<Actions>/NavigationActions/Go to Location" "<Primary>l")
 ; (gtk_accel_path "<Actions>/DirViewActions/Location Unmount Volume" "")
 ; (gtk_accel_path "<Actions>/IconViewActions/Keep Aligned" "")
 ; (gtk_accel_path "<Actions>/DirViewActions/New Launcher" "")
 ; (gtk_accel_path "<Actions>/DirViewActions/OtherApplication2" "")
+; (gtk_accel_path "<Actions>/NavigationActions/New Tab" "<Primary>t")
 ; (gtk_accel_path "<Actions>/DirViewActions/Move to next pane" "")
 ; (gtk_accel_path "<Actions>/DirViewActions/Open With" "")
 ; (gtk_accel_path "<Actions>/DirViewActions/OpenInNewTab" "<Primary><Shift>o")
 ; (gtk_accel_path "<Actions>/IconViewActions/Sort by Name" "")
 ; (gtk_accel_path "<Actions>/DirViewActions/Select Pattern" "<Primary>s")
 ; (gtk_accel_path "<Actions>/ShellActions/Go to Network" "")
+; (gtk_accel_path "<Actions>/NavigationActions/Search" "")
+; (gtk_accel_path "<Actions>/NavigationActions/Tab5" "<Alt>6")
 ; (gtk_accel_path "<Actions>/DirViewActions/OtherApplication1" "")
 ; (gtk_accel_path "<Actions>/DirViewActions/Format Volume" "")
 ; (gtk_accel_path "<Actions>/SpatialActions/Search" "<Primary>f")
 ; (gtk_accel_path "<Actions>/ShellActions/Show Backup Files" "<Primary>k")
 ; (gtk_accel_path "<Actions>/DirViewActions/Location Start Volume" "")
+; (gtk_accel_path "<Actions>/NavigationActions/New Window" "<Primary>n")
+; (gtk_accel_path "<Actions>/NavigationActions/Edit Bookmarks" "<Primary>b")
 ; (gtk_accel_path "<Actions>/DirViewActions/Properties" "<Alt>Return")
+; (gtk_accel_path "<Actions>/NavigationActions/Tab4" "<Alt>5")
 ; (gtk_accel_path "<Actions>/ShellActions/Home" "<Alt>Home")
 ; (gtk_accel_path "<Actions>/ShellActions/Go to Trash" "")
 ; (gtk_accel_path "<Actions>/DirViewActions/Location Poll" "")
@@ -59,27 +77,35 @@
 ; (gtk_accel_path "<Actions>/DirViewActions/Mount Volume" "")
 ; (gtk_accel_path "<Actions>/DirViewActions/Copy to Home" "")
 ; (gtk_accel_path "<Actions>/DirViewActions/Move to Desktop" "")
+; (gtk_accel_path "<Actions>/NavigationActions/Tab3" "<Alt>4")
 ; (gtk_accel_path "<Actions>/SpatialActions/Close Parent Folders" "<Primary><Shift>w")
 ; (gtk_accel_path "<Actions>/ExtensionsMenuGroup/CajaOpenTerminal::open_terminal" "")
 ; (gtk_accel_path "<Actions>/DirViewActions/Reset to Defaults" "")
 ; (gtk_accel_path "<Actions>/DirViewActions/LocationOpenInNewTab" "")
+; (gtk_accel_path "<Actions>/NavigationActions/Show Hide Sidebar" "F9")
+; (gtk_accel_path "<Actions>/NavigationActions/Tab2" "<Alt>3")
 ; (gtk_accel_path "<Actions>/DirViewActions/CopyToMenu" "")
 ; (gtk_accel_path "<Actions>/ShellActions/Backgrounds and Emblems" "")
+; (gtk_accel_path "<Actions>/NavigationActions/Folder Window" "")
 ; (gtk_accel_path "<Actions>/DirViewActions/Open" "<Primary>o")
 ; (gtk_accel_path "<Actions>/IconViewActions/Clean Up" "")
+; (gtk_accel_path "<Actions>/NavigationActions/Tab1" "<Alt>2")
 ; (gtk_accel_path "<Actions>/ShellActions/View" "")
 ; (gtk_accel_path "<Actions>/DirViewActions/Save Search" "")
 ; (gtk_accel_path "<Actions>/IconViewActions/Sort by Size on Disk" "")
 ; (gtk_accel_path "<Actions>/IconViewActions/Sort by Modification Date" "")
 ; (gtk_accel_path "<Actions>/DirViewActions/Select All" "<Primary>a")
 ; (gtk_accel_path "<Actions>/IconViewActions/Sort by Emblems" "")
+; (gtk_accel_path "<Actions>/NavigationActions/Tab0" "<Alt>1")
 ; (gtk_accel_path "<Actions>/ShellActions/Caja Manual" "F1")
 ; (gtk_accel_path "<Actions>/DirViewActions/LocationPasteFilesInto" "")
 ; (gtk_accel_path "<Actions>/ShellActions/About Caja" "")
+; (gtk_accel_path "<Actions>/NavigationActions/Show Hide Statusbar" "")
 ; (gtk_accel_path "<Actions>/DirViewActions/Eject Volume" "")
 ; (gtk_accel_path "<Actions>/DirViewActions/Unmount Volume" "")
 ; (gtk_accel_path "<Actions>/DirViewActions/Duplicate" "")
 ; (gtk_accel_path "<Actions>/DirViewActions/LocationTrash" "")
+; (gtk_accel_path "<Actions>/NavigationActions/Bookmarks" "")
 ; (gtk_accel_path "<Actions>/ShellActions/Help" "")
 ; (gtk_accel_path "<Actions>/IconViewActions/Stretch" "")
 ; (gtk_accel_path "<Actions>/DirViewActions/Copy to Desktop" "")
@@ -94,19 +120,28 @@
 ; (gtk_accel_path "<Actions>/DirViewActions/Location Format Volume" "")
 ; (gtk_accel_path "<Actions>/DirViewActions/LocationOpenFolderWindow" "")
 ; (gtk_accel_path "<Actions>/SpatialActions/Edit Bookmarks" "<Primary>b")
+; (gtk_accel_path "<Actions>/NavigationActions/Close All Windows" "<Primary>q")
+; (gtk_accel_path "<Actions>/NavigationActions/Clear History" "")
 ; (gtk_accel_path "<Actions>/ShellActions/ZoomOutAccel" "<Primary>KP_Subtract")
 ; (gtk_accel_path "<Actions>/ShellActions/ZoomInAccel2" "<Primary>KP_Add")
+; (gtk_accel_path "<Actions>/NavigationActions/TabsMoveRight" "<Primary><Shift>Page_Down")
 ; (gtk_accel_path "<Actions>/IconViewActions/Manual Layout" "")
+; (gtk_accel_path "<Actions>/NavigationActions/Add Bookmark" "<Primary>d")
 ; (gtk_accel_path "<Actions>/DirViewActions/Start Volume" "")
 ; (gtk_accel_path "<Actions>/DirViewActions/Undo" "<Primary>z")
 ; (gtk_accel_path "<Actions>/DirViewActions/Self Start Volume" "")
+; (gtk_accel_path "<Actions>/NavigationActions/TabsNext" "<Primary>Page_Down")
 ; (gtk_accel_path "<Actions>/IconViewActions/Arrange Items" "")
 ; (gtk_accel_path "<Caja-Window>/view_as_3" "<Primary>3")
+; (gtk_accel_path "<Actions>/NavigationActions/SplitViewSameLocation" "")
 ; (gtk_accel_path "<Actions>/IconViewActions/Sort by Trash Time" "")
+; (gtk_accel_path "<Actions>/ClipboardActions/Select All" "<Primary>a")
 ; (gtk_accel_path "<Actions>/DirViewActions/New Folder" "<Primary><Shift>n")
 ; (gtk_accel_path "<Actions>/DirViewActions/Self Poll" "")
+; (gtk_accel_path "<Actions>/NavigationActions/ShowSearch" "<Primary>f")
 ; (gtk_accel_path "<Actions>/ShellActions/Reload" "<Primary>r")
 ; (gtk_accel_path "<Actions>/DirViewActions/Restore From Trash" "")
+; (gtk_accel_path "<Actions>/NavigationActions/Show Hide Location Bar" "")
 ; (gtk_accel_path "<Actions>/DirViewActions/MoveToMenu" "")
 ; (gtk_accel_path "<Caja-Window>/view_as_4" "<Primary>4")
 ; (gtk_accel_path "<Actions>/ShellActions/Zoom Normal" "<Primary>0")
@@ -128,6 +163,7 @@
 ; (gtk_accel_path "<Actions>/ShellActions/Show Hidden Files" "<Primary>h")
 ; (gtk_accel_path "<Actions>/DirViewActions/Location Mount Volume" "")
 ; (gtk_accel_path "<Actions>/DirViewActions/LocationCut" "")
+; (gtk_accel_path "<Actions>/NavigationActions/TabsMoveLeft" "<Primary><Shift>Page_Up")
 ; (gtk_accel_path "<Actions>/DirViewActions/Copy" "<Primary>c")
 ; (gtk_accel_path "<Actions>/DirViewActions/LocationOpenAlternate" "")
 ; (gtk_accel_path "<Actions>/DirViewActions/Trash" "")
diff --git a/overlays/mate/etc/skel/.config/caja/desktop-metadata b/overlays/mate/etc/skel/.config/caja/desktop-metadata
index ecca7ee34cd8a81a9acbd3bf5ac9277fa25cdaba..dff672c53d90235d71a402bda7949b1813660053 100644
--- a/overlays/mate/etc/skel/.config/caja/desktop-metadata
+++ b/overlays/mate/etc/skel/.config/caja/desktop-metadata
@@ -1,16 +1,17 @@
 [directory]
 caja-icon-view-keep-aligned=true
-caja-icon-view-layout-timestamp=1562782885
+caja-icon-view-layout-timestamp=1565568068
 
 [home]
 caja-icon-position=64,102
 icon-scale=1
-caja-icon-position-timestamp=1562782885
+caja-icon-position-timestamp=1565568068
 
 [trash]
 caja-icon-position=64,182
 icon-scale=1
-caja-icon-position-timestamp=1562782885
+caja-icon-position-timestamp=1565568068
+annotation=
 
 [PINEBOOKneon.volume]
 caja-icon-position=64,182
@@ -20,4 +21,4 @@ caja-icon-position-timestamp=1542312498
 [computer]
 caja-icon-position=64,22
 icon-scale=1
-caja-icon-position-timestamp=1562782885
+caja-icon-position-timestamp=1565568068
diff --git a/overlays/mate/etc/skel/.config/dconf/user b/overlays/mate/etc/skel/.config/dconf/user
index ec093f6ab82dfa69d73bb558a80d14eec372a6c8..6566487ffdcd59e5ee97cc69ed5aa0384c0d8919 100644
Binary files a/overlays/mate/etc/skel/.config/dconf/user and b/overlays/mate/etc/skel/.config/dconf/user differ
diff --git a/overlays/mate/etc/skel/.config/manjaro/manjaro-settings-manager.conf b/overlays/mate/etc/skel/.config/manjaro/manjaro-settings-manager.conf
new file mode 100644
index 0000000000000000000000000000000000000000..608eea60f551f8df1fd3699ebfa5180522848d28
--- /dev/null
+++ b/overlays/mate/etc/skel/.config/manjaro/manjaro-settings-manager.conf
@@ -0,0 +1,6 @@
+[mainwindow]
+geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\0\xd4\0\0\0\x43\0\0\x3+\0\0\x2\x13\0\0\0\xd4\0\0\0\\\0\0\x3+\0\0\x2\x13\0\0\0\0\0\0\0\0\x5V\0\0\0\xd4\0\0\0\\\0\0\x3+\0\0\x2\x13)
+maximized=false
+pos=@Point(212 67)
+savestate=@ByteArray(\0\0\0\xff\0\0\0\0\xfd\0\0\0\0\0\0\x2X\0\0\x1\xb8\0\0\0\x4\0\0\0\x4\0\0\0\b\0\0\0\b\xfc\0\0\0\0)
+size=@Size(600 440)
diff --git a/overlays/xfce/etc/lightdm/lightdm-gtk-greeter.conf b/overlays/xfce/etc/lightdm/lightdm-gtk-greeter.conf
index d20178d9e13bdcea630d02844aa94a179eb8d34d..73c54d332917a6af61f41b52285b6ea949b8d524 100644
--- a/overlays/xfce/etc/lightdm/lightdm-gtk-greeter.conf
+++ b/overlays/xfce/etc/lightdm/lightdm-gtk-greeter.conf
@@ -1,6 +1,6 @@
 [greeter]
-theme-name = Breath-Dark
+theme-name = Matcha-dark-sea
 icon-theme-name = Papirus-Dark-Maia
-background = /usr/share/backgrounds/breath.png
+background = /usr/share/wallpapers/manjaro-arm/generic/manjaro-arm.png
 screensaver-timeout = 0
 
diff --git a/overlays/xfce/etc/lightdm/lightdm.conf b/overlays/xfce/etc/lightdm/lightdm.conf
deleted file mode 100644
index fd4c5bd2271f2ca5b2ee135db2c177cd509b7586..0000000000000000000000000000000000000000
--- a/overlays/xfce/etc/lightdm/lightdm.conf
+++ /dev/null
@@ -1,169 +0,0 @@
-#
-# General configuration
-#
-# start-default-seat = True to always start one seat if none are defined in the configuration
-# greeter-user = User to run greeter as
-# minimum-display-number = Minimum display number to use for X servers
-# minimum-vt = First VT to run displays on
-# lock-memory = True to prevent memory from being paged to disk
-# user-authority-in-system-dir = True if session authority should be in the system location
-# guest-account-script = Script to be run to setup guest account
-# logind-check-graphical = True to on start seats that are marked as graphical by logind
-# log-directory = Directory to log information to
-# run-directory = Directory to put running state in
-# cache-directory = Directory to cache to
-# sessions-directory = Directory to find sessions
-# remote-sessions-directory = Directory to find remote sessions
-# greeters-directory = Directory to find greeters
-# backup-logs = True to move add a .old suffix to old log files when opening new ones
-# dbus-service = True if LightDM provides a D-Bus service to control it
-#
-[LightDM]
-#start-default-seat=true
-#greeter-user=lightdm
-#minimum-display-number=0
-#minimum-vt=7 # Setting this to a value < 7 implies security issues, see FS#46799
-#lock-memory=true
-#user-authority-in-system-dir=false
-#guest-account-script=guest-account
-#logind-check-graphical=false
-#log-directory=/var/log/lightdm
-run-directory=/run/lightdm
-#cache-directory=/var/cache/lightdm
-#sessions-directory=/usr/share/lightdm/sessions:/usr/share/xsessions:/usr/share/wayland-sessions
-#remote-sessions-directory=/usr/share/lightdm/remote-sessions
-#greeters-directory=$XDG_DATA_DIRS/lightdm/greeters:$XDG_DATA_DIRS/xgreeters
-#backup-logs=true
-#dbus-service=true
-
-#
-# Seat configuration
-#
-# Seat configuration is matched against the seat name glob in the section, for example:
-# [Seat:*] matches all seats and is applied first.
-# [Seat:seat0] matches the seat named "seat0".
-# [Seat:seat-thin-client*] matches all seats that have names that start with "seat-thin-client".
-#
-# type = Seat type (local, xremote, unity)
-# pam-service = PAM service to use for login
-# pam-autologin-service = PAM service to use for autologin
-# pam-greeter-service = PAM service to use for greeters
-# xserver-backend = X backend to use (mir)
-# xserver-command = X server command to run (can also contain arguments e.g. X -special-option)
-# xmir-command = Xmir server command to run (can also contain arguments e.g. Xmir -special-option)
-# xserver-config = Config file to pass to X server
-# xserver-layout = Layout to pass to X server
-# xserver-allow-tcp = True if TCP/IP connections are allowed to this X server
-# xserver-share = True if the X server is shared for both greeter and session
-# xserver-hostname = Hostname of X server (only for type=xremote)
-# xserver-display-number = Display number of X server (only for type=xremote)
-# xdmcp-manager = XDMCP manager to connect to (implies xserver-allow-tcp=true)
-# xdmcp-port = XDMCP UDP/IP port to communicate on
-# xdmcp-key = Authentication key to use for XDM-AUTHENTICATION-1 (stored in keys.conf)
-# unity-compositor-command = Unity compositor command to run (can also contain arguments e.g. unity-system-compositor -special-option)
-# unity-compositor-timeout = Number of seconds to wait for compositor to start
-# greeter-session = Session to load for greeter
-# greeter-hide-users = True to hide the user list
-# greeter-allow-guest = True if the greeter should show a guest login option
-# greeter-show-manual-login = True if the greeter should offer a manual login option
-# greeter-show-remote-login = True if the greeter should offer a remote login option
-# user-session = Session to load for users
-# allow-user-switching = True if allowed to switch users
-# allow-guest = True if guest login is allowed
-# guest-session = Session to load for guests (overrides user-session)
-# session-wrapper = Wrapper script to run session with
-# greeter-wrapper = Wrapper script to run greeter with
-# guest-wrapper = Wrapper script to run guest sessions with
-# display-setup-script = Script to run when starting a greeter session (runs as root)
-# display-stopped-script = Script to run after stopping the display server (runs as root)
-# greeter-setup-script = Script to run when starting a greeter (runs as root)
-# session-setup-script = Script to run when starting a user session (runs as root)
-# session-cleanup-script = Script to run when quitting a user session (runs as root)
-# autologin-guest = True to log in as guest by default
-# autologin-user = User to log in with by default (overrides autologin-guest)
-# autologin-user-timeout = Number of seconds to wait before loading default user
-# autologin-session = Session to load for automatic login (overrides user-session)
-# autologin-in-background = True if autologin session should not be immediately activated
-# exit-on-failure = True if the daemon should exit if this seat fails
-#
-[Seat:*]
-#type=local
-#pam-service=lightdm
-#pam-autologin-service=lightdm-autologin
-#pam-greeter-service=lightdm-greeter
-#xserver-backend=
-#xserver-command=X
-#xmir-command=Xmir
-#xserver-config=
-#xserver-layout=
-#xserver-allow-tcp=false
-#xserver-share=true
-#xserver-hostname=
-#xserver-display-number=
-#xdmcp-manager=
-#xdmcp-port=177
-#xdmcp-key=
-#unity-compositor-command=unity-system-compositor
-#unity-compositor-timeout=60
-#greeter-session=example-gtk-gnome
-#greeter-hide-users=false
-#greeter-allow-guest=true
-#greeter-show-manual-login=false
-#greeter-show-remote-login=true
-#user-session=default
-#allow-user-switching=true
-#allow-guest=true
-#guest-session=
-session-wrapper=/etc/lightdm/Xsession
-#greeter-wrapper=
-#guest-wrapper=
-#display-setup-script=
-#display-stopped-script=
-#greeter-setup-script=
-#session-setup-script=
-#session-cleanup-script=
-#autologin-guest=false
-#autologin-user=
-#autologin-user-timeout=0
-#autologin-in-background=false
-#autologin-session=
-#exit-on-failure=false
-
-#
-# XDMCP Server configuration
-#
-# enabled = True if XDMCP connections should be allowed
-# port = UDP/IP port to listen for connections on
-# listen-address = Host/address to listen for XDMCP connections (use all addresses if not present)
-# key = Authentication key to use for XDM-AUTHENTICATION-1 or blank to not use authentication (stored in keys.conf)
-# hostname = Hostname to report to XDMCP clients (defaults to system hostname if unset)
-#
-# The authentication key is a 56 bit DES key specified in hex as 0xnnnnnnnnnnnnnn.  Alternatively
-# it can be a word and the first 7 characters are used as the key.
-#
-[XDMCPServer]
-#enabled=false
-#port=177
-#listen-address=
-#key=
-#hostname=
-
-#
-# VNC Server configuration
-#
-# enabled = True if VNC connections should be allowed
-# command = Command to run Xvnc server with
-# port = TCP/IP port to listen for connections on
-# listen-address = Host/address to listen for VNC connections (use all addresses if not present)
-# width = Width of display to use
-# height = Height of display to use
-# depth = Color depth of display to use
-#
-[VNCServer]
-#enabled=false
-#command=Xvnc
-#port=5900
-#listen-address=
-#width=1024
-#height=768
-#depth=8
diff --git a/overlays/xfce/etc/skel/.config/dconf/user b/overlays/xfce/etc/skel/.config/dconf/user
index 95d191d4e9ea601f42e6ef5b9f40f60fee2949f8..d93faf01783f90401d4121abcad685e1e29d3858 100755
Binary files a/overlays/xfce/etc/skel/.config/dconf/user and b/overlays/xfce/etc/skel/.config/dconf/user differ
diff --git a/overlays/xfce/etc/skel/.config/manjaro/manjaro-settings-manager.conf b/overlays/xfce/etc/skel/.config/manjaro/manjaro-settings-manager.conf
index afdb28c15e6b4b07f01fb2fa868339c444aa202f..398b2586cdb660d865250a83f6dae3f51a1fe0a0 100755
--- a/overlays/xfce/etc/skel/.config/manjaro/manjaro-settings-manager.conf
+++ b/overlays/xfce/etc/skel/.config/manjaro/manjaro-settings-manager.conf
@@ -1,6 +1,6 @@
 [mainwindow]
-geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\x1\x7f\0\0\0\xb4\0\0\x3\xdc\0\0\x2\x8b\0\0\x1\x82\0\0\0\xd1\0\0\x3\xd9\0\0\x2\x88\0\0\0\0\0\0\0\0\x5V\0\0\x1\x82\0\0\0\xd1\0\0\x3\xd9\0\0\x2\x88)
+geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\x1\x7f\0\0\0\x95\0\0\x3\xdc\0\0\x2l\0\0\x1\x82\0\0\0\xb2\0\0\x3\xd9\0\0\x2i\0\0\0\0\0\0\0\0\x5V\0\0\x1\x82\0\0\0\xb2\0\0\x3\xd9\0\0\x2i)
 maximized=false
-pos=@Point(383 180)
+pos=@Point(383 149)
 savestate=@ByteArray(\0\0\0\xff\0\0\0\0\xfd\0\0\0\0\0\0\x2X\0\0\x1\xb8\0\0\0\x4\0\0\0\x4\0\0\0\b\0\0\0\b\xfc\0\0\0\0)
 size=@Size(600 440)
diff --git a/overlays/xfce/etc/skel/.config/xfce4/panel/whiskermenu-7.rc b/overlays/xfce/etc/skel/.config/xfce4/panel/whiskermenu-7.rc
index e94a999ee862963c532d030f6b6d4d1d6206e67a..9dba806eaf20cd70a55ac41a40a4e79a6652c2bc 100644
--- a/overlays/xfce/etc/skel/.config/xfce4/panel/whiskermenu-7.rc
+++ b/overlays/xfce/etc/skel/.config/xfce4/panel/whiskermenu-7.rc
@@ -1,5 +1,5 @@
 favorites=exo-terminal-emulator.desktop,exo-file-manager.desktop,exo-mail-reader.desktop,exo-web-browser.desktop
-recent=xfce4-screenshooter.desktop,exo-file-manager.desktop,exo-terminal-emulator.desktop
+recent=manjaro-settings-manager.desktop,xfce4-mime-settings.desktop,xfce-session-settings.desktop,xfce4-screenshooter.desktop,xfce-ui-settings.desktop,exo-file-manager.desktop,exo-terminal-emulator.desktop
 button-title=Applications
 button-icon=/usr/share/icons/manjaro-logo.svg
 button-single-row=false
diff --git a/overlays/xfce/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/thunar.xml b/overlays/xfce/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/thunar.xml
index c044c87c7503db25820e19afee5d74f4422a590e..2bbbbf8526eb697203984a7e52941f5d1d8fb19c 100755
--- a/overlays/xfce/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/thunar.xml
+++ b/overlays/xfce/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/thunar.xml
@@ -8,4 +8,5 @@
   <property name="last-window-width" type="int" value="786"/>
   <property name="last-window-height" type="int" value="503"/>
   <property name="last-window-maximized" type="bool" value="false"/>
+  <property name="last-separator-position" type="int" value="170"/>
 </channel>
diff --git a/overlays/xfce/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml b/overlays/xfce/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml
index eeeda2e86ca16256c93247cf9c631bfde82f4fc2..39e4ebbab388fc039848a5b704f99bdffd14ee91 100755
--- a/overlays/xfce/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml
+++ b/overlays/xfce/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml
@@ -7,7 +7,7 @@
         <property name="workspace0" type="empty">
           <property name="color-style" type="int" value="0"/>
           <property name="image-style" type="int" value="5"/>
-          <property name="last-image" type="string" value="/usr/share/backgrounds/breath.png"/>
+          <property name="last-image" type="string" value="/usr/share/wallpapers/manjaro-arm/generic/manjaro-arm.png"/>
         </property>
         <property name="workspace1" type="empty">
           <property name="color-style" type="int" value="0"/>
@@ -38,8 +38,8 @@
     </property>
   </property>
   <property name="last" type="empty">
-    <property name="window-width" type="int" value="642"/>
-    <property name="window-height" type="int" value="609"/>
+    <property name="window-width" type="int" value="655"/>
+    <property name="window-height" type="int" value="612"/>
   </property>
   <property name="desktop-icons" type="empty">
     <property name="file-icons" type="empty">
diff --git a/overlays/xfce/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-mime-settings.xml b/overlays/xfce/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-mime-settings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..33cccb13d7dd8a1a67c7d518184c63fa90fab509
--- /dev/null
+++ b/overlays/xfce/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-mime-settings.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<channel name="xfce4-mime-settings" version="1.0">
+  <property name="last" type="empty">
+    <property name="window-width" type="int" value="550"/>
+    <property name="window-height" type="int" value="400"/>
+    <property name="mime-width" type="int" value="300"/>
+    <property name="status-width" type="int" value="75"/>
+    <property name="default-width" type="int" value="144"/>
+  </property>
+</channel>
diff --git a/overlays/xfce/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml b/overlays/xfce/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
index 4068673bf9d57e2ed76578e5c8d2dce5e2e4d35f..b85493f49858dbdbd6dd28219412ed25181ba8b1 100755
--- a/overlays/xfce/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
+++ b/overlays/xfce/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
@@ -31,7 +31,9 @@
   </property>
   <property name="plugins" type="empty">
     <property name="plugin-2" type="string" value="actions"/>
-    <property name="plugin-3" type="string" value="tasklist"/>
+    <property name="plugin-3" type="string" value="tasklist">
+      <property name="flat-buttons" type="bool" value="false"/>
+    </property>
     <property name="plugin-15" type="string" value="separator">
       <property name="expand" type="bool" value="true"/>
       <property name="style" type="uint" value="0"/>
@@ -59,7 +61,7 @@
       </property>
     </property>
     <property name="plugin-10" type="string" value="separator">
-      <property name="style" type="uint" value="3"/>
+      <property name="style" type="uint" value="0"/>
     </property>
     <property name="plugin-11" type="string" value="launcher">
       <property name="items" type="array">
@@ -71,13 +73,15 @@
         <value type="string" value="15646658773.desktop"/>
       </property>
     </property>
-    <property name="plugin-13" type="string" value="separator"/>
+    <property name="plugin-13" type="string" value="separator">
+      <property name="style" type="uint" value="1"/>
+    </property>
     <property name="plugin-1" type="string" value="battery"/>
     <property name="plugin-8" type="string" value="separator">
-      <property name="style" type="uint" value="3"/>
+      <property name="style" type="uint" value="0"/>
     </property>
     <property name="plugin-14" type="string" value="separator">
-      <property name="style" type="uint" value="3"/>
+      <property name="style" type="uint" value="0"/>
     </property>
   </property>
 </channel>
diff --git a/overlays/xfce/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-power-manager.xml b/overlays/xfce/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-power-manager.xml
index 80fc3e62c1f16141bdccf23070aa287920bda1a8..6ce3ccf35f2ec23768df7aa67d22c75ccd18b6dd 100755
--- a/overlays/xfce/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-power-manager.xml
+++ b/overlays/xfce/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-power-manager.xml
@@ -8,9 +8,6 @@
     <property name="logind-handle-lid-switch" type="bool" value="false"/>
     <property name="show-tray-icon" type="bool" value="true"/>
     <property name="general-notification" type="bool" value="true"/>
-    <property name="presentation-mode" type="bool" value="false"/>
-    <property name="brightness-switch-restore-on-exit" type="int" value="-1"/>
-    <property name="brightness-switch" type="int" value="0"/>
-    <property name="brightness-level-on-battery" type="uint" value="50"/>
+    <property name="presentation-mode" type="bool" value="true"/>
   </property>
 </channel>
diff --git a/overlays/xfce/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml b/overlays/xfce/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml
index 516d2ee2c1ffb563f08847b42543bfd68cf6a4c1..f64cc35d83bc705fdf16eb3415585269cd599569 100755
--- a/overlays/xfce/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml
+++ b/overlays/xfce/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml
@@ -2,7 +2,7 @@
 
 <channel name="xsettings" version="1.0">
   <property name="Net" type="empty">
-    <property name="ThemeName" type="string" value="Breath-Dark"/>
+    <property name="ThemeName" type="string" value="Matcha-dark-sea"/>
     <property name="IconThemeName" type="string" value="Papirus-Dark-Maia"/>
     <property name="DoubleClickTime" type="empty"/>
     <property name="DoubleClickDistance" type="empty"/>