[Xfce4-commits] r29303 - in xfwm4/trunk: . defaults src themes/default

Olivier Fourdan olivier at xfce.org
Fri Jan 23 23:36:35 CET 2009


Author: olivier
Date: 2009-01-23 22:36:35 +0000 (Fri, 23 Jan 2009)
New Revision: 29303

Modified:
   xfwm4/trunk/ChangeLog
   xfwm4/trunk/NEWS
   xfwm4/trunk/configure.ac.in
   xfwm4/trunk/defaults/defaults
   xfwm4/trunk/src/parserc.c
   xfwm4/trunk/src/settings.c
   xfwm4/trunk/themes/default/bottom-active.png
   xfwm4/trunk/themes/default/bottom-active.svg
   xfwm4/trunk/themes/default/bottom-inactive.png
   xfwm4/trunk/themes/default/bottom-inactive.svg
   xfwm4/trunk/themes/default/bottom-left-active.png
   xfwm4/trunk/themes/default/bottom-left-active.svg
   xfwm4/trunk/themes/default/bottom-left-inactive.png
   xfwm4/trunk/themes/default/bottom-left-inactive.svg
   xfwm4/trunk/themes/default/bottom-right-active.png
   xfwm4/trunk/themes/default/bottom-right-active.svg
   xfwm4/trunk/themes/default/bottom-right-inactive.png
   xfwm4/trunk/themes/default/bottom-right-inactive.svg
   xfwm4/trunk/themes/default/close-active.png
   xfwm4/trunk/themes/default/close-active.svg
   xfwm4/trunk/themes/default/close-inactive.png
   xfwm4/trunk/themes/default/close-inactive.svg
   xfwm4/trunk/themes/default/close-prelight.png
   xfwm4/trunk/themes/default/close-prelight.svg
   xfwm4/trunk/themes/default/close-pressed.png
   xfwm4/trunk/themes/default/close-pressed.svg
   xfwm4/trunk/themes/default/hide-active.png
   xfwm4/trunk/themes/default/hide-active.svg
   xfwm4/trunk/themes/default/hide-inactive.png
   xfwm4/trunk/themes/default/hide-inactive.svg
   xfwm4/trunk/themes/default/hide-prelight.png
   xfwm4/trunk/themes/default/hide-prelight.svg
   xfwm4/trunk/themes/default/hide-pressed.png
   xfwm4/trunk/themes/default/hide-pressed.svg
   xfwm4/trunk/themes/default/left-active.png
   xfwm4/trunk/themes/default/left-active.svg
   xfwm4/trunk/themes/default/left-inactive.png
   xfwm4/trunk/themes/default/left-inactive.svg
   xfwm4/trunk/themes/default/maximize-active.png
   xfwm4/trunk/themes/default/maximize-active.svg
   xfwm4/trunk/themes/default/maximize-inactive.png
   xfwm4/trunk/themes/default/maximize-inactive.svg
   xfwm4/trunk/themes/default/maximize-prelight.png
   xfwm4/trunk/themes/default/maximize-prelight.svg
   xfwm4/trunk/themes/default/maximize-pressed.png
   xfwm4/trunk/themes/default/maximize-pressed.svg
   xfwm4/trunk/themes/default/maximize-toggled-active.png
   xfwm4/trunk/themes/default/maximize-toggled-active.svg
   xfwm4/trunk/themes/default/maximize-toggled-inactive.png
   xfwm4/trunk/themes/default/maximize-toggled-inactive.svg
   xfwm4/trunk/themes/default/maximize-toggled-prelight.png
   xfwm4/trunk/themes/default/maximize-toggled-prelight.svg
   xfwm4/trunk/themes/default/maximize-toggled-pressed.png
   xfwm4/trunk/themes/default/maximize-toggled-pressed.svg
   xfwm4/trunk/themes/default/menu-active.png
   xfwm4/trunk/themes/default/menu-active.svg
   xfwm4/trunk/themes/default/menu-inactive.png
   xfwm4/trunk/themes/default/menu-inactive.svg
   xfwm4/trunk/themes/default/menu-prelight.png
   xfwm4/trunk/themes/default/menu-prelight.svg
   xfwm4/trunk/themes/default/menu-pressed.png
   xfwm4/trunk/themes/default/menu-pressed.svg
   xfwm4/trunk/themes/default/right-active.png
   xfwm4/trunk/themes/default/right-active.svg
   xfwm4/trunk/themes/default/right-inactive.png
   xfwm4/trunk/themes/default/right-inactive.svg
   xfwm4/trunk/themes/default/shade-active.png
   xfwm4/trunk/themes/default/shade-active.svg
   xfwm4/trunk/themes/default/shade-inactive.png
   xfwm4/trunk/themes/default/shade-inactive.svg
   xfwm4/trunk/themes/default/shade-prelight.png
   xfwm4/trunk/themes/default/shade-prelight.svg
   xfwm4/trunk/themes/default/shade-pressed.png
   xfwm4/trunk/themes/default/shade-pressed.svg
   xfwm4/trunk/themes/default/shade-toggled-active.png
   xfwm4/trunk/themes/default/shade-toggled-active.svg
   xfwm4/trunk/themes/default/shade-toggled-inactive.png
   xfwm4/trunk/themes/default/shade-toggled-inactive.svg
   xfwm4/trunk/themes/default/shade-toggled-prelight.png
   xfwm4/trunk/themes/default/shade-toggled-prelight.svg
   xfwm4/trunk/themes/default/shade-toggled-pressed.png
   xfwm4/trunk/themes/default/shade-toggled-pressed.svg
   xfwm4/trunk/themes/default/stick-active.png
   xfwm4/trunk/themes/default/stick-active.svg
   xfwm4/trunk/themes/default/stick-inactive.png
   xfwm4/trunk/themes/default/stick-inactive.svg
   xfwm4/trunk/themes/default/stick-prelight.png
   xfwm4/trunk/themes/default/stick-prelight.svg
   xfwm4/trunk/themes/default/stick-pressed.png
   xfwm4/trunk/themes/default/stick-pressed.svg
   xfwm4/trunk/themes/default/stick-toggled-active.png
   xfwm4/trunk/themes/default/stick-toggled-active.svg
   xfwm4/trunk/themes/default/stick-toggled-inactive.png
   xfwm4/trunk/themes/default/stick-toggled-inactive.svg
   xfwm4/trunk/themes/default/stick-toggled-prelight.png
   xfwm4/trunk/themes/default/stick-toggled-prelight.svg
   xfwm4/trunk/themes/default/stick-toggled-pressed.png
   xfwm4/trunk/themes/default/stick-toggled-pressed.svg
   xfwm4/trunk/themes/default/title-1-active.png
   xfwm4/trunk/themes/default/title-1-active.svg
   xfwm4/trunk/themes/default/title-1-inactive.png
   xfwm4/trunk/themes/default/title-1-inactive.svg
   xfwm4/trunk/themes/default/title-2-active.png
   xfwm4/trunk/themes/default/title-2-active.svg
   xfwm4/trunk/themes/default/title-2-inactive.png
   xfwm4/trunk/themes/default/title-2-inactive.svg
   xfwm4/trunk/themes/default/title-3-active.png
   xfwm4/trunk/themes/default/title-3-active.svg
   xfwm4/trunk/themes/default/title-3-inactive.png
   xfwm4/trunk/themes/default/title-3-inactive.svg
   xfwm4/trunk/themes/default/title-4-active.png
   xfwm4/trunk/themes/default/title-4-active.svg
   xfwm4/trunk/themes/default/title-4-inactive.png
   xfwm4/trunk/themes/default/title-4-inactive.svg
   xfwm4/trunk/themes/default/title-5-active.png
   xfwm4/trunk/themes/default/title-5-active.svg
   xfwm4/trunk/themes/default/title-5-inactive.png
   xfwm4/trunk/themes/default/title-5-inactive.svg
   xfwm4/trunk/themes/default/top-left-active.png
   xfwm4/trunk/themes/default/top-left-active.svg
   xfwm4/trunk/themes/default/top-left-inactive.png
   xfwm4/trunk/themes/default/top-left-inactive.svg
   xfwm4/trunk/themes/default/top-right-active.png
   xfwm4/trunk/themes/default/top-right-active.svg
   xfwm4/trunk/themes/default/top-right-inactive.png
   xfwm4/trunk/themes/default/top-right-inactive.svg
Log:
	* src/parserc.c, src/settings.c, src/settings.c: Fix settings not
	  being set at startup (Bug #4845)
	  themes/default/*: Flatten default theme

Modified: xfwm4/trunk/ChangeLog
===================================================================
--- xfwm4/trunk/ChangeLog	2009-01-23 22:20:25 UTC (rev 29302)
+++ xfwm4/trunk/ChangeLog	2009-01-23 22:36:35 UTC (rev 29303)
@@ -1,3 +1,9 @@
+2009-01-23	olivier
+
+	* src/parserc.c, src/settings.c, src/settings.c: Fix settings not
+	  being set at startup (Bug #4845)
+	  themes/default/*: Flatten default theme
+
 2009-01-21	olivier
 
 	* src/main.c: Command line option "--daemon" would have no effect 

Modified: xfwm4/trunk/NEWS
===================================================================
--- xfwm4/trunk/NEWS	2009-01-23 22:20:25 UTC (rev 29302)
+++ xfwm4/trunk/NEWS	2009-01-23 22:36:35 UTC (rev 29303)
@@ -4,6 +4,8 @@
 - Fix a crash when removing a monitor with xrandr 1.2
 - Command line option "--daemon" would have no effect when xfwm4 connects to 
   the session manager (Bug #4839).
+- Fix settings not being set at startup (Bug #4845)
+- Flatten default theme
 
 4.5.93 (Xfce 4.6beta3)
 ======================

Modified: xfwm4/trunk/configure.ac.in
===================================================================
--- xfwm4/trunk/configure.ac.in	2009-01-23 22:20:25 UTC (rev 29302)
+++ xfwm4/trunk/configure.ac.in	2009-01-23 22:36:35 UTC (rev 29303)
@@ -5,7 +5,7 @@
 
 m4_define([xfwm4_version_major], [4])
 m4_define([xfwm4_version_minor], [5])
-m4_define([xfwm4_version_micro], [93])
+m4_define([xfwm4_version_micro], [99.1])
 m4_define([xfwm4_version_build], [r at REVISION@])
 m4_define([xfwm4_version_tag],   [svn])
 m4_define([xfwm4_version], [xfwm4_version_major().xfwm4_version_minor().xfwm4_version_micro()ifelse(xfwm4_version_tag(), [svn], [xfwm4_version_tag().xfwm4_version_build()], [xfwm4_version_tag()])])

Modified: xfwm4/trunk/defaults/defaults
===================================================================
--- xfwm4/trunk/defaults/defaults	2009-01-23 22:20:25 UTC (rev 29302)
+++ xfwm4/trunk/defaults/defaults	2009-01-23 22:36:35 UTC (rev 29303)
@@ -64,3 +64,4 @@
 wrap_resistance=10
 wrap_windows=true
 wrap_workspaces=false
+

Modified: xfwm4/trunk/src/parserc.c
===================================================================
--- xfwm4/trunk/src/parserc.c	2009-01-23 22:20:25 UTC (rev 29302)
+++ xfwm4/trunk/src/parserc.c	2009-01-23 22:36:35 UTC (rev 29303)
@@ -148,7 +148,6 @@
                         setBooleanValue (lvalue, !g_ascii_strcasecmp ("true", rvalue), rc);
                         break;
                 }
-                //TRACE ("%s=%s", rc[i].option, rc[i].value);
                 return TRUE;
             }
         }
@@ -197,7 +196,6 @@
     GValue tmp_val = {0, };
     g_value_init(&tmp_val, G_TYPE_BOOLEAN);
     g_value_set_boolean(&tmp_val, value);
-
     return setGValue (lvalue, &tmp_val, rc);
 }
 
@@ -302,11 +300,7 @@
         {
             if (rc[i].value == NULL)
                 return NULL;
-            if (G_VALUE_TYPE(rc[i].value) != G_TYPE_STRING)
-            {
-                g_print("%s", rc[i].option);
-                return NULL;
-            }
+            g_return_val_if_fail(G_VALUE_TYPE(rc[i].value) == G_TYPE_STRING, NULL);
             return g_value_get_string(rc[i].value);
         }
     }
@@ -350,11 +344,6 @@
         {
             if (rc[i].value == NULL)
                 return FALSE;
-            if (G_VALUE_TYPE(rc[i].value) != G_TYPE_BOOLEAN)
-            {
-                g_print("%s", rc[i].option);
-                return FALSE;
-            }
             g_return_val_if_fail(G_VALUE_TYPE(rc[i].value) == G_TYPE_BOOLEAN, FALSE);
             return g_value_get_boolean(rc[i].value);
         }

Modified: xfwm4/trunk/src/settings.c
===================================================================
--- xfwm4/trunk/src/settings.c	2009-01-23 22:20:25 UTC (rev 29302)
+++ xfwm4/trunk/src/settings.c	2009-01-23 22:36:35 UTC (rev 29303)
@@ -47,7 +47,6 @@
 #define CHANNEL_XFWM            "xfwm4"
 #define THEMERC                 "themerc"
 #define XPM_COLOR_SYMBOL_SIZE   22
-#define XFWM4_SETTINGS_COUNT    66
 
 /* Forward static decls. */
 
@@ -214,8 +213,8 @@
 static void
 loadXfconfData (ScreenInfo *screen_info, Settings *rc)
 {
-    gint i = XPM_COLOR_SYMBOL_SIZE;
-    for (; i < (XPM_COLOR_SYMBOL_SIZE + XFWM4_SETTINGS_COUNT); ++i)
+    gint i;
+    for (i = XPM_COLOR_SYMBOL_SIZE; rc[i].option; ++i)
     {
         gchar *property_name = g_strconcat("/general/", rc[i].option, NULL);
         if(xfconf_channel_has_property(screen_info->xfwm4_channel, property_name))
@@ -229,7 +228,7 @@
 
             if(!xfconf_channel_get_property(screen_info->xfwm4_channel, property_name, rc[i].value))
             {
-               /* g_debug("get prop failed"); */
+               g_warning("get prop failed");
             }
         }
         else
@@ -703,72 +702,6 @@
         {"wrap_resistance", NULL, G_TYPE_INT, TRUE},
         {"wrap_windows", NULL, G_TYPE_BOOLEAN, TRUE},
         {"wrap_workspaces", NULL, G_TYPE_BOOLEAN, TRUE},
-        /* Keys */
-        {"above_key", NULL, G_TYPE_STRING, TRUE},
-        {"add_adjacent_workspace_key", NULL, G_TYPE_STRING, TRUE},
-        {"add_workspace_key", NULL, G_TYPE_STRING, TRUE},
-        {"cancel_key", NULL, G_TYPE_STRING, TRUE},
-        {"close_window_key", NULL, G_TYPE_STRING, TRUE},
-        {"cycle_windows_key", NULL, G_TYPE_STRING, TRUE},
-        {"cycle_reverse_windows_key", NULL, G_TYPE_STRING, TRUE},
-        {"del_active_workspace_key", NULL, G_TYPE_STRING, TRUE},
-        {"del_workspace_key", NULL, G_TYPE_STRING, TRUE},
-        {"down_key", NULL, G_TYPE_STRING, TRUE},
-        {"down_workspace_key", NULL, G_TYPE_STRING, TRUE},
-        {"fill_horiz_key", NULL, G_TYPE_STRING, TRUE},
-        {"fill_vert_key", NULL, G_TYPE_STRING, TRUE},
-        {"fill_window_key", NULL, G_TYPE_STRING, TRUE},
-        {"fullscreen_key", NULL, G_TYPE_STRING, TRUE},
-        {"hide_window_key", NULL, G_TYPE_STRING, TRUE},
-        {"left_key", NULL, G_TYPE_STRING, TRUE},
-        {"left_workspace_key", NULL, G_TYPE_STRING, TRUE},
-        {"lower_window_key", NULL, G_TYPE_STRING, TRUE},
-        {"maximize_horiz_key", NULL, G_TYPE_STRING, TRUE},
-        {"maximize_vert_key", NULL, G_TYPE_STRING, TRUE},
-        {"maximize_window_key", NULL, G_TYPE_STRING, TRUE},
-        {"move_window_down_workspace_key", NULL, G_TYPE_STRING, TRUE},
-        {"move_window_left_workspace_key", NULL, G_TYPE_STRING, TRUE},
-        {"move_window_next_workspace_key", NULL, G_TYPE_STRING, TRUE},
-        {"move_window_key", NULL, G_TYPE_STRING, TRUE},
-        {"move_window_prev_workspace_key", NULL, G_TYPE_STRING, TRUE},
-        {"move_window_right_workspace_key", NULL, G_TYPE_STRING, TRUE},
-        {"move_window_up_workspace_key", NULL, G_TYPE_STRING, TRUE},
-        {"move_window_workspace_1_key", NULL, G_TYPE_STRING, TRUE},
-        {"move_window_workspace_2_key", NULL, G_TYPE_STRING, TRUE},
-        {"move_window_workspace_3_key", NULL, G_TYPE_STRING, TRUE},
-        {"move_window_workspace_4_key", NULL, G_TYPE_STRING, TRUE},
-        {"move_window_workspace_5_key", NULL, G_TYPE_STRING, TRUE},
-        {"move_window_workspace_6_key", NULL, G_TYPE_STRING, TRUE},
-        {"move_window_workspace_7_key", NULL, G_TYPE_STRING, TRUE},
-        {"move_window_workspace_8_key", NULL, G_TYPE_STRING, TRUE},
-        {"move_window_workspace_9_key", NULL, G_TYPE_STRING, TRUE},
-        {"move_window_workspace_10_key", NULL, G_TYPE_STRING, TRUE},
-        {"move_window_workspace_11_key", NULL, G_TYPE_STRING, TRUE},
-        {"move_window_workspace_12_key", NULL, G_TYPE_STRING, TRUE},
-        {"next_workspace_key", NULL, G_TYPE_STRING, TRUE},
-        {"popup_menu_key", NULL, G_TYPE_STRING, TRUE},
-        {"prev_workspace_key", NULL, G_TYPE_STRING, TRUE},
-        {"raise_window_key", NULL, G_TYPE_STRING, TRUE},
-        {"resize_window_key", NULL, G_TYPE_STRING, TRUE},
-        {"right_key", NULL, G_TYPE_STRING, TRUE},
-        {"right_workspace_key", NULL, G_TYPE_STRING, TRUE},
-        {"shade_window_key", NULL, G_TYPE_STRING, TRUE},
-        {"show_desktop_key", NULL, G_TYPE_STRING, FALSE},
-        {"stick_window_key", NULL, G_TYPE_STRING, TRUE},
-        {"up_key", NULL, G_TYPE_STRING, TRUE},
-        {"up_workspace_key", NULL, G_TYPE_STRING, TRUE},
-        {"workspace_1_key", NULL, G_TYPE_STRING, TRUE},
-        {"workspace_2_key", NULL, G_TYPE_STRING, TRUE},
-        {"workspace_3_key", NULL, G_TYPE_STRING, TRUE},
-        {"workspace_4_key", NULL, G_TYPE_STRING, TRUE},
-        {"workspace_5_key", NULL, G_TYPE_STRING, TRUE},
-        {"workspace_6_key", NULL, G_TYPE_STRING, TRUE},
-        {"workspace_7_key", NULL, G_TYPE_STRING, TRUE},
-        {"workspace_8_key", NULL, G_TYPE_STRING, TRUE},
-        {"workspace_9_key", NULL, G_TYPE_STRING, TRUE},
-        {"workspace_10_key", NULL, G_TYPE_STRING, TRUE},
-        {"workspace_11_key", NULL, G_TYPE_STRING, TRUE},
-        {"workspace_12_key", NULL, G_TYPE_STRING, TRUE},
         {NULL, NULL, G_TYPE_INVALID, FALSE}
     };
 
@@ -850,7 +783,26 @@
         getBoolValue ("snap_resist", rc);
     screen_info->params->snap_width =
         getIntValue ("snap_width", rc);
+    screen_info->params->toggle_workspaces =
+        getBoolValue ("toggle_workspaces", rc);
+    screen_info->params->unredirect_overlays =
+        getBoolValue ("unredirect_overlays", rc);
+    screen_info->params->use_compositing =
+        getBoolValue ("use_compositing", rc);
+    screen_info->params->wrap_workspaces =
+        getBoolValue ("wrap_workspaces", rc);
 
+    screen_info->params->wrap_layout =
+        getBoolValue ("wrap_layout", rc);
+    screen_info->params->wrap_windows =
+        getBoolValue ("wrap_windows", rc);
+    screen_info->params->wrap_cycle =
+        getBoolValue ("wrap_cycle", rc);
+    screen_info->params->scroll_workspaces =
+        getBoolValue ("scroll_workspaces", rc);
+    screen_info->params->wrap_resistance =
+        getIntValue ("wrap_resistance", rc);
+
     set_settings_margin (screen_info, STRUTS_LEFT,   getIntValue ("margin_left", rc));
     set_settings_margin (screen_info, STRUTS_RIGHT,  getIntValue ("margin_right", rc));
     set_settings_margin (screen_info, STRUTS_BOTTOM, getIntValue ("margin_bottom", rc));
@@ -893,25 +845,6 @@
         workspaceSetCount (screen_info, workspace_count);
     }
 
