diff --git a/common/metacity-1/button-bg.svg b/common/metacity-1/button-bg.svg
deleted file mode 100644
index 1f225b5..0000000
--- a/common/metacity-1/button-bg.svg
+++ /dev/null
@@ -1,105 +0,0 @@
-<?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 /></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="-6.6664673"
-     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:#808080;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
deleted file mode 100644
index a1ab948..0000000
--- a/common/metacity-1/button-border.svg
+++ /dev/null
@@ -1,107 +0,0 @@
-<?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="-16.228967"
-     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:#808080;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
deleted file mode 100644
index 312fa9e..0000000
--- a/common/metacity-1/close-icon.svg
+++ /dev/null
@@ -1,104 +0,0 @@
-<?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="11.313709"
-     inkscape:cx="-6.97609"
-     inkscape:cy="12.311381"
-     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:#808080;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/close_focused_normal.png b/common/metacity-1/close_focused_normal.png
new file mode 100644
index 0000000..6ac2038
Binary files /dev/null and b/common/metacity-1/close_focused_normal.png differ
diff --git a/common/metacity-1/close_focused_prelight.png b/common/metacity-1/close_focused_prelight.png
new file mode 100644
index 0000000..5a0177a
Binary files /dev/null and b/common/metacity-1/close_focused_prelight.png differ
diff --git a/common/metacity-1/close_focused_pressed.png b/common/metacity-1/close_focused_pressed.png
new file mode 100644
index 0000000..d425ec1
Binary files /dev/null and b/common/metacity-1/close_focused_pressed.png differ
diff --git a/common/metacity-1/close_unfocused.png b/common/metacity-1/close_unfocused.png
new file mode 100644
index 0000000..86d1ef6
Binary files /dev/null and b/common/metacity-1/close_unfocused.png differ
diff --git a/common/metacity-1/close_unfocused_prelight.png b/common/metacity-1/close_unfocused_prelight.png
new file mode 100644
index 0000000..083ee57
Binary files /dev/null and b/common/metacity-1/close_unfocused_prelight.png differ
diff --git a/common/metacity-1/close_unfocused_pressed.png b/common/metacity-1/close_unfocused_pressed.png
new file mode 100644
index 0000000..8a1230d
Binary files /dev/null and b/common/metacity-1/close_unfocused_pressed.png differ
diff --git a/common/metacity-1/max-icon.svg b/common/metacity-1/max-icon.svg
deleted file mode 100644
index 6b80028..0000000
--- a/common/metacity-1/max-icon.svg
+++ /dev/null
@@ -1,75 +0,0 @@
-<?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 /></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="-11.666467"
-     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:#808080;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/maximize_focused_normal.png b/common/metacity-1/maximize_focused_normal.png
new file mode 100644
index 0000000..b536a03
Binary files /dev/null and b/common/metacity-1/maximize_focused_normal.png differ
diff --git a/common/metacity-1/maximize_focused_prelight.png b/common/metacity-1/maximize_focused_prelight.png
new file mode 100644
index 0000000..6c9ad52
Binary files /dev/null and b/common/metacity-1/maximize_focused_prelight.png differ
diff --git a/common/metacity-1/maximize_focused_pressed.png b/common/metacity-1/maximize_focused_pressed.png
new file mode 100644
index 0000000..a802cca
Binary files /dev/null and b/common/metacity-1/maximize_focused_pressed.png differ
diff --git a/common/metacity-1/maximize_unfocused.png b/common/metacity-1/maximize_unfocused.png
new file mode 100644
index 0000000..74790de
Binary files /dev/null and b/common/metacity-1/maximize_unfocused.png differ
diff --git a/common/metacity-1/maximize_unfocused_prelight.png b/common/metacity-1/maximize_unfocused_prelight.png
new file mode 100644
index 0000000..9adef04
Binary files /dev/null and b/common/metacity-1/maximize_unfocused_prelight.png differ
diff --git a/common/metacity-1/maximize_unfocused_pressed.png b/common/metacity-1/maximize_unfocused_pressed.png
new file mode 100644
index 0000000..d18d7af
Binary files /dev/null and b/common/metacity-1/maximize_unfocused_pressed.png differ
diff --git a/common/metacity-1/metacity-theme-3.xml b/common/metacity-1/metacity-theme-3.xml
index 946553e..24d1d01 100644
--- a/common/metacity-1/metacity-theme-3.xml
+++ b/common/metacity-1/metacity-theme-3.xml
@@ -18,26 +18,6 @@
 
 <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,#f46067)" />
