fix buttons in dark metacity theme

12 files changed, 666 insertions, 18 deletions

diff --git a/common/gtk-3.0/3.14/_colors-public.scss b/common/gtk-3.0/3.14/_colors-public.scss
index d5919aa..0590a00 100644
--- a/common/gtk-3.0/3.14/_colors-public.scss
+++ b/common/gtk-3.0/3.14/_colors-public.scss
@@ -43,6 +43,34 @@ $wm_bg_unfocused: opacify($header_bg_backdrop, 1);
 @define-color wm_highlight #{"" + $wm_highlight};
 @define-color wm_shadow alpha(black, 0.35);
 
+//WM Buttons
+
+// Close
+@define-color wm_button_close_bg #{"" + $wm_button_close_bg};
+@define-color wm_button_close_hover_bg #{"" + $wm_button_close_hover_bg};
+@define-color wm_button_close_active_bg #{"" + $wm_button_close_active_bg};
+
+@define-color wm_icon_close_bg #{"" + $wm_icon_close_bg};
+@define-color wm_icon_close_hover_bg #{"" + $wm_icon_close_hover_bg};
+@define-color wm_icon_close_active_bg #{"" + $wm_icon_close_active_bg};
+
+// Minimize, Maximize
+@define-color wm_button_bg #{"" + $wm_button_bg};
+@define-color wm_button_unfocused_bg #{"" + $wm_button_unfocused_bg};
+@define-color wm_button_hover_bg #{"" + $wm_button_hover_bg};
+@define-color wm_button_active_bg #{"" + $wm_button_active_bg};
+
+@define-color wm_button_border #{"" + $wm_button_border};
+@define-color wm_button_unfocused_border #{"" + $wm_button_unfocused_border};
+@define-color wm_button_hover_border #{"" + $wm_button_hover_border};
+@define-color wm_button_active_border #{"" + $wm_button_active_border};
+
+@define-color wm_icon_bg #{"" + $wm_icon_bg};
+@define-color wm_icon_unfocused_bg #{"" + $wm_icon_unfocused_bg};
+@define-color wm_icon_hover_bg #{"" + $wm_icon_hover_bg};
+@define-color wm_icon_active_bg #{"" + $wm_icon_active_bg};
+
+
 //FIXME this is really an API
 
 @define-color content_view_bg #{"" + $base_color};
