[Xfce4-commits] r27010 - in xfwm4/trunk/themes: . default default-4.4

Olivier Fourdan olivier at xfce.org
Mon Jun 2 22:26:08 CEST 2008


Author: olivier
Date: 2008-06-02 20:26:07 +0000 (Mon, 02 Jun 2008)
New Revision: 27010

Added:
   xfwm4/trunk/themes/default/menu-prelight.svg
   xfwm4/trunk/themes/default/menu-prelight.xpm
   xfwm4/trunk/themes/default/menu-pressed.svg
   xfwm4/trunk/themes/default/menu-pressed.xpm
Removed:
   xfwm4/trunk/themes/default/menu-prelight.png
   xfwm4/trunk/themes/default/menu-prelight.svg
   xfwm4/trunk/themes/default/menu-prelight.xpm
   xfwm4/trunk/themes/default/menu-pressed.png
   xfwm4/trunk/themes/default/menu-pressed.svg
   xfwm4/trunk/themes/default/menu-pressed.xpm
Modified:
   xfwm4/trunk/themes/Makefile.am
   xfwm4/trunk/themes/default-4.4/top-right-inactive.svg
   xfwm4/trunk/themes/default/Makefile.am
   xfwm4/trunk/themes/default/bottom-active.png
   xfwm4/trunk/themes/default/bottom-active.svg
   xfwm4/trunk/themes/default/bottom-active.xpm
   xfwm4/trunk/themes/default/bottom-inactive.png
   xfwm4/trunk/themes/default/bottom-inactive.svg
   xfwm4/trunk/themes/default/bottom-inactive.xpm
   xfwm4/trunk/themes/default/bottom-left-active.png
   xfwm4/trunk/themes/default/bottom-left-active.svg
   xfwm4/trunk/themes/default/bottom-left-active.xpm
   xfwm4/trunk/themes/default/bottom-left-inactive.png
   xfwm4/trunk/themes/default/bottom-left-inactive.svg
   xfwm4/trunk/themes/default/bottom-left-inactive.xpm
   xfwm4/trunk/themes/default/bottom-right-active.png
   xfwm4/trunk/themes/default/bottom-right-active.svg
   xfwm4/trunk/themes/default/bottom-right-active.xpm
   xfwm4/trunk/themes/default/bottom-right-inactive.png
   xfwm4/trunk/themes/default/bottom-right-inactive.svg
   xfwm4/trunk/themes/default/bottom-right-inactive.xpm
   xfwm4/trunk/themes/default/close-active.png
   xfwm4/trunk/themes/default/close-active.svg
   xfwm4/trunk/themes/default/close-active.xpm
   xfwm4/trunk/themes/default/close-inactive.png
   xfwm4/trunk/themes/default/close-inactive.svg
   xfwm4/trunk/themes/default/close-inactive.xpm
   xfwm4/trunk/themes/default/close-prelight.png
   xfwm4/trunk/themes/default/close-prelight.svg
   xfwm4/trunk/themes/default/close-prelight.xpm
   xfwm4/trunk/themes/default/close-pressed.png
   xfwm4/trunk/themes/default/close-pressed.svg
   xfwm4/trunk/themes/default/close-pressed.xpm
   xfwm4/trunk/themes/default/hide-active.png
   xfwm4/trunk/themes/default/hide-active.svg
   xfwm4/trunk/themes/default/hide-active.xpm
   xfwm4/trunk/themes/default/hide-inactive.png
   xfwm4/trunk/themes/default/hide-inactive.svg
   xfwm4/trunk/themes/default/hide-inactive.xpm
   xfwm4/trunk/themes/default/hide-prelight.png
   xfwm4/trunk/themes/default/hide-prelight.svg
   xfwm4/trunk/themes/default/hide-prelight.xpm
   xfwm4/trunk/themes/default/hide-pressed.png
   xfwm4/trunk/themes/default/hide-pressed.svg
   xfwm4/trunk/themes/default/hide-pressed.xpm
   xfwm4/trunk/themes/default/left-active.png
   xfwm4/trunk/themes/default/left-active.svg
   xfwm4/trunk/themes/default/left-active.xpm
   xfwm4/trunk/themes/default/left-inactive.png
   xfwm4/trunk/themes/default/left-inactive.svg
   xfwm4/trunk/themes/default/left-inactive.xpm
   xfwm4/trunk/themes/default/maximize-active.png
   xfwm4/trunk/themes/default/maximize-active.svg
   xfwm4/trunk/themes/default/maximize-active.xpm
   xfwm4/trunk/themes/default/maximize-inactive.png
   xfwm4/trunk/themes/default/maximize-inactive.svg
   xfwm4/trunk/themes/default/maximize-inactive.xpm
   xfwm4/trunk/themes/default/maximize-prelight.png
   xfwm4/trunk/themes/default/maximize-prelight.svg
   xfwm4/trunk/themes/default/maximize-prelight.xpm
   xfwm4/trunk/themes/default/maximize-pressed.png
   xfwm4/trunk/themes/default/maximize-pressed.svg
   xfwm4/trunk/themes/default/maximize-pressed.xpm
   xfwm4/trunk/themes/default/maximize-toggled-active.png
   xfwm4/trunk/themes/default/maximize-toggled-active.svg
   xfwm4/trunk/themes/default/maximize-toggled-active.xpm
   xfwm4/trunk/themes/default/maximize-toggled-inactive.png
   xfwm4/trunk/themes/default/maximize-toggled-inactive.svg
   xfwm4/trunk/themes/default/maximize-toggled-inactive.xpm
   xfwm4/trunk/themes/default/maximize-toggled-prelight.png
   xfwm4/trunk/themes/default/maximize-toggled-prelight.svg
   xfwm4/trunk/themes/default/maximize-toggled-prelight.xpm
   xfwm4/trunk/themes/default/maximize-toggled-pressed.png
   xfwm4/trunk/themes/default/maximize-toggled-pressed.svg
   xfwm4/trunk/themes/default/maximize-toggled-pressed.xpm
   xfwm4/trunk/themes/default/menu-active.png
   xfwm4/trunk/themes/default/menu-active.svg
   xfwm4/trunk/themes/default/menu-active.xpm
   xfwm4/trunk/themes/default/menu-inactive.png
   xfwm4/trunk/themes/default/menu-inactive.svg
   xfwm4/trunk/themes/default/menu-inactive.xpm
   xfwm4/trunk/themes/default/right-active.png
   xfwm4/trunk/themes/default/right-active.svg
   xfwm4/trunk/themes/default/right-active.xpm
   xfwm4/trunk/themes/default/right-inactive.png
   xfwm4/trunk/themes/default/right-inactive.svg
   xfwm4/trunk/themes/default/right-inactive.xpm
   xfwm4/trunk/themes/default/shade-active.png
   xfwm4/trunk/themes/default/shade-active.svg
   xfwm4/trunk/themes/default/shade-active.xpm
   xfwm4/trunk/themes/default/shade-inactive.png
   xfwm4/trunk/themes/default/shade-inactive.svg
   xfwm4/trunk/themes/default/shade-inactive.xpm
   xfwm4/trunk/themes/default/shade-prelight.png
   xfwm4/trunk/themes/default/shade-prelight.svg
   xfwm4/trunk/themes/default/shade-prelight.xpm
   xfwm4/trunk/themes/default/shade-pressed.png
   xfwm4/trunk/themes/default/shade-pressed.svg
   xfwm4/trunk/themes/default/shade-pressed.xpm
   xfwm4/trunk/themes/default/shade-toggled-active.png
   xfwm4/trunk/themes/default/shade-toggled-active.svg
   xfwm4/trunk/themes/default/shade-toggled-active.xpm
   xfwm4/trunk/themes/default/shade-toggled-inactive.png
   xfwm4/trunk/themes/default/shade-toggled-inactive.svg
   xfwm4/trunk/themes/default/shade-toggled-inactive.xpm
   xfwm4/trunk/themes/default/shade-toggled-prelight.png
   xfwm4/trunk/themes/default/shade-toggled-prelight.svg
   xfwm4/trunk/themes/default/shade-toggled-prelight.xpm
   xfwm4/trunk/themes/default/shade-toggled-pressed.png
   xfwm4/trunk/themes/default/shade-toggled-pressed.svg
   xfwm4/trunk/themes/default/shade-toggled-pressed.xpm
   xfwm4/trunk/themes/default/stick-active.png
   xfwm4/trunk/themes/default/stick-active.svg
   xfwm4/trunk/themes/default/stick-active.xpm
   xfwm4/trunk/themes/default/stick-inactive.png
   xfwm4/trunk/themes/default/stick-inactive.svg
   xfwm4/trunk/themes/default/stick-inactive.xpm
   xfwm4/trunk/themes/default/stick-prelight.png
   xfwm4/trunk/themes/default/stick-prelight.svg
   xfwm4/trunk/themes/default/stick-prelight.xpm
   xfwm4/trunk/themes/default/stick-pressed.png
   xfwm4/trunk/themes/default/stick-pressed.svg
   xfwm4/trunk/themes/default/stick-pressed.xpm
   xfwm4/trunk/themes/default/stick-toggled-active.png
   xfwm4/trunk/themes/default/stick-toggled-active.svg
   xfwm4/trunk/themes/default/stick-toggled-active.xpm
   xfwm4/trunk/themes/default/stick-toggled-inactive.png
   xfwm4/trunk/themes/default/stick-toggled-inactive.svg
   xfwm4/trunk/themes/default/stick-toggled-inactive.xpm
   xfwm4/trunk/themes/default/stick-toggled-prelight.png
   xfwm4/trunk/themes/default/stick-toggled-prelight.svg
   xfwm4/trunk/themes/default/stick-toggled-prelight.xpm
   xfwm4/trunk/themes/default/stick-toggled-pressed.png
   xfwm4/trunk/themes/default/stick-toggled-pressed.svg
   xfwm4/trunk/themes/default/stick-toggled-pressed.xpm
   xfwm4/trunk/themes/default/themerc
   xfwm4/trunk/themes/default/title-1-active.png
   xfwm4/trunk/themes/default/title-1-active.svg
   xfwm4/trunk/themes/default/title-1-active.xpm
   xfwm4/trunk/themes/default/title-1-inactive.png
   xfwm4/trunk/themes/default/title-1-inactive.svg
   xfwm4/trunk/themes/default/title-1-inactive.xpm
   xfwm4/trunk/themes/default/title-2-active.png
   xfwm4/trunk/themes/default/title-2-active.svg
   xfwm4/trunk/themes/default/title-2-active.xpm
   xfwm4/trunk/themes/default/title-2-inactive.png
   xfwm4/trunk/themes/default/title-2-inactive.svg
   xfwm4/trunk/themes/default/title-2-inactive.xpm
   xfwm4/trunk/themes/default/title-3-active.png
   xfwm4/trunk/themes/default/title-3-active.svg
   xfwm4/trunk/themes/default/title-3-active.xpm
   xfwm4/trunk/themes/default/title-3-inactive.png
   xfwm4/trunk/themes/default/title-3-inactive.svg
   xfwm4/trunk/themes/default/title-3-inactive.xpm
   xfwm4/trunk/themes/default/title-4-active.png
   xfwm4/trunk/themes/default/title-4-active.svg
   xfwm4/trunk/themes/default/title-4-active.xpm
   xfwm4/trunk/themes/default/title-4-inactive.png
   xfwm4/trunk/themes/default/title-4-inactive.svg
   xfwm4/trunk/themes/default/title-4-inactive.xpm
   xfwm4/trunk/themes/default/title-5-active.png
   xfwm4/trunk/themes/default/title-5-active.svg
   xfwm4/trunk/themes/default/title-5-active.xpm
   xfwm4/trunk/themes/default/title-5-inactive.png
   xfwm4/trunk/themes/default/title-5-inactive.svg
   xfwm4/trunk/themes/default/title-5-inactive.xpm
   xfwm4/trunk/themes/default/top-left-active.png
   xfwm4/trunk/themes/default/top-left-active.svg
   xfwm4/trunk/themes/default/top-left-active.xpm
   xfwm4/trunk/themes/default/top-left-inactive.png
   xfwm4/trunk/themes/default/top-left-inactive.svg
   xfwm4/trunk/themes/default/top-left-inactive.xpm
   xfwm4/trunk/themes/default/top-right-active.png
   xfwm4/trunk/themes/default/top-right-active.svg
   xfwm4/trunk/themes/default/top-right-active.xpm
   xfwm4/trunk/themes/default/top-right-inactive.png
   xfwm4/trunk/themes/default/top-right-inactive.svg
   xfwm4/trunk/themes/default/top-right-inactive.xpm
