diff --git a/overlays/gnome/etc/dconf/db/gdm.d/10_manjaro-branding b/overlays/gnome/etc/dconf/db/local.d/10_manjaro-branding
similarity index 100%
rename from overlays/gnome/etc/dconf/db/gdm.d/10_manjaro-branding
rename to overlays/gnome/etc/dconf/db/local.d/10_manjaro-branding
diff --git a/overlays/gnome/etc/dconf/profile/gdm b/overlays/gnome/etc/dconf/profile/gdm
index e4ac2200cfc29429dcd4356b8d208b1c53b6d04e..aca0641f52a51cb922d107396deb358187410231 100644
--- a/overlays/gnome/etc/dconf/profile/gdm
+++ b/overlays/gnome/etc/dconf/profile/gdm
@@ -1,2 +1,2 @@
 user-db:user
-system-db:gdm
+system-db:local
diff --git a/overlays/gnome/etc/skel/.cache/tracker/db-locale.txt b/overlays/gnome/etc/skel/.cache/tracker/db-locale.txt
deleted file mode 100644
index 7160308fc75effadde8aa6e088b4921f1857c897..0000000000000000000000000000000000000000
--- a/overlays/gnome/etc/skel/.cache/tracker/db-locale.txt
+++ /dev/null
@@ -1 +0,0 @@
-en_US.UTF-8
\ No newline at end of file
diff --git a/overlays/gnome/etc/skel/.cache/tracker/db-version.txt b/overlays/gnome/etc/skel/.cache/tracker/db-version.txt
deleted file mode 100644
index cabf43b5ddf813cbe89697372a21373f14921884..0000000000000000000000000000000000000000
--- a/overlays/gnome/etc/skel/.cache/tracker/db-version.txt
+++ /dev/null
@@ -1 +0,0 @@
-24
\ No newline at end of file
diff --git a/overlays/gnome/etc/skel/.cache/tracker/first-index.txt b/overlays/gnome/etc/skel/.cache/tracker/first-index.txt
deleted file mode 100644
index cc6612c36e05d4a1669f98ebbbe7412c16cf0af5..0000000000000000000000000000000000000000
--- a/overlays/gnome/etc/skel/.cache/tracker/first-index.txt
+++ /dev/null
@@ -1 +0,0 @@
-2.3.0
\ No newline at end of file
diff --git a/overlays/gnome/etc/skel/.cache/tracker/last-crawl.txt b/overlays/gnome/etc/skel/.cache/tracker/last-crawl.txt
deleted file mode 100644
index d1eeee4e82eedb41e2840ed6cf05f8e737a6ef65..0000000000000000000000000000000000000000
--- a/overlays/gnome/etc/skel/.cache/tracker/last-crawl.txt
+++ /dev/null
@@ -1 +0,0 @@
-1574296219
\ No newline at end of file
diff --git a/overlays/gnome/etc/skel/.cache/tracker/locale-for-miner-apps.txt b/overlays/gnome/etc/skel/.cache/tracker/locale-for-miner-apps.txt
deleted file mode 100644
index 7160308fc75effadde8aa6e088b4921f1857c897..0000000000000000000000000000000000000000
--- a/overlays/gnome/etc/skel/.cache/tracker/locale-for-miner-apps.txt
+++ /dev/null
@@ -1 +0,0 @@
-en_US.UTF-8
\ No newline at end of file
diff --git a/overlays/gnome/etc/skel/.cache/tracker/meta.db b/overlays/gnome/etc/skel/.cache/tracker/meta.db
deleted file mode 100644
index cbeb72b62c3ba68fd362a5508b40f85eaa765353..0000000000000000000000000000000000000000
Binary files a/overlays/gnome/etc/skel/.cache/tracker/meta.db and /dev/null differ
diff --git a/overlays/gnome/etc/skel/.cache/tracker/meta.db-shm b/overlays/gnome/etc/skel/.cache/tracker/meta.db-shm
deleted file mode 100644
index b2df9a1c98dbc209942ebf0924a6210c524f62a5..0000000000000000000000000000000000000000
Binary files a/overlays/gnome/etc/skel/.cache/tracker/meta.db-shm and /dev/null differ
diff --git a/overlays/gnome/etc/skel/.cache/tracker/meta.db-wal b/overlays/gnome/etc/skel/.cache/tracker/meta.db-wal
deleted file mode 100644
index e4cd194789e96e186dd8c37904bcb3a06c34d282..0000000000000000000000000000000000000000
Binary files a/overlays/gnome/etc/skel/.cache/tracker/meta.db-wal and /dev/null differ
diff --git a/overlays/gnome/etc/skel/.cache/tracker/no-need-mtime-check.txt b/overlays/gnome/etc/skel/.cache/tracker/no-need-mtime-check.txt
deleted file mode 100644
index cc6612c36e05d4a1669f98ebbbe7412c16cf0af5..0000000000000000000000000000000000000000
--- a/overlays/gnome/etc/skel/.cache/tracker/no-need-mtime-check.txt
+++ /dev/null
@@ -1 +0,0 @@
-2.3.0
\ No newline at end of file
diff --git a/overlays/gnome/etc/skel/.cache/tracker/ontologies.gvdb b/overlays/gnome/etc/skel/.cache/tracker/ontologies.gvdb
deleted file mode 100644
index d95f6cabcaa47beb04e4f41ec01c275c31d615d2..0000000000000000000000000000000000000000
Binary files a/overlays/gnome/etc/skel/.cache/tracker/ontologies.gvdb and /dev/null differ
diff --git a/overlays/gnome/etc/skel/.cache/tracker/parser-version.txt b/overlays/gnome/etc/skel/.cache/tracker/parser-version.txt
deleted file mode 100644
index d8263ee9860594d2806b0dfd1bfd17528b0ba2a4..0000000000000000000000000000000000000000
--- a/overlays/gnome/etc/skel/.cache/tracker/parser-version.txt
+++ /dev/null
@@ -1 +0,0 @@
-2
\ No newline at end of file
diff --git a/overlays/gnome/etc/skel/.config/gnome-control-center/backgrounds/last-edited.xml b/overlays/gnome/etc/skel/.config/gnome-control-center/backgrounds/last-edited.xml
deleted file mode 100755
index baf56e93951a997a1afc4e1e3854bc3183768a79..0000000000000000000000000000000000000000
--- a/overlays/gnome/etc/skel/.config/gnome-control-center/backgrounds/last-edited.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE wallpapers SYSTEM "gnome-wp-list.dtd">
-<wallpapers>
-  <wallpaper>
-    <name>Current background</name>
-  </wallpaper>
-</wallpapers>
diff --git a/overlays/gnome/etc/skel/.config/gtk-3.0/gtk.css b/overlays/gnome/etc/skel/.config/gtk-3.0/gtk.css
index 29f9f349ff95d9cd3e0a3806c1820efce04716ec..2cf47128af1062b416fe54367f6d8b2b38ab140b 100644
--- a/overlays/gnome/etc/skel/.config/gtk-3.0/gtk.css
+++ b/overlays/gnome/etc/skel/.config/gtk-3.0/gtk.css
@@ -15,20 +15,20 @@
 @define-color error_fg_color #eeeeee;
 @define-color window_bg_color #141a1b;
 @define-color window_fg_color #eeeeee;