-    screen_info->params->toggle_workspaces =
-        getBoolValue ("toggle_workspaces", rc);
-    screen_info->params->unredirect_overlays =
-        getBoolValue ("unredirect_overlays", rc);
-    screen_info->params->use_compositing =
-        getBoolValue ("use_compositing", rc);
-    screen_info->params->wrap_workspaces =
-        getBoolValue ("wrap_workspaces", rc);
-    screen_info->params->wrap_layout =
-        getBoolValue ("wrap_layout", rc);
-    screen_info->params->wrap_windows =
-        getBoolValue ("wrap_windows", rc);
-    screen_info->params->wrap_cycle =
-        getBoolValue ("wrap_cycle", rc);
-    screen_info->params->scroll_workspaces =
-        getBoolValue ("scroll_workspaces", rc);
-    screen_info->params->wrap_resistance =
-        getIntValue ("wrap_resistance", rc);
-
     freeRc (rc);
     return TRUE;
 }

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	2009-01-23 22:20:25 UTC (rev 29302)
+++ xfwm4/trunk/themes/default/bottom-active.svg	2009-01-23 22:36:35 UTC (rev 29303)
@@ -61,7 +61,7 @@
      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"
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.30"
        d="M 0.5,2.5 L 24,2.5"
        id="path6061" />
   </g>
@@ -70,7 +70,7 @@
      inkscape:groupmode="layer"
      id="border">
     <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.15"
+       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.25"
        d="M 0,3.5 L 24,3.5"
        id="path1340" />
   </g>

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	2009-01-23 22:20:25 UTC (rev 29302)
+++ xfwm4/trunk/themes/default/bottom-inactive.svg	2009-01-23 22:36:35 UTC (rev 29303)
@@ -61,7 +61,7 @@
      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"
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.35"
        d="M 0.5,2.5 L 24,2.5"
        id="path6061" />
   </g>
@@ -70,7 +70,7 @@
      inkscape:groupmode="layer"
      id="border">
     <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.15"
+       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.25"
        d="M 0,3.5 L 24,3.5"
        id="path1340" />
   </g>

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	2009-01-23 22:20:25 UTC (rev 29302)
+++ xfwm4/trunk/themes/default/bottom-left-active.svg	2009-01-23 22:36:35 UTC (rev 29303)
@@ -60,7 +60,7 @@
      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"
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.30"
        d="M 1.5,0 L 1.5,13.5 C 1.5,14.5 1.5,14.5 2.5,14.5 C 1.5,14.5 16,14.5 16,14.5"
        id="path6061" />
   </g>
@@ -69,7 +69,7 @@
      inkscape:groupmode="layer"
      id="layer1">
     <path
-       style="fill:black;fill-opacity:0.15"
+       style="fill:black;fill-opacity:0.25"
        d="M 0,0 L 0,16 L 16,16 L 16,15 C 16,15 16,15 2,15 C 1,15 1,14 1,14 L 1,0 L 0,0 z "
        id="rect1870" />
   </g>

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	2009-01-23 22:20:25 UTC (rev 29302)
+++ xfwm4/trunk/themes/default/bottom-left-inactive.svg	2009-01-23 22:36:35 UTC (rev 29303)
@@ -60,7 +60,7 @@
      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"
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.35"
        d="M 1.5,0 L 1.5,13.5 C 1.5,14.5 1.5,14.5 2.5,14.5 C 1.5,14.5 16,14.5 16,14.5"
        id="path6061" />
   </g>
@@ -69,7 +69,7 @@
      inkscape:groupmode="layer"
      id="layer1">
     <path
-       style="fill:black;fill-opacity:0.15"
+       style="fill:black;fill-opacity:0.25"
        d="M 0,0 L 0,16 L 16,16 L 16,15 C 16,15 16,15 2,15 C 1,15 1,14 1,14 L 1,0 L 0,0 z "
        id="rect1870" />
   </g>

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	2009-01-23 22:20:25 UTC (rev 29302)
+++ xfwm4/trunk/themes/default/bottom-right-active.svg	2009-01-23 22:36:35 UTC (rev 29303)
@@ -60,7 +60,7 @@
      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"
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.30"
        d="M 14.5,0 L 14.5,13.5 C 14.5,14.5 14.5,14.5 13.5,14.5 C 14.5,14.5 0,14.5  0,14.5"
        id="path6061" />
   </g>
@@ -69,7 +69,7 @@
      inkscape:groupmode="layer"
      id="layer1">
     <path
-       style="fill:black;fill-opacity:0.15"
+       style="fill:black;fill-opacity:0.25"
        d="M 16,0 L 16,16 L  0,16 L  0,15 C  0,15 0,15  14,15 C 15,15 15,14 15,14 L 15,0 L 16,0 z "
        id="rect1870" />
   </g>

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	2009-01-23 22:20:25 UTC (rev 29302)
+++ xfwm4/trunk/themes/default/bottom-right-inactive.svg	2009-01-23 22:36:35 UTC (rev 29303)
@@ -60,7 +60,7 @@
      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"
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.35"
        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>
@@ -69,7 +69,7 @@
      inkscape:groupmode="layer"
      id="layer1">
     <path
-       style="fill:black;fill-opacity:0.15"
+       style="fill:black;fill-opacity:0.25"
        d="M 16,0 L 16,16 L  0,16 L  0,15 C  0,15 0,15  14,15 C 15,15 15,14 15,14 L 15,0 L 16,0 z "
        id="rect1870" />
   </g>

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	2009-01-23 22:20:25 UTC (rev 29302)
+++ xfwm4/trunk/themes/default/close-active.svg	2009-01-23 22:36:35 UTC (rev 29303)
@@ -21,17 +21,6 @@
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient1886">
-      <stop
-         style="stop-color:white;stop-opacity:1;"
-         offset="0"
-         id="stop1888" />
-      <stop
-         style="stop-color:white;stop-opacity:0.25;"
-         offset="1"
-         id="stop1890" />
-    </linearGradient>
-    <linearGradient
        id="linearGradient5873">
       <stop
          id="stop5875"
@@ -47,66 +36,8 @@
          style="stop-color:white;stop-opacity:0;" />
     </linearGradient>
     <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:white;stop-opacity:0;" />
-      <stop
-         id="stop2776"
-         offset="0.5"
-         style="stop-color:black;stop-opacity:0;" />
-      <stop
-         id="stop2779"
-         offset="0.75"
-         style="stop-color:black;stop-opacity:0.0125;" />
-      <stop
-         id="stop5851"
-         offset="1"
-         style="stop-color:black;stop-opacity:0.05;" />
-    </linearGradient>
-    <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
-       x1="0"
-       y1="0.5"
-       x2="0"
-       y2="21.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"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2,0,1)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1886"
-       id="linearGradient1892"
-       x1="0"
-       y1="1"
-       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"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5873"
        id="linearGradient4147"
        x1="0"
        y1="1"
@@ -170,42 +101,22 @@
   </metadata>
   <g
      inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Grad"
-     style="display:inline">
-    <rect
-       style="fill:url(#linearGradient6945);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
-       id="rect6057"
-       width="24"
-       height="21"
-       x="0"
-       y="1" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
      id="layer3"
      inkscape:label="hilight">
     <rect
-       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"
-       id="rect6061"
-       width="24"
-       height="4"
-       x="0"
-       y="1" />
-    <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"
+       style="opacity:0.25;fill:none;fill-opacity:0;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"
        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"
+       style="fill:none;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.30"
+       d="M 0.5,2 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,2 23.5,2 L 23.5,2 L 23.5,2"
        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 "
+       style="fill:url(#linearGradient4147);fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:0.20"
+       d="M 2,2 C 2,2 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,2 22,2 L 2,2 z "
        id="path2188" />
   </g>
   <g
@@ -214,9 +125,13 @@
      id="layer1"
      style="display:inline">
     <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.15"
+       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.25"
        d="M 0,0.5 L 24,0.5"
        id="path6059" />
+    <path
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.30"
+       d="M 0,1.5 L 24,1.5"
+       id="path28" />
   </g>
   <g
      inkscape:groupmode="layer"

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	2009-01-23 22:20:25 UTC (rev 29302)
+++ xfwm4/trunk/themes/default/close-inactive.svg	2009-01-23 22:36:35 UTC (rev 29303)
@@ -21,32 +21,6 @@
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient1886">
-      <stop
-         style="stop-color:white;stop-opacity:1;"
-         offset="0"
-         id="stop1888" />
-      <stop
-         style="stop-color:white;stop-opacity:0.25;"
-         offset="1"
-         id="stop1890" />
-    </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"
@@ -75,44 +49,6 @@
        x2="0"
        y2="21.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"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2,0,1)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1886"
-       id="linearGradient1892"
-       x1="0"
-       y1="1"
-       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"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5873"
-       id="linearGradient4147"
-       x1="0"
-       y1="1"
-       x2="0"
-       y2="22"
-       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -185,27 +121,13 @@
      inkscape:groupmode="layer"
      id="layer3"
      inkscape:label="hilight">
-    <rect
-       style="fill:url(#linearGradient6962);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
-       id="rect6061"
-       width="24"
-       height="4"
-       x="0"
-       y="1" />
-    <rect
-       style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:0.60;stroke:none;stroke-width:0;stroke-opacity:1"
-       id="rect1884"
-       width="24"
-       height="15"
-       x="0"
-       y="1" />
     <path
        style="fill:none;stroke:#7f7f7f;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.30"
        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:#7f7f7f;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:0.10"
-       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 "
+       d="M 2,2 C 2,2 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,2 22,2 L 2,2 z "
        id="path2188" />
   </g>
   <g
@@ -214,9 +136,13 @@
      id="layer1"
      style="display:inline">
     <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.15"
+       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.25"
        d="M 0,0.5 L 24,0.5"
        id="path6059" />
+    <path
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.35"
+       d="M 0,1.5 L 24,1.5"
+       id="path28" />
   </g>
   <g
      inkscape:groupmode="layer"

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	2009-01-23 22:20:25 UTC (rev 29302)
+++ xfwm4/trunk/themes/default/close-prelight.svg	2009-01-23 22:36:35 UTC (rev 29303)
@@ -21,17 +21,6 @@
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient1886">
-      <stop
-         style="stop-color:white;stop-opacity:1;"
-         offset="0"
-         id="stop1888" />
-      <stop
-         style="stop-color:white;stop-opacity:0.25;"
-         offset="1"
-         id="stop1890" />
-    </linearGradient>
-    <linearGradient
        id="linearGradient5873">
       <stop
          id="stop5875"
@@ -46,45 +35,6 @@
          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;" />
-      <stop
-         id="stop2776"
-         offset="0.5"
-         style="stop-color:black;stop-opacity:0;" />
-      <stop
-         id="stop2779"
-         offset="0.75"
-         style="stop-color:black;stop-opacity:0.0125;" />
-      <stop
-         id="stop5851"
-         offset="1"
-         style="stop-color:black;stop-opacity:0.05;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
-       x1="0"
-       y1="0.5"
-       x2="0"
-       y2="21.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"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2,0,1)" />
     <radialGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5873"
@@ -98,25 +48,6 @@
        gradientUnits="userSpaceOnUse" />
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient1886"
-       id="linearGradient1892"
-       x1="0"
-       y1="1"
-       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"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient5873"
        id="linearGradient4147"
        x1="0"
@@ -187,7 +118,7 @@
        id="g1789"
        transform="translate(0,1)">
       <rect
-         style="opacity:0.5;fill:url(#radialGradient3087);fill-opacity:0.50;stroke:url(#radialGradient3087);stroke-width:1;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         style="opacity:0.25;fill:url(#radialGradient3087);fill-opacity:0.50;stroke:url(#radialGradient3087);stroke-width:1;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
          id="rect3079"
          width="24"
          height="22"
@@ -197,42 +128,22 @@
   </g>
   <g
      inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Grad"
-     style="display:inline">
-    <rect
-       style="fill:url(#linearGradient6945);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
-       id="rect6057"
-       width="24"
-       height="21"
-       x="0"
-       y="1" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
      id="layer3"
      inkscape:label="hilight">
     <rect
-       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"
-       id="rect6061"
-       width="24"
-       height="4"
-       x="0"
-       y="1" />
-    <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"
+       style="opacity:0.25;fill:none;fill-opacity:0;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"
        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"
+       style="fill:none;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.30"
+       d="M 0.5,2 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,2 23.5,2 L 23.5,2 L 23.5,2"
        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 "
+       style="fill:url(#linearGradient4147);fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:0.20"
+       d="M 2,2 C 2,2 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,2 22,2 L 2,2 z "
        id="path2188" />
   </g>
   <g
@@ -241,9 +152,13 @@
      id="g31"
      style="display:inline">
     <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.15"
+       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.25"
        d="M 0,0.5 L 24,0.5"
        id="path6059" />
+    <path
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.30"
+       d="M 0,1.5 L 24,1.5"
+       id="path28" />
   </g>
   <g
      inkscape:groupmode="layer"

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	2009-01-23 22:20:25 UTC (rev 29302)
+++ xfwm4/trunk/themes/default/close-pressed.svg	2009-01-23 22:36:35 UTC (rev 29303)
@@ -21,17 +21,6 @@
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient1886">
-      <stop
-         style="stop-color:white;stop-opacity:1;"
-         offset="0"
-         id="stop1888" />
-      <stop
-         style="stop-color:white;stop-opacity:0.25;"
-         offset="1"
-         id="stop1890" />
-    </linearGradient>
-    <linearGradient
        id="linearGradient5873">
       <stop
          id="stop5875"
@@ -46,45 +35,6 @@
          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;" />
-      <stop
-         id="stop2776"
-         offset="0.5"
-         style="stop-color:black;stop-opacity:0;" />
-      <stop
-         id="stop2779"
-         offset="0.75"
-         style="stop-color:black;stop-opacity:0.0125;" />
-      <stop
-         id="stop5851"
-         offset="1"
-         style="stop-color:black;stop-opacity:0.05;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
-       x1="0"
-       y1="0.5"
-       x2="0"
-       y2="21.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"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2,0,1)" />
     <radialGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5873"
@@ -98,25 +48,6 @@
        gradientUnits="userSpaceOnUse" />
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient1886"
-       id="linearGradient1892"
-       x1="0"
-       y1="1"
-       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"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient5873"
        id="linearGradient4147"
        x1="0"
@@ -187,7 +118,7 @@
        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"
+         style="opacity:0.35;fill:url(#radialGradient3087);fill-opacity:0.50;stroke:url(#radialGradient3087);stroke-width:1;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
          id="rect3079"
          width="24"
          height="22"
@@ -197,42 +128,15 @@
   </g>
   <g
      inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Grad"
-     style="display:inline">
-    <rect
-       style="fill:url(#linearGradient6945);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
-       id="rect6057"
-       width="24"
-       height="21"
-       x="0"
-       y="1" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
      id="layer3"
      inkscape:label="hilight">
-    <rect
-       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"
-       id="rect6061"
-       width="24"
-       height="4"
-       x="0"
-       y="1" />
-    <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"
-       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"
+       style="fill:none;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.30"
+       d="M 0.5,2 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,2 23.5,2 L 23.5,2 L 23.5,2"
        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 "
+       style="fill:url(#linearGradient4147);fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:0.20"
+       d="M 2,2 C 2,2 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,2 22,2 L 2,2 z "
        id="path2188" />
   </g>
   <g
@@ -241,9 +145,13 @@
      id="g31"
      style="display:inline">
     <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.15"
+       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.25"
        d="M 0,0.5 L 24,0.5"
        id="path6059" />
+    <path
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.30"
+       d="M 0,1.5 L 24,1.5"
+       id="path28" />
   </g>
   <g
      inkscape:groupmode="layer"

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	2009-01-23 22:20:25 UTC (rev 29302)
+++ xfwm4/trunk/themes/default/hide-active.svg	2009-01-23 22:36:35 UTC (rev 29303)
@@ -21,17 +21,6 @@
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient1886">
-      <stop
-         style="stop-color:white;stop-opacity:1;"
-         offset="0"
-         id="stop1888" />
-      <stop
-         style="stop-color:white;stop-opacity:0.25;"
-         offset="1"
-         id="stop1890" />
-    </linearGradient>
-    <linearGradient
        id="linearGradient5873">
       <stop
          id="stop5875"
@@ -47,66 +36,8 @@
          style="stop-color:white;stop-opacity:0;" />
     </linearGradient>
     <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:white;stop-opacity:0;" />
-      <stop
-         id="stop2776"
-         offset="0.5"
-         style="stop-color:black;stop-opacity:0;" />
-      <stop
-         id="stop2779"
-         offset="0.75"
-         style="stop-color:black;stop-opacity:0.0125;" />
-      <stop
-         id="stop5851"
-         offset="1"
-         style="stop-color:black;stop-opacity:0.05;" />
-    </linearGradient>
-    <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
-       x1="0"
-       y1="0.5"
-       x2="0"
-       y2="21.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"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2,0,1)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1886"
-       id="linearGradient1892"
-       x1="0"
-       y1="1"
-       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"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5873"
        id="linearGradient4147"
        x1="0"
        y1="1"
@@ -170,42 +101,22 @@
   </metadata>
   <g
      inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Grad"
-     style="display:inline">
-    <rect
-       style="fill:url(#linearGradient6945);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
-       id="rect6057"
-       width="24"
-       height="21"
-       x="0"
-       y="1" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
      id="layer3"
      inkscape:label="hilight">
     <rect
-       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"
-       id="rect6061"
-       width="24"
-       height="4"
-       x="0"
-       y="1" />
-    <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"
+       style="opacity:0.25;fill:none;fill-opacity:0;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"
        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"
+       style="fill:none;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.30"
+       d="M 0.5,2 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,2 23.5,2 L 23.5,2 L 23.5,2"
        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 "
+       style="fill:url(#linearGradient4147);fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:0.20"
+       d="M 2,2 C 2,2 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,2 22,2 L 2,2 z "
        id="path2188" />
   </g>
   <g
@@ -214,9 +125,13 @@
      id="layer1"
      style="display:inline">
     <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.15"
+       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.25"
        d="M 0,0.5 L 24,0.5"
        id="path6059" />