Log:
Change theme

Modified: xfwm4/trunk/themes/Makefile.am
===================================================================
--- xfwm4/trunk/themes/Makefile.am	2008-06-02 20:23:20 UTC (rev 27009)
+++ xfwm4/trunk/themes/Makefile.am	2008-06-02 20:26:07 UTC (rev 27010)
@@ -8,6 +8,7 @@
 	default-4.0							\
 	default-4.2							\
 	default-4.4							\
+	kokodi								\
 	moheli								\
 	sassandra							\
 	stoneage							\

Modified: xfwm4/trunk/themes/default/Makefile.am
===================================================================
--- xfwm4/trunk/themes/default/Makefile.am	2008-06-02 20:23:20 UTC (rev 27009)
+++ xfwm4/trunk/themes/default/Makefile.am	2008-06-02 20:26:07 UTC (rev 27010)
@@ -9,45 +9,45 @@
 	bottom-right-inactive.png					\
 	close-active.png						\
 	close-inactive.png						\
+	close-prelight.png						\
 	close-pressed.png						\
-	close-prelight.png						\
 	hide-active.png							\
 	hide-inactive.png						\
+	hide-prelight.png						\
 	hide-pressed.png						\
 	hide-pressed.png						\
-	hide-prelight.png						\
 	left-active.png							\
 	left-inactive.png						\
 	maximize-active.png						\
 	maximize-inactive.png						\
+	maximize-prelight.png						\
 	maximize-pressed.png						\
-	maximize-prelight.png						\
 	maximize-toggled-active.png					\
 	maximize-toggled-inactive.png					\
+	maximize-toggled-prelight.png					\
 	maximize-toggled-pressed.png					\
-	maximize-toggled-prelight.png					\
 	menu-active.png							\
 	menu-inactive.png						\
+	menu-prelight.png						\
 	menu-pressed.png						\
-	menu-prelight.png						\
 	right-active.png						\
 	right-inactive.png						\
 	shade-active.png						\
 	shade-inactive.png						\
+	shade-prelight.png						\
 	shade-pressed.png						\
-	shade-prelight.png						\
 	shade-toggled-active.png					\
 	shade-toggled-inactive.png					\
+	shade-toggled-prelight.png					\
 	shade-toggled-pressed.png					\
-	shade-toggled-prelight.png					\
 	stick-active.png						\
 	stick-inactive.png						\
+	stick-prelight.png						\
 	stick-pressed.png						\
-	stick-prelight.png						\
 	stick-toggled-active.png					\
 	stick-toggled-inactive.png					\
+	stick-toggled-prelight.png					\
 	stick-toggled-pressed.png					\
-	stick-toggled-prelight.png					\
 	title-1-active.png						\
 	title-1-inactive.png						\
 	title-2-active.png						\
@@ -72,44 +72,44 @@
 	bottom-right-inactive.svg					\
 	close-active.svg						\
 	close-inactive.svg						\
+	close-prelight.svg						\
 	close-pressed.svg						\
-	close-prelight.svg						\
 	hide-active.svg							\
 	hide-inactive.svg						\
+	hide-prelight.svg						\
 	hide-pressed.svg						\
-	hide-prelight.svg						\
 	left-active.svg							\
 	left-inactive.svg						\
 	maximize-active.svg						\
 	maximize-inactive.svg						\
+	maximize-prelight.svg						\
 	maximize-pressed.svg						\
-	maximize-prelight.svg						\
 	maximize-toggled-active.svg					\
 	maximize-toggled-inactive.svg					\
+	maximize-toggled-prelight.svg					\
 	maximize-toggled-pressed.svg					\
-	maximize-toggled-prelight.svg					\
 	menu-active.svg							\
 	menu-inactive.svg						\
+	menu-prelight.svg						\
 	menu-pressed.svg						\
-	menu-prelight.svg						\
 	right-active.svg						\
 	right-inactive.svg						\
 	shade-active.svg						\
 	shade-inactive.svg						\
+	shade-prelight.svg						\
 	shade-pressed.svg						\
-	shade-prelight.svg						\
 	shade-toggled-active.svg					\
 	shade-toggled-inactive.svg					\
+	shade-toggled-prelight.svg					\
 	shade-toggled-pressed.svg					\
-	shade-toggled-prelight.svg					\
 	stick-active.svg						\
 	stick-inactive.svg						\
+	stick-prelight.svg						\
 	stick-pressed.svg						\
-	stick-prelight.svg						\
 	stick-toggled-active.svg					\
 	stick-toggled-inactive.svg					\
+	stick-toggled-prelight.svg					\
 	stick-toggled-pressed.svg					\
-	stick-toggled-prelight.svg					\
 	title-1-active.svg						\
 	title-1-inactive.svg						\
 	title-2-active.svg						\
@@ -134,44 +134,44 @@
 	bottom-right-inactive.xpm					\
 	close-active.xpm						\
 	close-inactive.xpm						\
+	close-prelight.xpm						\
 	close-pressed.xpm						\
-	close-prelight.xpm						\
 	hide-active.xpm							\
 	hide-inactive.xpm						\
+	hide-prelight.xpm						\
 	hide-pressed.xpm						\
-	hide-prelight.xpm						\
 	left-active.xpm							\
 	left-inactive.xpm						\
 	maximize-active.xpm						\
 	maximize-inactive.xpm						\
+	maximize-prelight.xpm						\
 	maximize-pressed.xpm						\
-	maximize-prelight.xpm						\
 	maximize-toggled-active.xpm					\
 	maximize-toggled-inactive.xpm					\
+	maximize-toggled-prelight.xpm					\
 	maximize-toggled-pressed.xpm					\
-	maximize-toggled-prelight.xpm					\
 	menu-active.xpm							\
 	menu-inactive.xpm						\
+	menu-prelight.xpm						\
 	menu-pressed.xpm						\
-	menu-prelight.xpm						\
 	right-active.xpm						\
 	right-inactive.xpm						\
 	shade-active.xpm						\
 	shade-inactive.xpm						\
+	shade-prelight.xpm						\
 	shade-pressed.xpm						\
-	shade-prelight.xpm						\
 	shade-toggled-active.xpm					\
 	shade-toggled-inactive.xpm					\
+	shade-toggled-prelight.xpm					\
 	shade-toggled-pressed.xpm					\
-	shade-toggled-prelight.xpm					\
 	stick-active.xpm						\
 	stick-inactive.xpm						\
+	stick-prelight.xpm						\
 	stick-pressed.xpm						\
-	stick-prelight.xpm						\
 	stick-toggled-active.xpm					\
 	stick-toggled-inactive.xpm					\
+	stick-toggled-prelight.xpm					\
 	stick-toggled-pressed.xpm					\
-	stick-toggled-prelight.xpm					\
 	title-1-active.xpm						\
 	title-1-inactive.xpm						\
 	title-2-active.xpm						\

Modified: xfwm4/trunk/themes/default/bottom-active.png
===================================================================
(Binary files differ)