-<constant name="C_button_close_bg_hover" value="gtk:custom(wm_button_close_hover_bg,#f68086)" />
-<constant name="C_button_close_bg_active" value="gtk:custom(wm_button_close_active_bg,#f13039)" />
-
-<constant name="C_icon_close_bg" value="gtk:custom(wm_icon_close_bg,#F8F8F9)" />
-
-<!-- minimize, maximize -->
-<constant name="C_button_bg_hover" value="gtk:custom(wm_button_hover_bg,#fdfdfd)" />
-<constant name="C_button_bg_active" value="gtk:custom(wm_button_active_bg,#5294E2)" />
-
-<constant name="C_button_border_hover" value="gtk:custom(wm_button_hover_border,#D1D3DA)" />
-
-<constant name="C_icon_bg_focused" value="gtk:custom(wm_icon_bg,#90949E)" />
-<constant name="C_icon_bg_unfocused" value="gtk:custom(wm_icon_unfocused_bg,#B6B8C0)" />
-<constant name="C_icon_bg_hover" value="gtk:custom(wm_icon_hover_bg,#7A7F8B)" />
-<constant name="C_icon_bg_active" value="gtk:custom(wm_icon_active_bg,#ffffff)" />
-
 <!-- geometries -->
 
 <frame_geometry name="normal" title_scale="medium" rounded_top_left="1" rounded_top_right="1">
@@ -61,7 +41,7 @@
 	<distance name="right_width" value="0" />
 	<distance name="left_titlebar_edge" value="0"/>
 	<distance name="right_titlebar_edge" value="0"/>
-	<distance name="title_vertical_pad" value="2"/> <!-- 
+	<distance name="title_vertical_pad" value="2"/> <!--
 							This needs to be 1 less then the
 							title_vertical_pad on normal state
 							or you'll have bigger buttons		-->
@@ -186,100 +166,156 @@
 </draw_ops>
 
 
-<!--close-->
-<draw_ops name="close_focused">
-	<image filename="button-bg.svg" colorize="C_button_close_bg_focused" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
-	<image filename="close-icon.svg" colorize="C_icon_close_bg" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
-</draw_ops>
+<constant name="C_icons_shadow" value="blend/#000000/gtk:bg[NORMAL]/0.6" />
 
-<draw_ops name="close_focused_pressed">
-	<image filename="button-bg.svg" colorize="C_button_close_bg_active" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
-	<image filename="close-icon.svg" colorize="C_icon_close_bg" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+
+<draw_ops name="close_focused">
+	<image filename="close_focused_normal.png"
+		x="(width - object_width) / 2"
+		y="(height - object_height) / 2"
+		width="object_width"
+		height="object_height"/>
 </draw_ops>
 
 <draw_ops name="close_focused_prelight">
-	<image filename="button-bg.svg" colorize="C_button_close_bg_hover" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
-	<image filename="close-icon.svg" colorize="C_icon_close_bg" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+	<image filename="close_focused_prelight.png"
+		x="(width - object_width) / 2"
+		y="(height - object_height) / 2"
+		width="object_width"
+		height="object_height"/>
+</draw_ops>
+
+<draw_ops name="close_focused_pressed">
+	<image filename="close_focused_pressed.png"
+		x="(width - object_width) / 2"
+		y="(height - object_height) / 2"
+		width="object_width"
+		height="object_height"/>
 </draw_ops>
 
 <draw_ops name="close_unfocused">
-	<image filename="button-bg.svg" colorize="C_icon_bg_unfocused" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
-	<image filename="close-icon.svg" colorize="C_icon_close_bg" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+	<image filename="close_unfocused.png"
+		x="(width - object_width) / 2"
+		y="(height - object_height) / 2"
+		width="object_width"
+		height="object_height"/>
 </draw_ops>
 
 <draw_ops name="close_unfocused_prelight">