+    <path
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.30"
+       d="M 0,1.5 L 24,1.5"
+       id="path28" />
   </g>
   <g
      inkscape:groupmode="layer"

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	2009-01-23 22:20:25 UTC (rev 29302)
+++ xfwm4/trunk/themes/default/hide-inactive.svg	2009-01-23 22:36:35 UTC (rev 29303)
@@ -21,32 +21,6 @@
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient1886">
-      <stop
-         style="stop-color:white;stop-opacity:1;"
-         offset="0"
-         id="stop1888" />
-      <stop
-         style="stop-color:white;stop-opacity:0.25;"
-         offset="1"
-         id="stop1890" />
-    </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"
@@ -75,44 +49,6 @@
        x2="0"
        y2="21.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"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2,0,1)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1886"
-       id="linearGradient1892"
-       x1="0"
-       y1="1"
-       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"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5873"
-       id="linearGradient4147"
-       x1="0"
-       y1="1"
-       x2="0"
-       y2="22"
-       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -185,27 +121,13 @@
      inkscape:groupmode="layer"
      id="layer3"
      inkscape:label="hilight">
-    <rect
-       style="fill:url(#linearGradient6962);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
-       id="rect6061"
-       width="24"
-       height="4"
-       x="0"
-       y="1" />
-    <rect
-       style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:0.60;stroke:none;stroke-width:0;stroke-opacity:1"
-       id="rect1884"
-       width="24"
-       height="15"
-       x="0"
-       y="1" />
     <path
        style="fill:none;stroke:#7f7f7f;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.30"
        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:#7f7f7f;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:0.10"
-       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 "
+       d="M 2,2 C 2,2 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,2 22,2 L 2,2 z "
        id="path2188" />
   </g>
   <g
@@ -214,9 +136,13 @@
      id="layer1"
      style="display:inline">
     <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.15"
+       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.25"
        d="M 0,0.5 L 24,0.5"
        id="path6059" />
+    <path
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.35"
+       d="M 0,1.5 L 24,1.5"
+       id="path28" />
   </g>
   <g
      inkscape:groupmode="layer"

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

Modified: xfwm4/trunk/themes/default/hide-prelight.svg
===================================================================
--- xfwm4/trunk/themes/default/hide-prelight.svg	2009-01-23 22:20:25 UTC (rev 29302)
+++ xfwm4/trunk/themes/default/hide-prelight.svg	2009-01-23 22:36:35 UTC (rev 29303)
@@ -21,17 +21,6 @@
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient1886">
-      <stop
-         style="stop-color:white;stop-opacity:1;"
-         offset="0"
-         id="stop1888" />
-      <stop
-         style="stop-color:white;stop-opacity:0.25;"
-         offset="1"
-         id="stop1890" />
-    </linearGradient>
-    <linearGradient
        id="linearGradient5873">
       <stop
          id="stop5875"
@@ -46,45 +35,6 @@
          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;" />
-      <stop
-         id="stop2776"
-         offset="0.5"
-         style="stop-color:black;stop-opacity:0;" />
-      <stop
-         id="stop2779"
-         offset="0.75"
-         style="stop-color:black;stop-opacity:0.0125;" />
-      <stop
-         id="stop5851"
-         offset="1"
-         style="stop-color:black;stop-opacity:0.05;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
-       x1="0"
-       y1="0.5"
-       x2="0"
-       y2="21.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"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2,0,1)" />
     <radialGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5873"
@@ -98,25 +48,6 @@
        gradientUnits="userSpaceOnUse" />
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient1886"
-       id="linearGradient1892"
-       x1="0"
-       y1="1"
-       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"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient5873"
        id="linearGradient4147"
        x1="0"
@@ -187,7 +118,7 @@
        id="g1789"
        transform="translate(0,1)">
       <rect
-         style="opacity:0.5;fill:url(#radialGradient3087);fill-opacity:0.50;stroke:url(#radialGradient3087);stroke-width:1;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         style="opacity:0.25;fill:url(#radialGradient3087);fill-opacity:0.50;stroke:url(#radialGradient3087);stroke-width:1;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
          id="rect3079"
          width="24"
          height="22"
@@ -197,42 +128,22 @@
   </g>
   <g
      inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Grad"
-     style="display:inline">
-    <rect
-       style="fill:url(#linearGradient6945);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
-       id="rect6057"
-       width="24"
-       height="21"
-       x="0"
-       y="1" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
      id="layer3"
      inkscape:label="hilight">
     <rect
-       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"
-       id="rect6061"
-       width="24"
-       height="4"
-       x="0"
-       y="1" />
-    <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"
+       style="opacity:0.25;fill:none;fill-opacity:0;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"
        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"
+       style="fill:none;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.30"
+       d="M 0.5,2 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,2 23.5,2 L 23.5,2 L 23.5,2"
        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 "
+       style="fill:url(#linearGradient4147);fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:0.20"
+       d="M 2,2 C 2,2 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,2 22,2 L 2,2 z "
        id="path2188" />
   </g>
   <g
@@ -241,9 +152,13 @@
      id="g31"
      style="display:inline">
     <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.15"
+       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.25"
        d="M 0,0.5 L 24,0.5"
        id="path6059" />
+    <path
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.30"
+       d="M 0,1.5 L 24,1.5"
+       id="path28" />
   </g>
   <g
      inkscape:groupmode="layer"

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

Modified: xfwm4/trunk/themes/default/hide-pressed.svg
===================================================================
--- xfwm4/trunk/themes/default/hide-pressed.svg	2009-01-23 22:20:25 UTC (rev 29302)
+++ xfwm4/trunk/themes/default/hide-pressed.svg	2009-01-23 22:36:35 UTC (rev 29303)
@@ -21,17 +21,6 @@
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient1886">
-      <stop
-         style="stop-color:white;stop-opacity:1;"
-         offset="0"
-         id="stop1888" />
-      <stop
-         style="stop-color:white;stop-opacity:0.25;"
-         offset="1"
-         id="stop1890" />
-    </linearGradient>
-    <linearGradient
        id="linearGradient5873">
       <stop
          id="stop5875"
@@ -46,45 +35,6 @@
          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;" />
-      <stop
-         id="stop2776"
-         offset="0.5"
-         style="stop-color:black;stop-opacity:0;" />
-      <stop
-         id="stop2779"
-         offset="0.75"
-         style="stop-color:black;stop-opacity:0.0125;" />
-      <stop
-         id="stop5851"
-         offset="1"
-         style="stop-color:black;stop-opacity:0.05;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
-       x1="0"
-       y1="0.5"
-       x2="0"
-       y2="21.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"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2,0,1)" />
     <radialGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5873"
@@ -98,25 +48,6 @@
        gradientUnits="userSpaceOnUse" />
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient1886"
-       id="linearGradient1892"
-       x1="0"
-       y1="1"
-       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"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient5873"
        id="linearGradient4147"
        x1="0"
@@ -187,7 +118,7 @@
        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"
+         style="opacity:0.35;fill:url(#radialGradient3087);fill-opacity:0.50;stroke:url(#radialGradient3087);stroke-width:1;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
          id="rect3079"
          width="24"
          height="22"
@@ -197,42 +128,15 @@
   </g>
   <g
      inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Grad"
-     style="display:inline">
-    <rect
-       style="fill:url(#linearGradient6945);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
-       id="rect6057"
-       width="24"
-       height="21"
-       x="0"
-       y="1" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
      id="layer3"
      inkscape:label="hilight">
-    <rect
-       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"
-       id="rect6061"
-       width="24"
-       height="4"
-       x="0"
-       y="1" />
-    <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"
-       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"
+       style="fill:none;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.30"
+       d="M 0.5,2 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,2 23.5,2 L 23.5,2 L 23.5,2"
        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 "
+       style="fill:url(#linearGradient4147);fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:0.20"
+       d="M 2,2 C 2,2 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,2 22,2 L 2,2 z "
        id="path2188" />
   </g>
   <g
@@ -241,9 +145,13 @@
      id="g31"
      style="display:inline">
     <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.15"
+       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.25"
        d="M 0,0.5 L 24,0.5"
        id="path6059" />
+    <path
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.30"
+       d="M 0,1.5 L 24,1.5"
+       id="path28" />
   </g>
   <g
      inkscape:groupmode="layer"

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

Modified: xfwm4/trunk/themes/default/left-active.svg
===================================================================
--- xfwm4/trunk/themes/default/left-active.svg	2009-01-23 22:20:25 UTC (rev 29302)
+++ xfwm4/trunk/themes/default/left-active.svg	2009-01-23 22:36:35 UTC (rev 29303)
@@ -59,7 +59,7 @@
      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"
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.30"
        d="M 1.5,0 L 1.5,24"
        id="path6061" />
   </g>
@@ -68,7 +68,7 @@
      inkscape:groupmode="layer"
      id="border">
     <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.15"
+       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.25"
        d="M 0.5,0 L 0.5,24"
        id="path1340" />
   </g>

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

Modified: xfwm4/trunk/themes/default/left-inactive.svg
===================================================================
--- xfwm4/trunk/themes/default/left-inactive.svg	2009-01-23 22:20:25 UTC (rev 29302)
+++ xfwm4/trunk/themes/default/left-inactive.svg	2009-01-23 22:36:35 UTC (rev 29303)
@@ -59,7 +59,7 @@
      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"
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.35"
        d="M 1.5,0 L 1.5,24"
        id="path6061" />
   </g>
@@ -68,7 +68,7 @@
      inkscape:groupmode="layer"
      id="border">
     <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.15"
+       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.25"
        d="M 0.5,0 L 0.5,24"
        id="path1340" />
   </g>

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

Modified: xfwm4/trunk/themes/default/maximize-active.svg
===================================================================
--- xfwm4/trunk/themes/default/maximize-active.svg	2009-01-23 22:20:25 UTC (rev 29302)
+++ xfwm4/trunk/themes/default/maximize-active.svg	2009-01-23 22:36:35 UTC (rev 29303)
@@ -21,17 +21,6 @@
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient1886">
-      <stop
-         style="stop-color:white;stop-opacity:1;"
-         offset="0"
-         id="stop1888" />
-      <stop
-         style="stop-color:white;stop-opacity:0.25;"
-         offset="1"
-         id="stop1890" />
-    </linearGradient>
-    <linearGradient
        id="linearGradient5873">
       <stop
          id="stop5875"
@@ -47,66 +36,8 @@
          style="stop-color:white;stop-opacity:0;" />
     </linearGradient>
     <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:white;stop-opacity:0;" />
-      <stop
-         id="stop2776"
-         offset="0.5"
-         style="stop-color:black;stop-opacity:0;" />
-      <stop
-         id="stop2779"
-         offset="0.75"
-         style="stop-color:black;stop-opacity:0.0125;" />
-      <stop
-         id="stop5851"
-         offset="1"
-         style="stop-color:black;stop-opacity:0.05;" />
-    </linearGradient>
-    <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
-       x1="0"
-       y1="0.5"
-       x2="0"
-       y2="21.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"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2,0,1)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1886"
-       id="linearGradient1892"
-       x1="0"
-       y1="1"
-       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"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5873"
        id="linearGradient4147"
        x1="0"
        y1="1"
@@ -170,42 +101,22 @@
   </metadata>
   <g
      inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Grad"
-     style="display:inline">
-    <rect
-       style="fill:url(#linearGradient6945);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
-       id="rect6057"
-       width="24"
-       height="21"
-       x="0"
-       y="1" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
      id="layer3"
      inkscape:label="hilight">
     <rect
-       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"
-       id="rect6061"
-       width="24"
-       height="4"
-       x="0"
-       y="1" />
-    <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"
+       style="opacity:0.25;fill:none;fill-opacity:0;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"
        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"
+       style="fill:none;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.30"
+       d="M 0.5,2 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,2 23.5,2 L 23.5,2 L 23.5,2"
        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 "
+       style="fill:url(#linearGradient4147);fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:0.20"
+       d="M 2,2 C 2,2 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,2 22,2 L 2,2 z "
        id="path2188" />
   </g>
   <g
@@ -214,9 +125,13 @@
      id="layer1"
      style="display:inline">
     <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.15"
+       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.25"
        d="M 0,0.5 L 24,0.5"
        id="path6059" />
+    <path
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.30"
+       d="M 0,1.5 L 24,1.5"
+       id="path28" />
   </g>
   <g
      inkscape:groupmode="layer"

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

Modified: xfwm4/trunk/themes/default/maximize-inactive.svg
===================================================================
--- xfwm4/trunk/themes/default/maximize-inactive.svg	2009-01-23 22:20:25 UTC (rev 29302)
+++ xfwm4/trunk/themes/default/maximize-inactive.svg	2009-01-23 22:36:35 UTC (rev 29303)
@@ -21,32 +21,6 @@
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient1886">
-      <stop
-         style="stop-color:white;stop-opacity:1;"
-         offset="0"
-         id="stop1888" />
-      <stop
-         style="stop-color:white;stop-opacity:0.25;"
-         offset="1"
-         id="stop1890" />
-    </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"
@@ -75,44 +49,6 @@
        x2="0"
        y2="21.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"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2,0,1)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1886"
-       id="linearGradient1892"
-       x1="0"
-       y1="1"
-       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"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5873"
-       id="linearGradient4147"
-       x1="0"
-       y1="1"
-       x2="0"
-       y2="22"
-       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -185,27 +121,13 @@
      inkscape:groupmode="layer"
      id="layer3"
      inkscape:label="hilight">
-    <rect
-       style="fill:url(#linearGradient6962);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
-       id="rect6061"
-       width="24"
-       height="4"
-       x="0"
-       y="1" />
-    <rect
-       style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:0.60;stroke:none;stroke-width:0;stroke-opacity:1"
-       id="rect1884"
-       width="24"
-       height="15"
-       x="0"
-       y="1" />
     <path
        style="fill:none;stroke:#7f7f7f;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.30"
        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:#7f7f7f;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:0.10"
-       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 "
+       d="M 2,2 C 2,2 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,2 22,2 L 2,2 z "
        id="path2188" />
   </g>
   <g
@@ -214,9 +136,13 @@
      id="layer1"
      style="display:inline">
     <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.15"
+       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.25"
        d="M 0,0.5 L 24,0.5"
        id="path6059" />
+    <path
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.35"
+       d="M 0,1.5 L 24,1.5"
+       id="path28" />
   </g>
   <g
      inkscape:groupmode="layer"

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

Modified: xfwm4/trunk/themes/default/maximize-prelight.svg
===================================================================
--- xfwm4/trunk/themes/default/maximize-prelight.svg	2009-01-23 22:20:25 UTC (rev 29302)
+++ xfwm4/trunk/themes/default/maximize-prelight.svg	2009-01-23 22:36:35 UTC (rev 29303)
@@ -21,17 +21,6 @@
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient1886">
-      <stop
-         style="stop-color:white;stop-opacity:1;"
-         offset="0"
-         id="stop1888" />
-      <stop
-         style="stop-color:white;stop-opacity:0.25;"
-         offset="1"
-         id="stop1890" />
-    </linearGradient>
-    <linearGradient
        id="linearGradient5873">
       <stop
          id="stop5875"
@@ -46,45 +35,6 @@
          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;" />
-      <stop
-         id="stop2776"
-         offset="0.5"
-         style="stop-color:black;stop-opacity:0;" />
-      <stop
-         id="stop2779"
-         offset="0.75"
-         style="stop-color:black;stop-opacity:0.0125;" />
-      <stop
-         id="stop5851"
-         offset="1"
-         style="stop-color:black;stop-opacity:0.05;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
-       x1="0"
-       y1="0.5"
-       x2="0"
-       y2="21.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"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2,0,1)" />
     <radialGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5873"
@@ -98,25 +48,6 @@
        gradientUnits="userSpaceOnUse" />
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient1886"
-       id="linearGradient1892"
-       x1="0"
-       y1="1"
-       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"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient5873"
        id="linearGradient4147"
        x1="0"
@@ -187,7 +118,7 @@
        id="g1789"
        transform="translate(0,1)">
       <rect
-         style="opacity:0.5;fill:url(#radialGradient3087);fill-opacity:0.50;stroke:url(#radialGradient3087);stroke-width:1;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         style="opacity:0.25;fill:url(#radialGradient3087);fill-opacity:0.50;stroke:url(#radialGradient3087);stroke-width:1;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
          id="rect3079"
          width="24"
          height="22"
@@ -197,42 +128,22 @@
   </g>
   <g
      inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Grad"
-     style="display:inline">
-    <rect
-       style="fill:url(#linearGradient6945);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
-       id="rect6057"
-       width="24"
-       height="21"
-       x="0"
-       y="1" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
      id="layer3"
      inkscape:label="hilight">
     <rect
-       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"
-       id="rect6061"
-       width="24"
-       height="4"
-       x="0"
-       y="1" />
-    <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"
+       style="opacity:0.25;fill:none;fill-opacity:0;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"
        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"
+       style="fill:none;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.30"
+       d="M 0.5,2 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,2 23.5,2 L 23.5,2 L 23.5,2"
        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 "
+       style="fill:url(#linearGradient4147);fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:0.20"
+       d="M 2,2 C 2,2 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,2 22,2 L 2,2 z "
        id="path2188" />
   </g>
   <g
@@ -241,9 +152,13 @@
      id="g31"
      style="display:inline">
     <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.15"
+       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.25"
        d="M 0,0.5 L 24,0.5"
        id="path6059" />
+    <path
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.30"
+       d="M 0,1.5 L 24,1.5"
+       id="path28" />
   </g>
   <g
      inkscape:groupmode="layer"

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

Modified: xfwm4/trunk/themes/default/maximize-pressed.svg
===================================================================
--- xfwm4/trunk/themes/default/maximize-pressed.svg	2009-01-23 22:20:25 UTC (rev 29302)
+++ xfwm4/trunk/themes/default/maximize-pressed.svg	2009-01-23 22:36:35 UTC (rev 29303)
@@ -21,17 +21,6 @@
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient1886">
-      <stop
-         style="stop-color:white;stop-opacity:1;"
-         offset="0"
-         id="stop1888" />
-      <stop
-         style="stop-color:white;stop-opacity:0.25;"
-         offset="1"
-         id="stop1890" />
-    </linearGradient>
-    <linearGradient
        id="linearGradient5873">
       <stop
          id="stop5875"
@@ -46,45 +35,6 @@
          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;" />
-      <stop
-         id="stop2776"
-         offset="0.5"
-         style="stop-color:black;stop-opacity:0;" />
-      <stop
-         id="stop2779"
-         offset="0.75"
-         style="stop-color:black;stop-opacity:0.0125;" />
-      <stop
-         id="stop5851"
-         offset="1"
-         style="stop-color:black;stop-opacity:0.05;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
-       x1="0"
-       y1="0.5"
-       x2="0"
-       y2="21.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"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2,0,1)" />
     <radialGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5873"
@@ -98,25 +48,6 @@
        gradientUnits="userSpaceOnUse" />
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient1886"
-       id="linearGradient1892"
-       x1="0"
-       y1="1"
-       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"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient5873"
        id="linearGradient4147"
        x1="0"
@@ -187,7 +118,7 @@
        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"
+         style="opacity:0.35;fill:url(#radialGradient3087);fill-opacity:0.50;stroke:url(#radialGradient3087);stroke-width:1;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
          id="rect3079"
          width="24"
          height="22"
@@ -197,42 +128,15 @@
   </g>
   <g
      inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Grad"
-     style="display:inline">
-    <rect
-       style="fill:url(#linearGradient6945);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
-       id="rect6057"
-       width="24"
-       height="21"
-       x="0"
-       y="1" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
      id="layer3"
      inkscape:label="hilight">
-    <rect
-       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"
-       id="rect6061"
-       width="24"
-       height="4"
-       x="0"
-       y="1" />
-    <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"
-       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"
+       style="fill:none;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.30"
+       d="M 0.5,2 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,2 23.5,2 L 23.5,2 L 23.5,2"
        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 "
+       style="fill:url(#linearGradient4147);fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:0.20"
+       d="M 2,2 C 2,2 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,2 22,2 L 2,2 z "
        id="path2188" />
   </g>
   <g
@@ -241,9 +145,13 @@
      id="g31"
      style="display:inline">
     <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.15"