Modified: xfwm4/trunk/themes/default/bottom-active.svg
===================================================================
--- xfwm4/trunk/themes/default/bottom-active.svg	2008-06-02 20:23:20 UTC (rev 27009)
+++ xfwm4/trunk/themes/default/bottom-active.svg	2008-06-02 20:26:07 UTC (rev 27010)
@@ -2,7 +2,7 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
+   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"
@@ -12,8 +12,9 @@
    height="6"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.45.1"
+   inkscape:version="0.46"
    version="1.0"
+   sodipodi:docbase="/themes/default"
    sodipodi:docname="bottom-active.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
@@ -73,6 +74,15 @@
     </rdf:RDF>
   </metadata>
   <g
+     inkscape:groupmode="layer"
+     id="layer3"
+     inkscape:label="hilight">
+    <path
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+       d="M 0.5,4.5 L 24,4.5"
+       id="path6061" />
+  </g>
+  <g
      inkscape:label="Layer 1"
      inkscape:groupmode="layer"
      id="layer1">

Modified: xfwm4/trunk/themes/default/bottom-active.xpm
===================================================================
--- xfwm4/trunk/themes/default/bottom-active.xpm	2008-06-02 20:23:20 UTC (rev 27009)
+++ xfwm4/trunk/themes/default/bottom-active.xpm	2008-06-02 20:26:07 UTC (rev 27010)
@@ -6,7 +6,7 @@
 "@	c #C0C0FF s active_color_1",
 "########################",
 "########################",
-"########################",
-"########################",
 "@@@@@@@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@@@@@@@@@@"};

Modified: xfwm4/trunk/themes/default/bottom-inactive.png
===================================================================
(Binary files differ)

Modified: xfwm4/trunk/themes/default/bottom-inactive.svg
===================================================================
--- xfwm4/trunk/themes/default/bottom-inactive.svg	2008-06-02 20:23:20 UTC (rev 27009)
+++ xfwm4/trunk/themes/default/bottom-inactive.svg	2008-06-02 20:26:07 UTC (rev 27010)
@@ -2,7 +2,7 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
+   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"
@@ -12,8 +12,9 @@
    height="6"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.45.1"
+   inkscape:version="0.46"
    version="1.0"
+   sodipodi:docbase="/themes/default"
    sodipodi:docname="bottom-inactive.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
@@ -73,6 +74,15 @@
     </rdf:RDF>
   </metadata>
   <g
+     inkscape:groupmode="layer"
+     id="layer3"
+     inkscape:label="hilight">
+    <path
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.15"
+       d="M 0.5,4.5 L 24,4.5"
+       id="path6061" />
+  </g>
+  <g
      inkscape:label="Layer 1"
      inkscape:groupmode="layer"
      id="layer1">

Modified: xfwm4/trunk/themes/default/bottom-inactive.xpm
===================================================================
--- xfwm4/trunk/themes/default/bottom-inactive.xpm	2008-06-02 20:23:20 UTC (rev 27009)
+++ xfwm4/trunk/themes/default/bottom-inactive.xpm	2008-06-02 20:26:07 UTC (rev 27010)
@@ -6,7 +6,7 @@
 "@	c #C0C0FF s inactive_color_1",
 "########################",
 "########################",
-"########################",
-"########################",
 "@@@@@@@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@@@@@@@@@@"};

Modified: xfwm4/trunk/themes/default/bottom-left-active.png
===================================================================
(Binary files differ)

Modified: xfwm4/trunk/themes/default/bottom-left-active.svg
===================================================================
--- xfwm4/trunk/themes/default/bottom-left-active.svg	2008-06-02 20:23:20 UTC (rev 27009)
+++ xfwm4/trunk/themes/default/bottom-left-active.svg	2008-06-02 20:26:07 UTC (rev 27010)
@@ -2,7 +2,7 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
+   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"
@@ -12,8 +12,9 @@
    height="16"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.45.1"
+   inkscape:version="0.46"
    version="1.0"
+   sodipodi:docbase="/themes/default"
    sodipodi:docname="bottom-left-active.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
@@ -72,6 +73,15 @@
     </rdf:RDF>
   </metadata>
   <g
+     inkscape:groupmode="layer"
+     id="layer3"
+     inkscape:label="hilight">
+    <path
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+       d="M 1.5,0 L 1.5,12.5 C 1.5,12.5 1.5,14.5 3.5,14.5 C 5.5,14.5 16,14.5 16,14.5"
+       id="path6061" />
+  </g>
+  <g
      inkscape:label="Layer 1"
      inkscape:groupmode="layer"
      id="layer1">

Modified: xfwm4/trunk/themes/default/bottom-left-active.xpm
===================================================================
--- xfwm4/trunk/themes/default/bottom-left-active.xpm	2008-06-02 20:23:20 UTC (rev 27009)
+++ xfwm4/trunk/themes/default/bottom-left-active.xpm	2008-06-02 20:26:07 UTC (rev 27010)
@@ -4,19 +4,19 @@
 " 	c None",
 "#	c #C0C0C0 s active_color_2",
 "@	c #C0C0FF s active_color_1",
-"@@####          ",
-"@@####          ",
-"@@####          ",
-"@@####          ",
-"@@####          ",
-"@@####          ",
-"@@####          ",
-"@@####          ",
-"@@####          ",
-"@@####          ",
-"@@##############",
-"@@##############",
-"@@##############",
-"@@##############",
+"@@@@##          ",
+"@@@@##          ",
+"@@@@##          ",
+"@@@@##          ",
+"@@@@##          ",
+"@@@@##          ",
+"@@@@##          ",
+"@@@@##          ",
+"@@@@##          ",
+"@@@@##          ",
+"@@@@############",
+"@@@@############",
 "@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@",
 " @@@@@@@@@@@@@@@"};

Modified: xfwm4/trunk/themes/default/bottom-left-inactive.png
===================================================================
(Binary files differ)

Modified: xfwm4/trunk/themes/default/bottom-left-inactive.svg
===================================================================
--- xfwm4/trunk/themes/default/bottom-left-inactive.svg	2008-06-02 20:23:20 UTC (rev 27009)
+++ xfwm4/trunk/themes/default/bottom-left-inactive.svg	2008-06-02 20:26:07 UTC (rev 27010)
@@ -2,7 +2,7 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
+   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"
@@ -12,8 +12,9 @@
    height="16"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.45.1"
+   inkscape:version="0.46"
    version="1.0"
+   sodipodi:docbase="/themes/default"
    sodipodi:docname="bottom-left-inactive.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
@@ -72,6 +73,15 @@
     </rdf:RDF>
   </metadata>
   <g
+     inkscape:groupmode="layer"
+     id="layer3"
+     inkscape:label="hilight">
+    <path
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.15"
+       d="M 1.5,0 L 1.5,12.5 C 1.5,12.5 1.5,14.5 3.5,14.5 C 5.5,14.5 16,14.5 16,14.5"
+       id="path6061" />
+  </g>
+  <g
      inkscape:label="Layer 1"
      inkscape:groupmode="layer"
      id="layer1">

Modified: xfwm4/trunk/themes/default/bottom-left-inactive.xpm
===================================================================
--- xfwm4/trunk/themes/default/bottom-left-inactive.xpm	2008-06-02 20:23:20 UTC (rev 27009)
+++ xfwm4/trunk/themes/default/bottom-left-inactive.xpm	2008-06-02 20:26:07 UTC (rev 27010)
@@ -4,19 +4,19 @@
 " 	c None",
 "#	c #C0C0C0 s inactive_color_2",
 "@	c #C0C0FF s inactive_color_1",
-"@@####          ",
-"@@####          ",
-"@@####          ",
-"@@####          ",
-"@@####          ",
-"@@####          ",
-"@@####          ",
-"@@####          ",
-"@@####          ",
-"@@####          ",
-"@@##############",
-"@@##############",
-"@@##############",
-"@@##############",
+"@@@@##          ",
+"@@@@##          ",
+"@@@@##          ",
+"@@@@##          ",
+"@@@@##          ",
+"@@@@##          ",
+"@@@@##          ",
+"@@@@##          ",
+"@@@@##          ",
+"@@@@##          ",
+"@@@@############",
+"@@@@############",
 "@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@",
 " @@@@@@@@@@@@@@@"};

Modified: xfwm4/trunk/themes/default/bottom-right-active.png
===================================================================
(Binary files differ)

Modified: xfwm4/trunk/themes/default/bottom-right-active.svg
===================================================================
--- xfwm4/trunk/themes/default/bottom-right-active.svg	2008-06-02 20:23:20 UTC (rev 27009)
+++ xfwm4/trunk/themes/default/bottom-right-active.svg	2008-06-02 20:26:07 UTC (rev 27010)
@@ -2,7 +2,7 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
+   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"
@@ -12,8 +12,9 @@
    height="16"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.45.1"
+   inkscape:version="0.46"
    version="1.0"
+   sodipodi:docbase="/themes/default"
    sodipodi:docname="bottom-right-active.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
@@ -72,6 +73,15 @@
     </rdf:RDF>
   </metadata>
   <g
+     inkscape:groupmode="layer"
+     id="layer3"
+     inkscape:label="hilight">
+    <path
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+       d="M 14.5,0 L 14.5,12.5 C 14.5,12.5 14.5,14.5 12.5,14.5 C 10.5,14.5 0,14.5 0,14.5"
+       id="path6061" />
+  </g>
+  <g
      inkscape:label="Layer 1"
      inkscape:groupmode="layer"
      id="layer1">

Modified: xfwm4/trunk/themes/default/bottom-right-active.xpm
===================================================================
--- xfwm4/trunk/themes/default/bottom-right-active.xpm	2008-06-02 20:23:20 UTC (rev 27009)
+++ xfwm4/trunk/themes/default/bottom-right-active.xpm	2008-06-02 20:26:07 UTC (rev 27010)
@@ -4,19 +4,19 @@
 " 	c None",
 "#	c #C0C0C0 s active_color_2",
 "@	c #C0C0FF s active_color_1",