-@define-color view_bg_color #141a1b;
 @define-color view_fg_color #eeeeee;
+@define-color view_bg_color rgb(34,43,46);
 @define-color headerbar_bg_color #141a1b;
 @define-color headerbar_fg_color #eeeeee;
 @define-color headerbar_border_color #ffffff;
 @define-color headerbar_backdrop_color @window_bg_color;
 @define-color headerbar_shade_color rgba(0, 0, 0, 0.36);
-@define-color card_bg_color #141a1b;
 @define-color card_fg_color #eeeeee;
+@define-color card_bg_color rgb(47,58,62);
 @define-color card_shade_color rgba(0, 0, 0, 0.36);
-@define-color dialog_bg_color #141a1b;
 @define-color dialog_fg_color #eeeeee;
-@define-color popover_bg_color #141a1b;
 @define-color popover_fg_color #eeeeee;
+@define-color dialog_bg_color rgb(34,43,46);
+@define-color popover_bg_color rgb(34,43,46);
 @define-color shade_color #141a1b;
 @define-color scrollbar_outline_color rgba(0, 0, 0, 0.5);
 @define-color blue_1 #99c1f1;
diff --git a/overlays/gnome/etc/skel/.config/gtk-4.0/gtk.css b/overlays/gnome/etc/skel/.config/gtk-4.0/gtk.css
index 29f9f349ff95d9cd3e0a3806c1820efce04716ec..2cf47128af1062b416fe54367f6d8b2b38ab140b 100644
--- a/overlays/gnome/etc/skel/.config/gtk-4.0/gtk.css
+++ b/overlays/gnome/etc/skel/.config/gtk-4.0/gtk.css
@@ -15,20 +15,20 @@
 @define-color error_fg_color #eeeeee;
 @define-color window_bg_color #141a1b;
 @define-color window_fg_color #eeeeee;