+       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.25"
        d="M 0,0.5 L 24,0.5"
        id="path6059" />
+    <path
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.30"
+       d="M 0,1.5 L 24,1.5"
+       id="path28" />
   </g>
   <g
      inkscape:groupmode="layer"

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

Modified: xfwm4/trunk/themes/default/maximize-toggled-active.svg
===================================================================
--- xfwm4/trunk/themes/default/maximize-toggled-active.svg	2009-01-23 22:20:25 UTC (rev 29302)
+++ xfwm4/trunk/themes/default/maximize-toggled-active.svg	2009-01-23 22:36:35 UTC (rev 29303)
@@ -21,17 +21,6 @@
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient1886">
-      <stop
-         style="stop-color:white;stop-opacity:1;"
-         offset="0"
-         id="stop1888" />
-      <stop
-         style="stop-color:white;stop-opacity:0.25;"
-         offset="1"
-         id="stop1890" />
-    </linearGradient>
-    <linearGradient
        id="linearGradient5873">
       <stop
          id="stop5875"
@@ -47,66 +36,8 @@
          style="stop-color:white;stop-opacity:0;" />
     </linearGradient>
     <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:white;stop-opacity:0;" />
-      <stop
-         id="stop2776"
-         offset="0.5"
-         style="stop-color:black;stop-opacity:0;" />
-      <stop
-         id="stop2779"
-         offset="0.75"
-         style="stop-color:black;stop-opacity:0.0125;" />
-      <stop
-         id="stop5851"
-         offset="1"
-         style="stop-color:black;stop-opacity:0.05;" />
-    </linearGradient>
-    <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
-       x1="0"
-       y1="0.5"
-       x2="0"
-       y2="21.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"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2,0,1)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1886"
-       id="linearGradient1892"
-       x1="0"
-       y1="1"
-       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"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5873"
        id="linearGradient4147"
        x1="0"
        y1="1"
@@ -170,42 +101,22 @@
   </metadata>
   <g
      inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Grad"
-     style="display:inline">
-    <rect
-       style="fill:url(#linearGradient6945);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
-       id="rect6057"
-       width="24"
-       height="21"
-       x="0"
-       y="1" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
      id="layer3"
      inkscape:label="hilight">
     <rect
-       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"
-       id="rect6061"
-       width="24"
-       height="4"
-       x="0"
-       y="1" />
-    <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"
+       style="opacity:0.25;fill:none;fill-opacity:0;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"
        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"
+       style="fill:none;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.30"
+       d="M 0.5,2 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,2 23.5,2 L 23.5,2 L 23.5,2"
        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 "
+       style="fill:url(#linearGradient4147);fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:0.20"
+       d="M 2,2 C 2,2 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,2 22,2 L 2,2 z "
        id="path2188" />
   </g>
   <g
@@ -214,9 +125,13 @@
      id="layer1"
      style="display:inline">
     <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.15"
+       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.25"
        d="M 0,0.5 L 24,0.5"
        id="path6059" />
+    <path
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.30"
+       d="M 0,1.5 L 24,1.5"
+       id="path28" />
   </g>
   <g
      inkscape:groupmode="layer"

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

Modified: xfwm4/trunk/themes/default/maximize-toggled-inactive.svg
===================================================================
--- xfwm4/trunk/themes/default/maximize-toggled-inactive.svg	2009-01-23 22:20:25 UTC (rev 29302)
+++ xfwm4/trunk/themes/default/maximize-toggled-inactive.svg	2009-01-23 22:36:35 UTC (rev 29303)
@@ -21,32 +21,6 @@
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient1886">
-      <stop
-         style="stop-color:white;stop-opacity:1;"
-         offset="0"
-         id="stop1888" />
-      <stop
-         style="stop-color:white;stop-opacity:0.25;"
-         offset="1"
-         id="stop1890" />
-    </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"
@@ -75,44 +49,6 @@
        x2="0"
        y2="21.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"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2,0,1)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1886"
-       id="linearGradient1892"
-       x1="0"
-       y1="1"
-       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"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5873"
-       id="linearGradient4147"
-       x1="0"
-       y1="1"
-       x2="0"
-       y2="22"
-       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -185,27 +121,13 @@
      inkscape:groupmode="layer"
      id="layer3"
      inkscape:label="hilight">
-    <rect
-       style="fill:url(#linearGradient6962);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
-       id="rect6061"
-       width="24"
-       height="4"
-       x="0"
-       y="1" />
-    <rect
-       style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:0.60;stroke:none;stroke-width:0;stroke-opacity:1"
-       id="rect1884"
-       width="24"
-       height="15"
-       x="0"
-       y="1" />
     <path
        style="fill:none;stroke:#7f7f7f;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.30"
        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:#7f7f7f;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:0.10"
-       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 "
+       d="M 2,2 C 2,2 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,2 22,2 L 2,2 z "
        id="path2188" />
   </g>
   <g
@@ -214,9 +136,13 @@
      id="layer1"
      style="display:inline">
     <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.15"
+       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.25"
        d="M 0,0.5 L 24,0.5"
        id="path6059" />
+    <path
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.35"
+       d="M 0,1.5 L 24,1.5"
+       id="path28" />
   </g>
   <g
      inkscape:groupmode="layer"

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

Modified: xfwm4/trunk/themes/default/maximize-toggled-prelight.svg
===================================================================
--- xfwm4/trunk/themes/default/maximize-toggled-prelight.svg	2009-01-23 22:20:25 UTC (rev 29302)
+++ xfwm4/trunk/themes/default/maximize-toggled-prelight.svg	2009-01-23 22:36:35 UTC (rev 29303)
@@ -21,17 +21,6 @@
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient1886">
-      <stop
-         style="stop-color:white;stop-opacity:1;"
-         offset="0"
-         id="stop1888" />
-      <stop
-         style="stop-color:white;stop-opacity:0.25;"
-         offset="1"
-         id="stop1890" />
-    </linearGradient>
-    <linearGradient
        id="linearGradient5873">
       <stop
          id="stop5875"
@@ -46,45 +35,6 @@
          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;" />
-      <stop
-         id="stop2776"
-         offset="0.5"
-         style="stop-color:black;stop-opacity:0;" />
-      <stop
-         id="stop2779"
-         offset="0.75"
-         style="stop-color:black;stop-opacity:0.0125;" />
-      <stop
-         id="stop5851"
-         offset="1"
-         style="stop-color:black;stop-opacity:0.05;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
-       x1="0"
-       y1="0.5"
-       x2="0"
-       y2="21.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"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2,0,1)" />
     <radialGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5873"
@@ -98,25 +48,6 @@
        gradientUnits="userSpaceOnUse" />
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient1886"
-       id="linearGradient1892"
-       x1="0"
-       y1="1"
-       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"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient5873"
        id="linearGradient4147"
        x1="0"
@@ -187,7 +118,7 @@
        id="g1789"
        transform="translate(0,1)">
       <rect
-         style="opacity:0.5;fill:url(#radialGradient3087);fill-opacity:0.50;stroke:url(#radialGradient3087);stroke-width:1;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         style="opacity:0.25;fill:url(#radialGradient3087);fill-opacity:0.50;stroke:url(#radialGradient3087);stroke-width:1;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
          id="rect3079"
          width="24"
          height="22"
@@ -197,42 +128,22 @@
   </g>
   <g
      inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Grad"
-     style="display:inline">
-    <rect
-       style="fill:url(#linearGradient6945);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
-       id="rect6057"
-       width="24"
-       height="21"
-       x="0"
-       y="1" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
      id="layer3"
      inkscape:label="hilight">
     <rect
-       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"
-       id="rect6061"
-       width="24"
-       height="4"
-       x="0"
-       y="1" />
-    <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"
+       style="opacity:0.25;fill:none;fill-opacity:0;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"
        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"
+       style="fill:none;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.30"
+       d="M 0.5,2 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,2 23.5,2 L 23.5,2 L 23.5,2"
        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 "
+       style="fill:url(#linearGradient4147);fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:0.20"
+       d="M 2,2 C 2,2 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,2 22,2 L 2,2 z "
        id="path2188" />
   </g>
   <g
@@ -241,9 +152,13 @@
      id="g31"
      style="display:inline">
     <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.15"
+       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.25"
        d="M 0,0.5 L 24,0.5"
        id="path6059" />
+    <path
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.30"
+       d="M 0,1.5 L 24,1.5"
+       id="path28" />
   </g>
   <g
      inkscape:groupmode="layer"

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

Modified: xfwm4/trunk/themes/default/maximize-toggled-pressed.svg
===================================================================
--- xfwm4/trunk/themes/default/maximize-toggled-pressed.svg	2009-01-23 22:20:25 UTC (rev 29302)
+++ xfwm4/trunk/themes/default/maximize-toggled-pressed.svg	2009-01-23 22:36:35 UTC (rev 29303)
@@ -21,17 +21,6 @@
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient1886">
-      <stop
-         style="stop-color:white;stop-opacity:1;"
-         offset="0"
-         id="stop1888" />
-      <stop
-         style="stop-color:white;stop-opacity:0.25;"
-         offset="1"
-         id="stop1890" />
-    </linearGradient>
-    <linearGradient
        id="linearGradient5873">
       <stop
          id="stop5875"
@@ -46,45 +35,6 @@
          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;" />
-      <stop
-         id="stop2776"
-         offset="0.5"
-         style="stop-color:black;stop-opacity:0;" />
-      <stop
-         id="stop2779"
-         offset="0.75"
-         style="stop-color:black;stop-opacity:0.0125;" />
-      <stop
-         id="stop5851"
-         offset="1"
-         style="stop-color:black;stop-opacity:0.05;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
-       x1="0"
-       y1="0.5"
-       x2="0"
-       y2="21.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"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2,0,1)" />
     <radialGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5873"
@@ -98,25 +48,6 @@
        gradientUnits="userSpaceOnUse" />
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient1886"
-       id="linearGradient1892"
-       x1="0"
-       y1="1"
-       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"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient5873"
        id="linearGradient4147"
        x1="0"
@@ -187,7 +118,7 @@
        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"
+         style="opacity:0.35;fill:url(#radialGradient3087);fill-opacity:0.50;stroke:url(#radialGradient3087);stroke-width:1;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
          id="rect3079"
          width="24"
          height="22"
@@ -197,42 +128,15 @@
   </g>
   <g
      inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Grad"
-     style="display:inline">
-    <rect
-       style="fill:url(#linearGradient6945);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
-       id="rect6057"
-       width="24"
-       height="21"
-       x="0"
-       y="1" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
      id="layer3"
      inkscape:label="hilight">
-    <rect
-       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"
-       id="rect6061"
-       width="24"
-       height="4"
-       x="0"
-       y="1" />
-    <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"
-       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"
+       style="fill:none;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.30"
+       d="M 0.5,2 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,2 23.5,2 L 23.5,2 L 23.5,2"
        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 "
+       style="fill:url(#linearGradient4147);fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:0.20"
+       d="M 2,2 C 2,2 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,2 22,2 L 2,2 z "
        id="path2188" />
   </g>
   <g
@@ -241,9 +145,13 @@
      id="g31"
      style="display:inline">
     <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.15"
+       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.25"
        d="M 0,0.5 L 24,0.5"
        id="path6059" />
+    <path
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.30"
+       d="M 0,1.5 L 24,1.5"
+       id="path28" />
   </g>
   <g
      inkscape:groupmode="layer"

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

Modified: xfwm4/trunk/themes/default/menu-active.svg
===================================================================
--- xfwm4/trunk/themes/default/menu-active.svg	2009-01-23 22:20:25 UTC (rev 29302)
+++ xfwm4/trunk/themes/default/menu-active.svg	2009-01-23 22:36:35 UTC (rev 29303)
@@ -6,7 +6,6 @@
    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"
@@ -19,83 +18,7 @@
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
    sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default">
   <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient1886">
-      <stop
-         style="stop-color:white;stop-opacity:1;"
-         offset="0"
-         id="stop1888" />
-      <stop
-         style="stop-color:white;stop-opacity:0.25;"
-         offset="1"
-         id="stop1890" />
-    </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;" />
-      <stop
-         id="stop2776"
-         offset="0.5"
-         style="stop-color:black;stop-opacity:0;" />
-      <stop
-         id="stop2779"
-         offset="0.75"
-         style="stop-color:black;stop-opacity:0.0125;" />
-      <stop
-         id="stop5851"
-         offset="1"
-         style="stop-color:black;stop-opacity:0.05;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
-       x1="0"
-       y1="0.5"
-       x2="0"
-       y2="21.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"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2,0,1)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1886"
-       id="linearGradient1892"
-       x1="0"
-       y1="1"
-       x2="0"
-       y2="14"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
-  </defs>
+     id="defs4" />
   <sodipodi:namedview
      id="base"
      pagecolor="white"
@@ -157,7 +80,7 @@
      transform="translate(0,-2)"
      style="display:inline">
     <rect
-       style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linejoin:miter;stroke-opacity:1"
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linejoin:miter;stroke-opacity:1"
        id="rect6057"
        width="24"
        height="21"
@@ -168,22 +91,7 @@
      inkscape:groupmode="layer"
      id="layer3"
      transform="translate(0,-2)"
-     inkscape:label="hilight">
-    <rect
-       style="fill:url(#linearGradient6962);fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
-       id="rect6061"
-       width="24"
-       height="4"
-       x="0"
-       y="1" />
-    <rect
-       style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-opacity:1"
-       id="rect1884"
-       width="24"
-       height="15"
-       x="0"
-       y="1" />
-  </g>
+     inkscape:label="hilight" />
   <g
      inkscape:label="Border"
      inkscape:groupmode="layer"
@@ -191,7 +99,11 @@
      transform="translate(0,-2)"
      style="display:inline">
     <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.15"
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.30"
+       d="M 0,1.5 L 24,1.5"
+       id="path28" />
+    <path
+       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.25"
        d="M 0,0.5 L 24,0.5"
        id="path6059" />
   </g>

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

Modified: xfwm4/trunk/themes/default/menu-inactive.svg
===================================================================
--- xfwm4/trunk/themes/default/menu-inactive.svg	2009-01-23 22:20:25 UTC (rev 29302)
+++ xfwm4/trunk/themes/default/menu-inactive.svg	2009-01-23 22:36:35 UTC (rev 29303)
@@ -21,32 +21,6 @@
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient1886">
-      <stop
-         style="stop-color:white;stop-opacity:1;"
-         offset="0"
-         id="stop1888" />
-      <stop
-         style="stop-color:white;stop-opacity:0.25;"
-         offset="1"
-         id="stop1890" />
-    </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"
@@ -75,26 +49,6 @@
        x2="0"
        y2="21.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"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2,0,1)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1886"
-       id="linearGradient1892"
-       x1="0"
-       y1="1"
-       x2="0"
-       y2="14"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -168,22 +122,7 @@
      inkscape:groupmode="layer"
      id="layer3"
      transform="translate(0,-2)"
-     inkscape:label="hilight">
-    <rect
-       style="fill:url(#linearGradient6962);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
-       id="rect6061"
-       width="24"
-       height="4"
-       x="0"
-       y="1" />
-    <rect
-       style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:0.60;stroke:none;stroke-width:0;stroke-opacity:1"
-       id="rect1884"
-       width="24"
-       height="15"
-       x="0"
-       y="1" />
-  </g>
+     inkscape:label="hilight" />
   <g
      inkscape:label="Border"
      inkscape:groupmode="layer"
@@ -191,7 +130,11 @@
      transform="translate(0,-2)"
      style="display:inline">
     <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.15"
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.30"
+       d="M 0,1.5 L 24,1.5"
+       id="path28" />
+    <path
+       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.25"
        d="M 0,0.5 L 24,0.5"
        id="path6059" />
   </g>

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

Modified: xfwm4/trunk/themes/default/menu-prelight.svg
===================================================================
--- xfwm4/trunk/themes/default/menu-prelight.svg	2009-01-23 22:20:25 UTC (rev 29302)
+++ xfwm4/trunk/themes/default/menu-prelight.svg	2009-01-23 22:36:35 UTC (rev 29303)
@@ -6,7 +6,6 @@
    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"
@@ -19,83 +18,7 @@
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
    sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default">
   <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient1886">
-      <stop
-         style="stop-color:white;stop-opacity:1;"
-         offset="0"
-         id="stop1888" />
-      <stop
-         style="stop-color:white;stop-opacity:0.25;"
-         offset="1"
-         id="stop1890" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         id="stop5877"
-         offset="0.5"
-         style="stop-color:#ffffff;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;" />
-      <stop
-         id="stop2776"
-         offset="0.5"
-         style="stop-color:black;stop-opacity:0;" />
-      <stop
-         id="stop2779"
-         offset="0.75"
-         style="stop-color:black;stop-opacity:0.0125;" />
-      <stop
-         id="stop5851"
-         offset="1"
-         style="stop-color:black;stop-opacity:0.05;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
-       x1="0"
-       y1="0.5"
-       x2="0"
-       y2="21.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"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2,0,1)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1886"
-       id="linearGradient1892"
-       x1="0"
-       y1="1"
-       x2="0"
-       y2="14"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
-  </defs>
+     id="defs4" />
   <sodipodi:namedview
      id="base"
      pagecolor="white"
@@ -157,7 +80,7 @@
      transform="translate(0,-2)"
      style="display:inline">
     <rect
-       style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linejoin:miter;stroke-opacity:1"
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linejoin:miter;stroke-opacity:1"
        id="rect6057"
        width="24"
        height="21"
@@ -168,22 +91,7 @@
      inkscape:groupmode="layer"
      id="layer3"
      transform="translate(0,-2)"
-     inkscape:label="hilight">
-    <rect
-       style="fill:url(#linearGradient6962);fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
-       id="rect6061"
-       width="24"
-       height="4"
-       x="0"
-       y="1" />
-    <rect
-       style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-opacity:1"
-       id="rect1884"
-       width="24"
-       height="15"
-       x="0"
-       y="1" />
-  </g>
+     inkscape:label="hilight" />
   <g
      inkscape:label="Border"
      inkscape:groupmode="layer"
@@ -191,7 +99,11 @@
      transform="translate(0,-2)"
      style="display:inline">
     <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.15"
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.30"
+       d="M 0,1.5 L 24,1.5"
+       id="path28" />
+    <path
+       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.25"
        d="M 0,0.5 L 24,0.5"
        id="path6059" />
   </g>

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

Modified: xfwm4/trunk/themes/default/menu-pressed.svg
===================================================================
--- xfwm4/trunk/themes/default/menu-pressed.svg	2009-01-23 22:20:25 UTC (rev 29302)
+++ xfwm4/trunk/themes/default/menu-pressed.svg	2009-01-23 22:36:35 UTC (rev 29303)
@@ -6,7 +6,6 @@
    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"
@@ -19,83 +18,7 @@
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
    sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default">
   <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient1886">
-      <stop
-         style="stop-color:white;stop-opacity:1;"
-         offset="0"
-         id="stop1888" />
-      <stop
-         style="stop-color:white;stop-opacity:0.25;"
-         offset="1"
-         id="stop1890" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         id="stop5877"
-         offset="0.5"
-         style="stop-color:#ffffff;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;" />
-      <stop
-         id="stop2776"
-         offset="0.5"
-         style="stop-color:black;stop-opacity:0;" />
-      <stop
-         id="stop2779"
-         offset="0.75"
-         style="stop-color:black;stop-opacity:0.0125;" />
-      <stop
-         id="stop5851"
-         offset="1"
-         style="stop-color:black;stop-opacity:0.05;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
-       x1="0"
-       y1="0.5"
-       x2="0"
-       y2="21.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"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2,0,1)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1886"
-       id="linearGradient1892"
-       x1="0"
-       y1="1"
-       x2="0"
-       y2="14"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
-  </defs>
+     id="defs4" />
   <sodipodi:namedview
      id="base"
      pagecolor="white"