diff --git a/common/gtk-3.0/3.14/_colors.scss b/common/gtk-3.0/3.14/_colors.scss
index 2300247..a3ddc53 100644
--- a/common/gtk-3.0/3.14/_colors.scss
+++ b/common/gtk-3.0/3.14/_colors.scss
@@ -64,3 +64,31 @@ $dark_sidebar_border: if($variant == 'light', $dark_sidebar_bg, darken($dark_sid
 
 $panel_bg: darken($osd_bg_color, 10%);
 $panel_fg: $dark_sidebar_fg;
+
+
+//WM Buttons
+
+// Close
+$wm_button_close_bg: if($variant == 'light', #f37076, #e45e65);
+$wm_button_close_hover_bg: if($variant == 'light', #f79da1, #f48085);
+$wm_button_close_active_bg: if($variant == 'light', #ef4048, #e6262f);
+
+$wm_icon_close_bg: $selected_fg_color;
+$wm_icon_close_hover_bg: $selected_fg_color;
+$wm_icon_close_active_bg: $selected_fg_color;
+
+// Minimize, Maximize
+$wm_button_bg: if($variant == 'light', #fdfdfd, #212429);
+$wm_button_unfocused_bg: if($variant == 'light', #f6f7f8, #22252b);
+$wm_button_hover_bg: if($variant == 'light', #fdfdfd, #212429);
+$wm_button_active_bg: $selected_bg_color;
+
+$wm_button_border: if($variant == 'light', #d8dae0, #141619);
+$wm_button_unfocused_border: if($variant == 'light', #dddee2, #1a1c20);
+$wm_button_hover_border: $selected_bg_color;
+$wm_button_active_border: $selected_bg_color;
+
+$wm_icon_bg: if($variant == 'light', #a7adb9, #777d86);
+$wm_icon_unfocused_bg: if($variant == 'light', #babec7, #575c63);
+$wm_icon_hover_bg: if($variant == 'light', #757d91, #838993);
+$wm_icon_active_bg: $selected_fg_color;
diff --git a/common/gtk-3.0/3.14/gtk-contained-dark.css b/common/gtk-3.0/3.14/gtk-contained-dark.css
index 4572748..514eda1 100644
--- a/common/gtk-3.0/3.14/gtk-contained-dark.css
+++ b/common/gtk-3.0/3.14/gtk-contained-dark.css
@@ -3377,4 +3377,22 @@ GtkFileChooserDialog .action-bar.frame {
 @define-color wm_bg_unfocused #282c32;
 @define-color wm_highlight #2c2f36;
 @define-color wm_shadow alpha(black, 0.35);
+@define-color wm_button_close_bg #e45e65;
+@define-color wm_button_close_hover_bg #f48085;
+@define-color wm_button_close_active_bg #e6262f;
+@define-color wm_icon_close_bg #ffffff;
+@define-color wm_icon_close_hover_bg #ffffff;
+@define-color wm_icon_close_active_bg #ffffff;
+@define-color wm_button_bg #212429;
+@define-color wm_button_unfocused_bg #22252b;
+@define-color wm_button_hover_bg #212429;
+@define-color wm_button_active_bg #5294E2;
+@define-color wm_button_border #141619;
+@define-color wm_button_unfocused_border #1a1c20;
+@define-color wm_button_hover_border #5294E2;
+@define-color wm_button_active_border #5294E2;
+@define-color wm_icon_bg #777d86;
+@define-color wm_icon_unfocused_bg #575c63;
+@define-color wm_icon_hover_bg #838993;
+@define-color wm_icon_active_bg #ffffff;
 @define-color content_view_bg #292D33;
diff --git a/common/gtk-3.0/3.14/gtk-contained-solid-dark.css b/common/gtk-3.0/3.14/gtk-contained-solid-dark.css
index 3c17239..6fcaf6f 100644
--- a/common/gtk-3.0/3.14/gtk-contained-solid-dark.css
+++ b/common/gtk-3.0/3.14/gtk-contained-solid-dark.css
@@ -3377,4 +3377,22 @@ GtkFileChooserDialog .action-bar.frame {
 @define-color wm_bg_unfocused #282c32;
 @define-color wm_highlight #2c2f36;
 @define-color wm_shadow alpha(black, 0.35);
+@define-color wm_button_close_bg #e45e65;
+@define-color wm_button_close_hover_bg #f48085;
+@define-color wm_button_close_active_bg #e6262f;
+@define-color wm_icon_close_bg #ffffff;
+@define-color wm_icon_close_hover_bg #ffffff;
+@define-color wm_icon_close_active_bg #ffffff;
+@define-color wm_button_bg #212429;
+@define-color wm_button_unfocused_bg #22252b;
+@define-color wm_button_hover_bg #212429;
+@define-color wm_button_active_bg #5294E2;
+@define-color wm_button_border #141619;
+@define-color wm_button_unfocused_border #1a1c20;
+@define-color wm_button_hover_border #5294E2;
+@define-color wm_button_active_border #5294E2;
+@define-color wm_icon_bg #777d86;
+@define-color wm_icon_unfocused_bg #575c63;
+@define-color wm_icon_hover_bg #838993;
+@define-color wm_icon_active_bg #ffffff;
 @define-color content_view_bg #292D33;
diff --git a/common/gtk-3.0/3.14/gtk-contained-solid.css b/common/gtk-3.0/3.14/gtk-contained-solid.css
index 59d5c1d..fe074c4 100644
--- a/common/gtk-3.0/3.14/gtk-contained-solid.css
+++ b/common/gtk-3.0/3.14/gtk-contained-solid.css
@@ -3368,4 +3368,22 @@ GtkFileChooserDialog .action-bar.frame {
 @define-color wm_bg_unfocused #eff0f2;
 @define-color wm_highlight #eff0f2;
 @define-color wm_shadow alpha(black, 0.35);
+@define-color wm_button_close_bg #f37076;
+@define-color wm_button_close_hover_bg #f79da1;
+@define-color wm_button_close_active_bg #ef4048;
+@define-color wm_icon_close_bg #ffffff;
+@define-color wm_icon_close_hover_bg #ffffff;
+@define-color wm_icon_close_active_bg #ffffff;
+@define-color wm_button_bg #fdfdfd;
+@define-color wm_button_unfocused_bg #f6f7f8;
+@define-color wm_button_hover_bg #fdfdfd;
+@define-color wm_button_active_bg #5294E2;
+@define-color wm_button_border #d8dae0;
+@define-color wm_button_unfocused_border #dddee2;
+@define-color wm_button_hover_border #5294E2;
+@define-color wm_button_active_border #5294E2;
+@define-color wm_icon_bg #a7adb9;
+@define-color wm_icon_unfocused_bg #babec7;
+@define-color wm_icon_hover_bg #757d91;
+@define-color wm_icon_active_bg #ffffff;
 @define-color content_view_bg #ffffff;
diff --git a/common/gtk-3.0/3.14/gtk-contained.css b/common/gtk-3.0/3.14/gtk-contained.css
index 9e2c26c..90234ba 100644
--- a/common/gtk-3.0/3.14/gtk-contained.css
+++ b/common/gtk-3.0/3.14/gtk-contained.css
@@ -3368,4 +3368,22 @@ GtkFileChooserDialog .action-bar.frame {
 @define-color wm_bg_unfocused #eff0f2;
 @define-color wm_highlight #eff0f2;
 @define-color wm_shadow alpha(black, 0.35);
+@define-color wm_button_close_bg #f37076;
+@define-color wm_button_close_hover_bg #f79da1;
+@define-color wm_button_close_active_bg #ef4048;
+@define-color wm_icon_close_bg #ffffff;
+@define-color wm_icon_close_hover_bg #ffffff;
+@define-color wm_icon_close_active_bg #ffffff;
+@define-color wm_button_bg #fdfdfd;
+@define-color wm_button_unfocused_bg #f6f7f8;
+@define-color wm_button_hover_bg #fdfdfd;
+@define-color wm_button_active_bg #5294E2;
+@define-color wm_button_border #d8dae0;
+@define-color wm_button_unfocused_border #dddee2;
+@define-color wm_button_hover_border #5294E2;
+@define-color wm_button_active_border #5294E2;
+@define-color wm_icon_bg #a7adb9;
+@define-color wm_icon_unfocused_bg #babec7;
+@define-color wm_icon_hover_bg #757d91;
+@define-color wm_icon_active_bg #ffffff;
 @define-color content_view_bg #ffffff;
diff --git a/common/metacity-1/button-bg.svg b/common/metacity-1/button-bg.svg
new file mode 100644
index 0000000..49a6f1e
--- /dev/null
+++ b/common/metacity-1/button-bg.svg
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<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"
+   enable-background="new 0 0 32 32"
+   height="16"
+   id="Layer_1"
+   version="1.1"
+   viewBox="0 0 16 16"
+   width="16"
+   xml:space="preserve"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="button_bg.svg"><metadata
+     id="metadata26"><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><defs
+     id="defs24" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1366"
+     inkscape:window-height="718"
+     id="namedview22"
+     showgrid="true"
+     inkscape:zoom="16"
+     inkscape:cx="4.4272827"
+     inkscape:cy="4.949103"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="Layer_1"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"><inkscape:grid
+       type="xygrid"
+       id="grid3003"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" /></sodipodi:namedview><g
+     style="display:inline"
+     id="titlebutton-close"
+     inkscape:label="#g6210"
+     transform="translate(-645,185.63782)"><g
+       id="g4927-9"
+       style="display:inline;opacity:1"
+       transform="translate(-678,-432.63782)"><g
+         transform="translate(-103,0)"
+         style="display:inline;opacity:1"
+         id="g4490-6-5-2"><g
+           id="g4092-0-2-21-0"
+           style="display:inline"
+           transform="translate(58,0)"><circle
+             r="7"
+             cy="255"
+             cx="1376"
+             style="fill:#7d7d7d;fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+             id="path4068-7-5-9-6" /></g></g><g
+         id="g4778-2-68"
+         transform="translate(1323,246.86719)"
+         style="fill:#ffffff;fill-opacity:1"><g
+           style="display:inline;fill:#ffffff;fill-opacity:1"
+           id="layer9-9-4-4"
+           transform="translate(-60,-518)" /><g
+           id="layer10-2-1-8"
+           transform="translate(-60,-518)"
+           style="fill:#ffffff;fill-opacity:1" /><g
+           id="layer11-16-4-9"
+           transform="translate(-60,-518)"
+           style="fill:#ffffff;fill-opacity:1" /><g
+           transform="matrix(0.75,0,0,0.75,2,2.0546875)"
+           id="g2996-76-5"
+           style="fill:#ffffff;fill-opacity:1"><g
+             transform="translate(-60,-518)"
+             id="layer12-4-5-7"
+             style="fill:#ffffff;fill-opacity:1"><g
+               transform="translate(19,-242)"
+               id="layer4-4-1-9-5"
+               style="display:inline;fill:#ffffff;fill-opacity:1" /></g></g><g
+           id="layer13-2-6-11"
+           transform="translate(-60,-518)"
+           style="fill:#ffffff;fill-opacity:1" /><g
+           id="layer14-4-0-33"
+           transform="translate(-60,-518)"
+           style="fill:#ffffff;fill-opacity:1" /><g
+           id="layer15-7-3-0"
+           transform="translate(-60,-518)"
+           style="fill:#ffffff;fill-opacity:1" /></g></g><rect
+       y="-185.63782"
+       x="645"
+       height="16"
+       width="16"
+       id="rect17883-39"
+       style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0" /></g></svg>
\ No newline at end of file
diff --git a/common/metacity-1/button-border.svg b/common/metacity-1/button-border.svg
new file mode 100644
index 0000000..0822007
--- /dev/null
+++ b/common/metacity-1/button-border.svg
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<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"
+   enable-background="new 0 0 32 32"
+   height="16"
+   id="Layer_1"
+   version="1.1"
+   viewBox="0 0 16 16"
+   width="16"
+   xml:space="preserve"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="button-border.svg"><metadata
+     id="metadata26"><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 /></cc:Work></rdf:RDF></metadata><defs
+     id="defs24" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1366"
+     inkscape:window-height="718"
+     id="namedview22"
+     showgrid="true"
+     inkscape:zoom="16"
+     inkscape:cx="-5.1352173"
+     inkscape:cy="2.449103"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="Layer_1"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"><inkscape:grid
+       type="xygrid"
+       id="grid3003"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" /></sodipodi:namedview><g
+     style="display:inline"
+     id="titlebutton-max-hover"
+     inkscape:label="#g6284"
+     transform="translate(-513,185.63782)"><g
+       id="g4891"
+       style="display:inline;opacity:1"
+       transform="translate(-781,-432.63782)"><path
+         style="display:inline;opacity:1;fill:#7d7d7d;fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         d="m 1302,248 a 7,7 0 0 0 -7,7 7,7 0 0 0 7,7 7,7 0 0 0 7,-7 7,7 0 0 0 -7,-7 z m 0,1 a 6,6 0 0 1 6,6 6,6 0 0 1 -6,6 6,6 0 0 1 -6,-6 6,6 0 0 1 6,-6 z"
+         id="path4068-7-5-9-6-7-2-5-78"
+         inkscape:connector-curvature="0" /><g
+         id="g4806-9"
+         transform="translate(1294,247)"
+         style="fill:#c0e3ff;fill-opacity:1"><g
+           transform="translate(-81.0002,-967)"
+           style="display:inline;fill:#c0e3ff;fill-opacity:1"
+           inkscape:label="status"
+           id="layer9-78-7" /><g
+           transform="translate(-81.0002,-967)"
+           inkscape:label="devices"
+           id="layer10-3-3"
+           style="fill:#c0e3ff;fill-opacity:1" /><g
+           transform="translate(-81.0002,-967)"
+           inkscape:label="apps"
+           id="layer11-19-75"
+           style="fill:#c0e3ff;fill-opacity:1" /><g
+           transform="translate(-81.0002,-967)"
+           inkscape:label="places"
+           id="layer13-4-9"
+           style="fill:#c0e3ff;fill-opacity:1" /><g
+           transform="translate(-81.0002,-967)"
+           inkscape:label="mimetypes"
+           id="layer14-8-5"
+           style="fill:#c0e3ff;fill-opacity:1" /><g
+           transform="translate(-81.0002,-967)"
+           style="display:inline;fill:#c0e3ff;fill-opacity:1"
+           inkscape:label="emblems"
+           id="layer15-5-8" /><g
+           transform="translate(-81.0002,-967)"
+           style="display:inline;fill:#c0e3ff;fill-opacity:1"
+           inkscape:label="emotes"
+           id="g71291-1-7" /><g
+           transform="translate(-81.0002,-967)"
+           style="display:inline;fill:#c0e3ff;fill-opacity:1"
+           inkscape:label="categories"
+           id="g4953-7-1" /><g
+           transform="translate(-81.0002,-967)"
+           style="display:inline;fill:#c0e3ff;fill-opacity:1"
+           inkscape:label="actions"
+           id="layer12-3-0" /></g></g><rect
+       y="-185.63782"
+       x="513"
+       height="16"
+       width="16"
+       id="rect17883-0"
+       style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0" /></g></svg>
\ No newline at end of file
diff --git a/common/metacity-1/close-icon.svg b/common/metacity-1/close-icon.svg
new file mode 100644
index 0000000..1f717ab
--- /dev/null
+++ b/common/metacity-1/close-icon.svg
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<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"
+   enable-background="new 0 0 32 32"
+   height="16"
+   id="Layer_1"
+   version="1.1"
+   viewBox="0 0 16 16"
+   width="16"
+   xml:space="preserve"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="close-icon.svg"><metadata
+     id="metadata26"><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 /></cc:Work></rdf:RDF></metadata><defs
+     id="defs24" /><sodipodi:namedview
+     pagecolor="#cecece"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1366"
+     inkscape:window-height="718"
+     id="namedview22"
+     showgrid="true"
+     inkscape:zoom="16"
+     inkscape:cx="-17.197717"
+     inkscape:cy="-0.050897"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="Layer_1"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"><inkscape:grid
+       type="xygrid"
+       id="grid3003"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" /></sodipodi:namedview><g
+     style="display:inline"
+     id="titlebutton-close"
+     inkscape:label="#g6210"
+     transform="translate(-645,185.63782)"><g
+       id="g4927-9"
+       style="display:inline;opacity:1"
+       transform="translate(-678,-432.63782)"><g
+         transform="translate(-103,0)"
+         style="display:inline;opacity:1"
+         id="g4490-6-5-2"><g
+           id="g4092-0-2-21-0"
+           style="display:inline"
+           transform="translate(58,0)" /></g><g
+         id="g4778-2-68"
+         transform="translate(1323,246.86719)"
+         style="fill:#ffffff;fill-opacity:1"><g
+           style="display:inline;fill:#ffffff;fill-opacity:1"
+           id="layer9-9-4-4"
+           transform="translate(-60,-518)" /><g
+           id="layer10-2-1-8"
+           transform="translate(-60,-518)"
+           style="fill:#ffffff;fill-opacity:1" /><g
+           id="layer11-16-4-9"
+           transform="translate(-60,-518)"
+           style="fill:#ffffff;fill-opacity:1" /><g
+           transform="matrix(0.75,0,0,0.75,2,2.0546875)"
+           id="g2996-76-5"
+           style="fill:#ffffff;fill-opacity:1"><g
+             transform="translate(-60,-518)"
+             id="layer12-4-5-7"
+             style="fill:#ffffff;fill-opacity:1"><g
+               transform="translate(19,-242)"
+               id="layer4-4-1-9-5"
+               style="display:inline;fill:#ffffff;fill-opacity:1"><path
+                 inkscape:connector-curvature="0"
+                 d="m 45,764 1,0 c 0.01037,-1.2e-4 0.02079,-4.6e-4 0.03125,0 0.254951,0.0112 0.50987,0.12858 0.6875,0.3125 L 49,766.59375 51.3125,764.3125 C 51.578125,764.082 51.759172,764.007 52,764 l 1,0 0,1 c 0,0.28647 -0.03434,0.55065 -0.25,0.75 l -2.28125,2.28125 2.25,2.25 C 52.906938,770.46942 52.999992,770.7347 53,771 l 0,1 -1,0 c -0.265301,-10e-6 -0.530586,-0.0931 -0.71875,-0.28125 L 49,769.4375 46.71875,771.71875 C 46.530586,771.90694 46.26529,772 46,772 l -1,0 0,-1 c -3e-6,-0.26529 0.09306,-0.53058 0.28125,-0.71875 l 2.28125,-2.25 L 45.28125,765.75 C 45.070508,765.55537 44.97809,765.28075 45,765 l 0,-1 z"
+                 id="path10839-9-2-2"
+                 style="color:#bebebe;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:'Andale Mono';-inkscape-font-specification:'Andale Mono';text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#7d7d7d;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.78124988;marker:none;enable-background:new" /></g></g></g><g
+           id="layer13-2-6-11"
+           transform="translate(-60,-518)"
+           style="fill:#ffffff;fill-opacity:1" /><g
+           id="layer14-4-0-33"
+           transform="translate(-60,-518)"
+           style="fill:#ffffff;fill-opacity:1" /><g
+           id="layer15-7-3-0"
+           transform="translate(-60,-518)"
+           style="fill:#ffffff;fill-opacity:1" /></g></g><rect
+       y="-185.63782"
+       x="645"
+       height="16"
+       width="16"
+       id="rect17883-39"
+       style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0" /></g></svg>
\ No newline at end of file
diff --git a/common/metacity-1/max-icon.svg b/common/metacity-1/max-icon.svg
new file mode 100644
index 0000000..4120785
--- /dev/null
+++ b/common/metacity-1/max-icon.svg
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<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"
+   enable-background="new 0 0 32 32"
+   height="16"
+   id="Layer_1"
+   version="1.1"
+   viewBox="0 0 16 16"
+   width="16"
+   xml:space="preserve"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="max-icon.svg"><metadata
+     id="metadata26"><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><defs
+     id="defs24" /><sodipodi:namedview
+     pagecolor="#d7d7d7"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1366"
+     inkscape:window-height="718"
+     id="namedview22"
+     showgrid="true"
+     inkscape:zoom="16"
+     inkscape:cx="-0.5727173"
+     inkscape:cy="2.449103"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="Layer_1"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"><inkscape:grid
+       type="xygrid"
+       id="grid3003"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" /></sodipodi:namedview><g
+     style="display:inline"
+     id="titlebutton-max"
+     inkscape:label="#g6234"
+     transform="translate(-616,185.63782)"><g
+       id="g7146"
+       style="display:inline;opacity:1"
+       transform="translate(-781,-432.63782)"><g
+         transform="translate(-29,0)"
+         style="display:inline;opacity:1"
+         id="g4490-2-96"><g
+           id="g4092-0-6-83"
+           style="display:inline"
+           transform="translate(58,0)" /></g><path
+         id="path4293-5-95"
+         style="display:inline;opacity:1;fill:#7d7d7d;fill-opacity:1;fill-rule:evenodd;stroke:none"
+         d="m 1403.7995,252 3.3818,0 c 0.4503,0 0.8162,0.36847 0.8187,0.8188 l 0,3.3817 z m 2.4074,6.00692 -3.395,0 c -0.4504,0 -0.8188,-0.36842 -0.8188,-0.81875 l 0,-3.39509 4.2138,4.21384"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="csscccsscc" /></g><rect
+       y="-185.63782"
+       x="616"
+       height="16"
+       width="16"
+       id="rect17883-29"
+       style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0" /></g></svg>
\ No newline at end of file
diff --git a/common/metacity-1/metacity-theme-3.xml b/common/metacity-1/metacity-theme-3.xml
index d0038a9..56a41d9 100644
--- a/common/metacity-1/metacity-theme-3.xml
+++ b/common/metacity-1/metacity-theme-3.xml
@@ -18,6 +18,33 @@
 
 <constant name="C_wm_highlight" value="gtk:custom(wm_highlight,#eeeff1)" />
 
+<!-- window button colors -->
+
+<!-- close -->
+<constant name="C_button_close_bg_focused" value="gtk:custom(wm_button_close_bg,#eeeff1)" />
+<constant name="C_button_close_bg_hover" value="gtk:custom(wm_button_close_hover_bg,#eeeff1)" />
+<constant name="C_button_close_bg_active" value="gtk:custom(wm_button_close_active_bg,#eeeff1)" />
+
+<constant name="C_icon_close_bg_focused" value="gtk:custom(wm_icon_close_bg,#eeeff1)" />
+<constant name="C_icon_close_bg_hover" value="gtk:custom(wm_icon_close_hover_bg,#eeeff1)" />
+<constant name="C_icon_close_bg_active" value="gtk:custom(wm_icon_close_active_bg,#eeeff1)" />
+
+<!-- minimize, maximize -->
+<constant name="C_button_bg_focused" value="gtk:custom(wm_button_bg,#eeeff1)" />
+<constant name="C_button_bg_unfocused" value="gtk:custom(wm_button_unfocused_bg,#eeeff1)" />
+<constant name="C_button_bg_hover" value="gtk:custom(wm_button_hover_bg,#eeeff1)" />
+<constant name="C_button_bg_active" value="gtk:custom(wm_button_active_bg,#eeeff1)" />
+
+<constant name="C_button_border_focused" value="gtk:custom(wm_button_border,#eeeff1)" />
+<constant name="C_button_border_unfocused" value="gtk:custom(wm_button_unfocused_border,#eeeff1)" />
+<constant name="C_button_border_hover" value="gtk:custom(wm_button_hover_border,#eeeff1)" />
+<constant name="C_button_border_active" value="gtk:custom(wm_button_active_border,#eeeff1)" />
+
+<constant name="C_icon_bg_focused" value="gtk:custom(wm_icon_bg,#eeeff1)" />
+<constant name="C_icon_bg_unfocused" value="gtk:custom(wm_icon_unfocused_bg,#eeeff1)" />
+<constant name="C_icon_bg_hover" value="gtk:custom(wm_icon_hover_bg,#eeeff1)" />
+<constant name="C_icon_bg_active" value="gtk:custom(wm_icon_active_bg,#eeeff1)" />
+
 <!-- geometries -->
 
 <frame_geometry name="normal" title_scale="medium" rounded_top_left="1" rounded_top_right="1">
@@ -166,77 +193,104 @@
 
 <!--close-->
 <draw_ops name="close_focused">
-	<image filename="close.svg" x="width/2-8" y="height/2-8" width="16" height="16"/>
+	<image filename="button-bg.svg" colorize="C_button_close_bg_focused" x="width/2-8" y="height/2-8" width="16" height="16"/>
+	<image filename="close-icon.svg" colorize="C_icon_close_bg_focused" x="width/2-8" y="height/2-8" width="16" height="16"/>
 </draw_ops>
 
 <draw_ops name="close_focused_pressed">
-	<image filename="close_pressed.svg" x="width/2-8" y="height/2-8" width="16" height="16"/>
+	<image filename="button-bg.svg" colorize="C_button_close_bg_active" x="width/2-8" y="height/2-8" width="16" height="16"/>
+	<image filename="close-icon.svg" colorize="C_icon_close_bg_active" x="width/2-8" y="height/2-8" width="16" height="16"/>
 </draw_ops>
 
 <draw_ops name="close_focused_prelight">
-	<image filename="close_prelight.svg" x="width/2-8" y="height/2-8" width="16" height="16" />
+	<image filename="button-bg.svg" colorize="C_button_close_bg_hover" x="width/2-8" y="height/2-8" width="16" height="16"/>
+	<image filename="close-icon.svg" colorize="C_icon_close_bg_hover" x="width/2-8" y="height/2-8" width="16" height="16"/>
 </draw_ops>
 
 <draw_ops name="close_unfocused">
-	<image filename="close_unfocused.svg" x="width/2-8" y="height/2-8" width="16" height="16" />
+	<image filename="button-bg.svg" colorize="C_button_bg_unfocused" x="width/2-8" y="height/2-8" width="16" height="16"/>
+	<image filename="button-border.svg" colorize="C_button_border_unfocused" x="width/2-8" y="height/2-8" width="16" height="16"/>
+	<image filename="close-icon.svg" colorize="C_icon_bg_unfocused" x="width/2-8" y="height/2-8" width="16" height="16"/>
 </draw_ops>
 
 <draw_ops name="close_unfocused_prelight">
-	<image filename="close_prelight.svg" x="width/2-8" y="height/2-8" width="16" height="16"/>
+	<image filename="button-bg.svg" colorize="C_button_close_bg_hover" x="width/2-8" y="height/2-8" width="16" height="16"/>
+	<image filename="close-icon.svg" colorize="C_icon_close_bg_hover" x="width/2-8" y="height/2-8" width="16" height="16"/>
 </draw_ops>
 
 <draw_ops name="close_unfocused_pressed">
-	<image filename="close_pressed.svg" x="width/2-8" y="height/2-8" width="16" height="16"/>
+	<image filename="button-bg.svg" colorize="C_button_close_bg_focused" x="width/2-8" y="height/2-8" width="16" height="16"/>
+	<image filename="close-icon.svg" colorize="C_icon_close_bg_focused" x="width/2-8" y="height/2-8" width="16" height="16"/>
 </draw_ops>
 
 <!--maximize-->
 <draw_ops name="maximize_focused">
-	<image filename="max.svg" x="width/2-8" y="height/2-8" width="16" height="16"/>
+	<image filename="button-bg.svg" colorize="C_button_bg_focused" x="width/2-8" y="height/2-8" width="16" height="16"/>
+	<image filename="button-border.svg" colorize="C_button_border_focused" x="width/2-8" y="height/2-8" width="16" height="16"/>
+	<image filename="max-icon.svg" colorize="C_icon_bg_focused" x="width/2-8" y="height/2-8" width="16" height="16"/>
 </draw_ops>
 
 <draw_ops name="maximize_focused_pressed">
-	<image filename="max_pressed.svg" x="width/2-8" y="height/2-8" width="16" height="16"/>
+	<image filename="button-bg.svg" colorize="C_button_bg_active" x="width/2-8" y="height/2-8" width="16" height="16"/>
+	<image filename="max-icon.svg" colorize="C_icon_bg_active" x="width/2-8" y="height/2-8" width="16" height="16"/>
 </draw_ops>
 
 <draw_ops name="maximize_focused_prelight">
-	<image filename="max_prelight.svg" x="width/2-8" y="height/2-8" width="16" height="16"/>
+	<image filename="button-bg.svg" colorize="C_button_bg_hover" x="width/2-8" y="height/2-8" width="16" height="16"/>
+	<image filename="button-border.svg" colorize="C_button_border_hover" x="width/2-8" y="height/2-8" width="16" height="16"/>
+	<image filename="max-icon.svg" colorize="C_icon_bg_hover" x="width/2-8" y="height/2-8" width="16" height="16"/>
 </draw_ops>
 
 <draw_ops name="maximize_unfocused">
-	<image filename="max_unfocused.svg" x="width/2-8" y="height/2-8" width="16" height="16"/>
+	<image filename="button-bg.svg" colorize="C_button_bg_unfocused" x="width/2-8" y="height/2-8" width="16" height="16"/>
+	<image filename="button-border.svg" colorize="C_button_border_unfocused" x="width/2-8" y="height/2-8" width="16" height="16"/>
+	<image filename="max-icon.svg" colorize="C_icon_bg_unfocused" x="width/2-8" y="height/2-8" width="16" height="16"/>
 </draw_ops>
 
 <draw_ops name="maximize_unfocused_prelight">
-	<image filename="max_prelight.svg" x="width/2-8" y="height/2-8" width="16" height="16"/>
+	<image filename="button-bg.svg" colorize="C_button_bg_hover" x="width/2-8" y="height/2-8" width="16" height="16"/>
+	<image filename="button-border.svg" colorize="C_button_border_hover" x="width/2-8" y="height/2-8" width="16" height="16"/>
+	<image filename="max-icon.svg" colorize="C_icon_bg_hover" x="width/2-8" y="height/2-8" width="16" height="16"/>
 </draw_ops>
 
 <draw_ops name="maximize_unfocused_pressed">
-	<image filename="max_pressed.svg" x="width/2-8" y="height/2-8" width="16" height="16"/>
+	<image filename="button-bg.svg" colorize="C_button_bg_active" x="width/2-8" y="height/2-8" width="16" height="16"/>
+	<image filename="max-icon.svg" colorize="C_icon_bg_active" x="width/2-8" y="height/2-8" width="16" height="16"/>
 </draw_ops>
 
 <!--minimize-->
 <draw_ops name="minimize_focused">
-	<image filename="min.svg" x="width/2-8" y="height/2-8" width="16" height="16"/>
+	<image filename="button-bg.svg" colorize="C_button_bg_focused" x="width/2-8" y="height/2-8" width="16" height="16"/>
+	<image filename="button-border.svg" colorize="C_button_border_focused" x="width/2-8" y="height/2-8" width="16" height="16"/>
+	<image filename="min-icon.svg" colorize="C_icon_bg_focused" x="width/2-8" y="height/2-8" width="16" height="16"/>
 </draw_ops>
 
 <draw_ops name="minimize_focused_pressed">
-	<image filename="min_pressed.svg" x="width/2-8" y="height/2-8" width="16" height="16"/>
+	<image filename="button-bg.svg" colorize="C_button_bg_active" x="width/2-8" y="height/2-8" width="16" height="16"/>
+	<image filename="min-icon.svg" colorize="C_icon_bg_active" x="width/2-8" y="height/2-8" width="16" height="16"/>
 </draw_ops>
 
 <draw_ops name="minimize_focused_prelight">
-	<image filename="min_prelight.svg" x="width/2-8" y="height/2-8" width="16" height="16"/>
+	<image filename="button-bg.svg" colorize="C_button_bg_hover" x="width/2-8" y="height/2-8" width="16" height="16"/>
+	<image filename="button-border.svg" colorize="C_button_border_hover" x="width/2-8" y="height/2-8" width="16" height="16"/>
+	<image filename="min-icon.svg" colorize="C_icon_bg_hover" x="width/2-8" y="height/2-8" width="16" height="16"/>
 </draw_ops>
 
 <draw_ops name="minimize_unfocused">
-	<image filename="min_unfocused.svg" x="width/2-8" y="height/2-8" width="16" height="16"/>
+	<image filename="button-bg.svg" colorize="C_button_bg_unfocused" x="width/2-8" y="height/2-8" width="16" height="16"/>
+	<image filename="button-border.svg" colorize="C_button_border_unfocused" x="width/2-8" y="height/2-8" width="16" height="16"/>
+	<image filename="min-icon.svg" colorize="C_icon_bg_unfocused" x="width/2-8" y="height/2-8" width="16" height="16"/>
 </draw_ops>
 
 <draw_ops name="minimize_unfocused_prelight">
-	<image filename="min_prelight.svg" x="width/2-8" y="height/2-8" width="16" height="16"/>
+	<image filename="button-bg.svg" colorize="C_button_bg_hover" x="width/2-8" y="height/2-8" width="16" height="16"/>
+	<image filename="button-border.svg" colorize="C_button_border_hover" x="width/2-8" y="height/2-8" width="16" height="16"/>
+	<image filename="min-icon.svg" colorize="C_icon_bg_hover" x="width/2-8" y="height/2-8" width="16" height="16"/>
 </draw_ops>
 
 <draw_ops name="minimize_unfocused_pressed">
-	<image filename="min_pressed.svg" x="width/2-8" y="height/2-8" width="16" height="16"/>
+	<image filename="button-bg.svg" colorize="C_button_bg_active" x="width/2-8" y="height/2-8" width="16" height="16"/>
+	<image filename="min-icon.svg" colorize="C_icon_bg_active" x="width/2-8" y="height/2-8" width="16" height="16"/>
 </draw_ops>
 
 
diff --git a/common/metacity-1/min-icon.svg b/common/metacity-1/min-icon.svg
new file mode 100644
index 0000000..cac4f61
--- /dev/null
+++ b/common/metacity-1/min-icon.svg
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<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"
+   enable-background="new 0 0 32 32"
+   height="16"
+   id="Layer_1"
+   version="1.1"
+   viewBox="0 0 16 16"
+   width="16"
+   xml:space="preserve"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="min-icon.svg"><metadata
+     id="metadata26"><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><defs
+     id="defs24" /><sodipodi:namedview
+     pagecolor="#e2e2e2"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1366"
+     inkscape:window-height="718"
+     id="namedview22"
+     showgrid="true"
+     inkscape:zoom="16"
+     inkscape:cx="-20.135217"
+     inkscape:cy="2.449103"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="Layer_1"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"><inkscape:grid
+       type="xygrid"
+       id="grid3003"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" /></sodipodi:namedview><g
+     style="display:inline"
+     id="titlebutton-min"
+     inkscape:label="#g6247"
+     transform="translate(-587,185.63782)"><g
+       id="g7138"
+       style="display:inline;opacity:1"
+       transform="translate(-781,-432.63782)"><g
+         transform="translate(-58,0)"
+         style="display:inline;opacity:1"
+         id="g4490-3-75"><g
+           id="g4092-0-7-0"
+           style="display:inline"
+           transform="translate(58,0)" /></g><path
+         inkscape:connector-curvature="0"
+         d="m 1373,254 0,2 6,0 0,-2 z"
+         id="rect9057-4-3"
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#7d7d7d;fill-opacity:1;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
+         sodipodi:nodetypes="ccccc" /></g><rect
+       y="-185.63782"
+       x="587"
+       height="16"
+       width="16"
+       id="rect17883-32"
+       style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0" /></g></svg>
\ No newline at end of file