diff --git a/gtk-3.0/gtk.css b/gtk-3.0/gtk.css
index dbc79ed..cacfbd2 100644
--- a/gtk-3.0/gtk.css
+++ b/gtk-3.0/gtk.css
@@ -1565,6 +1565,12 @@ XfdesktopIconView.view:active { text-shadow: none; color: #f9f06b; background-co
.nemo-desktop-window stack { background: none; border: none; }
+#slab_section_style1 > box > label { color: #c9a98e; }
+
+.caja-navigation-window widget.view { caret-color: #7f7f7f; }
+
+#mate-menu { border-width: 2px; border-style: solid; background-color: #606060; border-left-color: #9c9c9c; border-top-color: #9c9c9c; border-right-color: #424242; border-bottom-color: #424242; }
+
.top-bar { background-color: #503e2f; color: #f9f06b; }
.top-bar:backdrop { background-color: #606060; color: #ffffff; transition: none; }
diff --git a/gtk-4.0/gtk.css b/gtk-4.0/gtk.css
index 58add4b..0541394 100644
--- a/gtk-4.0/gtk.css
+++ b/gtk-4.0/gtk.css
@@ -1743,6 +1743,12 @@ XfdesktopIconView.view:active { text-shadow: none; color: #f9f06b; background-co
.nemo-desktop-window stack { background: none; border: none; }
+#slab_section_style1 > box > label { color: #c9a98e; }
+
+.caja-navigation-window widget.view { caret-color: #7f7f7f; }
+
+#mate-menu { border-width: 2px; border-style: solid; background-color: #606060; border-left-color: #9c9c9c; border-top-color: #9c9c9c; border-right-color: #424242; border-bottom-color: #424242; }
+
.top-bar { background-color: #503e2f; color: #f9f06b; }
.top-bar:backdrop { background-color: #606060; color: #ffffff; transition: none; }
diff --git a/metacity-1/metacity-theme-1 (WIP_has_errors).xml b/metacity-1/metacity-theme-1 (WIP_has_errors).xml
new file mode 100755
index 0000000..36e458a
--- /dev/null
+++ b/metacity-1/metacity-theme-1 (WIP_has_errors).xml
@@ -0,0 +1,1152 @@
+
+
+
+
+ Oldiewaita
+ Nestor Andreu
+ Licensed under GPLv2 or later
+ February 2024
+ Oldiewaita
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/metacity-1/metacity-theme-1 (backup).xml b/metacity-1/metacity-theme-1 (backup).xml
new file mode 100755
index 0000000..ee18a80
--- /dev/null
+++ b/metacity-1/metacity-theme-1 (backup).xml
@@ -0,0 +1,2021 @@
+
+
+
+
+ Oldiewaita
+ Novomente, heavily modified by Nestort
+ Licensed under GPLv2 or later
+ February 2024
+ Oldiewaita, based on The Fugitive Metacity Theme (squared version)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/metacity-1/metacity-theme-1.xml b/metacity-1/metacity-theme-1.xml
index 48dd762..ee18a80 100755
--- a/metacity-1/metacity-theme-1.xml
+++ b/metacity-1/metacity-theme-1.xml
@@ -2,11 +2,11 @@
- Simplewaita
- Novomente
+ Oldiewaita
+ Novomente, heavily modified by Nestort
Licensed under GPLv2 or later
- December 2022
- Simplewaita, based on The Fugitive Metacity Theme (squared version)
+ February 2024
+ Oldiewaita, based on The Fugitive Metacity Theme (squared version)
@@ -102,16 +102,16 @@
-
+
-
+
@@ -557,6 +557,13 @@
+
+
+
+
+
+
+
diff --git a/source/common/desktops.scss b/source/common/desktops.scss
index 19eaa3d..abed514 100644
--- a/source/common/desktops.scss
+++ b/source/common/desktops.scss
@@ -46,6 +46,26 @@ XfdesktopIconView.view:active {
border: none;
}
+// Mate:
+
+// In case contrast of selected bakcground and background is low... mate-control-center needs this:
+
+#slab_section_style1 > box > label {
+ color: mix($selected_bg_color, $text_color, 50%);
+}
+
+.caja-navigation-window widget.view {
+ caret-color: #7f7f7f; //for some reason, when renaming a file in icon view mode, background is white and text is black, so caret needs to be set
+}
+
+
+#mate-menu {
+ border-width: $border_width;
+ border-style: solid;
+ @include relief($bg_color);
+ } //not working...
+
+
// general libadwaita
.top-bar {
background-color: $titlebar_active_bg;
diff --git a/source/gtk3/gtk-new.css b/source/gtk3/gtk-new.css
index dbc79ed..cacfbd2 100644
--- a/source/gtk3/gtk-new.css
+++ b/source/gtk3/gtk-new.css
@@ -1565,6 +1565,12 @@ XfdesktopIconView.view:active { text-shadow: none; color: #f9f06b; background-co
.nemo-desktop-window stack { background: none; border: none; }
+#slab_section_style1 > box > label { color: #c9a98e; }
+
+.caja-navigation-window widget.view { caret-color: #7f7f7f; }
+
+#mate-menu { border-width: 2px; border-style: solid; background-color: #606060; border-left-color: #9c9c9c; border-top-color: #9c9c9c; border-right-color: #424242; border-bottom-color: #424242; }
+
.top-bar { background-color: #503e2f; color: #f9f06b; }
.top-bar:backdrop { background-color: #606060; color: #ffffff; transition: none; }
diff --git a/source/gtk4/gtk-new.css b/source/gtk4/gtk-new.css
index 58add4b..0541394 100644
--- a/source/gtk4/gtk-new.css
+++ b/source/gtk4/gtk-new.css
@@ -1743,6 +1743,12 @@ XfdesktopIconView.view:active { text-shadow: none; color: #f9f06b; background-co
.nemo-desktop-window stack { background: none; border: none; }
+#slab_section_style1 > box > label { color: #c9a98e; }
+
+.caja-navigation-window widget.view { caret-color: #7f7f7f; }
+
+#mate-menu { border-width: 2px; border-style: solid; background-color: #606060; border-left-color: #9c9c9c; border-top-color: #9c9c9c; border-right-color: #424242; border-bottom-color: #424242; }
+
.top-bar { background-color: #503e2f; color: #f9f06b; }
.top-bar:backdrop { background-color: #606060; color: #ffffff; transition: none; }