@@ -157,7 +80,7 @@
      transform="translate(0,-2)"
      style="display:inline">
     <rect
-       style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linejoin:miter;stroke-opacity:1"
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linejoin:miter;stroke-opacity:1"
        id="rect6057"
        width="24"
        height="21"
@@ -168,22 +91,7 @@
      inkscape:groupmode="layer"
      id="layer3"
      transform="translate(0,-2)"
-     inkscape:label="hilight">
-    <rect
-       style="fill:url(#linearGradient6962);fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
-       id="rect6061"
-       width="24"
-       height="4"
-       x="0"
-       y="1" />
-    <rect
-       style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-opacity:1"
-       id="rect1884"
-       width="24"
-       height="15"
-       x="0"
-       y="1" />
-  </g>
+     inkscape:label="hilight" />
   <g
      inkscape:label="Border"
      inkscape:groupmode="layer"
@@ -191,7 +99,11 @@
      transform="translate(0,-2)"
      style="display:inline">
     <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.15"
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.30"
+       d="M 0,1.5 L 24,1.5"
+       id="path28" />
+    <path
+       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.25"
        d="M 0,0.5 L 24,0.5"
        id="path6059" />
   </g>

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

Modified: xfwm4/trunk/themes/default/right-active.svg
===================================================================
--- xfwm4/trunk/themes/default/right-active.svg	2009-01-23 22:20:25 UTC (rev 29302)
+++ xfwm4/trunk/themes/default/right-active.svg	2009-01-23 22:36:35 UTC (rev 29303)
@@ -59,7 +59,7 @@
      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"
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.30"
        d="M 2.5,0 L 2.5,24"
        id="path6061" />
   </g>
@@ -68,7 +68,7 @@
      inkscape:groupmode="layer"
      id="border">
     <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.15"
+       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.25"
        d="M 3.5,0 L 3.5,24"
        id="path1340" />
   </g>

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

Modified: xfwm4/trunk/themes/default/right-inactive.svg
===================================================================
--- xfwm4/trunk/themes/default/right-inactive.svg	2009-01-23 22:20:25 UTC (rev 29302)
+++ xfwm4/trunk/themes/default/right-inactive.svg	2009-01-23 22:36:35 UTC (rev 29303)
@@ -59,7 +59,7 @@
      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"
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.35"
        d="M 2.5,0 L 2.5,24"
        id="path6061" />
   </g>
@@ -68,7 +68,7 @@
      inkscape:groupmode="layer"
      id="border">
     <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.15"
+       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.25"
        d="M 3.5,0 L 3.5,24"
        id="path1340" />
   </g>

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

Modified: xfwm4/trunk/themes/default/shade-active.svg
===================================================================
--- xfwm4/trunk/themes/default/shade-active.svg	2009-01-23 22:20:25 UTC (rev 29302)
+++ xfwm4/trunk/themes/default/shade-active.svg	2009-01-23 22:36:35 UTC (rev 29303)
@@ -21,17 +21,6 @@
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient1886">
-      <stop
-         style="stop-color:white;stop-opacity:1;"
-         offset="0"
-         id="stop1888" />
-      <stop
-         style="stop-color:white;stop-opacity:0.25;"
-         offset="1"
-         id="stop1890" />
-    </linearGradient>
-    <linearGradient
        id="linearGradient5873">
       <stop
          id="stop5875"
@@ -47,66 +36,8 @@
          style="stop-color:white;stop-opacity:0;" />
     </linearGradient>
     <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:white;stop-opacity:0;" />
-      <stop
-         id="stop2776"
-         offset="0.5"
-         style="stop-color:black;stop-opacity:0;" />
-      <stop
-         id="stop2779"
-         offset="0.75"
-         style="stop-color:black;stop-opacity:0.0125;" />
-      <stop
-         id="stop5851"
-         offset="1"
-         style="stop-color:black;stop-opacity:0.05;" />
-    </linearGradient>
-    <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
-       x1="0"
-       y1="0.5"
-       x2="0"
-       y2="21.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"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2,0,1)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1886"
-       id="linearGradient1892"
-       x1="0"
-       y1="1"
-       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"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5873"
        id="linearGradient4147"
        x1="0"
        y1="1"
@@ -170,42 +101,22 @@
   </metadata>
   <g
      inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Grad"
-     style="display:inline">
-    <rect
-       style="fill:url(#linearGradient6945);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
-       id="rect6057"
-       width="24"
-       height="21"
-       x="0"
-       y="1" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
      id="layer3"
      inkscape:label="hilight">
     <rect
-       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"
-       id="rect6061"
-       width="24"
-       height="4"
-       x="0"
-       y="1" />
-    <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"
+       style="opacity:0.25;fill:none;fill-opacity:0;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"
        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"
+       style="fill:none;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.30"
+       d="M 0.5,2 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,2 23.5,2 L 23.5,2 L 23.5,2"
        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 "
+       style="fill:url(#linearGradient4147);fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:0.20"
+       d="M 2,2 C 2,2 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,2 22,2 L 2,2 z "
        id="path2188" />
   </g>
   <g
@@ -214,9 +125,13 @@
      id="layer1"
      style="display:inline">
     <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.15"
+       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.25"
        d="M 0,0.5 L 24,0.5"
        id="path6059" />
+    <path
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.30"
+       d="M 0,1.5 L 24,1.5"
+       id="path28" />
   </g>
   <g
      inkscape:groupmode="layer"

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

Modified: xfwm4/trunk/themes/default/shade-inactive.svg
===================================================================
--- xfwm4/trunk/themes/default/shade-inactive.svg	2009-01-23 22:20:25 UTC (rev 29302)
+++ xfwm4/trunk/themes/default/shade-inactive.svg	2009-01-23 22:36:35 UTC (rev 29303)
@@ -21,32 +21,6 @@
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient1886">
-      <stop
-         style="stop-color:white;stop-opacity:1;"
-         offset="0"
-         id="stop1888" />
-      <stop
-         style="stop-color:white;stop-opacity:0.25;"
-         offset="1"
-         id="stop1890" />
-    </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"
@@ -75,44 +49,6 @@
        x2="0"
        y2="21.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"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2,0,1)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1886"
-       id="linearGradient1892"
-       x1="0"
-       y1="1"
-       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"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5873"
-       id="linearGradient4147"
-       x1="0"
-       y1="1"
-       x2="0"
-       y2="22"
-       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -185,27 +121,13 @@
      inkscape:groupmode="layer"
      id="layer3"
      inkscape:label="hilight">
-    <rect
-       style="fill:url(#linearGradient6962);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
-       id="rect6061"
-       width="24"
-       height="4"
-       x="0"
-       y="1" />
-    <rect
-       style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:0.60;stroke:none;stroke-width:0;stroke-opacity:1"
-       id="rect1884"
-       width="24"
-       height="15"
-       x="0"
-       y="1" />
     <path
        style="fill:none;stroke:#7f7f7f;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.30"
        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:#7f7f7f;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:0.10"
-       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 "
+       d="M 2,2 C 2,2 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,2 22,2 L 2,2 z "
        id="path2188" />
   </g>
   <g
@@ -214,9 +136,13 @@
      id="layer1"
      style="display:inline">
     <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.15"
+       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.25"
        d="M 0,0.5 L 24,0.5"
        id="path6059" />
+    <path
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.35"
+       d="M 0,1.5 L 24,1.5"
+       id="path28" />
   </g>
   <g
      inkscape:groupmode="layer"

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

Modified: xfwm4/trunk/themes/default/shade-prelight.svg
===================================================================
--- xfwm4/trunk/themes/default/shade-prelight.svg	2009-01-23 22:20:25 UTC (rev 29302)
+++ xfwm4/trunk/themes/default/shade-prelight.svg	2009-01-23 22:36:35 UTC (rev 29303)
@@ -21,17 +21,6 @@
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient1886">
-      <stop
-         style="stop-color:white;stop-opacity:1;"
-         offset="0"
-         id="stop1888" />
-      <stop
-         style="stop-color:white;stop-opacity:0.25;"
-         offset="1"
-         id="stop1890" />
-    </linearGradient>
-    <linearGradient
        id="linearGradient5873">
       <stop
          id="stop5875"
@@ -46,45 +35,6 @@
          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;" />
-      <stop
-         id="stop2776"
-         offset="0.5"
-         style="stop-color:black;stop-opacity:0;" />
-      <stop
-         id="stop2779"
-         offset="0.75"
-         style="stop-color:black;stop-opacity:0.0125;" />
-      <stop
-         id="stop5851"
-         offset="1"
-         style="stop-color:black;stop-opacity:0.05;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
-       x1="0"
-       y1="0.5"
-       x2="0"
-       y2="21.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"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2,0,1)" />
     <radialGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5873"
@@ -98,25 +48,6 @@
        gradientUnits="userSpaceOnUse" />
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient1886"
-       id="linearGradient1892"
-       x1="0"
-       y1="1"
-       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"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient5873"
        id="linearGradient4147"
        x1="0"
@@ -187,7 +118,7 @@
        id="g1789"
        transform="translate(0,1)">
       <rect
-         style="opacity:0.5;fill:url(#radialGradient3087);fill-opacity:0.50;stroke:url(#radialGradient3087);stroke-width:1;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         style="opacity:0.25;fill:url(#radialGradient3087);fill-opacity:0.50;stroke:url(#radialGradient3087);stroke-width:1;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
          id="rect3079"
          width="24"
          height="22"
@@ -197,42 +128,22 @@
   </g>
   <g
      inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Grad"
-     style="display:inline">
-    <rect
-       style="fill:url(#linearGradient6945);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
-       id="rect6057"
-       width="24"
-       height="21"
-       x="0"
-       y="1" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
      id="layer3"
      inkscape:label="hilight">
     <rect
-       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"
-       id="rect6061"
-       width="24"
-       height="4"
-       x="0"
-       y="1" />
-    <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"
+       style="opacity:0.25;fill:none;fill-opacity:0;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"
        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"
+       style="fill:none;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.30"
+       d="M 0.5,2 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,2 23.5,2 L 23.5,2 L 23.5,2"
        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 "
+       style="fill:url(#linearGradient4147);fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:0.20"
+       d="M 2,2 C 2,2 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,2 22,2 L 2,2 z "
        id="path2188" />
   </g>
   <g
@@ -241,9 +152,13 @@
      id="g31"
      style="display:inline">
     <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.15"
+       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.25"
        d="M 0,0.5 L 24,0.5"
        id="path6059" />
+    <path
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.30"
+       d="M 0,1.5 L 24,1.5"
+       id="path28" />
   </g>
   <g
      inkscape:groupmode="layer"

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

Modified: xfwm4/trunk/themes/default/shade-pressed.svg
===================================================================
--- xfwm4/trunk/themes/default/shade-pressed.svg	2009-01-23 22:20:25 UTC (rev 29302)
+++ xfwm4/trunk/themes/default/shade-pressed.svg	2009-01-23 22:36:35 UTC (rev 29303)
@@ -21,17 +21,6 @@
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient1886">
-      <stop
-         style="stop-color:white;stop-opacity:1;"
-         offset="0"
-         id="stop1888" />
-      <stop
-         style="stop-color:white;stop-opacity:0.25;"
-         offset="1"
-         id="stop1890" />
-    </linearGradient>
-    <linearGradient
        id="linearGradient5873">
       <stop
          id="stop5875"
@@ -46,45 +35,6 @@
          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;" />
-      <stop
-         id="stop2776"
-         offset="0.5"
-         style="stop-color:black;stop-opacity:0;" />
-      <stop
-         id="stop2779"
-         offset="0.75"
-         style="stop-color:black;stop-opacity:0.0125;" />
-      <stop
-         id="stop5851"
-         offset="1"
-         style="stop-color:black;stop-opacity:0.05;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
-       x1="0"
-       y1="0.5"
-       x2="0"
-       y2="21.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"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2,0,1)" />
     <radialGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5873"
@@ -98,25 +48,6 @@
        gradientUnits="userSpaceOnUse" />
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient1886"
-       id="linearGradient1892"
-       x1="0"
-       y1="1"
-       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"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient5873"
        id="linearGradient4147"
        x1="0"
@@ -187,7 +118,7 @@
        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"
+         style="opacity:0.35;fill:url(#radialGradient3087);fill-opacity:0.50;stroke:url(#radialGradient3087);stroke-width:1;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
          id="rect3079"
          width="24"
          height="22"
@@ -197,42 +128,15 @@
   </g>
   <g
      inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Grad"
-     style="display:inline">
-    <rect
-       style="fill:url(#linearGradient6945);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
-       id="rect6057"
-       width="24"
-       height="21"
-       x="0"
-       y="1" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
      id="layer3"
      inkscape:label="hilight">
-    <rect
-       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"
-       id="rect6061"
-       width="24"
-       height="4"
-       x="0"
-       y="1" />
-    <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"
-       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"
+       style="fill:none;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.30"
+       d="M 0.5,2 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,2 23.5,2 L 23.5,2 L 23.5,2"
        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 "
+       style="fill:url(#linearGradient4147);fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:0.20"
+       d="M 2,2 C 2,2 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,2 22,2 L 2,2 z "
        id="path2188" />
   </g>
   <g
@@ -241,9 +145,13 @@
      id="g31"
      style="display:inline">
     <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.15"
+       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.25"
        d="M 0,0.5 L 24,0.5"
        id="path6059" />
+    <path
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.30"
+       d="M 0,1.5 L 24,1.5"
+       id="path28" />
   </g>
   <g
      inkscape:groupmode="layer"

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

Modified: xfwm4/trunk/themes/default/shade-toggled-active.svg
===================================================================
--- xfwm4/trunk/themes/default/shade-toggled-active.svg	2009-01-23 22:20:25 UTC (rev 29302)
+++ xfwm4/trunk/themes/default/shade-toggled-active.svg	2009-01-23 22:36:35 UTC (rev 29303)
@@ -21,17 +21,6 @@
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient1886">
-      <stop
-         style="stop-color:white;stop-opacity:1;"
-         offset="0"
-         id="stop1888" />
-      <stop
-         style="stop-color:white;stop-opacity:0.25;"
-         offset="1"
-         id="stop1890" />
-    </linearGradient>
-    <linearGradient
        id="linearGradient5873">
       <stop
          id="stop5875"
@@ -47,66 +36,8 @@
          style="stop-color:white;stop-opacity:0;" />
     </linearGradient>
     <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:white;stop-opacity:0;" />
-      <stop
-         id="stop2776"
-         offset="0.5"
-         style="stop-color:black;stop-opacity:0;" />
-      <stop
-         id="stop2779"
-         offset="0.75"
-         style="stop-color:black;stop-opacity:0.0125;" />
-      <stop
-         id="stop5851"
-         offset="1"
-         style="stop-color:black;stop-opacity:0.05;" />
-    </linearGradient>
-    <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
-       x1="0"
-       y1="0.5"
-       x2="0"
-       y2="21.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"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2,0,1)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1886"
-       id="linearGradient1892"
-       x1="0"
-       y1="1"
-       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"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5873"
        id="linearGradient4147"
        x1="0"
        y1="1"
@@ -170,42 +101,22 @@
   </metadata>
   <g
      inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Grad"
-     style="display:inline">
-    <rect
-       style="fill:url(#linearGradient6945);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
-       id="rect6057"
-       width="24"
-       height="21"
-       x="0"
-       y="1" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
      id="layer3"
      inkscape:label="hilight">
     <rect
-       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"
-       id="rect6061"
-       width="24"
-       height="4"
-       x="0"
-       y="1" />
-    <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"
+       style="opacity:0.25;fill:none;fill-opacity:0;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"
        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"
+       style="fill:none;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.30"
+       d="M 0.5,2 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,2 23.5,2 L 23.5,2 L 23.5,2"
        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 "
+       style="fill:url(#linearGradient4147);fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:0.20"
+       d="M 2,2 C 2,2 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,2 22,2 L 2,2 z "
        id="path2188" />
   </g>
   <g
@@ -214,9 +125,13 @@
      id="layer1"
      style="display:inline">
     <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.15"
+       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.25"
        d="M 0,0.5 L 24,0.5"
        id="path6059" />
+    <path
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.30"
+       d="M 0,1.5 L 24,1.5"
+       id="path28" />
   </g>
   <g
      inkscape:groupmode="layer"

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

Modified: xfwm4/trunk/themes/default/shade-toggled-inactive.svg
===================================================================
--- xfwm4/trunk/themes/default/shade-toggled-inactive.svg	2009-01-23 22:20:25 UTC (rev 29302)
+++ xfwm4/trunk/themes/default/shade-toggled-inactive.svg	2009-01-23 22:36:35 UTC (rev 29303)
@@ -21,32 +21,6 @@
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient1886">
-      <stop
-         style="stop-color:white;stop-opacity:1;"
-         offset="0"
-         id="stop1888" />
-      <stop
-         style="stop-color:white;stop-opacity:0.25;"
-         offset="1"
-         id="stop1890" />
-    </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"
@@ -75,44 +49,6 @@
        x2="0"
        y2="21.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"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2,0,1)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1886"
-       id="linearGradient1892"
-       x1="0"
-       y1="1"
-       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"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5873"
-       id="linearGradient4147"
-       x1="0"
-       y1="1"
-       x2="0"
-       y2="22"
-       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -185,27 +121,13 @@
      inkscape:groupmode="layer"
      id="layer3"
      inkscape:label="hilight">
-    <rect
-       style="fill:url(#linearGradient6962);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
-       id="rect6061"
-       width="24"
-       height="4"
-       x="0"
-       y="1" />
-    <rect
-       style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:0.60;stroke:none;stroke-width:0;stroke-opacity:1"
-       id="rect1884"
-       width="24"
-       height="15"
-       x="0"
-       y="1" />
     <path
        style="fill:none;stroke:#7f7f7f;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.30"
        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:#7f7f7f;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:0.10"
-       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 "
+       d="M 2,2 C 2,2 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,2 22,2 L 2,2 z "
        id="path2188" />
   </g>
   <g
@@ -214,9 +136,13 @@
      id="layer1"
      style="display:inline">
     <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.15"
+       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.25"
        d="M 0,0.5 L 24,0.5"
        id="path6059" />
+    <path
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.35"
+       d="M 0,1.5 L 24,1.5"
+       id="path28" />
   </g>
   <g
      inkscape:groupmode="layer"

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

Modified: xfwm4/trunk/themes/default/shade-toggled-prelight.svg
===================================================================
--- xfwm4/trunk/themes/default/shade-toggled-prelight.svg	2009-01-23 22:20:25 UTC (rev 29302)
+++ xfwm4/trunk/themes/default/shade-toggled-prelight.svg	2009-01-23 22:36:35 UTC (rev 29303)
@@ -21,17 +21,6 @@
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient1886">
-      <stop
-         style="stop-color:white;stop-opacity:1;"
-         offset="0"
-         id="stop1888" />
-      <stop
-         style="stop-color:white;stop-opacity:0.25;"
-         offset="1"
-         id="stop1890" />
-    </linearGradient>
-    <linearGradient
        id="linearGradient5873">
       <stop
          id="stop5875"
@@ -46,45 +35,6 @@
          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;" />
-      <stop
-         id="stop2776"
-         offset="0.5"
-         style="stop-color:black;stop-opacity:0;" />
-      <stop
-         id="stop2779"
-         offset="0.75"
-         style="stop-color:black;stop-opacity:0.0125;" />
-      <stop
-         id="stop5851"
-         offset="1"
-         style="stop-color:black;stop-opacity:0.05;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
-       x1="0"
-       y1="0.5"
-       x2="0"
-       y2="21.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"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2,0,1)" />
     <radialGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5873"
@@ -98,25 +48,6 @@
        gradientUnits="userSpaceOnUse" />
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient1886"
-       id="linearGradient1892"
-       x1="0"
-       y1="1"
-       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"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient5873"
        id="linearGradient4147"
        x1="0"