-@define-color view_bg_color #141a1b;
 @define-color view_fg_color #eeeeee;
+@define-color view_bg_color rgb(34,43,46);
 @define-color headerbar_bg_color #141a1b;
 @define-color headerbar_fg_color #eeeeee;
 @define-color headerbar_border_color #ffffff;
 @define-color headerbar_backdrop_color @window_bg_color;
 @define-color headerbar_shade_color rgba(0, 0, 0, 0.36);
-@define-color card_bg_color #141a1b;
 @define-color card_fg_color #eeeeee;
+@define-color card_bg_color rgb(47,58,62);
 @define-color card_shade_color rgba(0, 0, 0, 0.36);
-@define-color dialog_bg_color #141a1b;
 @define-color dialog_fg_color #eeeeee;
-@define-color popover_bg_color #141a1b;
 @define-color popover_fg_color #eeeeee;
+@define-color dialog_bg_color rgb(34,43,46);
+@define-color popover_bg_color rgb(34,43,46);
 @define-color shade_color #141a1b;
 @define-color scrollbar_outline_color rgba(0, 0, 0, 0.5);
 @define-color blue_1 #99c1f1;
diff --git a/overlays/gnome/etc/systemd/system/multi-user.target.wants/remove-classic.service b/overlays/gnome/etc/systemd/system/multi-user.target.wants/remove-classic.service
deleted file mode 120000
index 45c426a0425646d7eb4927be0e74267600e8b7cd..0000000000000000000000000000000000000000
--- a/overlays/gnome/etc/systemd/system/multi-user.target.wants/remove-classic.service
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/systemd/system/remove-classic.service
\ No newline at end of file
diff --git a/overlays/gnome/usr/lib/systemd/system/remove-classic.service b/overlays/gnome/usr/lib/systemd/system/remove-classic.service
deleted file mode 100644
index 136325a9dd2a6fc026ad41fb165bd3801d62d931..0000000000000000000000000000000000000000
--- a/overlays/gnome/usr/lib/systemd/system/remove-classic.service
+++ /dev/null
@@ -1,8 +0,0 @@
-[Unit]
-Description=Disable Gnome Classic
-
-[Service]
-ExecStart=/usr/local/bin/remove-classic.sh
-
-[Install]
-WantedBy=multi-user.target
diff --git a/overlays/gnome/usr/local/bin/remove-classic.sh b/overlays/gnome/usr/local/bin/remove-classic.sh
deleted file mode 100755
index 625d052022ed210de8a8b439da3b34e685a134f8..0000000000000000000000000000000000000000
--- a/overlays/gnome/usr/local/bin/remove-classic.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-
-file=gnome-classic.desktop
-
-if [ -f /usr/share/xsessions/$file ] ; then
-	mv /usr/share/xsessions/$file /usr/share/xsessions/gnome-classic~
-fi
-
diff --git a/overlays/gnome/usr/share/gnome-shell/gnome-shell-theme.gresource b/overlays/gnome/usr/share/gnome-shell/gnome-shell-theme.gresource
index 7d7423ed09a34da6a0805b63756f9835a6062b46..9110f8195ccf2cebde6c3aa5ce83ddbdda1711b8 100644
Binary files a/overlays/gnome/usr/share/gnome-shell/gnome-shell-theme.gresource and b/overlays/gnome/usr/share/gnome-shell/gnome-shell-theme.gresource differ
diff --git a/overlays/gnome/usr/share/pixmaps/manjarolinux-text-dark.svg b/overlays/gnome/usr/share/pixmaps/manjarolinux-text-dark.svg
new file mode 100644
index 0000000000000000000000000000000000000000..86658a22b6f82404311420fba3d4311651f9a5dc
--- /dev/null
+++ b/overlays/gnome/usr/share/pixmaps/manjarolinux-text-dark.svg
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="56.444447mm"
+   height="56.44445mm"
+   viewBox="0 0 200 200.00002"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.92.1 r"
+   sodipodi:docname="green.svg">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.4142136"
+     inkscape:cx="30.692892"
+     inkscape:cy="126.5323"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:showpageshadow="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1366"
+     inkscape:window-height="742"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:pagecheckerboard="true" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Ebene 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(222.41168,-236.90016)">
+    <g
+       id="g5967"
+       style="fill:#35bf5c;fill-opacity:1">
+      <g
+         id="g4446"
+         transform="matrix(1.2196132,0,0,1.0000088,-467.56616,-225.96506)"
+         style="fill:#35bf5c;fill-opacity:1">
+        <rect
+           style="opacity:1;fill:#35bf5c;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:7.07399988;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:21.222, 21.22200000000000131;stroke-dashoffset:0;stroke-opacity:1"
+           id="rect4149-7"
+           width="47.994675"
+           height="199.99825"
+           x="317.00177"
+           y="462.86115" />
+        <rect
+           style="opacity:1;fill:#35bf5c;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:7.07399988;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:21.222, 21.22200000000000131;stroke-dashoffset:0;stroke-opacity:1"
+           id="rect4149-0-6"
+           width="47.994675"
+           height="129.26767"
+           x="259.00415"
+           y="533.59174" />
+      </g>
+      <path
+         inkscape:connector-curvature="0"
+         id="path5961"
+         d="m -222.41168,236.90016 h 129.26633 v 58.53494 h -70.93002 v 141.46508 h -58.33631 z"
+         style="fill:#35bf5c;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.93749994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    </g>
+  </g>
+</svg>
diff --git a/overlays/gnome/usr/share/pixmaps/manjarolinux-text.svg b/overlays/gnome/usr/share/pixmaps/manjarolinux-text.svg
new file mode 100644
index 0000000000000000000000000000000000000000..86658a22b6f82404311420fba3d4311651f9a5dc
--- /dev/null
+++ b/overlays/gnome/usr/share/pixmaps/manjarolinux-text.svg
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="56.444447mm"
+   height="56.44445mm"
+   viewBox="0 0 200 200.00002"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.92.1 r"
+   sodipodi:docname="green.svg">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.4142136"
+     inkscape:cx="30.692892"
+     inkscape:cy="126.5323"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:showpageshadow="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1366"
+     inkscape:window-height="742"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:pagecheckerboard="true" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Ebene 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(222.41168,-236.90016)">
+    <g
+       id="g5967"
+       style="fill:#35bf5c;fill-opacity:1">
+      <g
+         id="g4446"
+         transform="matrix(1.2196132,0,0,1.0000088,-467.56616,-225.96506)"
+         style="fill:#35bf5c;fill-opacity:1">
+        <rect
+           style="opacity:1;fill:#35bf5c;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:7.07399988;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:21.222, 21.22200000000000131;stroke-dashoffset:0;stroke-opacity:1"
+           id="rect4149-7"
+           width="47.994675"
+           height="199.99825"
+           x="317.00177"
+           y="462.86115" />
+        <rect
+           style="opacity:1;fill:#35bf5c;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:7.07399988;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:21.222, 21.22200000000000131;stroke-dashoffset:0;stroke-opacity:1"
+           id="rect4149-0-6"
+           width="47.994675"
+           height="129.26767"
+           x="259.00415"
+           y="533.59174" />
+      </g>
+      <path
+         inkscape:connector-curvature="0"
+         id="path5961"
+         d="m -222.41168,236.90016 h 129.26633 v 58.53494 h -70.93002 v 141.46508 h -58.33631 z"
+         style="fill:#35bf5c;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.93749994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    </g>
+  </g>
+</svg>