-	<image filename="button-bg.svg" colorize="C_button_close_bg_hover" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
-	<image filename="close-icon.svg" colorize="C_icon_close_bg" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+	<image filename="close_unfocused_prelight.png"
+		x="(width - object_width) / 2"
+		y="(height - object_height) / 2"
+		width="object_width"
+		height="object_height"/>
 </draw_ops>
 
 <draw_ops name="close_unfocused_pressed">
-	<image filename="button-bg.svg" colorize="C_button_close_bg_active" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
-	<image filename="close-icon.svg" colorize="C_icon_close_bg" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+	<image filename="close_unfocused_pressed.png"
+		x="(width - object_width) / 2"
+		y="(height - object_height) / 2"
+		width="object_width"
+		height="object_height"/>
 </draw_ops>
 
-<!--maximize-->
+
 <draw_ops name="maximize_focused">
-	<image filename="max-icon.svg" colorize="C_icon_bg_focused" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="maximize_focused_pressed">
-	<image filename="button-bg.svg" colorize="C_button_bg_active" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
-	<image filename="max-icon.svg" colorize="C_icon_bg_active" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+	<image filename="maximize_focused_normal.png"
+		x="(width - object_width) / 2"
+		y="(height - object_height) / 2"
+		width="object_width"
+		height="object_height"/>
 </draw_ops>
 
 <draw_ops name="maximize_focused_prelight">
-	<image filename="button-bg.svg" colorize="C_button_bg_hover" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
-	<image filename="button-border.svg" colorize="C_button_border_hover" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
-	<image filename="max-icon.svg" colorize="C_icon_bg_hover" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+	<image filename="maximize_focused_prelight.png"
+		x="(width - object_width) / 2"
+		y="(height - object_height) / 2"
+		width="object_width"
+		height="object_height"/>
+</draw_ops>
+
+<draw_ops name="maximize_focused_pressed">
+	<image filename="maximize_focused_pressed.png"
+		x="(width - object_width) / 2"
+		y="(height - object_height) / 2"
+		width="object_width"
+		height="object_height"/>
 </draw_ops>
 
 <draw_ops name="maximize_unfocused">
-	<image filename="max-icon.svg" colorize="C_icon_bg_unfocused" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+	<image filename="maximize_unfocused.png"
+		x="(width - object_width) / 2"
+		y="(height - object_height) / 2"
+		width="object_width"
+		height="object_height"/>
 </draw_ops>
 
 <draw_ops name="maximize_unfocused_prelight">
-	<image filename="button-bg.svg" colorize="C_button_bg_hover" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
-	<image filename="button-border.svg" colorize="C_button_border_hover" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
-	<image filename="max-icon.svg" colorize="C_icon_bg_hover" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+	<image filename="maximize_unfocused_prelight.png"
+		x="(width - object_width) / 2"
+		y="(height - object_height) / 2"
+		width="object_width"
+		height="object_height"/>
 </draw_ops>
 
 <draw_ops name="maximize_unfocused_pressed">
-	<image filename="button-bg.svg" colorize="C_button_bg_active" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
-	<image filename="max-icon.svg" colorize="C_icon_bg_active" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+	<image filename="maximize_unfocused_pressed.png"
+		x="(width - object_width) / 2"
+		y="(height - object_height) / 2"
+		width="object_width"
+		height="object_height"/>
 </draw_ops>
 
-<!--minimize-->
+<!-- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx -->
+
 <draw_ops name="minimize_focused">
-	<image filename="min-icon.svg" colorize="C_icon_bg_focused" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="minimize_focused_pressed">
-	<image filename="button-bg.svg" colorize="C_button_bg_active" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
-	<image filename="min-icon.svg" colorize="C_icon_bg_active" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+	<image filename="minimize_focused_normal.png"
+		x="(width - object_width) / 2"
+		y="(height - object_height) / 2"
+		width="object_width"
+		height="object_height"/>
 </draw_ops>
 
 <draw_ops name="minimize_focused_prelight">