@@ -187,7 +118,7 @@
        id="g1789"
        transform="translate(0,1)">
       <rect
-         style="opacity:0.5;fill:url(#radialGradient3087);fill-opacity:0.50;stroke:url(#radialGradient3087);stroke-width:1;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         style="opacity:0.25;fill:url(#radialGradient3087);fill-opacity:0.50;stroke:url(#radialGradient3087);stroke-width:1;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
          id="rect3079"
          width="24"
          height="22"
@@ -197,42 +128,22 @@
   </g>
   <g
      inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Grad"
-     style="display:inline">
-    <rect
-       style="fill:url(#linearGradient6945);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
-       id="rect6057"
-       width="24"
-       height="21"
-       x="0"
-       y="1" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
      id="layer3"
      inkscape:label="hilight">
     <rect
-       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"
-       id="rect6061"
-       width="24"
-       height="4"
-       x="0"
-       y="1" />
-    <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"
+       style="opacity:0.25;fill:none;fill-opacity:0;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"
        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"
+       style="fill:none;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.30"
+       d="M 0.5,2 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,2 23.5,2 L 23.5,2 L 23.5,2"
        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 "
+       style="fill:url(#linearGradient4147);fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:0.20"
+       d="M 2,2 C 2,2 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,2 22,2 L 2,2 z "
        id="path2188" />
   </g>
   <g
@@ -241,9 +152,13 @@
      id="g31"
      style="display:inline">
     <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.15"
+       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.25"
        d="M 0,0.5 L 24,0.5"
        id="path6059" />
+    <path
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.35"
+       d="M 0,1.5 L 24,1.5"
+       id="path28" />
   </g>
   <g
      inkscape:groupmode="layer"

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

Modified: xfwm4/trunk/themes/default/shade-toggled-pressed.svg
===================================================================
--- xfwm4/trunk/themes/default/shade-toggled-pressed.svg	2009-01-23 22:20:25 UTC (rev 29302)
+++ xfwm4/trunk/themes/default/shade-toggled-pressed.svg	2009-01-23 22:36:35 UTC (rev 29303)
@@ -21,17 +21,6 @@
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient1886">
-      <stop
-         style="stop-color:white;stop-opacity:1;"
-         offset="0"
-         id="stop1888" />
-      <stop
-         style="stop-color:white;stop-opacity:0.25;"
-         offset="1"
-         id="stop1890" />
-    </linearGradient>
-    <linearGradient
        id="linearGradient5873">
       <stop
          id="stop5875"
@@ -46,45 +35,6 @@
          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;" />
-      <stop
-         id="stop2776"
-         offset="0.5"
-         style="stop-color:black;stop-opacity:0;" />
-      <stop
-         id="stop2779"
-         offset="0.75"
-         style="stop-color:black;stop-opacity:0.0125;" />
-      <stop
-         id="stop5851"
-         offset="1"
-         style="stop-color:black;stop-opacity:0.05;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
-       x1="0"
-       y1="0.5"
-       x2="0"
-       y2="21.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"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2,0,1)" />
     <radialGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5873"
@@ -98,25 +48,6 @@
        gradientUnits="userSpaceOnUse" />
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient1886"
-       id="linearGradient1892"
-       x1="0"
-       y1="1"
-       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"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient5873"
        id="linearGradient4147"
        x1="0"
@@ -187,7 +118,7 @@
        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"
+         style="opacity:0.35;fill:url(#radialGradient3087);fill-opacity:0.50;stroke:url(#radialGradient3087);stroke-width:1;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
          id="rect3079"
          width="24"
          height="22"
@@ -197,42 +128,15 @@
   </g>
   <g
      inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Grad"
-     style="display:inline">
-    <rect
-       style="fill:url(#linearGradient6945);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
-       id="rect6057"
-       width="24"
-       height="21"
-       x="0"
-       y="1" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
      id="layer3"
      inkscape:label="hilight">
-    <rect
-       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"
-       id="rect6061"
-       width="24"
-       height="4"
-       x="0"
-       y="1" />
-    <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"
-       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"
+       style="fill:none;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.30"
+       d="M 0.5,2 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,2 23.5,2 L 23.5,2 L 23.5,2"
        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 "
+       style="fill:url(#linearGradient4147);fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:0.20"
+       d="M 2,2 C 2,2 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,2 22,2 L 2,2 z "
        id="path2188" />
   </g>
   <g
@@ -241,9 +145,13 @@
      id="g31"
      style="display:inline">
     <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.15"
+       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.25"
        d="M 0,0.5 L 24,0.5"
        id="path6059" />
+    <path
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.30"
+       d="M 0,1.5 L 24,1.5"
+       id="path28" />
   </g>
   <g
      inkscape:groupmode="layer"

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

Modified: xfwm4/trunk/themes/default/stick-active.svg
===================================================================
--- xfwm4/trunk/themes/default/stick-active.svg	2009-01-23 22:20:25 UTC (rev 29302)
+++ xfwm4/trunk/themes/default/stick-active.svg	2009-01-23 22:36:35 UTC (rev 29303)
@@ -21,17 +21,6 @@
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient1886">
-      <stop
-         style="stop-color:white;stop-opacity:1;"
-         offset="0"
-         id="stop1888" />
-      <stop
-         style="stop-color:white;stop-opacity:0.25;"
-         offset="1"
-         id="stop1890" />
-    </linearGradient>
-    <linearGradient
        id="linearGradient5873">
       <stop
          id="stop5875"
@@ -47,66 +36,8 @@
          style="stop-color:white;stop-opacity:0;" />
     </linearGradient>
     <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:white;stop-opacity:0;" />
-      <stop
-         id="stop2776"
-         offset="0.5"
-         style="stop-color:black;stop-opacity:0;" />
-      <stop
-         id="stop2779"
-         offset="0.75"
-         style="stop-color:black;stop-opacity:0.0125;" />
-      <stop
-         id="stop5851"
-         offset="1"
-         style="stop-color:black;stop-opacity:0.05;" />
-    </linearGradient>
-    <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
-       x1="0"
-       y1="0.5"
-       x2="0"
-       y2="21.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"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2,0,1)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1886"
-       id="linearGradient1892"
-       x1="0"
-       y1="1"
-       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"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5873"
        id="linearGradient4147"
        x1="0"
        y1="1"
@@ -170,42 +101,22 @@
   </metadata>
   <g
      inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Grad"
-     style="display:inline">
-    <rect
-       style="fill:url(#linearGradient6945);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
-       id="rect6057"
-       width="24"
-       height="21"
-       x="0"
-       y="1" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
      id="layer3"
      inkscape:label="hilight">
     <rect
-       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"
-       id="rect6061"
-       width="24"
-       height="4"
-       x="0"
-       y="1" />
-    <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"
+       style="opacity:0.25;fill:none;fill-opacity:0;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"
        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"
+       style="fill:none;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.30"
+       d="M 0.5,2 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,2 23.5,2 L 23.5,2 L 23.5,2"
        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 "
+       style="fill:url(#linearGradient4147);fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:0.20"
+       d="M 2,2 C 2,2 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,2 22,2 L 2,2 z "
        id="path2188" />
   </g>
   <g
@@ -214,9 +125,13 @@
      id="layer1"
      style="display:inline">
     <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.15"
+       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.25"
        d="M 0,0.5 L 24,0.5"
        id="path6059" />
+    <path
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.30"
+       d="M 0,1.5 L 24,1.5"
+       id="path28" />
   </g>
   <g
      inkscape:groupmode="layer"

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

Modified: xfwm4/trunk/themes/default/stick-inactive.svg
===================================================================
--- xfwm4/trunk/themes/default/stick-inactive.svg	2009-01-23 22:20:25 UTC (rev 29302)
+++ xfwm4/trunk/themes/default/stick-inactive.svg	2009-01-23 22:36:35 UTC (rev 29303)
@@ -21,32 +21,6 @@
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient1886">
-      <stop
-         style="stop-color:white;stop-opacity:1;"
-         offset="0"
-         id="stop1888" />
-      <stop
-         style="stop-color:white;stop-opacity:0.25;"
-         offset="1"
-         id="stop1890" />
-    </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"
@@ -75,44 +49,6 @@
        x2="0"
        y2="21.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"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2,0,1)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1886"
-       id="linearGradient1892"
-       x1="0"
-       y1="1"
-       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"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5873"
-       id="linearGradient4147"
-       x1="0"
-       y1="1"
-       x2="0"
-       y2="22"
-       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -185,27 +121,13 @@
      inkscape:groupmode="layer"
      id="layer3"
      inkscape:label="hilight">
-    <rect
-       style="fill:url(#linearGradient6962);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
-       id="rect6061"
-       width="24"
-       height="4"
-       x="0"
-       y="1" />
-    <rect
-       style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:0.60;stroke:none;stroke-width:0;stroke-opacity:1"
-       id="rect1884"
-       width="24"
-       height="15"
-       x="0"
-       y="1" />
     <path
        style="fill:none;stroke:#7f7f7f;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.30"
        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:#7f7f7f;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:0.10"
-       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 "
+       d="M 2,2 C 2,2 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,2 22,2 L 2,2 z "
        id="path2188" />
   </g>
   <g
@@ -214,9 +136,13 @@
      id="layer1"
      style="display:inline">
     <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.15"
+       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.25"
        d="M 0,0.5 L 24,0.5"
        id="path6059" />
+    <path
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.35"
+       d="M 0,1.5 L 24,1.5"
+       id="path28" />
   </g>
   <g
      inkscape:groupmode="layer"

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

Modified: xfwm4/trunk/themes/default/stick-prelight.svg
===================================================================
--- xfwm4/trunk/themes/default/stick-prelight.svg	2009-01-23 22:20:25 UTC (rev 29302)
+++ xfwm4/trunk/themes/default/stick-prelight.svg	2009-01-23 22:36:35 UTC (rev 29303)
@@ -21,17 +21,6 @@
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient1886">
-      <stop
-         style="stop-color:white;stop-opacity:1;"
-         offset="0"
-         id="stop1888" />
-      <stop
-         style="stop-color:white;stop-opacity:0.25;"
-         offset="1"
-         id="stop1890" />
-    </linearGradient>
-    <linearGradient
        id="linearGradient5873">
       <stop
          id="stop5875"
@@ -46,45 +35,6 @@
          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;" />
-      <stop
-         id="stop2776"
-         offset="0.5"
-         style="stop-color:black;stop-opacity:0;" />
-      <stop
-         id="stop2779"
-         offset="0.75"
-         style="stop-color:black;stop-opacity:0.0125;" />
-      <stop
-         id="stop5851"
-         offset="1"
-         style="stop-color:black;stop-opacity:0.05;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
-       x1="0"
-       y1="0.5"
-       x2="0"
-       y2="21.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"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2,0,1)" />
     <radialGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5873"
@@ -98,25 +48,6 @@
        gradientUnits="userSpaceOnUse" />
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient1886"
-       id="linearGradient1892"
-       x1="0"
-       y1="1"
-       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"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient5873"
        id="linearGradient4147"
        x1="0"
@@ -187,7 +118,7 @@
        id="g1789"
        transform="translate(0,1)">
       <rect
-         style="opacity:0.5;fill:url(#radialGradient3087);fill-opacity:0.50;stroke:url(#radialGradient3087);stroke-width:1;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         style="opacity:0.25;fill:url(#radialGradient3087);fill-opacity:0.50;stroke:url(#radialGradient3087);stroke-width:1;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
          id="rect3079"
          width="24"
          height="22"
@@ -197,42 +128,22 @@
   </g>
   <g
      inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Grad"
-     style="display:inline">
-    <rect
-       style="fill:url(#linearGradient6945);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
-       id="rect6057"
-       width="24"
-       height="21"
-       x="0"
-       y="1" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
      id="layer3"
      inkscape:label="hilight">
     <rect
-       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"
-       id="rect6061"
-       width="24"
-       height="4"
-       x="0"
-       y="1" />
-    <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"
+       style="opacity:0.25;fill:none;fill-opacity:0;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"
        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"
+       style="fill:none;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.30"
+       d="M 0.5,2 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,2 23.5,2 L 23.5,2 L 23.5,2"
        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 "
+       style="fill:url(#linearGradient4147);fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:0.20"
+       d="M 2,2 C 2,2 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,2 22,2 L 2,2 z "
        id="path2188" />
   </g>
   <g
@@ -241,9 +152,13 @@
      id="g31"
      style="display:inline">
     <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.15"
+       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.25"
        d="M 0,0.5 L 24,0.5"
        id="path6059" />
+    <path
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.30"
+       d="M 0,1.5 L 24,1.5"
+       id="path28" />
   </g>
   <g
      inkscape:groupmode="layer"

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

Modified: xfwm4/trunk/themes/default/stick-pressed.svg
===================================================================
--- xfwm4/trunk/themes/default/stick-pressed.svg	2009-01-23 22:20:25 UTC (rev 29302)
+++ xfwm4/trunk/themes/default/stick-pressed.svg	2009-01-23 22:36:35 UTC (rev 29303)
@@ -21,17 +21,6 @@
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient1886">
-      <stop
-         style="stop-color:white;stop-opacity:1;"
-         offset="0"
-         id="stop1888" />
-      <stop
-         style="stop-color:white;stop-opacity:0.25;"
-         offset="1"
-         id="stop1890" />
-    </linearGradient>
-    <linearGradient
        id="linearGradient5873">
       <stop
          id="stop5875"
@@ -46,45 +35,6 @@
          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;" />
-      <stop
-         id="stop2776"
-         offset="0.5"
-         style="stop-color:black;stop-opacity:0;" />
-      <stop
-         id="stop2779"
-         offset="0.75"
-         style="stop-color:black;stop-opacity:0.0125;" />
-      <stop
-         id="stop5851"
-         offset="1"
-         style="stop-color:black;stop-opacity:0.05;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
-       x1="0"
-       y1="0.5"
-       x2="0"
-       y2="21.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"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2,0,1)" />
     <radialGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5873"
@@ -98,25 +48,6 @@
        gradientUnits="userSpaceOnUse" />
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient1886"
-       id="linearGradient1892"
-       x1="0"
-       y1="1"
-       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"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient5873"
        id="linearGradient4147"
        x1="0"
@@ -187,7 +118,7 @@
        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"
+         style="opacity:0.35;fill:url(#radialGradient3087);fill-opacity:0.50;stroke:url(#radialGradient3087);stroke-width:1;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
          id="rect3079"
          width="24"
          height="22"
@@ -197,42 +128,15 @@
   </g>
   <g
      inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Grad"
-     style="display:inline">
-    <rect
-       style="fill:url(#linearGradient6945);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
-       id="rect6057"
-       width="24"
-       height="21"
-       x="0"
-       y="1" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
      id="layer3"
      inkscape:label="hilight">
-    <rect
-       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"
-       id="rect6061"
-       width="24"
-       height="4"
-       x="0"
-       y="1" />
-    <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"
-       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"
+       style="fill:none;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.30"
+       d="M 0.5,2 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,2 23.5,2 L 23.5,2 L 23.5,2"
        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 "
+       style="fill:url(#linearGradient4147);fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:0.20"
+       d="M 2,2 C 2,2 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,2 22,2 L 2,2 z "
        id="path2188" />
   </g>
   <g
@@ -241,9 +145,13 @@
      id="g31"
      style="display:inline">
     <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.15"
+       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.25"
        d="M 0,0.5 L 24,0.5"
        id="path6059" />
+    <path
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.30"
+       d="M 0,1.5 L 24,1.5"
+       id="path28" />
   </g>
   <g
      inkscape:groupmode="layer"

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

Modified: xfwm4/trunk/themes/default/stick-toggled-active.svg
===================================================================
--- xfwm4/trunk/themes/default/stick-toggled-active.svg	2009-01-23 22:20:25 UTC (rev 29302)
+++ xfwm4/trunk/themes/default/stick-toggled-active.svg	2009-01-23 22:36:35 UTC (rev 29303)
@@ -21,17 +21,6 @@
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient1886">
-      <stop
-         style="stop-color:white;stop-opacity:1;"
-         offset="0"
-         id="stop1888" />
-      <stop
-         style="stop-color:white;stop-opacity:0.25;"
-         offset="1"
-         id="stop1890" />
-    </linearGradient>
-    <linearGradient
        id="linearGradient5873">
       <stop
          id="stop5875"
@@ -47,66 +36,8 @@
          style="stop-color:white;stop-opacity:0;" />
     </linearGradient>
     <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:white;stop-opacity:0;" />
-      <stop
-         id="stop2776"
-         offset="0.5"
-         style="stop-color:black;stop-opacity:0;" />
-      <stop
-         id="stop2779"
-         offset="0.75"
-         style="stop-color:black;stop-opacity:0.0125;" />
-      <stop
-         id="stop5851"
-         offset="1"
-         style="stop-color:black;stop-opacity:0.05;" />
-    </linearGradient>
-    <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
-       x1="0"
-       y1="0.5"
-       x2="0"
-       y2="21.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"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2,0,1)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1886"
-       id="linearGradient1892"
-       x1="0"
-       y1="1"
-       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"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5873"
        id="linearGradient4147"
        x1="0"
        y1="1"
@@ -170,42 +101,22 @@
   </metadata>
   <g
      inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Grad"
-     style="display:inline">
-    <rect
-       style="fill:url(#linearGradient6945);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
-       id="rect6057"
-       width="24"
-       height="21"
-       x="0"
-       y="1" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
      id="layer3"
      inkscape:label="hilight">
     <rect
-       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"
-       id="rect6061"
-       width="24"
-       height="4"
-       x="0"
-       y="1" />
-    <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"
+       style="opacity:0.25;fill:none;fill-opacity:0;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"
        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"
+       style="fill:none;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.30"
+       d="M 0.5,2 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,2 23.5,2 L 23.5,2 L 23.5,2"
        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 "
+       style="fill:url(#linearGradient4147);fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:0.20"
+       d="M 2,2 C 2,2 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,2 22,2 L 2,2 z "
        id="path2188" />
   </g>
   <g
@@ -214,9 +125,13 @@
      id="layer1"
      style="display:inline">
     <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.15"
+       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.25"
        d="M 0,0.5 L 24,0.5"
        id="path6059" />
+    <path
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.30"
+       d="M 0,1.5 L 24,1.5"
+       id="path28" />
   </g>
   <g
      inkscape:groupmode="layer"

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

Modified: xfwm4/trunk/themes/default/stick-toggled-inactive.svg
===================================================================
--- xfwm4/trunk/themes/default/stick-toggled-inactive.svg	2009-01-23 22:20:25 UTC (rev 29302)
+++ xfwm4/trunk/themes/default/stick-toggled-inactive.svg	2009-01-23 22:36:35 UTC (rev 29303)
@@ -21,32 +21,6 @@
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient1886">
-      <stop
-         style="stop-color:white;stop-opacity:1;"
-         offset="0"
-         id="stop1888" />
-      <stop
-         style="stop-color:white;stop-opacity:0.25;"
-         offset="1"
-         id="stop1890" />
-    </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"
@@ -75,44 +49,6 @@
        x2="0"
        y2="21.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"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2,0,1)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1886"
-       id="linearGradient1892"
-       x1="0"
-       y1="1"
-       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"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5873"
-       id="linearGradient4147"
-       x1="0"
-       y1="1"
-       x2="0"
-       y2="22"
-       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -185,27 +121,13 @@
      inkscape:groupmode="layer"
      id="layer3"
      inkscape:label="hilight">
-    <rect
-       style="fill:url(#linearGradient6962);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
-       id="rect6061"
-       width="24"
-       height="4"
-       x="0"
-       y="1" />
-    <rect
-       style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:0.60;stroke:none;stroke-width:0;stroke-opacity:1"
-       id="rect1884"
-       width="24"
-       height="15"
-       x="0"
-       y="1" />
     <path
        style="fill:none;stroke:#7f7f7f;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.30"
        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:#7f7f7f;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:0.10"