-"          ####@@",
-"          ####@@",
-"          ####@@",
-"          ####@@",
-"          ####@@",
-"          ####@@",
-"          ####@@",
-"          ####@@",
-"          ####@@",
-"          ####@@",
-"##############@@",
-"##############@@",
-"##############@@",
-"##############@@",
+"          ##@@@@",
+"          ##@@@@",
+"          ##@@@@",
+"          ##@@@@",
+"          ##@@@@",
+"          ##@@@@",
+"          ##@@@@",
+"          ##@@@@",
+"          ##@@@@",
+"          ##@@@@",
+"############@@@@",
+"############@@@@",
 "@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@ "};

Modified: xfwm4/trunk/themes/default/bottom-right-inactive.png
===================================================================
(Binary files differ)

Modified: xfwm4/trunk/themes/default/bottom-right-inactive.svg
===================================================================
--- xfwm4/trunk/themes/default/bottom-right-inactive.svg	2008-06-02 20:23:20 UTC (rev 27009)
+++ xfwm4/trunk/themes/default/bottom-right-inactive.svg	2008-06-02 20:26:07 UTC (rev 27010)
@@ -2,7 +2,7 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
+   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"
@@ -12,8 +12,9 @@
    height="16"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.45.1"
+   inkscape:version="0.46"
    version="1.0"
+   sodipodi:docbase="/themes/default"
    sodipodi:docname="bottom-right-inactive.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
@@ -72,6 +73,15 @@
     </rdf:RDF>
   </metadata>
   <g
+     inkscape:groupmode="layer"
+     id="layer3"
+     inkscape:label="hilight">
+    <path
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.15"
+       d="M 14.5,0 L 14.5,12.5 C 14.5,12.5 14.5,14.5 12.5,14.5 C 10.5,14.5 0,14.5 0,14.5"
+       id="path6061" />
+  </g>
+  <g
      inkscape:label="Layer 1"
      inkscape:groupmode="layer"
      id="layer1">

Modified: xfwm4/trunk/themes/default/bottom-right-inactive.xpm
===================================================================
--- xfwm4/trunk/themes/default/bottom-right-inactive.xpm	2008-06-02 20:23:20 UTC (rev 27009)
+++ xfwm4/trunk/themes/default/bottom-right-inactive.xpm	2008-06-02 20:26:07 UTC (rev 27010)
@@ -4,19 +4,19 @@
 " 	c None",
 "#	c #C0C0C0 s inactive_color_2",
 "@	c #C0C0FF s inactive_color_1",
-"          ####@@",
-"          ####@@",
-"          ####@@",
-"          ####@@",
-"          ####@@",
-"          ####@@",
-"          ####@@",
-"          ####@@",
-"          ####@@",
-"          ####@@",
-"##############@@",
-"##############@@",
-"##############@@",
-"##############@@",
+"          ##@@@@",
+"          ##@@@@",
+"          ##@@@@",
+"          ##@@@@",
+"          ##@@@@",
+"          ##@@@@",
+"          ##@@@@",
+"          ##@@@@",
+"          ##@@@@",
+"          ##@@@@",
+"############@@@@",
+"############@@@@",
 "@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@ "};

Modified: xfwm4/trunk/themes/default/close-active.png
===================================================================
(Binary files differ)

Modified: xfwm4/trunk/themes/default/close-active.svg
===================================================================
--- xfwm4/trunk/themes/default/close-active.svg	2008-06-02 20:23:20 UTC (rev 27009)
+++ xfwm4/trunk/themes/default/close-active.svg	2008-06-02 20:26:07 UTC (rev 27010)
@@ -2,116 +2,73 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
+   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:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="24"
-   height="27"
+   width="18"
+   height="24"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.45.1"
+   inkscape:version="0.46"
    version="1.0"
+   sodipodi:docbase="/themes/default"
    sodipodi:docname="close-active.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient1886">
+       id="linearGradient3143">
       <stop
-         style="stop-color:white;stop-opacity:1;"
+         style="stop-color:#ffffff;stop-opacity:0.0;"
          offset="0"
-         id="stop1888" />
+         id="stop3145" />
       <stop
-         style="stop-color:white;stop-opacity:0.25;"
+         style="stop-color:#000000;stop-opacity:0.10;"
          offset="1"
-         id="stop1890" />
+         id="stop3147" />
     </linearGradient>
     <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:white;stop-opacity:1;" />
-      <stop
-         id="stop5877"
-         offset="0.5"
-         style="stop-color:white;stop-opacity:0.90;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:white;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
        id="linearGradient5847">
       <stop
          id="stop5849"
          offset="0"
-         style="stop-color:white;stop-opacity:0;" />
+         style="stop-color:#ffffff;stop-opacity:0.90;" />
       <stop
-         id="stop2779"
-         offset="0.75"
-         style="stop-color:white;stop-opacity:0;" />
+         id="stop5850"
+         offset="0.70"
+         style="stop-color:#ffffff;stop-opacity:0.10;" />
       <stop
          id="stop5851"
          offset="1"
-         style="stop-color:white;stop-opacity:0.20;" />
+         style="stop-color:#ffffff;stop-opacity:0;" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
+       id="linearGradient3148"
        x1="0"
-       y1="0.5"
-       x2="0"
-       y2="26.5"
-       gradientTransform="matrix(1,0,0,1,0,0)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5873"
-       id="linearGradient6962"
-       x1="0"
        y1="1"
        x2="0"
-       y2="8"
+       y2="18"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2,0,1)" />
+       spreadMethod="none" />
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient1886"
-       id="linearGradient1892"
+       xlink:href="#linearGradient3143"
+       id="linearGradient3149"
        x1="0"
-       y1="1"
+       y1="13"
        x2="0"
-       y2="14"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1886"
-       id="linearGradient2791"
-       x1="0"
-       y1="1"
-       x2="0"
-       y2="25"
+       y2="24"
        gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5873"
-       id="linearGradient4147"
-       x1="0"
-       y1="1"
-       x2="0"
-       y2="19"
-       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
-     pagecolor="white"
+     pagecolor="#ffffff"
      bordercolor="#666666"
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
@@ -124,7 +81,6 @@
      showgrid="true"
      inkscape:grid-bbox="true"
      inkscape:grid-points="true"
-     gridoriginx="0px"
      gridtolerance="0.5px"
      guidetolerance="1px"
      inkscape:window-width="640"
@@ -133,7 +89,20 @@
      inkscape:window-y="0"
      inkscape:guide-bbox="true"
      inkscape:guide-points="false"
-     showguides="true" />
+     showguides="true">
+    <inkscape:grid
+       id="GridFromPre046Settings"
+       type="xygrid"
+       originx="0px"
+       originy="0px"
+       spacingx="0px"
+       spacingy="1px"
+       color="#0000ff"
+       empcolor="#0000ff"
+       opacity="0.2"
+       empopacity="0.4"
+       empspacing="5" />
+  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -152,86 +121,72 @@
     </rdf:RDF>
   </metadata>
   <g
+     inkscape:label="Border"
      inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Grad"
+     id="layer1"
      style="display:inline">
     <path
-       style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 0,0.5 L 24,0.5 C 24,0.5 24,26 24,26 L 0,26 L 0,0.5 z "
-       id="path6057" />
+       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+       d="M 0.5,0.5 L 17.5,0.5"
+       id="path6059" />
   </g>
   <g
      inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="hilight">
-    <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 0,1 L 24,1 C 24,1 24,4 24,4 L 0,4 L 0,3 z "
-       id="path6061" />
+     id="layer2"
+     inkscape:label="Grad"
+     style="display:inline">
     <rect
-       style="opacity:0.25;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect1884"
-       width="24"
-       height="15"
+       style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect6057"
+       width="18"
+       height="12"
        x="0"
        y="1" />
-    <path
-       style="fill:none;stroke:url(#linearGradient2791);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.60"
-       d="M 0.5,1 L 0.5,16.5 C 0.5,16.5 0.5,18.5 2.5,18.5 C 4,18.5 21.5,18.5 21.5,18.5 C 21.5,18.5 23.5,18.5 23.5,16.5 C 23.5,14.5 23.5,1 23.5,1 L 23.5,1 L 23.5,1"
-       id="path2187" />
-    <path
-       style="fill:url(#linearGradient4147);fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:0.50"
-       d="M 2,1 C 2,1 2,13 2,15 C 2,17 5,17 5,17 L 20,17 C 20,17 22,17 22,15 C 22,13 22,1 22,1 L 2,1 z "
-       id="path2188" />
   </g>
   <g
-     inkscape:label="Border"
      inkscape:groupmode="layer"
-     id="layer1"
-     style="display:inline">
+     id="layer3"
+     inkscape:label="hilight">
+    <rect
+       style="fill:url(#linearGradient3149);fill-opacity:1.00;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect3141"
+       width="18"
+       height="12"
+       x="0"
+       y="12" />
     <path
-       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
-       d="M 0.5,0.5 L 23.5,0.5"
-       id="path6059" />
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+       d="M 0,1.5 L 18,1.5"
+       id="path6061" />
   </g>
   <g
      inkscape:groupmode="layer"
      id="g20"
      inkscape:label="Button">
     <g
-       id="g2327"
-       transform="translate(6,4)">
+       id="g2328"
+       transform="translate(3,7)">
       <g
          transform="matrix(0.875,0,0,0.875,0.75,0.75)"
-         style="opacity:0.33;stroke:black;stroke-width:4.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         style="opacity:0.33;stroke:#000000;stroke-width:4.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
          id="g2217">
         <path
-           style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:4.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:4.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
            d="M 2,2 L 10,10"
            id="path1340" />
         <path
-           style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:4.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:4.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
            d="M 2,10 L 10,2"
            id="path2215" />
       </g>
       <path
          id="path2221"
          d="M 2.5,2.5 L 9.5,9.5 L 9.5,9.5"
-         style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:white;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+         style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
       <path
          id="path2225"
          d="M 2.5,9.5 L 9.5,2.5"
