diff --git a/gtk-3.0/gtk.css b/gtk-3.0/gtk.css
index 5744968..6b63a6b 100644
--- a/gtk-3.0/gtk.css
+++ b/gtk-3.0/gtk.css
@@ -1614,12 +1614,14 @@ these are pretty self explicative */
/*
these colors are exported for the window manager and shouldn't be used in applications,
read if you used those and something break with a version upgrade you're on your own... */
-@define-color wm_title shade(#EDF0F5, 1.8);
-@define-color wm_unfocused_title #96979a;
+@define-color wm_title #ffffff;
+@define-color wm_unfocused_title #3f3e3e;
@define-color wm_highlight rgba(0, 0, 0, 0);
@define-color wm_borders_edge rgba(237, 240, 245, 0.07);
-@define-color wm_bg_a shade(#3f3e3e, 1.2);
-@define-color wm_bg_b #3f3e3e;
+@define-color wm_bg_a shade(#768556, 1.2);
+@define-color wm_bg_b #768556;
+@define-color wm_bg #768556;
+@define-color wm_unfocused_bg #3f3e3e;
@define-color wm_shadow alpha(black, 0.35);
@define-color wm_border alpha(black, 0.18);
@define-color wm_button_hover_color_a shade(#3f3e3e, 1.3);
diff --git a/gtk-4.0/gtk.css b/gtk-4.0/gtk.css
index 477731f..6a77f7b 100644
--- a/gtk-4.0/gtk.css
+++ b/gtk-4.0/gtk.css
@@ -1672,12 +1672,14 @@ these are pretty self explicative */
/*
these colors are exported for the window manager and shouldn't be used in applications,
read if you used those and something break with a version upgrade you're on your own... */
-@define-color wm_title shade(#EDF0F5, 1.8);
-@define-color wm_unfocused_title #96979a;
+@define-color wm_title #ffffff;
+@define-color wm_unfocused_title #3f3e3e;
@define-color wm_highlight rgba(0, 0, 0, 0);
@define-color wm_borders_edge rgba(237, 240, 245, 0.07);
-@define-color wm_bg_a shade(#3f3e3e, 1.2);
-@define-color wm_bg_b #3f3e3e;
+@define-color wm_bg_a shade(#373636, 1.2);
+@define-color wm_bg_b #373636;
+@define-color wm_bg #373636;
+@define-color wm_unfocused_bg #3f3e3e;
@define-color wm_shadow alpha(black, 0.35);
@define-color wm_border alpha(black, 0.18);
@define-color wm_button_hover_color_a shade(#3f3e3e, 1.3);
diff --git a/metacity-1/assets/button.svg b/metacity-1/assets/button.svg
new file mode 100644
index 0000000..51c67bf
--- /dev/null
+++ b/metacity-1/assets/button.svg
@@ -0,0 +1,3 @@
+
diff --git a/metacity-1/assets/close.svg b/metacity-1/assets/close.svg
new file mode 100644
index 0000000..1fe0805
--- /dev/null
+++ b/metacity-1/assets/close.svg
@@ -0,0 +1,3 @@
+
diff --git a/metacity-1/assets/maximize.svg b/metacity-1/assets/maximize.svg
new file mode 100644
index 0000000..02d76eb
--- /dev/null
+++ b/metacity-1/assets/maximize.svg
@@ -0,0 +1,3 @@
+
diff --git a/metacity-1/assets/menu.svg b/metacity-1/assets/menu.svg
new file mode 100644
index 0000000..ad8570a
--- /dev/null
+++ b/metacity-1/assets/menu.svg
@@ -0,0 +1,3 @@
+
diff --git a/metacity-1/assets/minimize.svg b/metacity-1/assets/minimize.svg
new file mode 100644
index 0000000..dc1fa3f
--- /dev/null
+++ b/metacity-1/assets/minimize.svg
@@ -0,0 +1,3 @@
+
diff --git a/metacity-1/assets/shade.svg b/metacity-1/assets/shade.svg
new file mode 100644
index 0000000..29aeeae
--- /dev/null
+++ b/metacity-1/assets/shade.svg
@@ -0,0 +1,3 @@
+
diff --git a/metacity-1/assets/unmaximize.svg b/metacity-1/assets/unmaximize.svg
new file mode 100644
index 0000000..cd03f34
--- /dev/null
+++ b/metacity-1/assets/unmaximize.svg
@@ -0,0 +1,3 @@
+
diff --git a/metacity-1/assets/unshade.svg b/metacity-1/assets/unshade.svg
new file mode 100644
index 0000000..fa98887
--- /dev/null
+++ b/metacity-1/assets/unshade.svg
@@ -0,0 +1,3 @@
+
diff --git a/metacity-1/metacity-theme-2.xml b/metacity-1/metacity-theme-2.xml
new file mode 100644
index 0000000..6450e5f
--- /dev/null
+++ b/metacity-1/metacity-theme-2.xml
@@ -0,0 +1,621 @@
+
+
+
+ ClearCrystal
+ nana-4
+ GPL
+ 2020
+ ClearCrystal Metacity theme
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/metacity-1/metacity-theme-3.xml b/metacity-1/metacity-theme-3.xml
new file mode 100644
index 0000000..b5ef101
--- /dev/null
+++ b/metacity-1/metacity-theme-3.xml
@@ -0,0 +1,648 @@
+
+
+
+ ClearCrystal
+ nana-4
+ GPL
+ 2020
+ ClearCrystal Metacity theme
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/source/gtk3/_colors-public.scss b/source/gtk3/_colors-public.scss
index 3b638e2..71a1167 100644
--- a/source/gtk3/_colors-public.scss
+++ b/source/gtk3/_colors-public.scss
@@ -93,13 +93,15 @@ $_wm_highlight: if($variant=='light', $top_hilight, // Sass gets mad if this is
/*
these colors are exported for the window manager and shouldn't be used in applications,
read if you used those and something break with a version upgrade you're on your own... */
-@define-color wm_title shade(#{$fg_color}, 1.8);
-@define-color wm_unfocused_title #{$backdrop_fg_color};
+@define-color wm_title #{$headerbar_fg_color};
+@define-color wm_unfocused_title #{$headerbar_backdrop_color};
@define-color wm_highlight #{"" + $_wm_highlight};
@define-color wm_borders_edge #{"" + $borders_edge};
-@define-color wm_bg_a shade(#{$bg_color}, 1.2);
-@define-color wm_bg_b #{$bg_color};
+@define-color wm_bg_a shade(#{$headerbar_bg_color}, 1.2);
+@define-color wm_bg_b #{$headerbar_bg_color};
+@define-color wm_bg #{$headerbar_bg_color};
+@define-color wm_unfocused_bg #{$headerbar_backdrop_color};
@define-color wm_shadow alpha(black, 0.35);
@define-color wm_border alpha(black, 0.18);
diff --git a/source/gtk3/_common.scss b/source/gtk3/_common.scss
index 2a3c720..429cda0 100644
--- a/source/gtk3/_common.scss
+++ b/source/gtk3/_common.scss
@@ -4218,4 +4218,4 @@ popover.emoji-completion .emoji:hover {
@import '../common/stack_switcher.scss';
-@import '../common/wm_export.scss';
+// @import '../common/wm_export.scss';
diff --git a/source/gtk3/gtk-new.css b/source/gtk3/gtk-new.css
index 5744968..6b63a6b 100644
--- a/source/gtk3/gtk-new.css
+++ b/source/gtk3/gtk-new.css
@@ -1614,12 +1614,14 @@ these are pretty self explicative */
/*
these colors are exported for the window manager and shouldn't be used in applications,
read if you used those and something break with a version upgrade you're on your own... */
-@define-color wm_title shade(#EDF0F5, 1.8);
-@define-color wm_unfocused_title #96979a;
+@define-color wm_title #ffffff;
+@define-color wm_unfocused_title #3f3e3e;
@define-color wm_highlight rgba(0, 0, 0, 0);
@define-color wm_borders_edge rgba(237, 240, 245, 0.07);
-@define-color wm_bg_a shade(#3f3e3e, 1.2);
-@define-color wm_bg_b #3f3e3e;
+@define-color wm_bg_a shade(#768556, 1.2);
+@define-color wm_bg_b #768556;
+@define-color wm_bg #768556;
+@define-color wm_unfocused_bg #3f3e3e;
@define-color wm_shadow alpha(black, 0.35);
@define-color wm_border alpha(black, 0.18);
@define-color wm_button_hover_color_a shade(#3f3e3e, 1.3);
diff --git a/source/gtk4/_colors-public.scss b/source/gtk4/_colors-public.scss
index 3b638e2..71a1167 100644
--- a/source/gtk4/_colors-public.scss
+++ b/source/gtk4/_colors-public.scss
@@ -93,13 +93,15 @@ $_wm_highlight: if($variant=='light', $top_hilight, // Sass gets mad if this is
/*
these colors are exported for the window manager and shouldn't be used in applications,
read if you used those and something break with a version upgrade you're on your own... */
-@define-color wm_title shade(#{$fg_color}, 1.8);
-@define-color wm_unfocused_title #{$backdrop_fg_color};
+@define-color wm_title #{$headerbar_fg_color};
+@define-color wm_unfocused_title #{$headerbar_backdrop_color};
@define-color wm_highlight #{"" + $_wm_highlight};
@define-color wm_borders_edge #{"" + $borders_edge};
-@define-color wm_bg_a shade(#{$bg_color}, 1.2);
-@define-color wm_bg_b #{$bg_color};
+@define-color wm_bg_a shade(#{$headerbar_bg_color}, 1.2);
+@define-color wm_bg_b #{$headerbar_bg_color};
+@define-color wm_bg #{$headerbar_bg_color};
+@define-color wm_unfocused_bg #{$headerbar_backdrop_color};
@define-color wm_shadow alpha(black, 0.35);
@define-color wm_border alpha(black, 0.18);
diff --git a/source/gtk4/_common.scss b/source/gtk4/_common.scss
index dc7f13c..ada7986 100644
--- a/source/gtk4/_common.scss
+++ b/source/gtk4/_common.scss
@@ -3927,4 +3927,4 @@ menubutton {
@import '../common/undershoot.scss';
@import '../common/stack_switcher.scss';
-@import '../common/wm_export.scss';
+// @import '../common/wm_export.scss';
diff --git a/source/gtk4/gtk-new.css b/source/gtk4/gtk-new.css
index 477731f..6a77f7b 100644
--- a/source/gtk4/gtk-new.css
+++ b/source/gtk4/gtk-new.css
@@ -1672,12 +1672,14 @@ these are pretty self explicative */
/*
these colors are exported for the window manager and shouldn't be used in applications,
read if you used those and something break with a version upgrade you're on your own... */
-@define-color wm_title shade(#EDF0F5, 1.8);
-@define-color wm_unfocused_title #96979a;
+@define-color wm_title #ffffff;
+@define-color wm_unfocused_title #3f3e3e;
@define-color wm_highlight rgba(0, 0, 0, 0);
@define-color wm_borders_edge rgba(237, 240, 245, 0.07);
-@define-color wm_bg_a shade(#3f3e3e, 1.2);
-@define-color wm_bg_b #3f3e3e;
+@define-color wm_bg_a shade(#373636, 1.2);
+@define-color wm_bg_b #373636;
+@define-color wm_bg #373636;
+@define-color wm_unfocused_bg #3f3e3e;
@define-color wm_shadow alpha(black, 0.35);
@define-color wm_border alpha(black, 0.18);
@define-color wm_button_hover_color_a shade(#3f3e3e, 1.3);