-       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 "
+       d="M 2,2 C 2,2 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,2 22,2 L 2,2 z "
        id="path2188" />
   </g>
   <g
@@ -214,9 +136,13 @@
      id="layer1"
      style="display:inline">
     <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.15"
+       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.25"
        d="M 0,0.5 L 24,0.5"
        id="path6059" />
+    <path
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.30"
+       d="M 0,1.5 L 24,1.5"
+       id="path28" />
   </g>
   <g
      inkscape:groupmode="layer"

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

Modified: xfwm4/trunk/themes/default/stick-toggled-prelight.svg
===================================================================
--- xfwm4/trunk/themes/default/stick-toggled-prelight.svg	2009-01-23 22:20:25 UTC (rev 29302)
+++ xfwm4/trunk/themes/default/stick-toggled-prelight.svg	2009-01-23 22:36:35 UTC (rev 29303)
@@ -21,17 +21,6 @@
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient1886">
-      <stop
-         style="stop-color:white;stop-opacity:1;"
-         offset="0"
-         id="stop1888" />
-      <stop
-         style="stop-color:white;stop-opacity:0.25;"
-         offset="1"
-         id="stop1890" />
-    </linearGradient>
-    <linearGradient
        id="linearGradient5873">
       <stop
          id="stop5875"
@@ -46,45 +35,6 @@
          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;" />
-      <stop
-         id="stop2776"
-         offset="0.5"
-         style="stop-color:black;stop-opacity:0;" />
-      <stop
-         id="stop2779"
-         offset="0.75"
-         style="stop-color:black;stop-opacity:0.0125;" />
-      <stop
-         id="stop5851"
-         offset="1"
-         style="stop-color:black;stop-opacity:0.05;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
-       x1="0"
-       y1="0.5"
-       x2="0"
-       y2="21.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"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2,0,1)" />
     <radialGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5873"
@@ -98,25 +48,6 @@
        gradientUnits="userSpaceOnUse" />
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient1886"
-       id="linearGradient1892"
-       x1="0"
-       y1="1"
-       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"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient5873"
        id="linearGradient4147"
        x1="0"
@@ -187,7 +118,7 @@
        id="g1789"
        transform="translate(0,1)">
       <rect
-         style="opacity:0.5;fill:url(#radialGradient3087);fill-opacity:0.50;stroke:url(#radialGradient3087);stroke-width:1;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         style="opacity:0.25;fill:url(#radialGradient3087);fill-opacity:0.50;stroke:url(#radialGradient3087);stroke-width:1;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
          id="rect3079"
          width="24"
          height="22"
@@ -197,42 +128,22 @@
   </g>
   <g
      inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Grad"
-     style="display:inline">
-    <rect
-       style="fill:url(#linearGradient6945);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
-       id="rect6057"
-       width="24"
-       height="21"
-       x="0"
-       y="1" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
      id="layer3"
      inkscape:label="hilight">
     <rect
-       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"
-       id="rect6061"
-       width="24"
-       height="4"
-       x="0"
-       y="1" />
-    <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"
+       style="opacity:0.25;fill:none;fill-opacity:0;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"
        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"
+       style="fill:none;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.30"
+       d="M 0.5,2 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,2 23.5,2 L 23.5,2 L 23.5,2"
        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 "
+       style="fill:url(#linearGradient4147);fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:0.20"
+       d="M 2,2 C 2,2 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,2 22,2 L 2,2 z "
        id="path2188" />
   </g>
   <g
@@ -241,9 +152,13 @@
      id="g31"
      style="display:inline">
     <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.15"
+       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.25"
        d="M 0,0.5 L 24,0.5"
        id="path6059" />
+    <path
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.30"
+       d="M 0,1.5 L 24,1.5"
+       id="path28" />
   </g>
   <g
      inkscape:groupmode="layer"

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

Modified: xfwm4/trunk/themes/default/stick-toggled-pressed.svg
===================================================================
--- xfwm4/trunk/themes/default/stick-toggled-pressed.svg	2009-01-23 22:20:25 UTC (rev 29302)
+++ xfwm4/trunk/themes/default/stick-toggled-pressed.svg	2009-01-23 22:36:35 UTC (rev 29303)
@@ -21,17 +21,6 @@
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient1886">
-      <stop
-         style="stop-color:white;stop-opacity:1;"
-         offset="0"
-         id="stop1888" />
-      <stop
-         style="stop-color:white;stop-opacity:0.25;"
-         offset="1"
-         id="stop1890" />
-    </linearGradient>
-    <linearGradient
        id="linearGradient5873">
       <stop
          id="stop5875"
@@ -46,45 +35,6 @@
          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;" />
-      <stop
-         id="stop2776"
-         offset="0.5"
-         style="stop-color:black;stop-opacity:0;" />
-      <stop
-         id="stop2779"
-         offset="0.75"
-         style="stop-color:black;stop-opacity:0.0125;" />
-      <stop
-         id="stop5851"
-         offset="1"
-         style="stop-color:black;stop-opacity:0.05;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
-       x1="0"
-       y1="0.5"
-       x2="0"
-       y2="21.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"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2,0,1)" />
     <radialGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5873"
@@ -98,25 +48,6 @@
        gradientUnits="userSpaceOnUse" />
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient1886"
-       id="linearGradient1892"
-       x1="0"
-       y1="1"
-       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"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient5873"
        id="linearGradient4147"
        x1="0"
@@ -187,7 +118,7 @@
        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"
+         style="opacity:0.35;fill:url(#radialGradient3087);fill-opacity:0.50;stroke:url(#radialGradient3087);stroke-width:1;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
          id="rect3079"
          width="24"
          height="22"
@@ -197,42 +128,15 @@
   </g>
   <g
      inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Grad"
-     style="display:inline">
-    <rect
-       style="fill:url(#linearGradient6945);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
-       id="rect6057"
-       width="24"
-       height="21"
-       x="0"
-       y="1" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
      id="layer3"
      inkscape:label="hilight">
-    <rect
-       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"
-       id="rect6061"
-       width="24"
-       height="4"
-       x="0"
-       y="1" />
-    <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"
-       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"
+       style="fill:none;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.30"
+       d="M 0.5,2 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,2 23.5,2 L 23.5,2 L 23.5,2"
        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 "
+       style="fill:url(#linearGradient4147);fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:0.20"
+       d="M 2,2 C 2,2 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,2 22,2 L 2,2 z "
        id="path2188" />
   </g>
   <g
@@ -241,9 +145,13 @@
      id="g31"
      style="display:inline">
     <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.15"
+       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.25"
        d="M 0,0.5 L 24,0.5"
        id="path6059" />
+    <path
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.30"
+       d="M 0,1.5 L 24,1.5"
+       id="path28" />
   </g>
   <g
      inkscape:groupmode="layer"

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

Modified: xfwm4/trunk/themes/default/title-1-active.svg
===================================================================
--- xfwm4/trunk/themes/default/title-1-active.svg	2009-01-23 22:20:25 UTC (rev 29302)
+++ xfwm4/trunk/themes/default/title-1-active.svg	2009-01-23 22:36:35 UTC (rev 29303)
@@ -6,7 +6,6 @@
    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="8"
@@ -19,82 +18,7 @@
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
    sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default">
   <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient1886">
-      <stop
-         style="stop-color:white;stop-opacity:1;"
-         offset="0"
-         id="stop1888" />
-      <stop
-         style="stop-color:white;stop-opacity:0.25;"
-         offset="1"
-         id="stop1890" />
-    </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;" />
-      <stop
-         id="stop2776"
-         offset="0.5"
-         style="stop-color:black;stop-opacity:0;" />
-      <stop
-         id="stop2779"
-         offset="0.75"
-         style="stop-color:black;stop-opacity:0.0125;" />
-      <stop
-         id="stop5851"
-         offset="1"
-         style="stop-color:black;stop-opacity:0.05;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
-       x1="0"
-       y1="0.5"
-       x2="0"
-       y2="21.5" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5873"
-       id="linearGradient6962"
-       x1="0"
-       y1="1"
-       x2="0"
-       y2="8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2,0,1)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1886"
-       id="linearGradient1892"
-       x1="0"
-       y1="1"
-       x2="0"
-       y2="14"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
-  </defs>
+     id="defs4" />
   <sodipodi:namedview
      id="base"
      pagecolor="white"
@@ -155,7 +79,7 @@
      inkscape:label="Grad"
      style="display:inline">
     <rect
-       style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linejoin:miter;stroke-opacity:1"
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linejoin:miter;stroke-opacity:1"
        id="rect6057"
        width="8"
        height="21"
@@ -163,28 +87,12 @@
        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-linejoin:miter;stroke-opacity:1"
-       d="M 0,1 L 8,1 C 8,1 8,4 8,4 L 0,4 L 0,3 z "
-       id="path6061" />
-    <rect
-       style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-opacity:1"
-       id="rect1884"
-       width="8"
-       height="15"
-       x="0"
-       y="1" />
-  </g>
-  <g
      inkscape:label="Border"
      inkscape:groupmode="layer"
      id="layer1"
      style="display:inline">
     <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.15"
+       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.25"
        d="M 0,0.5 L 8,0.5"
        id="path6059" />
   </g>
@@ -197,7 +105,7 @@
        d="M 0,21.5 L 8,21.5"
        id="path6989" />
     <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"
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.30"
        d="M 0,1.5 L 8,1.5"
        id="path28" />
   </g>

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

Modified: xfwm4/trunk/themes/default/title-1-inactive.svg
===================================================================
--- xfwm4/trunk/themes/default/title-1-inactive.svg	2009-01-23 22:20:25 UTC (rev 29302)
+++ xfwm4/trunk/themes/default/title-1-inactive.svg	2009-01-23 22:36:35 UTC (rev 29303)
@@ -21,32 +21,6 @@
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient1886">
-      <stop
-         style="stop-color:white;stop-opacity:1;"
-         offset="0"
-         id="stop1888" />
-      <stop
-         style="stop-color:white;stop-opacity:0.25;"
-         offset="1"
-         id="stop1890" />
-    </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"
@@ -75,26 +49,6 @@
        x2="0"
        y2="21.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"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2,0,1)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1886"
-       id="linearGradient1892"
-       x1="0"
-       y1="1"
-       x2="0"
-       y2="14"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -164,28 +118,12 @@
        y="1" />
   </g>
   <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="hilight">
-    <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 0,1 L 8,1 C 8,1 8,4 8,4 L 0,4 L 0,3 z "
-       id="path6061" />
-    <rect
-       style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:0.60;stroke:none;stroke-width:0;stroke-opacity:1"
-       id="rect1884"
-       width="8"
-       height="15"
-       x="0"
-       y="1" />
-  </g>
-  <g
      inkscape:label="Border"
      inkscape:groupmode="layer"
      id="layer1"
      style="display:inline">
     <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.15"
+       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.25"
        d="M 0,0.5 L 8,0.5"
        id="path6059" />
   </g>
@@ -198,7 +136,7 @@
        d="M 0,21.5 L 8,21.5"
        id="path6989" />
     <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"
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.35"
        d="M 0,1.5 L 8,1.5"
        id="path28" />
   </g>

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

Modified: xfwm4/trunk/themes/default/title-2-active.svg
===================================================================
--- xfwm4/trunk/themes/default/title-2-active.svg	2009-01-23 22:20:25 UTC (rev 29302)
+++ xfwm4/trunk/themes/default/title-2-active.svg	2009-01-23 22:36:35 UTC (rev 29303)
@@ -6,7 +6,6 @@
    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="8"
@@ -19,83 +18,7 @@
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
    sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default">
   <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient1886">
-      <stop
-         style="stop-color:white;stop-opacity:1;"
-         offset="0"
-         id="stop1888" />
-      <stop
-         style="stop-color:white;stop-opacity:0.25;"
-         offset="1"
-         id="stop1890" />
-    </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;" />
-      <stop
-         id="stop2776"
-         offset="0.5"
-         style="stop-color:black;stop-opacity:0;" />
-      <stop
-         id="stop2779"
-         offset="0.75"
-         style="stop-color:black;stop-opacity:0.0125;" />
-      <stop
-         id="stop5851"
-         offset="1"
-         style="stop-color:black;stop-opacity:0.05;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
-       x1="0"
-       y1="0.5"
-       x2="0"
-       y2="21.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"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2,0,1)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1886"
-       id="linearGradient1892"
-       x1="0"
-       y1="1"
-       x2="0"
-       y2="14"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
-  </defs>
+     id="defs4" />
   <sodipodi:namedview
      id="base"
      pagecolor="white"
@@ -156,7 +79,7 @@
      inkscape:label="Grad"
      style="display:inline">
     <rect
-       style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linejoin:miter;stroke-opacity:1"
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linejoin:miter;stroke-opacity:1"
        id="rect6057"
        width="8"
        height="21"
@@ -164,28 +87,12 @@
        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-linejoin:miter;stroke-opacity:1"
-       d="M 0,1 L 8,1 C 8,1 8,4 8,4 L 0,4 L 0,3 z "
-       id="path6061" />
-    <rect
-       style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-opacity:1"
-       id="rect1884"
-       width="8"
-       height="15"
-       x="0"
-       y="1" />
-  </g>
-  <g
      inkscape:label="Border"
      inkscape:groupmode="layer"
      id="layer1"
      style="display:inline">
     <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.15"
+       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.25"
        d="M 0,0.5 L 8,0.5"
        id="path6059" />
   </g>
@@ -198,7 +105,7 @@
        d="M 0,21.5 L 8,21.5"
        id="path6989" />
     <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"
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.30"
        d="M 0,1.5 L 8,1.5"
        id="path28" />
   </g>

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

Modified: xfwm4/trunk/themes/default/title-2-inactive.svg
===================================================================
--- xfwm4/trunk/themes/default/title-2-inactive.svg	2009-01-23 22:20:25 UTC (rev 29302)
+++ xfwm4/trunk/themes/default/title-2-inactive.svg	2009-01-23 22:36:35 UTC (rev 29303)
@@ -21,32 +21,6 @@
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient1886">
-      <stop
-         style="stop-color:white;stop-opacity:1;"
-         offset="0"
-         id="stop1888" />
-      <stop
-         style="stop-color:white;stop-opacity:0.25;"
-         offset="1"
-         id="stop1890" />
-    </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"
@@ -75,26 +49,6 @@
        x2="0"
        y2="21.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"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2,0,1)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1886"
-       id="linearGradient1892"
-       x1="0"
-       y1="1"
-       x2="0"
-       y2="14"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -164,28 +118,12 @@
        y="1" />
   </g>
   <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="hilight">
-    <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 0,1 L 8,1 C 8,1 8,4 8,4 L 0,4 L 0,3 z "
-       id="path6061" />
-    <rect
-       style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:0.60;stroke:none;stroke-width:0;stroke-opacity:1"
-       id="rect1884"
-       width="8"
-       height="15"
-       x="0"
-       y="1" />
-  </g>
-  <g
      inkscape:label="Border"
      inkscape:groupmode="layer"
      id="layer1"
      style="display:inline">
     <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.15"
+       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.25"
        d="M 0,0.5 L 8,0.5"
        id="path6059" />
   </g>
@@ -198,7 +136,7 @@
        d="M 0,21.5 L 8,21.5"
        id="path6989" />
     <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"
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.35"
        d="M 0,1.5 L 8,1.5"
        id="path28" />
   </g>

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

Modified: xfwm4/trunk/themes/default/title-3-active.svg
===================================================================
--- xfwm4/trunk/themes/default/title-3-active.svg	2009-01-23 22:20:25 UTC (rev 29302)
+++ xfwm4/trunk/themes/default/title-3-active.svg	2009-01-23 22:36:35 UTC (rev 29303)
@@ -6,7 +6,6 @@
    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="8"
@@ -19,83 +18,7 @@
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
    sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default">
   <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient1886">
-      <stop
-         style="stop-color:white;stop-opacity:1;"
-         offset="0"
-         id="stop1888" />
-      <stop
-         style="stop-color:white;stop-opacity:0.25;"
-         offset="1"
-         id="stop1890" />
-    </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;" />
-      <stop
-         id="stop2776"
-         offset="0.5"
-         style="stop-color:black;stop-opacity:0;" />
-      <stop
-         id="stop2779"
-         offset="0.75"
-         style="stop-color:black;stop-opacity:0.0125;" />
-      <stop
-         id="stop5851"
-         offset="1"
-         style="stop-color:black;stop-opacity:0.05;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
-       x1="0"
-       y1="0.5"
-       x2="0"
-       y2="21.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"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2,0,1)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1886"
-       id="linearGradient1892"
-       x1="0"
-       y1="1"
-       x2="0"
-       y2="14"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
-  </defs>
+     id="defs4" />
   <sodipodi:namedview
      id="base"
      pagecolor="white"
@@ -156,7 +79,7 @@
      inkscape:label="Grad"
      style="display:inline">
     <rect
-       style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linejoin:miter;stroke-opacity:1"
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linejoin:miter;stroke-opacity:1"
        id="rect6057"
        width="8"
        height="21"
@@ -164,28 +87,12 @@
        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-linejoin:miter;stroke-opacity:1"
-       d="M 0,1 L 8,1 C 8,1 8,4 8,4 L 0,4 L 0,3 z "
-       id="path6061" />
-    <rect
-       style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-opacity:1"
-       id="rect1884"
-       width="8"
-       height="15"
-       x="0"
-       y="1" />
-  </g>
-  <g
      inkscape:label="Border"
      inkscape:groupmode="layer"
      id="layer1"
      style="display:inline">
     <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.15"
+       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.25"
        d="M 0,0.5 L 8,0.5"
        id="path6059" />
   </g>
@@ -198,7 +105,7 @@
        d="M 0,21.5 L 8,21.5"
        id="path6989" />
     <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"
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.30"
        d="M 0,1.5 L 8,1.5"
        id="path28" />
   </g>

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

Modified: xfwm4/trunk/themes/default/title-3-inactive.svg
===================================================================
--- xfwm4/trunk/themes/default/title-3-inactive.svg	2009-01-23 22:20:25 UTC (rev 29302)
+++ xfwm4/trunk/themes/default/title-3-inactive.svg	2009-01-23 22:36:35 UTC (rev 29303)
@@ -21,32 +21,6 @@
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient1886">
-      <stop
-         style="stop-color:white;stop-opacity:1;"
-         offset="0"
-         id="stop1888" />
-      <stop
-         style="stop-color:white;stop-opacity:0.25;"
-         offset="1"
-         id="stop1890" />
-    </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"
@@ -75,26 +49,6 @@
        x2="0"
        y2="21.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"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2,0,1)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1886"
-       id="linearGradient1892"
-       x1="0"
-       y1="1"
-       x2="0"
-       y2="14"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -164,28 +118,12 @@
        y="1" />
   </g>
   <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="hilight">
-    <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 0,1 L 8,1 C 8,1 8,4 8,4 L 0,4 L 0,3 z "
-       id="path6061" />
-    <rect
-       style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:0.60;stroke:none;stroke-width:0;stroke-opacity:1"
-       id="rect1884"
-       width="8"
-       height="15"
-       x="0"
-       y="1" />
-  </g>
-  <g
      inkscape:label="Border"
      inkscape:groupmode="layer"
      id="layer1"
      style="display:inline">
     <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.15"
+       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.25"
        d="M 0,0.5 L 8,0.5"
        id="path6059" />
   </g>
@@ -198,7 +136,7 @@
        d="M 0,21.5 L 8,21.5"
        id="path6989" />
     <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"
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.35"
        d="M 0,1.5 L 8,1.5"
        id="path28" />
   </g>

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

Modified: xfwm4/trunk/themes/default/title-4-active.svg
===================================================================
--- xfwm4/trunk/themes/default/title-4-active.svg	2009-01-23 22:20:25 UTC (rev 29302)
+++ xfwm4/trunk/themes/default/title-4-active.svg	2009-01-23 22:36:35 UTC (rev 29303)
@@ -6,7 +6,6 @@
    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="8"