-         style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:white;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+         style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
     </g>
   </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer5"
-     inkscape:label="Shadow">
-    <path
-       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.05"
-       d="M 0.5,26.5 L 23.5,26.5"
-       id="path6989" />
-  </g>
 </svg>

Modified: xfwm4/trunk/themes/default/close-active.xpm
===================================================================
--- xfwm4/trunk/themes/default/close-active.xpm	2008-06-02 20:23:20 UTC (rev 27009)
+++ xfwm4/trunk/themes/default/close-active.xpm	2008-06-02 20:26:07 UTC (rev 27010)
@@ -1,32 +1,29 @@
 /* XPM */
 static char * close_active_xpm[] = {
-"24 27 2 1",
+"18 24 2 1",
 " 	c None",
 ".	c #C0C0FF s active_color_1",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................"};
+"                  ",
+"                  ",
+"                  ",
+"                  ",
+" ................ ",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+" ................ ",
+"                  ",
+"                  "};

Modified: xfwm4/trunk/themes/default/close-inactive.png
===================================================================
(Binary files differ)

Modified: xfwm4/trunk/themes/default/close-inactive.svg
===================================================================
--- xfwm4/trunk/themes/default/close-inactive.svg	2008-06-02 20:23:20 UTC (rev 27009)
+++ xfwm4/trunk/themes/default/close-inactive.svg	2008-06-02 20:26:07 UTC (rev 27010)
@@ -2,98 +2,73 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
+   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:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="24"
-   height="27"
+   width="18"
+   height="24"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.45.1"
+   inkscape:version="0.46"
    version="1.0"
+   sodipodi:docbase="/themes/default"
    sodipodi:docname="close-inactive.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient1886">
+       id="linearGradient3143">
       <stop
-         style="stop-color:white;stop-opacity:1;"
+         style="stop-color:#ffffff;stop-opacity:0.0;"
          offset="0"
-         id="stop1888" />
+         id="stop3145" />
       <stop
-         style="stop-color:white;stop-opacity:0.25;"
+         style="stop-color:#000000;stop-opacity:0.10;"
          offset="1"
-         id="stop1890" />
+         id="stop3147" />
     </linearGradient>
     <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:white;stop-opacity:1;" />
-      <stop
-         id="stop5877"
-         offset="0.5"
-         style="stop-color:white;stop-opacity:0.90;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:white;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
        id="linearGradient5847">
       <stop
          id="stop5849"
          offset="0"
-         style="stop-color:white;stop-opacity:0;" />
+         style="stop-color:#ffffff;stop-opacity:0.90;" />
       <stop
-         id="stop2779"
-         offset="0.75"
-         style="stop-color:white;stop-opacity:0;" />
+         id="stop5850"
+         offset="0.70"
+         style="stop-color:#ffffff;stop-opacity:0.10;" />
       <stop
          id="stop5851"
          offset="1"
-         style="stop-color:white;stop-opacity:0.20;" />
+         style="stop-color:#ffffff;stop-opacity:0;" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
+       id="linearGradient3148"
        x1="0"
-       y1="0.5"
-       x2="0"
-       y2="26.5"
-       gradientTransform="matrix(1,0,0,1,0,0)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5873"
-       id="linearGradient6962"
-       x1="0"
        y1="1"
        x2="0"
-       y2="8"
+       y2="18"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2,0,1)" />
+       spreadMethod="none" />
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient1886"
-       id="linearGradient1892"
+       xlink:href="#linearGradient3143"
+       id="linearGradient3149"
        x1="0"
-       y1="1"
+       y1="13"
        x2="0"
-       y2="14"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
+       y2="24"
+       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
-     pagecolor="white"
+     pagecolor="#ffffff"
      bordercolor="#666666"
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
@@ -106,7 +81,6 @@
      showgrid="true"
      inkscape:grid-bbox="true"
      inkscape:grid-points="true"
-     gridoriginx="0px"
      gridtolerance="0.5px"
      guidetolerance="1px"
      inkscape:window-width="640"
@@ -115,7 +89,20 @@
      inkscape:window-y="0"
      inkscape:guide-bbox="true"
      inkscape:guide-points="false"
-     showguides="true" />
+     showguides="true">
+    <inkscape:grid
+       id="GridFromPre046Settings"
+       type="xygrid"
+       originx="0px"
+       originy="0px"
+       spacingx="0px"
+       spacingy="1px"
+       color="#0000ff"
+       empcolor="#0000ff"
+       opacity="0.2"
+       empopacity="0.4"
+       empspacing="5" />
+  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -134,52 +121,51 @@
     </rdf:RDF>
   </metadata>
   <g
+     inkscape:label="Border"
      inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Grad"
+     id="layer1"
      style="display:inline">
     <path
-       style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 0,0.5 L 24,0.5 C 24,0.5 24,26 24,26 L 0,26 L 0,0.5 z "
-       id="path6057" />
+       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+       d="M 0.5,0.5 L 17.5,0.5"
+       id="path6059" />
   </g>
   <g
      inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="hilight">
-    <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 0,1 L 24,1 C 24,1 24,4 24,4 L 0,4 L 0,3 z "
-       id="path6061" />
+     id="layer2"
+     inkscape:label="Grad"
+     style="display:inline">
     <rect
-       style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect1884"
-       width="24"
-       height="15"
+       style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect6057"
+       width="18"
+       height="12"
        x="0"
        y="1" />
-    <path
-       style="fill:none;stroke:#7f7f7f;stroke-width:1px;stroke-opacity:0.25"
-       d="M 0.5,1 L 0.5,16.5 C 0.5,16.5 0.5,18.5 2.5,18.5 C 4,18.5 21.5,18.5 21.5,18.5 C 21.5,18.5 23.5,18.5 23.5,16.5 C 23.5,14.5 23.5,1 23.5,1 L 23.5,1 L 23.5,1"
-       id="path2187" />
   </g>
   <g
-     inkscape:label="Border"
      inkscape:groupmode="layer"
-     id="layer1"
-     style="display:inline">
+     id="layer3"
+     inkscape:label="hilight">
+    <rect
+       style="fill:url(#linearGradient3149);fill-opacity:0.00;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect3141"
+       width="18"
+       height="12"
+       x="0"
+       y="12" />
     <path
-       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
-       d="M 0.5,0.5 L 23.5,0.5"
-       id="path6059" />
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.15"
+       d="M 0,1.5 L 18,1.5"
+       id="path6061" />
   </g>
   <g
      inkscape:groupmode="layer"
      id="g20"
      inkscape:label="Button">
     <g
-       id="g2327"
-       transform="translate(6,4)">
+       id="g2328"
+       transform="translate(3,7)">
       <path
          id="path2221"
          d="M 2.5,2.5 L 9.5,9.5 L 9.5,9.5"
@@ -190,13 +176,4 @@
          style="opacity:0.50;fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#7f7f7f;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1" />
     </g>
   </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer5"
-     inkscape:label="Shadow">
-    <path
-       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.05"
-       d="M 0.5,26.5 L 23.5,26.5"
-       id="path6989" />
-  </g>
 </svg>

Modified: xfwm4/trunk/themes/default/close-inactive.xpm
===================================================================
--- xfwm4/trunk/themes/default/close-inactive.xpm	2008-06-02 20:23:20 UTC (rev 27009)
+++ xfwm4/trunk/themes/default/close-inactive.xpm	2008-06-02 20:26:07 UTC (rev 27010)
@@ -1,32 +1,29 @@
 /* XPM */
 static char * close_inactive_xpm[] = {
-"24 27 2 1",
+"18 24 2 1",
 " 	c None",
 ".	c #C0C0FF s inactive_color_1",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................"};
+"                  ",
+"                  ",
+"                  ",
+"                  ",
+" ................ ",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+" ................ ",
+"                  ",
+"                  "};

Modified: xfwm4/trunk/themes/default/close-prelight.png
===================================================================
(Binary files differ)

Modified: xfwm4/trunk/themes/default/close-prelight.svg
===================================================================
--- xfwm4/trunk/themes/default/close-prelight.svg	2008-06-02 20:23:20 UTC (rev 27009)
+++ xfwm4/trunk/themes/default/close-prelight.svg	2008-06-02 20:26:07 UTC (rev 27010)
@@ -2,127 +2,73 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
+   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:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="24"
-   height="27"
+   width="18"
+   height="24"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.45.1"
+   inkscape:version="0.46"
    version="1.0"
+   sodipodi:docbase="/themes/default"
    sodipodi:docname="close-prelight.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient1886">
+       id="linearGradient3143">
       <stop
-         style="stop-color:white;stop-opacity:1;"
+         style="stop-color:#ffffff;stop-opacity:0.0;"
          offset="0"
-         id="stop1888" />
+         id="stop3145" />
       <stop
-         style="stop-color:white;stop-opacity:0.25;"
+         style="stop-color:#000000;stop-opacity:0.10;"
          offset="1"
-         id="stop1890" />
+         id="stop3147" />
     </linearGradient>
     <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:white;stop-opacity:1;" />
-      <stop
-         id="stop5877"
-         offset="0.5"
-         style="stop-color:white;stop-opacity:0.90;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:white;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
        id="linearGradient5847">
       <stop
          id="stop5849"
          offset="0"
-         style="stop-color:white;stop-opacity:0;" />
+         style="stop-color:#ffffff;stop-opacity:0.90;" />
       <stop
-         id="stop2779"
-         offset="0.75"
-         style="stop-color:white;stop-opacity:0;" />
+         id="stop5850"
+         offset="0.70"
+         style="stop-color:#ffffff;stop-opacity:0.10;" />
       <stop
          id="stop5851"
          offset="1"
-         style="stop-color:white;stop-opacity:0.20;" />
+         style="stop-color:#ffffff;stop-opacity:0;" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
+       id="linearGradient3148"
        x1="0"