-	<image filename="button-bg.svg" colorize="C_button_bg_hover" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
-	<image filename="button-border.svg" colorize="C_button_border_hover" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
-	<image filename="min-icon.svg" colorize="C_icon_bg_hover" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+	<image filename="minimize_focused_prelight.png"
+		x="(width - object_width) / 2"
+		y="(height - object_height) / 2"
+		width="object_width"
+		height="object_height"/>
+</draw_ops>
+
+<draw_ops name="minimize_focused_pressed">
+	<image filename="minimize_focused_pressed.png"
+		x="(width - object_width) / 2"
+		y="(height - object_height) / 2"
+		width="object_width"
+		height="object_height"/>
 </draw_ops>
 
 <draw_ops name="minimize_unfocused">
-	<image filename="min-icon.svg" colorize="C_icon_bg_unfocused" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+	<image filename="minimize_unfocused.png"
+		x="(width - object_width) / 2"
+		y="(height - object_height) / 2"
+		width="object_width"
+		height="object_height"/>
 </draw_ops>
 
 <draw_ops name="minimize_unfocused_prelight">
-	<image filename="button-bg.svg" colorize="C_button_bg_hover" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
-	<image filename="button-border.svg" colorize="C_button_border_hover" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
-	<image filename="min-icon.svg" colorize="C_icon_bg_hover" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+	<image filename="minimize_unfocused_prelight.png"
+		x="(width - object_width) / 2"
+		y="(height - object_height) / 2"
+		width="object_width"
+		height="object_height"/>
 </draw_ops>
 
 <draw_ops name="minimize_unfocused_pressed">
-	<image filename="button-bg.svg" colorize="C_button_bg_active" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
-	<image filename="min-icon.svg" colorize="C_icon_bg_active" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+	<image filename="minimize_unfocused_pressed.png"
+		x="(width - object_width) / 2"
+		y="(height - object_height) / 2"
+		width="object_width"
+		height="object_height"/>
 </draw_ops>
 
-
 <!--Todo-->
 <draw_ops name="menu_focused"></draw_ops>
 <draw_ops name="menu_focused_pressed"></draw_ops>
diff --git a/common/metacity-1/min-icon.svg b/common/metacity-1/min-icon.svg
deleted file mode 100644
index 92920b5..0000000
--- a/common/metacity-1/min-icon.svg
+++ /dev/null
@@ -1,75 +0,0 @@
-<?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 /></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="22.627417"
-     inkscape:cx="6.164106"
-     inkscape:cy="8.4082271"
-     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:#808080;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
diff --git a/common/metacity-1/minimize.png b/common/metacity-1/minimize.png
new file mode 100644
index 0000000..80d1c7c
Binary files /dev/null and b/common/metacity-1/minimize.png differ
diff --git a/common/metacity-1/minimize_focused_normal.png b/common/metacity-1/minimize_focused_normal.png
new file mode 100644
index 0000000..80d1c7c
Binary files /dev/null and b/common/metacity-1/minimize_focused_normal.png differ
diff --git a/common/metacity-1/minimize_focused_prelight.png b/common/metacity-1/minimize_focused_prelight.png
new file mode 100644
index 0000000..2f4e8e9
Binary files /dev/null and b/common/metacity-1/minimize_focused_prelight.png differ
diff --git a/common/metacity-1/minimize_focused_pressed.png b/common/metacity-1/minimize_focused_pressed.png
new file mode 100644
index 0000000..2efe3a5
Binary files /dev/null and b/common/metacity-1/minimize_focused_pressed.png differ
diff --git a/common/metacity-1/minimize_unfocused.png b/common/metacity-1/minimize_unfocused.png
new file mode 100644
index 0000000..1324b9d
Binary files /dev/null and b/common/metacity-1/minimize_unfocused.png differ
diff --git a/common/metacity-1/minimize_unfocused_prelight.png b/common/metacity-1/minimize_unfocused_prelight.png
new file mode 100644
index 0000000..2f4e8e9
Binary files /dev/null and b/common/metacity-1/minimize_unfocused_prelight.png differ
diff --git a/common/metacity-1/minimize_unfocused_pressed.png b/common/metacity-1/minimize_unfocused_pressed.png
new file mode 100644
index 0000000..2efe3a5
Binary files /dev/null and b/common/metacity-1/minimize_unfocused_pressed.png differ