@@ -19,83 +18,7 @@
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
    sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default">
   <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient1886">
-      <stop
-         style="stop-color:white;stop-opacity:1;"
-         offset="0"
-         id="stop1888" />
-      <stop
-         style="stop-color:white;stop-opacity:0.25;"
-         offset="1"
-         id="stop1890" />
-    </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;" />
-      <stop
-         id="stop2776"
-         offset="0.5"
-         style="stop-color:black;stop-opacity:0;" />
-      <stop
-         id="stop2779"
-         offset="0.75"
-         style="stop-color:black;stop-opacity:0.0125;" />
-      <stop
-         id="stop5851"
-         offset="1"
-         style="stop-color:black;stop-opacity:0.05;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
-       x1="0"
-       y1="0.5"
-       x2="0"
-       y2="21.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"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2,0,1)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1886"
-       id="linearGradient1892"
-       x1="0"
-       y1="1"
-       x2="0"
-       y2="14"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
-  </defs>
+     id="defs4" />
   <sodipodi:namedview
      id="base"
      pagecolor="white"
@@ -156,7 +79,7 @@
      inkscape:label="Grad"
      style="display:inline">
     <rect
-       style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linejoin:miter;stroke-opacity:1"
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linejoin:miter;stroke-opacity:1"
        id="rect6057"
        width="8"
        height="21"
@@ -164,28 +87,12 @@
        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-linejoin:miter;stroke-opacity:1"
-       d="M 0,1 L 8,1 C 8,1 8,4 8,4 L 0,4 L 0,3 z "
-       id="path6061" />
-    <rect
-       style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-opacity:1"
-       id="rect1884"
-       width="8"
-       height="15"
-       x="0"
-       y="1" />
-  </g>
-  <g
      inkscape:label="Border"
      inkscape:groupmode="layer"
      id="layer1"
      style="display:inline">
     <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.15"
+       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.25"
        d="M 0,0.5 L 8,0.5"
        id="path6059" />
   </g>
@@ -198,7 +105,7 @@
        d="M 0,21.5 L 8,21.5"
        id="path6989" />
     <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"
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.30"
        d="M 0,1.5 L 8,1.5"
        id="path28" />
   </g>

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

Modified: xfwm4/trunk/themes/default/title-4-inactive.svg
===================================================================
--- xfwm4/trunk/themes/default/title-4-inactive.svg	2009-01-23 22:20:25 UTC (rev 29302)
+++ xfwm4/trunk/themes/default/title-4-inactive.svg	2009-01-23 22:36:35 UTC (rev 29303)
@@ -21,32 +21,6 @@
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient1886">
-      <stop
-         style="stop-color:white;stop-opacity:1;"
-         offset="0"
-         id="stop1888" />
-      <stop
-         style="stop-color:white;stop-opacity:0.25;"
-         offset="1"
-         id="stop1890" />
-    </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"
@@ -75,26 +49,6 @@
        x2="0"
        y2="21.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"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2,0,1)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1886"
-       id="linearGradient1892"
-       x1="0"
-       y1="1"
-       x2="0"
-       y2="14"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -164,28 +118,12 @@
        y="1" />
   </g>
   <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="hilight">
-    <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 0,1 L 8,1 C 8,1 8,4 8,4 L 0,4 L 0,3 z "
-       id="path6061" />
-    <rect
-       style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:0.60;stroke:none;stroke-width:0;stroke-opacity:1"
-       id="rect1884"
-       width="8"
-       height="15"
-       x="0"
-       y="1" />
-  </g>
-  <g
      inkscape:label="Border"
      inkscape:groupmode="layer"
      id="layer1"
      style="display:inline">
     <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.15"
+       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.25"
        d="M 0,0.5 L 8,0.5"
        id="path6059" />
   </g>
@@ -198,7 +136,7 @@
        d="M 0,21.5 L 8,21.5"
        id="path6989" />
     <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"
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.35"
        d="M 0,1.5 L 8,1.5"
        id="path28" />
   </g>

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

Modified: xfwm4/trunk/themes/default/title-5-active.svg
===================================================================
--- xfwm4/trunk/themes/default/title-5-active.svg	2009-01-23 22:20:25 UTC (rev 29302)
+++ xfwm4/trunk/themes/default/title-5-active.svg	2009-01-23 22:36:35 UTC (rev 29303)
@@ -6,7 +6,6 @@
    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="8"
@@ -19,83 +18,7 @@
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
    sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default">
   <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient1886">
-      <stop
-         style="stop-color:white;stop-opacity:1;"
-         offset="0"
-         id="stop1888" />
-      <stop
-         style="stop-color:white;stop-opacity:0.25;"
-         offset="1"
-         id="stop1890" />
-    </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;" />
-      <stop
-         id="stop2776"
-         offset="0.5"
-         style="stop-color:black;stop-opacity:0;" />
-      <stop
-         id="stop2779"
-         offset="0.75"
-         style="stop-color:black;stop-opacity:0.0125;" />
-      <stop
-         id="stop5851"
-         offset="1"
-         style="stop-color:black;stop-opacity:0.05;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
-       x1="0"
-       y1="0.5"
-       x2="0"
-       y2="21.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"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2,0,1)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1886"
-       id="linearGradient1892"
-       x1="0"
-       y1="1"
-       x2="0"
-       y2="14"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
-  </defs>
+     id="defs4" />
   <sodipodi:namedview
      id="base"
      pagecolor="white"
@@ -156,7 +79,7 @@
      inkscape:label="Grad"
      style="display:inline">
     <rect
-       style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linejoin:miter;stroke-opacity:1"
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linejoin:miter;stroke-opacity:1"
        id="rect6057"
        width="8"
        height="21"
@@ -164,28 +87,12 @@
        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-linejoin:miter;stroke-opacity:1"
-       d="M 0,1 L 8,1 C 8,1 8,4 8,4 L 0,4 L 0,3 z "
-       id="path6061" />
-    <rect
-       style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-opacity:1"
-       id="rect1884"
-       width="8"
-       height="15"
-       x="0"
-       y="1" />
-  </g>
-  <g
      inkscape:label="Border"
      inkscape:groupmode="layer"
      id="layer1"
      style="display:inline">
     <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.15"
+       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.25"
        d="M 0,0.5 L 8,0.5"
        id="path6059" />
   </g>
@@ -198,7 +105,7 @@
        d="M 0,21.5 L 8,21.5"
        id="path6989" />
     <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"
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.30"
        d="M 0,1.5 L 8,1.5"
        id="path28" />
   </g>

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

Modified: xfwm4/trunk/themes/default/title-5-inactive.svg
===================================================================
--- xfwm4/trunk/themes/default/title-5-inactive.svg	2009-01-23 22:20:25 UTC (rev 29302)
+++ xfwm4/trunk/themes/default/title-5-inactive.svg	2009-01-23 22:36:35 UTC (rev 29303)
@@ -21,32 +21,6 @@
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient1886">
-      <stop
-         style="stop-color:white;stop-opacity:1;"
-         offset="0"
-         id="stop1888" />
-      <stop
-         style="stop-color:white;stop-opacity:0.25;"
-         offset="1"
-         id="stop1890" />
-    </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"
@@ -75,26 +49,6 @@
        x2="0"
        y2="21.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"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2,0,1)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1886"
-       id="linearGradient1892"
-       x1="0"
-       y1="1"
-       x2="0"
-       y2="14"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -164,28 +118,12 @@
        y="1" />
   </g>
   <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="hilight">
-    <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 0,1 L 8,1 C 8,1 8,4 8,4 L 0,4 L 0,3 z "
-       id="path6061" />
-    <rect
-       style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:0.60;stroke:none;stroke-width:0;stroke-opacity:1"
-       id="rect1884"
-       width="8"
-       height="15"
-       x="0"
-       y="1" />
-  </g>
-  <g
      inkscape:label="Border"
      inkscape:groupmode="layer"
      id="layer1"
      style="display:inline">
     <path
-       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.15"
+       style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.25"
        d="M 0,0.5 L 8,0.5"
        id="path6059" />
   </g>
@@ -198,7 +136,7 @@
        d="M 0,21.5 L 8,21.5"
        id="path6989" />
     <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"
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.35"
        d="M 0,1.5 L 8,1.5"
        id="path28" />
   </g>

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

Modified: xfwm4/trunk/themes/default/top-left-active.svg
===================================================================
--- xfwm4/trunk/themes/default/top-left-active.svg	2009-01-23 22:20:25 UTC (rev 29302)
+++ xfwm4/trunk/themes/default/top-left-active.svg	2009-01-23 22:36:35 UTC (rev 29303)
@@ -6,7 +6,6 @@
    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"
    sodipodi:docname="top-left-active.svg"
@@ -19,83 +18,7 @@
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
    sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default">
   <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient1886">
-      <stop
-         style="stop-color:white;stop-opacity:1;"
-         offset="0"
-         id="stop1888" />
-      <stop
-         style="stop-color:white;stop-opacity:0.25;"
-         offset="1"
-         id="stop1890" />
-    </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;" />
-      <stop
-         id="stop2776"
-         offset="0.5"
-         style="stop-color:black;stop-opacity:0;" />
-      <stop
-         id="stop2779"
-         offset="0.75"
-         style="stop-color:black;stop-opacity:0.0125;" />
-      <stop
-         id="stop5851"
-         offset="1"
-         style="stop-color:black;stop-opacity:0.05;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
-       x1="0"
-       y1="0.5"
-       x2="0"
-       y2="21.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"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2,0,1)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1886"
-       id="linearGradient1892"
-       x1="0"
-       y1="1"
-       x2="0"
-       y2="14"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
-  </defs>
+     id="defs4" />
   <sodipodi:namedview
      id="base"
      pagecolor="white"
@@ -157,23 +80,10 @@
      inkscape:groupmode="layer">
     <path
        id="path6057"
-       style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linejoin:miter;stroke-opacity:1"
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linejoin:miter;stroke-opacity:1"
        d="M 8,1 L 3,1 C 3,1 1,1 1,4 L 1,17 C 1,17 1,22 6,22 L 8,22 L 8,22 L 8,1 z " />
   </g>
   <g
-     inkscape:label="hilight"
-     id="layer3"
-     inkscape:groupmode="layer">
-    <path
-       id="path6061"
-       d="M 8,1 L 5.75,1 C 5.75,1 2,1 2,4 C 2,4 2.75,4 2.75,4 L 8,4 L 8,4 z "
-       style="fill:url(#linearGradient6962);fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1" />
-    <path
-       style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-opacity:1"
-       d="M 8,1 L 3,1 C 3,1 1,1 1,4 L 1,11 C 1,11 1,16 6,16 L 8,16 L 8,16 L 8,1 z "
-       id="path1884" />
-  </g>
-  <g
      style="display:inline"
      id="layer1"
      inkscape:groupmode="layer"
@@ -181,7 +91,7 @@
     <path
        id="rect1319"
        d="M 8,0 L 8,1 L 3,1 C 3,1 1,1 1,4 C 1,22 1,22 1,22 L 0,22 L 0,0 L 8,0 z "
-       style="fill:black;fill-opacity:0.15" />
+       style="fill:black;fill-opacity:0.25" />
   </g>
   <g
      inkscape:label="Shadow"
@@ -192,7 +102,7 @@
        d="M 2.5,21.5 L 7.5,21.5"
        id="path6989" />
     <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"
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.30"
        d="M 8,1.5 L 3.5,1.5 C 3.5,1.5 1.5,1.5 1.5,4.5 C 1.5,7.5 1.5,24 1.5,24 L 1.5,24 L 1.5,24"
        id="path2170" />
   </g>

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

Modified: xfwm4/trunk/themes/default/top-left-inactive.svg
===================================================================
--- xfwm4/trunk/themes/default/top-left-inactive.svg	2009-01-23 22:20:25 UTC (rev 29302)
+++ xfwm4/trunk/themes/default/top-left-inactive.svg	2009-01-23 22:36:35 UTC (rev 29303)
@@ -21,32 +21,6 @@
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient1886">
-      <stop
-         style="stop-color:white;stop-opacity:1;"
-         offset="0"
-         id="stop1888" />
-      <stop
-         style="stop-color:white;stop-opacity:0.25;"
-         offset="1"
-         id="stop1890" />
-    </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"
@@ -75,26 +49,6 @@
        x2="0"
        y2="21.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"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2,0,1)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1886"
-       id="linearGradient1892"
-       x1="0"
-       y1="1"
-       x2="0"
-       y2="14"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -161,19 +115,6 @@
        d="M 8,1 L 3,1 C 3,1 1,1 1,4 L 1,17 C 1,17 1,22 6,22 L 8,22 L 8,22 L 8,1 z " />
   </g>
   <g
-     inkscape:label="hilight"
-     id="layer3"
-     inkscape:groupmode="layer">
-    <path
-       id="path6061"
-       d="M 8,1 L 5.75,1 C 5.75,1 2,1 2,4 C 2,4 2.75,4 2.75,4 L 8,4 L 8,4 z "
-       style="fill:url(#linearGradient6962);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1" />
-    <path
-       style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:0.60;stroke:none;stroke-width:0;stroke-opacity:1"
-       d="M 8,1 L 3,1 C 3,1 1,1 1,4 L 1,11 C 1,11 1,16 6,16 L 8,16 L 8,16 L 8,1 z "
-       id="path1884" />
-  </g>
-  <g
      style="display:inline"
      id="layer1"
      inkscape:groupmode="layer"
@@ -181,7 +122,7 @@
     <path
        id="rect1319"
        d="M 8,0 L 8,1 L 3,1 C 3,1 1,1 1,4 C 1,22 1,22 1,22 L 0,22 L 0,0 L 8,0 z "
-       style="fill:black;fill-opacity:0.15" />
+       style="fill:black;fill-opacity:0.25" />
   </g>
   <g
      inkscape:label="Shadow"
@@ -192,7 +133,7 @@
        d="M 2.5,21.5 L 7.5,21.5"
        id="path6989" />
     <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"
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.35"
        d="M 8,1.5 L 3.5,1.5 C 3.5,1.5 1.5,1.5 1.5,4.5 C 1.5,7.5 1.5,24 1.5,24 L 1.5,24 L 1.5,24"
        id="path2170" />
   </g>

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

Modified: xfwm4/trunk/themes/default/top-right-active.svg
===================================================================
--- xfwm4/trunk/themes/default/top-right-active.svg	2009-01-23 22:20:25 UTC (rev 29302)
+++ xfwm4/trunk/themes/default/top-right-active.svg	2009-01-23 22:36:35 UTC (rev 29303)
@@ -6,7 +6,6 @@
    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="8"
@@ -19,83 +18,7 @@
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
    sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default">
   <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient1886">
-      <stop
-         style="stop-color:white;stop-opacity:1;"
-         offset="0"
-         id="stop1888" />
-      <stop
-         style="stop-color:white;stop-opacity:0.25;"
-         offset="1"
-         id="stop1890" />
-    </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;" />
-      <stop
-         id="stop2776"
-         offset="0.5"
-         style="stop-color:black;stop-opacity:0;" />
-      <stop
-         id="stop2779"
-         offset="0.75"
-         style="stop-color:black;stop-opacity:0.0125;" />
-      <stop
-         id="stop5851"
-         offset="1"
-         style="stop-color:black;stop-opacity:0.05;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
-       x1="0"
-       y1="0.5"
-       x2="0"
-       y2="21.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"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2,0,1)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1886"
-       id="linearGradient1892"
-       x1="0"
-       y1="1"
-       x2="0"
-       y2="14"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
-  </defs>
+     id="defs4" />
   <sodipodi:namedview
      id="base"
      pagecolor="white"
@@ -156,24 +79,11 @@
      inkscape:label="Grad"
      style="display:inline">
     <path
-       style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linejoin:miter;stroke-opacity:1"
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linejoin:miter;stroke-opacity:1"
        d="M 0,1 L 5,1 C 5,1 7,1 7,4 L 7,17 C 7,17 7,22 2,22 L 0,22 L 0,22 L 0,1 z "
        id="path6057" />
   </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-linejoin:miter;stroke-opacity:1"
-       d="M 0,1 L 2.25,1 C 2.25,1 6,1 6,4 C 6,4 5.25,4 5.25,4 L 0,4 L 0,3 z "
-       id="path6061" />
-    <path
-       style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-opacity:1"
-       d="M 0,1 L 5,1 C 5,1 7,1 7,4 L 7,11 C 7,11 7,16 2,16 L 0,16 L 0,16 L 0,1 z "
-       id="path1884" />
-  </g>
-  <g
      inkscape:label="Border"
      inkscape:groupmode="layer"
      id="layer1"
@@ -181,7 +91,7 @@
     <path
        id="rect1319"
        d="M 0,0 L 0,1 L 5,1 C 5,1 7,1 7,4 C 7,22 7,22 7,22 L 8,22 L 8,0 L 0,0 z "
-       style="fill:black;fill-opacity:0.15" />
+       style="fill:black;fill-opacity:0.25" />
   </g>
   <g
      inkscape:groupmode="layer"
@@ -192,9 +102,8 @@
        d="M 0.5,21.5 L 5.5,21.5"
        id="path6989" />
     <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"
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.30"
        d="M 0,1.5 L 4.5,1.5 C 4.5,1.5 6.5,1.5 6.5,4.5 C 6.5,0.5 6.5,24 6.5,24 L 6.5,24 L 6.5,24"
        id="path2170" />
-
   </g>
 </svg>

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

Modified: xfwm4/trunk/themes/default/top-right-inactive.svg
===================================================================
--- xfwm4/trunk/themes/default/top-right-inactive.svg	2009-01-23 22:20:25 UTC (rev 29302)
+++ xfwm4/trunk/themes/default/top-right-inactive.svg	2009-01-23 22:36:35 UTC (rev 29303)
@@ -21,32 +21,6 @@
   <defs
      id="defs4">
     <linearGradient
-       id="linearGradient1886">
-      <stop
-         style="stop-color:white;stop-opacity:1;"
-         offset="0"
-         id="stop1888" />
-      <stop
-         style="stop-color:white;stop-opacity:0.25;"
-         offset="1"
-         id="stop1890" />
-    </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"
@@ -75,26 +49,6 @@
        x2="0"
        y2="21.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"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.2,0,1)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1886"
-       id="linearGradient1892"
-       x1="0"
-       y1="1"
-       x2="0"
-       y2="14"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -161,19 +115,6 @@
        id="path6057" />
   </g>
   <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="hilight">
-    <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.50;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 0,1 L 2.25,1 C 2.25,1 6,1 6,4 C 6,4 5.25,4 5.25,4 L 0,4 L 0,3 z "
-       id="path6061" />
-    <path
-       style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:0.60;stroke:none;stroke-width:0;stroke-opacity:1"
-       d="M 0,1 L 5,1 C 5,1 7,1 7,4 L 7,11 C 7,11 7,16 2,16 L 0,16 L 0,16 L 0,1 z "
-       id="path1884" />
-  </g>
-  <g
      inkscape:label="Border"
      inkscape:groupmode="layer"
      id="layer1"
@@ -181,7 +122,7 @@
     <path
        id="rect1319"
        d="M 0,0 L 0,1 L 5,1 C 5,1 7,1 7,4 C 7,22 7,22 7,22 L 8,22 L 8,0 L 0,0 z "
-       style="fill:black;fill-opacity:0.15" />
+       style="fill:black;fill-opacity:0.25" />
   </g>
   <g
      inkscape:groupmode="layer"
@@ -192,7 +133,7 @@
        d="M 0.5,21.5 L 5.5,21.5"
        id="path6989" />
     <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"
+       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.35"
        d="M 0,1.5 L 4.5,1.5 C 4.5,1.5 6.5,1.5 6.5,4.5 C 6.5,0.5 6.5,24 6.5,24 L 6.5,24 L 6.5,24"
        id="path2170" />
   </g>




More information about the Xfce4-commits mailing list