-       y1="0.5"
-       x2="0"
-       y2="26.5"
-       gradientTransform="matrix(1,0,0,1,0,0)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5873"
-       id="linearGradient6962"
-       x1="0"
        y1="1"
        x2="0"
-       y2="8"
+       y2="18"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2,0,1)" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5873"
-       id="radialGradient3087"
-       cx="12"
-       cy="0"
-       fx="12"
-       fy="3"
-       r="22"
-       gradientTransform="matrix(1,0,0,1,0,0.5)"
-       gradientUnits="userSpaceOnUse" />
+       spreadMethod="none" />
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient1886"
-       id="linearGradient1892"
+       xlink:href="#linearGradient3143"
+       id="linearGradient3149"
        x1="0"
-       y1="1"
+       y1="13"
        x2="0"
-       y2="12"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1886"
-       id="linearGradient2791"
-       x1="0"
-       y1="1"
-       x2="0"
-       y2="25"
+       y2="24"
        gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5873"
-       id="linearGradient4147"
-       x1="0"
-       y1="1"
-       x2="0"
-       y2="19"
-       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
-     pagecolor="white"
+     pagecolor="#ffffff"
      bordercolor="#666666"
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
@@ -135,7 +81,6 @@
      showgrid="true"
      inkscape:grid-bbox="true"
      inkscape:grid-points="true"
-     gridoriginx="0px"
      gridtolerance="0.5px"
      guidetolerance="1px"
      inkscape:window-width="640"
@@ -144,7 +89,20 @@
      inkscape:window-y="0"
      inkscape:guide-bbox="true"
      inkscape:guide-points="false"
-     showguides="true" />
+     showguides="true">
+    <inkscape:grid
+       id="GridFromPre046Settings"
+       type="xygrid"
+       originx="0px"
+       originy="0px"
+       spacingx="0px"
+       spacingy="1px"
+       color="#0000ff"
+       empcolor="#0000ff"
+       opacity="0.2"
+       empopacity="0.4"
+       empspacing="5" />
+  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -163,19 +121,27 @@
     </rdf:RDF>
   </metadata>
   <g
+     inkscape:label="Border"
      inkscape:groupmode="layer"
      id="layer1"
-     inkscape:label="pressed">
+     style="display:inline">
+    <path
+       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+       d="M 0.5,0.5 L 17.5,0.5"
+       id="path6059" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer4"
+     inkscape:label="frame">
     <g
-       id="g1789"
-       transform="translate(0,1)">
-      <rect
-         style="opacity:0.5;fill:url(#radialGradient3087);fill-opacity:1.0;stroke:url(#radialGradient3087);stroke-width:1;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         id="rect3079"
-         width="24"
-         height="25"
-         x="0"
-         y="0" />
+       style="display:inline"
+       id="g1969"
+       transform="translate(0,4)">
+      <path
+         style="fill:#ffffff;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.5;fill-opacity:0.25;opacity:0.5"
+         d="M 5.5,0.5 L 14.5,0.5 C 14.5,0.5 17.5,0.5 17.5,3.5 C 17.5,6.5 17.5,14.5 17.5,14.5 C 17.5,14.5 17.5,17.5 14.5,17.5 C 11.5,17.5 3.5,17.5 3.5,17.5 C 3.5,17.5 0.5,17.5 0.5,14.5 C 0.5,11.5 0.5,3.5 0.5,3.5 C 0.5,3.5 0.5,0.5 3.5,0.5 C 6.5,0.5 6.5,0.5 6.5,0.5 L 6.5,0.5"
+         id="path4123" />
     </g>
   </g>
   <g
@@ -183,82 +149,58 @@
      id="layer2"
      inkscape:label="Grad"
      style="display:inline">
-    <path
-       style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 0,0.5 L 24,0.5 C 24,0.5 24,26 24,26 L 0,26 L 0,0.5 z "
-       id="path6057" />
+    <rect
+       style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect6057"
+       width="18"
+       height="12"
+       x="0"
+       y="1" />
   </g>
   <g
      inkscape:groupmode="layer"
      id="layer3"
      inkscape:label="hilight">
-    <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 0,1 L 24,1 C 24,1 24,4 24,4 L 0,4 L 0,3 z "
-       id="path6061" />
     <rect
-       style="opacity:0.25;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect1884"
-       width="24"
-       height="15"
+       style="fill:url(#linearGradient3149);fill-opacity:1.00;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect3141"
+       width="18"
+       height="12"
        x="0"
-       y="1" />
+       y="12" />
     <path
-       style="fill:none;stroke:url(#linearGradient2791);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.60"
-       d="M 0.5,1 L 0.5,16.5 C 0.5,16.5 0.5,18.5 2.5,18.5 C 4,18.5 21.5,18.5 21.5,18.5 C 21.5,18.5 23.5,18.5 23.5,16.5 C 23.5,14.5 23.5,1 23.5,1 L 23.5,1 L 23.5,1"
-       id="path2187" />
-    <path
-       style="fill:url(#linearGradient4147);fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:0.50"
-       d="M 2,1 C 2,1 2,13 2,15 C 2,17 5,17 5,17 L 20,17 C 20,17 22,17 22,15 C 22,13 22,1 22,1 L 2,1 z "
-       id="path2188" />
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+       d="M 0,1.5 L 18,1.5"
+       id="path6061" />
   </g>
   <g
-     inkscape:label="Border"
      inkscape:groupmode="layer"
-     id="g31"
-     style="display:inline">
-    <path
-       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
-       d="M 0.5,0.5 L 23.5,0.5"
-       id="path6059" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="g3722"
+     id="g20"
      inkscape:label="Button">
     <g
-       id="g2327"
-       transform="translate(6,4)">
+       id="g2328"
+       transform="translate(3,7)">
       <g
          transform="matrix(0.875,0,0,0.875,0.75,0.75)"
-         style="opacity:0.33;stroke:black;stroke-width:4.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         style="opacity:0.33;stroke:#000000;stroke-width:4.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
          id="g2217">
         <path
-           style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:4.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:4.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
            d="M 2,2 L 10,10"
            id="path1340" />
         <path
-           style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:4.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:4.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
            d="M 2,10 L 10,2"
            id="path2215" />
       </g>
       <path
          id="path2221"
          d="M 2.5,2.5 L 9.5,9.5 L 9.5,9.5"
-         style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:white;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+         style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
       <path
          id="path2225"
          d="M 2.5,9.5 L 9.5,2.5"
-         style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:white;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+         style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
     </g>
   </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer5"
-     inkscape:label="Shadow">
-    <path
-       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.05"
-       d="M 0.5,26.5 L 23.5,26.5"
-       id="path6989" />
-  </g>
 </svg>

Modified: xfwm4/trunk/themes/default/close-prelight.xpm
===================================================================
--- xfwm4/trunk/themes/default/close-prelight.xpm	2008-06-02 20:23:20 UTC (rev 27009)
+++ xfwm4/trunk/themes/default/close-prelight.xpm	2008-06-02 20:26:07 UTC (rev 27010)
@@ -1,32 +1,29 @@
 /* XPM */
-static char * close_pressed_xpm[] = {
-"24 27 2 1",
+static char * close_active_xpm[] = {
+"18 24 2 1",
 " 	c None",
 ".	c #C0C0FF s active_color_1",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................"};
+"                  ",
+"                  ",
+"                  ",
+"                  ",
+" ................ ",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+" ................ ",
+"                  ",
+"                  "};

Modified: xfwm4/trunk/themes/default/close-pressed.png
===================================================================
(Binary files differ)

Modified: xfwm4/trunk/themes/default/close-pressed.svg
===================================================================
--- xfwm4/trunk/themes/default/close-pressed.svg	2008-06-02 20:23:20 UTC (rev 27009)
+++ xfwm4/trunk/themes/default/close-pressed.svg	2008-06-02 20:26:07 UTC (rev 27010)
@@ -2,127 +2,73 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
+   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:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="24"
-   height="27"
+   width="18"
+   height="24"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.45.1"
+   inkscape:version="0.46"
    version="1.0"
+   sodipodi:docbase="/themes/default"
    sodipodi:docname="close-pressed.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient1886">
+       id="linearGradient3143">
       <stop
-         style="stop-color:white;stop-opacity:1;"
+         style="stop-color:#ffffff;stop-opacity:0.0;"
          offset="0"
-         id="stop1888" />
+         id="stop3145" />
       <stop
-         style="stop-color:white;stop-opacity:0.25;"
+         style="stop-color:#000000;stop-opacity:0.10;"
          offset="1"
-         id="stop1890" />
+         id="stop3147" />
     </linearGradient>
     <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:white;stop-opacity:1;" />
-      <stop
-         id="stop5877"
-         offset="0.5"
-         style="stop-color:white;stop-opacity:0.90;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:white;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
        id="linearGradient5847">
       <stop
          id="stop5849"
          offset="0"
-         style="stop-color:white;stop-opacity:0;" />
+         style="stop-color:#ffffff;stop-opacity:0.90;" />
       <stop
-         id="stop2779"
-         offset="0.75"
-         style="stop-color:white;stop-opacity:0;" />
+         id="stop5850"
+         offset="0.70"
+         style="stop-color:#ffffff;stop-opacity:0.10;" />
       <stop
          id="stop5851"
          offset="1"
-         style="stop-color:white;stop-opacity:0.20;" />
+         style="stop-color:#ffffff;stop-opacity:0;" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
+       id="linearGradient3148"
        x1="0"
-       y1="0.5"
-       x2="0"
-       y2="26.5"
-       gradientTransform="matrix(1,0,0,1,0,0)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5873"
-       id="linearGradient6962"
-       x1="0"
        y1="1"
        x2="0"
-       y2="8"
+       y2="18"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2,0,1)" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5873"
-       id="radialGradient3087"
-       cx="12"
-       cy="0"
-       fx="12"
-       fy="3"
-       r="22"
-       gradientTransform="matrix(1,0,0,1,0,0.5)"
-       gradientUnits="userSpaceOnUse" />
+       spreadMethod="none" />
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient1886"
-       id="linearGradient1892"
+       xlink:href="#linearGradient3143"
+       id="linearGradient3149"
        x1="0"
-       y1="1"
+       y1="13"
        x2="0"
-       y2="12"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1886"
-       id="linearGradient2791"
-       x1="0"
-       y1="1"
-       x2="0"
-       y2="25"
+       y2="24"
        gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5873"
-       id="linearGradient4147"
-       x1="0"
-       y1="1"
-       x2="0"
-       y2="19"
-       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
-     pagecolor="white"
+     pagecolor="#ffffff"
      bordercolor="#666666"
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
@@ -135,7 +81,6 @@
      showgrid="true"
      inkscape:grid-bbox="true"
      inkscape:grid-points="true"
-     gridoriginx="0px"
      gridtolerance="0.5px"
      guidetolerance="1px"
      inkscape:window-width="640"
@@ -144,7 +89,20 @@
      inkscape:window-y="0"
      inkscape:guide-bbox="true"
      inkscape:guide-points="false"
-     showguides="true" />
+     showguides="true">
+    <inkscape:grid
+       id="GridFromPre046Settings"
+       type="xygrid"
+       originx="0px"
+       originy="0px"
+       spacingx="0px"
+       spacingy="1px"
+       color="#0000ff"
+       empcolor="#0000ff"
+       opacity="0.2"
+       empopacity="0.4"
+       empspacing="5" />
+  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -163,19 +121,27 @@
     </rdf:RDF>
   </metadata>
   <g
+     inkscape:label="Border"
      inkscape:groupmode="layer"
-     id="layer1"
-     inkscape:label="pressed">
+     id="g24"
+     style="display:inline">
+    <path
+       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+       d="M 0.5,0.5 L 17.5,0.5"
+       id="path6059" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer4"
+     inkscape:label="frame">
     <g
-       id="g1789"
-       transform="translate(0,1)">
-      <rect
-         style="opacity:0.5;fill:url(#radialGradient3087);fill-opacity:1.0;stroke:url(#radialGradient3087);stroke-width:1;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         id="rect3079"
-         width="24"
-         height="25"
-         x="0"
-         y="0" />
+       style="display:inline"
+       id="g1969"
+       transform="translate(0,4)">
+      <path
+         style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.50;fill-opacity:0.25;opacity:0.5"
+         d="M 5.5,0.5 L 14.5,0.5 C 14.5,0.5 17.5,0.5 17.5,3.5 C 17.5,6.5 17.5,14.5 17.5,14.5 C 17.5,14.5 17.5,17.5 14.5,17.5 C 11.5,17.5 3.5,17.5 3.5,17.5 C 3.5,17.5 0.5,17.5 0.5,14.5 C 0.5,11.5 0.5,3.5 0.5,3.5 C 0.5,3.5 0.5,0.5 3.5,0.5 C 6.5,0.5 6.5,0.5 6.5,0.5 L 6.5,0.5"
+         id="path4123" />
     </g>
   </g>
   <g
@@ -183,82 +149,58 @@
      id="layer2"
      inkscape:label="Grad"
      style="display:inline">
-    <path
-       style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 0,0.5 L 24,0.5 C 24,0.5 24,26 24,26 L 0,26 L 0,0.5 z "
-       id="path6057" />
+    <rect
+       style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect6057"
+       width="18"
+       height="12"
+       x="0"
+       y="1" />
   </g>
   <g
      inkscape:groupmode="layer"
      id="layer3"
      inkscape:label="hilight">
-    <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 0,1 L 24,1 C 24,1 24,4 24,4 L 0,4 L 0,3 z "
-       id="path6061" />
     <rect
-       style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:0.75;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect1884"
-       width="24"
+       style="fill:url(#linearGradient3149);fill-opacity:1.00;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect3141"
+       width="18"
        height="12"
        x="0"
-       y="1" />
+       y="12" />
     <path
-       style="fill:none;stroke:url(#linearGradient2791);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.60"
-       d="M 0.5,1 L 0.5,16.5 C 0.5,16.5 0.5,18.5 2.5,18.5 C 4,18.5 21.5,18.5 21.5,18.5 C 21.5,18.5 23.5,18.5 23.5,16.5 C 23.5,14.5 23.5,1 23.5,1 L 23.5,1 L 23.5,1"
-       id="path2187" />
-    <path
-       style="fill:url(#linearGradient4147);fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:0.50"
-       d="M 2,1 C 2,1 2,13 2,15 C 2,17 5,17 5,17 L 20,17 C 20,17 22,17 22,15 C 22,13 22,1 22,1 L 2,1 z "
-       id="path2188" />
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+       d="M 0,1.5 L 18,1.5"
+       id="path6061" />
   </g>
   <g
-     inkscape:label="Border"
      inkscape:groupmode="layer"
-     id="g31"
-     style="display:inline">
-    <path
-       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
-       d="M 0.5,0.5 L 23.5,0.5"
-       id="path6059" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
      id="g3722"
      inkscape:label="Button">
     <g
-       id="g2327"
-       transform="translate(6,5)">
+       id="g2328"
+       transform="translate(3,8)">
       <g
          transform="matrix(0.875,0,0,0.875,0.75,0.75)"
-         style="opacity:0.33;stroke:black;stroke-width:4.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         style="opacity:0.33;stroke:#000000;stroke-width:4.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
          id="g2217">
         <path
-           style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:4.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:4.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
            d="M 2,2 L 10,10"
            id="path1340" />
         <path
-           style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:4.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:4.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
            d="M 2,10 L 10,2"
            id="path2215" />
       </g>
       <path
          id="path2221"
          d="M 2.5,2.5 L 9.5,9.5 L 9.5,9.5"
-         style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:white;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+         style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
       <path
          id="path2225"
          d="M 2.5,9.5 L 9.5,2.5"
-         style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:white;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+         style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
     </g>
   </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer5"
-     inkscape:label="Shadow">
-    <path
-       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.05"
-       d="M 0.5,26.5 L 23.5,26.5"
-       id="path6989" />
-  </g>
 </svg>

Modified: xfwm4/trunk/themes/default/close-pressed.xpm
===================================================================
--- xfwm4/trunk/themes/default/close-pressed.xpm	2008-06-02 20:23:20 UTC (rev 27009)
+++ xfwm4/trunk/themes/default/close-pressed.xpm	2008-06-02 20:26:07 UTC (rev 27010)
@@ -1,32 +1,29 @@
 /* XPM */
-static char * close_pressed_xpm[] = {
-"24 27 2 1",
+static char * close_active_xpm[] = {
+"18 24 2 1",
 " 	c None",
 ".	c #C0C0FF s active_color_1",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................"};
+"                  ",
+"                  ",
+"                  ",
+"                  ",
+" ................ ",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+" ................ ",
+"                  ",
+"                  "};

Modified: xfwm4/trunk/themes/default/hide-active.png
===================================================================
(Binary files differ)

Modified: xfwm4/trunk/themes/default/hide-active.svg
===================================================================
--- xfwm4/trunk/themes/default/hide-active.svg	2008-06-02 20:23:20 UTC (rev 27009)
+++ xfwm4/trunk/themes/default/hide-active.svg	2008-06-02 20:26:07 UTC (rev 27010)
@@ -2,116 +2,73 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
+   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:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="24"
-   height="27"
+   width="18"
+   height="24"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.45.1"
+   inkscape:version="0.46"
    version="1.0"
+   sodipodi:docbase="/themes/default"
    sodipodi:docname="hide-active.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient1886">
+       id="linearGradient3143">
       <stop
-         style="stop-color:white;stop-opacity:1;"
+         style="stop-color:#ffffff;stop-opacity:0.0;"
          offset="0"
-         id="stop1888" />
+         id="stop3145" />
       <stop
-         style="stop-color:white;stop-opacity:0.25;"
+         style="stop-color:#000000;stop-opacity:0.10;"
          offset="1"
-         id="stop1890" />
+         id="stop3147" />
     </linearGradient>
     <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:white;stop-opacity:1;" />
-      <stop
-         id="stop5877"
-         offset="0.5"
-         style="stop-color:white;stop-opacity:0.90;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:white;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
        id="linearGradient5847">
       <stop
          id="stop5849"
          offset="0"
-         style="stop-color:white;stop-opacity:0;" />
+         style="stop-color:#ffffff;stop-opacity:0.90;" />
       <stop
-         id="stop2779"
-         offset="0.75"
-         style="stop-color:white;stop-opacity:0;" />
+         id="stop5850"
+         offset="0.70"
+         style="stop-color:#ffffff;stop-opacity:0.10;" />
       <stop
          id="stop5851"
          offset="1"
-         style="stop-color:white;stop-opacity:0.20;" />
+         style="stop-color:#ffffff;stop-opacity:0;" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
+       id="linearGradient3148"
        x1="0"
-       y1="0.5"
-       x2="0"
-       y2="26.5"
-       gradientTransform="matrix(1,0,0,1,0,0)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5873"
-       id="linearGradient6962"
-       x1="0"
        y1="1"
        x2="0"
-       y2="8"
+       y2="18"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2,0,1)" />
+       spreadMethod="none" />
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient1886"
-       id="linearGradient1892"
+       xlink:href="#linearGradient3143"
+       id="linearGradient3149"
        x1="0"
-       y1="1"
+       y1="13"
        x2="0"
-       y2="14"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1886"
-       id="linearGradient2791"
-       x1="0"
-       y1="1"
-       x2="0"
-       y2="25"
+       y2="24"
        gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5873"
-       id="linearGradient4147"
-       x1="0"
-       y1="1"
-       x2="0"
-       y2="19"
-       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
-     pagecolor="white"
+     pagecolor="#ffffff"
      bordercolor="#666666"
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
@@ -124,7 +81,6 @@
      showgrid="true"
      inkscape:grid-bbox="true"
      inkscape:grid-points="true"
-     gridoriginx="0px"
      gridtolerance="0.5px"
      guidetolerance="1px"
      inkscape:window-width="640"
@@ -133,7 +89,20 @@
      inkscape:window-y="0"
      inkscape:guide-bbox="true"
      inkscape:guide-points="false"
-     showguides="true" />
+     showguides="true">
+    <inkscape:grid
+       id="GridFromPre046Settings"
+       type="xygrid"
+       originx="0px"
+       originy="0px"
+       spacingx="0px"
+       spacingy="1px"
+       color="#0000ff"
+       empcolor="#0000ff"
+       opacity="0.2"
+       empopacity="0.4"
+       empspacing="5" />
+  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -152,48 +121,43 @@
     </rdf:RDF>
   </metadata>
   <g
+     inkscape:label="Border"
      inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Grad"
+     id="layer1"
      style="display:inline">
     <path
-       style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 0,0.5 L 24,0.5 C 24,0.5 24,26 24,26 L 0,26 L 0,0.5 z "
-       id="path6057" />
+       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+       d="M 0.5,0.5 L 17.5,0.5"
+       id="path6059" />
   </g>
   <g
      inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="hilight">
-    <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 0,1 L 24,1 C 24,1 24,4 24,4 L 0,4 L 0,3 z "
-       id="path6061" />
+     id="layer2"
+     inkscape:label="Grad"
+     style="display:inline">
     <rect
-       style="opacity:0.25;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect1884"
-       width="24"
-       height="15"
+       style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect6057"
+       width="18"
+       height="12"
        x="0"
        y="1" />
-    <path
-       style="fill:none;stroke:url(#linearGradient2791);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.60"
-       d="M 0.5,1 L 0.5,16.5 C 0.5,16.5 0.5,18.5 2.5,18.5 C 4,18.5 21.5,18.5 21.5,18.5 C 21.5,18.5 23.5,18.5 23.5,16.5 C 23.5,14.5 23.5,1 23.5,1 L 23.5,1 L 23.5,1"
-       id="path2187" />
-    <path
-       style="fill:url(#linearGradient4147);fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:0.50"
-       d="M 2,1 C 2,1 2,13 2,15 C 2,17 5,17 5,17 L 20,17 C 20,17 22,17 22,15 C 22,13 22,1 22,1 L 2,1 z "
-       id="path2188" />
   </g>
   <g
-     inkscape:label="Border"
      inkscape:groupmode="layer"
-     id="layer1"
-     style="display:inline">
+     id="layer3"
+     inkscape:label="hilight">
+    <rect
+       style="fill:url(#linearGradient3149);fill-opacity:1.00;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect3141"
+       width="18"
+       height="12"
+       x="0"
+       y="12" />
     <path
-       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
-       d="M 0.5,0.5 L 23.5,0.5"
-       id="path6059" />
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.25"
+       d="M 0,1.5 L 18,1.5"
+       id="path6061" />
   </g>
   <g
      inkscape:groupmode="layer"
@@ -202,16 +166,16 @@
     <g
        style="display:inline"
        id="g1616"
-       transform="translate(6,4)">
+       transform="translate(3,7)">
       <rect
-         style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
+         style="opacity:0.33;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
          id="rect2376"
          width="8"
          height="4"
          x="2"
          y="7" />
       <rect
-         style="opacity:1;fill:white;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
+         style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
          id="rect2378"
          width="6"
          height="2"
@@ -219,13 +183,4 @@
          y="8" />
     </g>
   </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer5"
-     inkscape:label="Shadow">
-    <path
-       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.05"
-       d="M 0.5,26.5 L 23.5,26.5"
-       id="path6989" />
-  </g>
 </svg>

Modified: xfwm4/trunk/themes/default/hide-active.xpm
===================================================================
--- xfwm4/trunk/themes/default/hide-active.xpm	2008-06-02 20:23:20 UTC (rev 27009)
+++ xfwm4/trunk/themes/default/hide-active.xpm	2008-06-02 20:26:07 UTC (rev 27010)
@@ -1,32 +1,29 @@
 /* XPM */
 static char * hide_active_xpm[] = {
-"24 27 2 1",
+"18 24 2 1",
 " 	c None",
 ".	c #C0C0FF s active_color_1",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................"};
+"                  ",
+"                  ",
+"                  ",
+"                  ",
+" ................ ",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+" ................ ",
+"                  ",
+"                  "};

Modified: xfwm4/trunk/themes/default/hide-inactive.png
===================================================================
(Binary files differ)

Modified: xfwm4/trunk/themes/default/hide-inactive.svg
===================================================================
--- xfwm4/trunk/themes/default/hide-inactive.svg	2008-06-02 20:23:20 UTC (rev 27009)
+++ xfwm4/trunk/themes/default/hide-inactive.svg	2008-06-02 20:26:07 UTC (rev 27010)
@@ -2,98 +2,73 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
+   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:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="24"
-   height="27"
+   width="18"
+   height="24"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.45.1"
+   inkscape:version="0.46"
    version="1.0"
+   sodipodi:docbase="/themes/default"
    sodipodi:docname="hide-inactive.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient1886">
+       id="linearGradient3143">
       <stop
-         style="stop-color:white;stop-opacity:1;"
+         style="stop-color:#ffffff;stop-opacity:0.0;"
          offset="0"
-         id="stop1888" />
+         id="stop3145" />
       <stop
-         style="stop-color:white;stop-opacity:0.25;"
+         style="stop-color:#000000;stop-opacity:0.10;"
          offset="1"
-         id="stop1890" />
+         id="stop3147" />
     </linearGradient>
     <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:white;stop-opacity:1;" />
-      <stop
-         id="stop5877"
-         offset="0.5"
-         style="stop-color:white;stop-opacity:0.90;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:white;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
        id="linearGradient5847">
       <stop
          id="stop5849"
          offset="0"
-         style="stop-color:white;stop-opacity:0;" />
+         style="stop-color:#ffffff;stop-opacity:0.90;" />
       <stop
-         id="stop2779"
-         offset="0.75"
-         style="stop-color:white;stop-opacity:0;" />
+         id="stop5850"
+         offset="0.70"
+         style="stop-color:#ffffff;stop-opacity:0.10;" />
       <stop
          id="stop5851"
          offset="1"
-         style="stop-color:white;stop-opacity:0.20;" />
+         style="stop-color:#ffffff;stop-opacity:0;" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
+       id="linearGradient3148"
        x1="0"
-       y1="0.5"
-       x2="0"
-       y2="26.5"
-       gradientTransform="matrix(1,0,0,1,0,0)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5873"
-       id="linearGradient6962"
-       x1="0"
        y1="1"
        x2="0"
-       y2="8"
+       y2="18"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2,0,1)" />
+       spreadMethod="none" />
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient1886"
-       id="linearGradient1892"
+       xlink:href="#linearGradient3143"
+       id="linearGradient3149"
        x1="0"
-       y1="1"
+       y1="13"
        x2="0"
-       y2="14"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
+       y2="24"
+       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
-     pagecolor="white"
+     pagecolor="#ffffff"
      bordercolor="#666666"
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
@@ -106,7 +81,6 @@
      showgrid="true"
      inkscape:grid-bbox="true"
      inkscape:grid-points="true"
-     gridoriginx="0px"
      gridtolerance="0.5px"
      guidetolerance="1px"
      inkscape:window-width="640"
@@ -115,7 +89,20 @@
      inkscape:window-y="0"
      inkscape:guide-bbox="true"
      inkscape:guide-points="false"
-     showguides="true" />
+     showguides="true">
+    <inkscape:grid
+       id="GridFromPre046Settings"
+       type="xygrid"
+       originx="0px"
+       originy="0px"
+       spacingx="0px"
+       spacingy="1px"
+       color="#0000ff"
+       empcolor="#0000ff"
+       opacity="0.2"
+       empopacity="0.4"
+       empspacing="5" />
+  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -134,44 +121,43 @@
     </rdf:RDF>
   </metadata>
   <g
+     inkscape:label="Border"
      inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Grad"
+     id="layer1"
      style="display:inline">
     <path
-       style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 0,0.5 L 24,0.5 C 24,0.5 24,26 24,26 L 0,26 L 0,0.5 z "
-       id="path6057" />
+       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+       d="M 0.5,0.5 L 17.5,0.5"
+       id="path6059" />
   </g>
   <g
      inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="hilight">
-    <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 0,1 L 24,1 C 24,1 24,4 24,4 L 0,4 L 0,3 z "
-       id="path6061" />
+     id="layer2"
+     inkscape:label="Grad"
+     style="display:inline">
     <rect
-       style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect1884"
-       width="24"
-       height="15"
+       style="fill:url(#linearGradient3148);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect6057"
+       width="18"
+       height="12"
        x="0"
        y="1" />
-    <path
-       style="fill:none;stroke:#7f7f7f;stroke-width:1px;stroke-opacity:0.25"
-       d="M 0.5,1 L 0.5,16.5 C 0.5,16.5 0.5,18.5 2.5,18.5 C 4,18.5 21.5,18.5 21.5,18.5 C 21.5,18.5 23.5,18.5 23.5,16.5 C 23.5,14.5 23.5,1 23.5,1 L 23.5,1 L 23.5,1"
-       id="path2187" />
   </g>
   <g
-     inkscape:label="Border"
      inkscape:groupmode="layer"
-     id="layer1"
-     style="display:inline">
+     id="layer3"
+     inkscape:label="hilight">
+    <rect
+       style="fill:url(#linearGradient3149);fill-opacity:0.00;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect3141"
+       width="18"
+       height="12"
+       x="0"
+       y="12" />
     <path
-       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
-       d="M 0.5,0.5 L 23.5,0.5"
-       id="path6059" />
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width