diff --git a/gtk-2.0/gtkrc b/gtk-2.0/gtkrc
index b1effa9..830ae2d 100644
--- a/gtk-2.0/gtkrc
+++ b/gtk-2.0/gtkrc
@@ -1,6 +1,6 @@
# Numix GTK Theme
-gtk-color-scheme = "base_color:#f9f9f9\nbg_color:#dedede\ntooltip_bg_color:#2d2d2d\nselected_bg_color:#d64937\ntext_color:#333333\nfg_color:#555555\ntooltip_fg_color:#dedede\nselected_fg_color:#f9f9f9\nmenubar_bg_color:#2d2d2d\nmenubar_fg_color:#dcdcdc\ntoolbar_bg_color:#dedede\ntoolbar_fg_color:#555555\nmenu_bg_color:#2d2d2d\nmenu_fg_color:#dcdcdc\npanel_bg_color:#2d2d2d\npanel_fg_color:#dcdcdc\nlink_color:#fc6f5d"
+gtk-color-scheme = "bg_color:#dedede\nfg_color:#555555\nbase_color:#f9f9f9\ntext_color:#333333\nselected_bg_color:#d64937\nselected_fg_color:#f9f9f9\ntooltip_bg_color:#2d2d2d\ntooltip_fg_color:#dedede\ntitlebar_bg_color:#2d2d2d\ntitlebar_fg_color:#dcdcdc\nmenubar_bg_color:#2d2d2d\nmenubar_fg_color:#dcdcdc\ntoolbar_bg_color:#dedede\ntoolbar_fg_color:#555555\nmenu_bg_color:#2d2d2d\nmenu_fg_color:#dcdcdc\npanel_bg_color:#2d2d2d\npanel_fg_color:#dcdcdc\nlink_color:#fc6f5d"
# Default Style
@@ -45,8 +45,8 @@ style "murrine-default" {
GtkRange::stepper_spacing = 0
GtkRange::trough-under-steppers = 1
- GtkScale::slider-length = 15
- GtkScale::slider-width = 15
+ GtkScale::slider-length = 16
+ GtkScale::slider-width = 16
GtkScale::trough-side-details = 1
GtkScrollbar::activate-slider = 1
@@ -200,7 +200,7 @@ style "murrine-scrollbar" {
engine "murrine" {
roundness = 0
- contrast = 0.00
+ contrast = 0.0
border_shades = { 0.9, 0.9 }
trough_shades = { 0.97, 0.97 }
trough_border_shades = { 1.0, 1.0 }
@@ -222,7 +222,7 @@ style "murrine-scale" = "murrine-thin" {
bg[INSENSITIVE] = shade (0.95, @bg_color)
engine "murrine" {
- roundness = 7
+ roundness = 8
gradient_shades = { 1.08, 1.08, 1.08, 1.08 }
border_shades = { 1.0, 1.0 }
trough_shades = { 1.08, 1.08 }
@@ -388,34 +388,34 @@ style "murrine-menubaritem" {
# Toolbars
style "murrine-toolbar" = "murrine-thin" {
- bg[NORMAL] = @toolbar_bg_color
- bg[PRELIGHT] = shade (1.02, @toolbar_bg_color)
+ bg[NORMAL] = @bg_color
+ bg[PRELIGHT] = shade (1.02, @bg_color)
bg[SELECTED] = @selected_bg_color
- bg[ACTIVE] = shade (0.9, @toolbar_bg_color)
- bg[INSENSITIVE] = @toolbar_bg_color
+ bg[ACTIVE] = shade (0.9, @bg_color)
+ bg[INSENSITIVE] = @bg_color
- fg[NORMAL] = @toolbar_fg_color
- fg[PRELIGHT] = @toolbar_fg_color
+ fg[NORMAL] = @fg_color
+ fg[PRELIGHT] = @fg_color
fg[SELECTED] = @selected_fg_color
- fg[ACTIVE] = @toolbar_fg_color
- fg[INSENSITIVE] = mix (0.5, @toolbar_bg_color, @toolbar_fg_color)
+ fg[ACTIVE] = @fg_color
+ fg[INSENSITIVE] = mix (0.5, @bg_color, @fg_color)
engine "murrine" {
}
}
style "murrine-toolbutton" = "murrine-button" {
- bg[NORMAL] = shade (1.08, @toolbar_bg_color)
- bg[PRELIGHT] = shade (1.10, @toolbar_bg_color)
+ bg[NORMAL] = shade (1.08, @bg_color)
+ bg[PRELIGHT] = shade (1.10, @bg_color)
bg[SELECTED] = @selected_bg_color
- bg[ACTIVE] = shade (0.95, @toolbar_bg_color)
- bg[INSENSITIVE] = shade (0.85, @toolbar_bg_color)
+ bg[ACTIVE] = shade (0.95, @bg_color)
+ bg[INSENSITIVE] = shade (0.85, @bg_color)
- fg[NORMAL] = @toolbar_fg_color
- fg[PRELIGHT] = @toolbar_fg_color
+ fg[NORMAL] = @fg_color
+ fg[PRELIGHT] = @fg_color
fg[SELECTED] = @selected_fg_color
- fg[ACTIVE] = @toolbar_fg_color
- fg[INSENSITIVE] = mix (0.5, @toolbar_bg_color, @toolbar_fg_color)
+ fg[ACTIVE] = @fg_color
+ fg[INSENSITIVE] = mix (0.5, @bg_color, @fg_color)
engine "murrine" {
}
@@ -433,7 +433,7 @@ style "murrine-panel" = "murrine-thin" {
bg[NORMAL] = @panel_bg_color
bg[PRELIGHT] = mix (0.21, @panel_fg_color, @panel_bg_color)
bg[SELECTED] = mix (0.21, @panel_fg_color, @panel_bg_color)
- bg[ACTIVE] = shade (0.9, @panel_bg_color)
+ bg[ACTIVE] = shade (0.8, @panel_bg_color)
bg[INSENSITIVE] = @panel_bg_color
fg[NORMAL] = @panel_fg_color
@@ -456,6 +456,7 @@ style "murrine-panel" = "murrine-thin" {
engine "murrine" {
roundness = 0
+ contrast = 0.0
}
}
@@ -595,17 +596,17 @@ style "chromium-toolbar-button" {
}
style "chrome-gtk-frame" {
- ChromeGtkFrame::frame-color = @menubar_bg_color
- ChromeGtkFrame::inactive-frame-color = @menubar_bg_color
+ ChromeGtkFrame::frame-color = @titlebar_bg_color
+ ChromeGtkFrame::inactive-frame-color = @titlebar_bg_color
ChromeGtkFrame::frame-gradient-size = 0
- ChromeGtkFrame::frame-gradient-color = @menubar_bg_color
+ ChromeGtkFrame::frame-gradient-color = @titlebar_bg_color
- ChromeGtkFrame::incognito-frame-color = @menubar_bg_color
- ChromeGtkFrame::incognito-inactive-frame-color = @menubar_bg_color
+ ChromeGtkFrame::incognito-frame-color = @titlebar_bg_color
+ ChromeGtkFrame::incognito-inactive-frame-color = @titlebar_bg_color
ChromeGtkFrame::incognito-frame-gradient-size = 0
- ChromeGtkFrame::incognito-frame-gradient-color = @menubar_bg_color
+ ChromeGtkFrame::incognito-frame-gradient-color = @titlebar_bg_color
ChromeGtkFrame::scrollbar-trough-color = @bg_color
ChromeGtkFrame::scrollbar-slider-normal-color = mix (0.21, @fg_color, @bg_color)
diff --git a/gtk-3.0/gtk-dark.css b/gtk-3.0/gtk-dark.css
index 2200c4d..15247d6 100644
--- a/gtk-3.0/gtk-dark.css
+++ b/gtk-3.0/gtk-dark.css
@@ -1,4 +1,4 @@
-/* Default color scheme */
+/* default color scheme */
@define-color base_color #333333;
@define-color bg_color #2d2d2d;
@define-color text_color #dedede;
@@ -6,7 +6,11 @@
@define-color selected_bg_color #d64937;
@define-color selected_fg_color #f9f9f9;
@define-color tooltip_bg_color #2d2d2d;
-@define-color tooltip_fg_color #dedede;
+@define-color tooltip_fg_color #dcdcdc;
+
+/* dark color scheme */
+@define-color dark_bg_color #2d2d2d;
+@define-color dark_fg_color #dcdcdc;
/* colormap actually used by the theme, to be overridden in other css files */
@define-color theme_bg_color @bg_color;
@@ -37,26 +41,32 @@
@define-color error_color #cc0000;
/* widget colors */
-@define-color menubar_bg_color #2d2d2d;
-@define-color menubar_fg_color #dcdcdc;
-@define-color toolbar_bg_color #2d2d2d;
-@define-color toolbar_fg_color #dcdcdc;
-@define-color menu_bg_color #2d2d2d;
-@define-color menu_fg_color #dcdcdc;
-@define-color panel_bg_color #2d2d2d;
-@define-color panel_fg_color #dcdcdc;
+@define-color menubar_bg_color @dark_bg_color;
+@define-color menubar_fg_color @dark_fg_color;
+@define-color toolbar_bg_color @theme_bg_color;
+@define-color toolbar_fg_color @theme_fg_color;
+@define-color menu_bg_color @dark_bg_color;
+@define-color menu_fg_color @dark_fg_color;
+@define-color panel_bg_color @dark_bg_color;
+@define-color panel_fg_color @dark_fg_color;
/* osd */
-@define-color osd_base #2d2d2d;
-@define-color osd_fg #dcdcdc;
+@define-color osd_base @dark_bg_color;
+@define-color osd_fg @dark_fg_color;
@define-color osd_bg alpha(@osd_base, 0.8);
/* window manager colors */
@define-color wm_bg #2d2d2d;
-@define-color wm_title_focused #dcdcdc;
-@define-color wm_title_unfocused #888888;
@define-color wm_border_focused #484848;
@define-color wm_border_unfocused #393939;
+@define-color wm_title_focused #dcdcdc;
+@define-color wm_title_unfocused #888888;
+@define-color wm_icons_focused #dcdcdc;
+@define-color wm_icons_focused_prelight @selected_bg_color;
+@define-color wm_icons_focused_pressed shade(@selected_bg_color, 0.8);
+@define-color wm_icons_unfocused #888888;
+@define-color wm_icons_unfocused_prelight @selected_bg_color;
+@define-color wm_icons_unfocused_pressed shade(@selected_bg_color, 0.8);
@import url("gtk-widgets.css");
@import url("gtk-widgets-assets-dark.css");
diff --git a/gtk-3.0/gtk-widgets.css b/gtk-3.0/gtk-widgets.css
old mode 100644
new mode 100755
index b7f0923..86ef3d5
--- a/gtk-3.0/gtk-widgets.css
+++ b/gtk-3.0/gtk-widgets.css
@@ -1178,13 +1178,13 @@ GtkLevelBar.vertical {
border-width: 1px;
border-radius: 2px;
- -GtkRange-slider-width: 15;
+ -GtkRange-slider-width: 16;
-GtkRange-trough-border: 1;
- -GtkScale-slider-length: 15;
+ -GtkScale-slider-length: 16;
}
.scale.slider {
- border-radius: 7px;
+ border-radius: 8px;
background-color: shade(@theme_bg_color, 1.08);
background-image: none;
color: transparent;
@@ -1216,9 +1216,9 @@ GtkLevelBar.vertical {
}
.scale.trough {
- border-width: 6px 0;
+ border-width: 7px 0;
border-color: transparent;
- border-radius: 7px;
+ border-radius: 8px;
background-color: shade(@theme_bg_color, 1.08);
background-image: none;
/* we will draw the border using box shadow for now */
@@ -1229,7 +1229,7 @@ GtkLevelBar.vertical {
}
.scale.trough.vertical {
- border-width: 0 6px;
+ border-width: 0 7px;
box-shadow: inset 1 0 shade(@theme_bg_color, 0.8),
inset 0 1 shade(@theme_bg_color, 0.8),
inset -1 0 shade(@theme_bg_color, 0.8),
@@ -2670,7 +2670,6 @@ GtkOverlay.osd {
}
.osd .scale.slider {
- border-radius: 7px;
background-color: shade(@osd_bg, 1.08);
background-image: none;
color: transparent;
diff --git a/gtk-3.0/gtk.css b/gtk-3.0/gtk.css
index aed917c..759c570 100644
--- a/gtk-3.0/gtk.css
+++ b/gtk-3.0/gtk.css
@@ -1,4 +1,4 @@
-/* Default color scheme */
+/* default color scheme */
@define-color bg_color #dedede;
@define-color fg_color #555555;
@define-color base_color #f9f9f9;
@@ -6,7 +6,11 @@
@define-color selected_bg_color #d64937;
@define-color selected_fg_color #f9f9f9;
@define-color tooltip_bg_color #2d2d2d;
-@define-color tooltip_fg_color #dedede;
+@define-color tooltip_fg_color #dcdcdc;
+
+/* dark color scheme */
+@define-color dark_bg_color #2d2d2d;
+@define-color dark_fg_color #dcdcdc;
/* colormap actually used by the theme, to be overridden in other css files */
@define-color theme_bg_color @bg_color;
@@ -37,26 +41,32 @@
@define-color error_color #cc0000;
/* widget colors */
-@define-color menubar_bg_color #2d2d2d;
-@define-color menubar_fg_color #dcdcdc;
-@define-color toolbar_bg_color #dedede;
-@define-color toolbar_fg_color #555555;
-@define-color menu_bg_color #2d2d2d;
-@define-color menu_fg_color #dcdcdc;
-@define-color panel_bg_color #2d2d2d;
-@define-color panel_fg_color #dcdcdc;
+@define-color menubar_bg_color @dark_bg_color;
+@define-color menubar_fg_color @dark_fg_color;
+@define-color toolbar_bg_color @theme_bg_color;
+@define-color toolbar_fg_color @theme_fg_color;
+@define-color menu_bg_color @dark_bg_color;
+@define-color menu_fg_color @dark_fg_color;
+@define-color panel_bg_color @dark_bg_color;
+@define-color panel_fg_color @dark_fg_color;
/* osd */
-@define-color osd_base #2d2d2d;
-@define-color osd_fg #dcdcdc;
+@define-color osd_base @dark_bg_color;
+@define-color osd_fg @dark_fg_color;
@define-color osd_bg alpha(@osd_base, 0.8);
/* window manager colors */
@define-color wm_bg #2d2d2d;
-@define-color wm_title_focused #dcdcdc;
-@define-color wm_title_unfocused #888888;
@define-color wm_border_focused #484848;
@define-color wm_border_unfocused #393939;
+@define-color wm_title_focused #dcdcdc;
+@define-color wm_title_unfocused #888888;
+@define-color wm_icons_focused #dcdcdc;
+@define-color wm_icons_focused_prelight @selected_bg_color;
+@define-color wm_icons_focused_pressed shade(@selected_bg_color, 0.8);
+@define-color wm_icons_unfocused #888888;
+@define-color wm_icons_unfocused_prelight @selected_bg_color;
+@define-color wm_icons_unfocused_pressed shade(@selected_bg_color, 0.8);
@import url("gtk-widgets.css");
@import url("gtk-widgets-assets.css");
diff --git a/gtk-3.0/settings.ini b/gtk-3.0/settings.ini
index 20d8359..9d67089 100644
--- a/gtk-3.0/settings.ini
+++ b/gtk-3.0/settings.ini
@@ -1,4 +1,4 @@
[Settings]
-gtk-color-scheme = "base_color:#f9f9f9\nbg_color:#dedede\ntooltip_bg_color:#2d2d2d\nselected_bg_color:#d64937\ntext_color:#333333\nfg_color:#555555\ntooltip_fg_color:#dedede\nselected_fg_color:#f9f9f9\nmenubar_bg_color:#2d2d2d\nmenubar_fg_color:#dcdcdc\ntoolbar_bg_color:#dedede\ntoolbar_fg_color:#555555\nmenu_bg_color:#2d2d2d\nmenu_fg_color:#dcdcdc\npanel_bg_color:#2d2d2d\npanel_fg_color:#dcdcdc\nlink_color:#fc6f5d"
+gtk-color-scheme = "base_color:#f9f9f9\nbg_color:#dedede\ntooltip_bg_color:#2d2d2d\nselected_bg_color:#d64937\ntext_color:#333333\nfg_color:#555555\ntooltip_fg_color:#dedede\nselected_fg_color:#f9f9f9\nmenubar_bg_color:#2d2d2d\nmenubar_fg_color:#dcdcdc\ntoolbar_bg_color:#2d2d2d\ntoolbar_fg_color:#dcdcdc\nmenu_bg_color:#2d2d2d\nmenu_fg_color:#dcdcdc\npanel_bg_color:#2d2d2d\npanel_fg_color:#dcdcdc\nlink_color:#fc6f5d"
gtk-auto-mnemonics = 1
gtk-visible-focus = automatic
diff --git a/metacity-1/close_focused_normal.png b/metacity-1/close_focused_normal.png
deleted file mode 100644
index d3c84ec..0000000
Binary files a/metacity-1/close_focused_normal.png and /dev/null differ
diff --git a/metacity-1/close_focused_prelight.png b/metacity-1/close_focused_prelight.png
deleted file mode 100644
index 980a80e..0000000
Binary files a/metacity-1/close_focused_prelight.png and /dev/null differ
diff --git a/metacity-1/close_focused_pressed.png b/metacity-1/close_focused_pressed.png
deleted file mode 100644
index e2d55a2..0000000
Binary files a/metacity-1/close_focused_pressed.png and /dev/null differ
diff --git a/metacity-1/close_unfocused.png b/metacity-1/close_unfocused.png
deleted file mode 100644
index 7b0814f..0000000
Binary files a/metacity-1/close_unfocused.png and /dev/null differ
diff --git a/metacity-1/maximize_focused_normal.png b/metacity-1/maximize_focused_normal.png
deleted file mode 100644
index 9e09e71..0000000
Binary files a/metacity-1/maximize_focused_normal.png and /dev/null differ
diff --git a/metacity-1/maximize_focused_prelight.png b/metacity-1/maximize_focused_prelight.png
deleted file mode 100644
index 3a51c72..0000000
Binary files a/metacity-1/maximize_focused_prelight.png and /dev/null differ
diff --git a/metacity-1/maximize_focused_pressed.png b/metacity-1/maximize_focused_pressed.png
deleted file mode 100644
index 2b4dad5..0000000
Binary files a/metacity-1/maximize_focused_pressed.png and /dev/null differ
diff --git a/metacity-1/maximize_unfocused.png b/metacity-1/maximize_unfocused.png
deleted file mode 100644
index fdb0d03..0000000
Binary files a/metacity-1/maximize_unfocused.png and /dev/null differ
diff --git a/metacity-1/metacity-theme-2.xml b/metacity-1/metacity-theme-2.xml
index cd65830..8d8f3c8 100644
--- a/metacity-1/metacity-theme-2.xml
+++ b/metacity-1/metacity-theme-2.xml
@@ -4,7 +4,7 @@
<name>Numix</name>
<author>Satyajit Sahoo</author>
<copyright>GPL-3.0+</copyright>
- <date>4 August 2013</date>
+ <date>11 December 2013</date>
<description>Numix Metacity Theme</description>
</info>
@@ -14,6 +14,12 @@
<constant name="C_border_unfocused" value="#393939" />
<constant name="C_title_focused" value="#dcdcdc" />
<constant name="C_title_unfocused" value="#888888" />
+<constant name="C_icons_focused" value="#dcdcdc" />
+<constant name="C_icons_focused_prelight" value="gtk:bg[SELECTED])" />
+<constant name="C_icons_focused_pressed" value="shade/gtk:bg[SELECTED]/0.8" />
+<constant name="C_icons_unfocused" value="#888888" />
+<constant name="C_icons_unfocused_prelight" value="gtk:bg[SELECTED])" />
+<constant name="C_icons_unfocused_pressed" value="shade/gtk:bg[SELECTED]/0.8" />
<!-- ::: GEOMETRY ::: -->
<frame_geometry name="normal" title_scale="medium" rounded_top_left="1" rounded_top_right="1">
@@ -168,22 +174,22 @@
<draw_ops name="border_right_unfocused">
<line
- x1="width-1" y1="0"
- x2="width-1" y2="height"
+ x1="width-1" y1="0"
+ x2="width-1" y2="height"
color="C_border_unfocused" />
</draw_ops>
<draw_ops name="border_left_focused">
<line
- x1="0" y1="0"
- x2="0" y2="height"
+ x1="0" y1="0"
+ x2="0" y2="height"
color="C_border_focused" />
</draw_ops>
<draw_ops name="border_left_unfocused">
<line
- x1="0" y1="0"
- x2="0" y2="height"
+ x1="0" y1="0"
+ x2="0" y2="height"
color="C_border_unfocused" />
</draw_ops>
@@ -191,19 +197,111 @@
<!-- note: negative values in x or y causes gnome-shell to crash -->
<!-- close icon -->
<draw_ops name="close_focused">
- <image filename="close_focused_normal.png" x="0" y="1" width="object_width" height="object_height" />
+ <line
+ x1="width-(width-width%3)/3-2" y1="(height-height%3)/3+1"
+ x2="(width-width%3)/3+1" y2="height-(height-height%3)/3-2"
+ color="C_icons_focused" />
+ <line
+ x1="width-(width-width%3)/3-2" y1="(height-height%3)/3+2"
+ x2="(width-width%3)/3+2" y2="height-(height-height%3)/3-2"
+ color="C_icons_focused" />
+ <line
+ x1="width-(width-width%3)/3-3" y1="(height-height%3)/3+1"
+ x2="(width-width%3)/3+1" y2="height-(height-height%3)/3-3"
+ color="C_icons_focused" />
+ <line
+ x1="(width-width%3)/3+1" y1="(height-height%3)/3+1"
+ x2="width-(width-width%3)/3-2" y2="height-(height-height%3)/3-2"
+ color="C_icons_focused" />
+ <line
+ x1="(width-width%3)/3+1" y1="(height-height%3)/3+2"
+ x2="width-(width-width%3)/3-3" y2="height-(height-height%3)/3-2"
+ color="C_icons_focused" />
+ <line
+ x1="(width-width%3)/3+2" y1="(height-height%3)/3+1"
+ x2="width-(width-width%3)/3-2" y2="height-(height-height%3)/3-3"
+ color="C_icons_focused" />
</draw_ops>
<draw_ops name="close_focused_prelight">
- <image filename="close_focused_prelight.png" x="0" y="1" width="object_width" height="object_height" />
+ <line
+ x1="width-(width-width%3)/3-2" y1="(height-height%3)/3+1"
+ x2="(width-width%3)/3+1" y2="height-(height-height%3)/3-2"
+ color="C_icons_focused_prelight" />
+ <line
+ x1="width-(width-width%3)/3-2" y1="(height-height%3)/3+2"
+ x2="(width-width%3)/3+2" y2="height-(height-height%3)/3-2"
+ color="C_icons_focused_prelight" />
+ <line
+ x1="width-(width-width%3)/3-3" y1="(height-height%3)/3+1"
+ x2="(width-width%3)/3+1" y2="height-(height-height%3)/3-3"
+ color="C_icons_focused_prelight" />
+ <line
+ x1="(width-width%3)/3+1" y1="(height-height%3)/3+1"
+ x2="width-(width-width%3)/3-2" y2="height-(height-height%3)/3-2"
+ color="C_icons_focused_prelight" />
+ <line
+ x1="(width-width%3)/3+1" y1="(height-height%3)/3+2"
+ x2="width-(width-width%3)/3-3" y2="height-(height-height%3)/3-2"
+ color="C_icons_focused_prelight" />
+ <line
+ x1="(width-width%3)/3+2" y1="(height-height%3)/3+1"
+ x2="width-(width-width%3)/3-2" y2="height-(height-height%3)/3-3"
+ color="C_icons_focused_prelight" />
</draw_ops>
<draw_ops name="close_focused_pressed">
- <image filename="close_focused_pressed.png" x="0" y="1" width="object_width" height="object_height" />
+ <line
+ x1="width-(width-width%3)/3-2" y1="(height-height%3)/3+1"
+ x2="(width-width%3)/3+1" y2="height-(height-height%3)/3-2"
+ color="C_icons_focused_pressed" />
+ <line
+ x1="width-(width-width%3)/3-2" y1="(height-height%3)/3+2"
+ x2="(width-width%3)/3+2" y2="height-(height-height%3)/3-2"
+ color="C_icons_focused_pressed" />
+ <line
+ x1="width-(width-width%3)/3-3" y1="(height-height%3)/3+1"
+ x2="(width-width%3)/3+1" y2="height-(height-height%3)/3-3"
+ color="C_icons_focused_pressed" />
+ <line
+ x1="(width-width%3)/3+1" y1="(height-height%3)/3+1"
+ x2="width-(width-width%3)/3-2" y2="height-(height-height%3)/3-2"
+ color="C_icons_focused_pressed" />
+ <line
+ x1="(width-width%3)/3+1" y1="(height-height%3)/3+2"
+ x2="width-(width-width%3)/3-3" y2="height-(height-height%3)/3-2"
+ color="C_icons_focused_pressed" />
+ <line
+ x1="(width-width%3)/3+2" y1="(height-height%3)/3+1"
+ x2="width-(width-width%3)/3-2" y2="height-(height-height%3)/3-3"
+ color="C_icons_focused_pressed" />
</draw_ops>
<draw_ops name="close_unfocused">
- <image filename="close_unfocused.png" x="0" y="1" width="object_width" height="object_height" />
+ <line
+ x1="width-(width-width%3)/3-2" y1="(height-height%3)/3+1"
+ x2="(width-width%3)/3+1" y2="height-(height-height%3)/3-2"
+ color="C_icons_unfocused" />
+ <line
+ x1="width-(width-width%3)/3-2" y1="(height-height%3)/3+2"
+ x2="(width-width%3)/3+2" y2="height-(height-height%3)/3-2"
+ color="C_icons_unfocused" />
+ <line
+ x1="width-(width-width%3)/3-3" y1="(height-height%3)/3+1"
+ x2="(width-width%3)/3+1" y2="height-(height-height%3)/3-3"
+ color="C_icons_unfocused" />
+ <line
+ x1="(width-width%3)/3+1" y1="(height-height%3)/3+1"
+ x2="width-(width-width%3)/3-2" y2="height-(height-height%3)/3-2"
+ color="C_icons_unfocused" />
+ <line
+ x1="(width-width%3)/3+1" y1="(height-height%3)/3+2"
+ x2="width-(width-width%3)/3-3" y2="height-(height-height%3)/3-2"
+ color="C_icons_unfocused" />
+ <line
+ x1="(width-width%3)/3+2" y1="(height-height%3)/3+1"
+ x2="width-(width-width%3)/3-2" y2="height-(height-height%3)/3-3"
+ color="C_icons_unfocused" />
</draw_ops>
<draw_ops name="close_unfocused_prelight">
@@ -216,19 +314,47 @@
<!-- maximize icon -->
<draw_ops name="maximize_focused">
- <image filename="maximize_focused_normal.png" x="0" y="1" width="object_width" height="object_height" />
+ <rectangle
+ x="(width-width%3)/3+1" y="(height-height%3)/3+1"
+ width="width-2*(width-width%3)/3-3" height="height-2*(height-height%3)/3-3"
+ color="C_icons_focused" />
+ <rectangle
+ x="(width-width%3)/3+2" y="(height-height%3)/3+2"
+ width="width-2*(width-width%3)/3-5" height="height-2*(height-height%3)/3-5"
+ color="C_icons_focused" />
</draw_ops>
<draw_ops name="maximize_focused_prelight">
- <image filename="maximize_focused_prelight.png" x="0" y="1" width="object_width" height="object_height" />
+ <rectangle
+ x="(width-width%3)/3+1" y="(height-height%3)/3+1"
+ width="width-2*(width-width%3)/3-3" height="height-2*(height-height%3)/3-3"
+ color="C_icons_focused_prelight" />
+ <rectangle
+ x="(width-width%3)/3+2" y="(height-height%3)/3+2"
+ width="width-2*(width-width%3)/3-5" height="height-2*(height-height%3)/3-5"
+ color="C_icons_focused_prelight" />
</draw_ops>
<draw_ops name="maximize_focused_pressed">
- <image filename="maximize_focused_pressed.png" x="0" y="1" width="object_width" height="object_height" />
+ <rectangle
+ x="(width-width%3)/3+1" y="(height-height%3)/3+1"
+ width="width-2*(width-width%3)/3-3" height="height-2*(height-height%3)/3-3"
+ color="C_icons_focused_pressed" />
+ <rectangle
+ x="(width-width%3)/3+2" y="(height-height%3)/3+2"
+ width="width-2*(width-width%3)/3-5" height="height-2*(height-height%3)/3-5"
+ color="C_icons_focused_pressed" />
</draw_ops>
<draw_ops name="maximize_unfocused">
- <image filename="maximize_unfocused.png" x="0" y="1" width="object_width" height="object_height" />
+ <rectangle
+ x="(width-width%3)/3+1" y="(height-height%3)/3+1"
+ width="width-2*(width-width%3)/3-3" height="height-2*(height-height%3)/3-3"
+ color="C_icons_unfocused" />
+ <rectangle
+ x="(width-width%3)/3+2" y="(height-height%3)/3+2"
+ width="width-2*(width-width%3)/3-5" height="height-2*(height-height%3)/3-5"
+ color="C_icons_unfocused" />
</draw_ops>
<draw_ops name="maximize_unfocused_prelight">
@@ -241,19 +367,47 @@
<!-- unmaximize icon -->
<draw_ops name="unmaximize_focused">
- <image filename="unmaximize_focused_normal.png" x="0" y="1" width="object_width" height="object_height" />
+ <rectangle
+ x="(width-width%3)/3+1" y="(height-height%3)/3+1"
+ width="width-2*(width-width%3)/3-3" height="height-2*(height-height%3)/3-3"
+ color="C_icons_focused" />
+ <rectangle
+ x="(width-width%3)/3+2" y="(height-height%3)/3+2"
+ width="width-2*(width-width%3)/3-5" height="height-2*(height-height%3)/3-5"
+ color="C_icons_focused" />
</draw_ops>
<draw_ops name="unmaximize_focused_prelight">
- <image filename="unmaximize_focused_prelight.png" x="0" y="1" width="object_width" height="object_height" />
+ <rectangle
+ x="(width-width%3)/3+1" y="(height-height%3)/3+1"
+ width="width-2*(width-width%3)/3-3" height="height-2*(height-height%3)/3-3"
+ color="C_icons_focused_prelight" />
+ <rectangle
+ x="(width-width%3)/3+2" y="(height-height%3)/3+2"
+ width="width-2*(width-width%3)/3-5" height="height-2*(height-height%3)/3-5"
+ color="C_icons_focused_prelight" />
</draw_ops>
<draw_ops name="unmaximize_focused_pressed">
- <image filename="unmaximize_focused_pressed.png" x="0" y="1" width="object_width" height="object_height" />
+ <rectangle
+ x="(width-width%3)/3+1" y="(height-height%3)/3+1"
+ width="width-2*(width-width%3)/3-3" height="height-2*(height-height%3)/3-3"
+ color="C_icons_focused_pressed" />
+ <rectangle
+ x="(width-width%3)/3+2" y="(height-height%3)/3+2"
+ width="width-2*(width-width%3)/3-5" height="height-2*(height-height%3)/3-5"
+ color="C_icons_focused_pressed" />
</draw_ops>
<draw_ops name="unmaximize_unfocused">
- <image filename="unmaximize_unfocused.png" x="0" y="1" width="object_width" height="object_height" />
+ <rectangle
+ x="(width-width%3)/3+1" y="(height-height%3)/3+1"
+ width="width-2*(width-width%3)/3-3" height="height-2*(height-height%3)/3-3"
+ color="C_icons_unfocused" />
+ <rectangle
+ x="(width-width%3)/3+2" y="(height-height%3)/3+2"
+ width="width-2*(width-width%3)/3-5" height="height-2*(height-height%3)/3-5"
+ color="C_icons_unfocused" />
</draw_ops>
<draw_ops name="unmaximize_unfocused_prelight">
@@ -266,19 +420,31 @@
<!-- minimize icon -->
<draw_ops name="minimize_focused">
- <image filename="minimize_focused_normal.png" x="0" y="1" width="object_width" height="object_height" />
+ <rectangle
+ x="(width-width%3)/3+2" y="height-(height-height%3)/3-5"
+ width="width-2*(width-width%3)/3-2" height="2" filled="true"
+ color="C_icons_focused" />
</draw_ops>
<draw_ops name="minimize_focused_prelight">
- <image filename="minimize_focused_prelight.png" x="0" y="1" width="object_width" height="object_height" />
+ <rectangle
+ x="(width-width%3)/3+2" y="height-(height-height%3)/3-5"
+ width="width-2*(width-width%3)/3-2" height="2" filled="true"
+ color="C_icons_focused_prelight" />
</draw_ops>
<draw_ops name="minimize_focused_pressed">
- <image filename="minimize_focused_pressed.png" x="0" y="1" width="object_width" height="object_height" />
+ <rectangle
+ x="(width-width%3)/3+2" y="height-(height-height%3)/3-5"
+ width="width-2*(width-width%3)/3-2" height="2" filled="true"
+ color="C_icons_focused_pressed" />
</draw_ops>
<draw_ops name="minimize_unfocused">
- <image filename="minimize_unfocused.png" x="0" y="1" width="object_width" height="object_height" />
+ <rectangle
+ x="(width-width%3)/3+2" y="height-(height-height%3)/3-5"
+ width="width-2*(width-width%3)/3-2" height="2" filled="true"
+ color="C_icons_unfocused" />
</draw_ops>
<draw_ops name="minimize_unfocused_prelight">
@@ -290,33 +456,197 @@
</draw_ops>
<!-- menu icon -->
-<draw_ops name="menu_focused"></draw_ops>
+<draw_ops name="menu_focused">
+ <rectangle
+ x="(width-width%3)/3+2" y="(height-height%3)/3+1"
+ width="width-2*(width-width%3)/3-3" height="height-2*(height-height%3)/3-3"
+ color="C_icons_focused" />
+ <rectangle
+ x="(width-width%3)/3+3" y="(height-height%3)/3+2"
+ width="width-2*(width-width%3)/3-5" height="height-2*(height-height%3)/3-5"
+ color="C_icons_focused" />
+ <rectangle
+ x="(width-width%3)/3+5" y="height/2-2"
+ width="width-2*(width-width%3)/3-8" height="2" filled="true"
+ color="C_icons_focused" />
+</draw_ops>
-<draw_ops name="menu_focused_prelight"></draw_ops>
+<draw_ops name="menu_focused_prelight">
+ <rectangle
+ x="(width-width%3)/3+2" y="(height-height%3)/3+1"
+ width="width-2*(width-width%3)/3-3" height="height-2*(height-height%3)/3-3"
+ color="C_icons_focused_prelight" />
+ <rectangle
+ x="(width-width%3)/3+3" y="(height-height%3)/3+2"
+ width="width-2*(width-width%3)/3-5" height="height-2*(height-height%3)/3-5"
+ color="C_icons_focused_prelight" />
+ <rectangle
+ x="(width-width%3)/3+5" y="height/2-2"
+ width="width-2*(width-width%3)/3-8" height="2" filled="true"
+ color="C_icons_focused_prelight" />
+</draw_ops>
-<draw_ops name="menu_focused_pressed"></draw_ops>
+<draw_ops name="menu_focused_pressed">
+ <rectangle
+ x="(width-width%3)/3+2" y="(height-height%3)/3+1"
+ width="width-2*(width-width%3)/3-3" height="height-2*(height-height%3)/3-3"
+ color="C_icons_focused_pressed" />
+ <rectangle
+ x="(width-width%3)/3+3" y="(height-height%3)/3+2"
+ width="width-2*(width-width%3)/3-5" height="height-2*(height-height%3)/3-5"
+ color="C_icons_focused_pressed" />
+ <rectangle
+ x="(width-width%3)/3+5" y="height/2-2"
+ width="width-2*(width-width%3)/3-8" height="2" filled="true"
+ color="C_icons_focused_pressed" />
+</draw_ops>
-<draw_ops name="menu_unfocused"></draw_ops>
+<draw_ops name="menu_unfocused">
+ <rectangle
+ x="(width-width%3)/3+2" y="(height-height%3)/3+1"
+ width="width-2*(width-width%3)/3-3" height="height-2*(height-height%3)/3-3"
+ color="C_icons_unfocused" />
+ <rectangle
+ x="(width-width%3)/3+3" y="(height-height%3)/3+2"
+ width="width-2*(width-width%3)/3-5" height="height-2*(height-height%3)/3-5"
+ color="C_icons_unfocused" />
+ <rectangle
+ x="(width-width%3)/3+5" y="height/2-2"
+ width="width-2*(width-width%3)/3-8" height="2" filled="true"
+ color="C_icons_unfocused" />
+</draw_ops>
-<draw_ops name="menu_unfocused_prelight"></draw_ops>
+<draw_ops name="menu_unfocused_prelight">
+ <include name="menu_focused_prelight" />
+</draw_ops>
-<draw_ops name="menu_unfocused_pressed"></draw_ops>
+<draw_ops name="menu_unfocused_pressed">
+ <include name="menu_focused_pressed" />
+</draw_ops>
<!-- shade icon -->
<draw_ops name="shade_focused">
- <image filename="shade_focused_normal.png" x="0" y="1" width="object_width" height="object_height" />
+ <line
+ x1="width-(width-width%3)/3-6" y1="(height-height%3)/3+1"
+ x2="(width-width%3)/3" y2="height-(height-height%3)/3-5"
+ color="C_icons_focused" />
+ <line
+ x1="width-(width-width%3)/3-6" y1="(height-height%3)/3+2"
+ x2="(width-width%3)/3+1" y2="height-(height-height%3)/3-5"
+ color="C_icons_focused" />
+ <line
+ x1="width-(width-width%3)/3-7" y1="(height-height%3)/3+1"
+ x2="(width-width%3)/3" y2="height-(height-height%3)/3-6"
+ color="C_icons_focused" />
+ <line
+ x1="(width-width%3)/3+3" y1="(height-height%3)/3+1"
+ x2="width-(width-width%3)/3-3" y2="height-(height-height%3)/3-5"
+ color="C_icons_focused" />
+ <line
+ x1="(width-width%3)/3+3" y1="(height-height%3)/3+2"
+ x2="width-(width-width%3)/3-4" y2="height-(height-height%3)/3-5"
+ color="C_icons_focused" />
+ <line
+ x1="(width-width%3)/3+4" y1="(height-height%3)/3+1"
+ x2="width-(width-width%3)/3-3" y2="height-(height-height%3)/3-6"
+ color="C_icons_focused" />
+ <rectangle
+ x="(width-width%3)/3+3" y="height/2-2"
+ width="width-2*(width-width%3)/3-8" height="6" filled="true"
+ color="C_icons_focused" />
</draw_ops>
<draw_ops name="shade_focused_prelight">
- <image filename="shade_focused_prelight.png" x="0" y="1" width="object_width" height="object_height" />
+ <line
+ x1="width-(width-width%3)/3-6" y1="(height-height%3)/3+1"
+ x2="(width-width%3)/3" y2="height-(height-height%3)/3-5"
+ color="C_icons_focused_prelight" />
+ <line
+ x1="width-(width-width%3)/3-6" y1="(height-height%3)/3+2"
+ x2="(width-width%3)/3+1" y2="height-(height-height%3)/3-5"
+ color="C_icons_focused_prelight" />
+ <line
+ x1="width-(width-width%3)/3-7" y1="(height-height%3)/3+1"
+ x2="(width-width%3)/3" y2="height-(height-height%3)/3-6"
+ color="C_icons_focused_prelight" />
+ <line
+ x1="(width-width%3)/3+3" y1="(height-height%3)/3+1"
+ x2="width-(width-width%3)/3-3" y2="height-(height-height%3)/3-5"
+ color="C_icons_focused_prelight" />
+ <line
+ x1="(width-width%3)/3+3" y1="(height-height%3)/3+2"
+ x2="width-(width-width%3)/3-4" y2="height-(height-height%3)/3-5"
+ color="C_icons_focused_prelight" />
+ <line
+ x1="(width-width%3)/3+4" y1="(height-height%3)/3+1"
+ x2="width-(width-width%3)/3-3" y2="height-(height-height%3)/3-6"
+ color="C_icons_focused_prelight" />
+ <rectangle
+ x="(width-width%3)/3+3" y="height/2-2"
+ width="width-2*(width-width%3)/3-8" height="6" filled="true"
+ color="C_icons_focused_prelight" />
</draw_ops>
<draw_ops name="shade_focused_pressed">
- <image filename="shade_focused_pressed.png" x="0" y="1" width="object_width" height="object_height" />
+ <line
+ x1="width-(width-width%3)/3-6" y1="(height-height%3)/3+1"
+ x2="(width-width%3)/3" y2="height-(height-height%3)/3-5"
+ color="C_icons_focused_pressed" />
+ <line
+ x1="width-(width-width%3)/3-6" y1="(height-height%3)/3+2"
+ x2="(width-width%3)/3+1" y2="height-(height-height%3)/3-5"
+ color="C_icons_focused_pressed" />
+ <line
+ x1="width-(width-width%3)/3-7" y1="(height-height%3)/3+1"
+ x2="(width-width%3)/3" y2="height-(height-height%3)/3-6"
+ color="C_icons_focused_pressed" />
+ <line
+ x1="(width-width%3)/3+3" y1="(height-height%3)/3+1"
+ x2="width-(width-width%3)/3-3" y2="height-(height-height%3)/3-5"
+ color="C_icons_focused_pressed" />
+ <line
+ x1="(width-width%3)/3+3" y1="(height-height%3)/3+2"
+ x2="width-(width-width%3)/3-4" y2="height-(height-height%3)/3-5"
+ color="C_icons_focused_pressed" />
+ <line
+ x1="(width-width%3)/3+4" y1="(height-height%3)/3+1"
+ x2="width-(width-width%3)/3-3" y2="height-(height-height%3)/3-6"
+ color="C_icons_focused_pressed" />
+ <rectangle
+ x="(width-width%3)/3+3" y="height/2-2"
+ width="width-2*(width-width%3)/3-8" height="6" filled="true"
+ color="C_icons_focused_pressed" />
</draw_ops>
<draw_ops name="shade_unfocused">
- <image filename="shade_unfocused.png" x="0" y="1" width="object_width" height="object_height" />
+ <line
+ x1="width-(width-width%3)/3-6" y1="(height-height%3)/3+1"
+ x2="(width-width%3)/3" y2="height-(height-height%3)/3-5"
+ color="C_icons_unfocused" />
+ <line
+ x1="width-(width-width%3)/3-6" y1="(height-height%3)/3+2"
+ x2="(width-width%3)/3+1" y2="height-(height-height%3)/3-5"
+ color="C_icons_unfocused" />
+ <line
+ x1="width-(width-width%3)/3-7" y1="(height-height%3)/3+1"
+ x2="(width-width%3)/3" y2="height-(height-height%3)/3-6"
+ color="C_icons_unfocused" />
+ <line
+ x1="(width-width%3)/3+3" y1="(height-height%3)/3+1"
+ x2="width-(width-width%3)/3-3" y2="height-(height-height%3)/3-5"
+ color="C_icons_unfocused" />
+ <line
+ x1="(width-width%3)/3+3" y1="(height-height%3)/3+2"
+ x2="width-(width-width%3)/3-4" y2="height-(height-height%3)/3-5"
+ color="C_icons_unfocused" />
+ <line
+ x1="(width-width%3)/3+4" y1="(height-height%3)/3+1"
+ x2="width-(width-width%3)/3-3" y2="height-(height-height%3)/3-6"
+ color="C_icons_unfocused" />
+ <rectangle
+ x="(width-width%3)/3+3" y="height/2-2"
+ width="width-2*(width-width%3)/3-8" height="6" filled="true"
+ color="C_icons_unfocused" />
</draw_ops>
<draw_ops name="shade_unfocused_prelight">
@@ -329,19 +659,127 @@
<!-- unshade icon -->
<draw_ops name="unshade_focused">
- <image filename="unshade_focused_normal.png" x="0" y="1" width="object_width" height="object_height" />
+ <line
+ x1="width-(width-width%3)/3-3" y1="(height-height%3)/3+4"
+ x2="(width-width%3)/3+3" y2="height-(height-height%3)/3-2"
+ color="C_icons_focused" />
+ <line
+ x1="width-(width-width%3)/3-3" y1="(height-height%3)/3+5"
+ x2="(width-width%3)/3+4" y2="height-(height-height%3)/3-2"
+ color="C_icons_focused" />
+ <line
+ x1="width-(width-width%3)/3-4" y1="(height-height%3)/3+4"
+ x2="(width-width%3)/3+3" y2="height-(height-height%3)/3-3"
+ color="C_icons_focused" />
+ <line
+ x1="(width-width%3)/3" y1="(height-height%3)/3+4"
+ x2="width-(width-width%3)/3-6" y2="height-(height-height%3)/3-2"
+ color="C_icons_focused" />
+ <line
+ x1="(width-width%3)/3" y1="(height-height%3)/3+5"
+ x2="width-(width-width%3)/3-7" y2="height-(height-height%3)/3-2"
+ color="C_icons_focused" />
+ <line
+ x1="(width-width%3)/3+1" y1="(height-height%3)/3+4"
+ x2="width-(width-width%3)/3-6" y2="height-(height-height%3)/3-3"
+ color="C_icons_focused" />
+ <rectangle
+ x="(width-width%3)/3+3" y="height/2-4"
+ width="width-2*(width-width%3)/3-8" height="6" filled="true"
+ color="C_icons_focused" />
</draw_ops>
<draw_ops name="unshade_focused_prelight">
- <image filename="unshade_focused_prelight.png" x="0" y="1" width="object_width" height="object_height" />
+ <line
+ x1="width-(width-width%3)/3-3" y1="(height-height%3)/3+4"
+ x2="(width-width%3)/3+3" y2="height-(height-height%3)/3-2"
+ color="C_icons_focused_prelight" />
+ <line
+ x1="width-(width-width%3)/3-3" y1="(height-height%3)/3+5"
+ x2="(width-width%3)/3+4" y2="height-(height-height%3)/3-2"
+ color="C_icons_focused_prelight" />
+ <line
+ x1="width-(width-width%3)/3-4" y1="(height-height%3)/3+4"
+ x2="(width-width%3)/3+3" y2="height-(height-height%3)/3-3"
+ color="C_icons_focused_prelight" />
+ <line
+ x1="(width-width%3)/3" y1="(height-height%3)/3+4"
+ x2="width-(width-width%3)/3-6" y2="height-(height-height%3)/3-2"
+ color="C_icons_focused_prelight" />
+ <line
+ x1="(width-width%3)/3" y1="(height-height%3)/3+5"
+ x2="width-(width-width%3)/3-7" y2="height-(height-height%3)/3-2"
+ color="C_icons_focused_prelight" />
+ <line
+ x1="(width-width%3)/3+1" y1="(height-height%3)/3+4"
+ x2="width-(width-width%3)/3-6" y2="height-(height-height%3)/3-3"
+ color="C_icons_focused_prelight" />
+ <rectangle
+ x="(width-width%3)/3+3" y="height/2-4"
+ width="width-2*(width-width%3)/3-8" height="6" filled="true"
+ color="C_icons_focused_prelight" />
</draw_ops>
<draw_ops name="unshade_focused_pressed">
- <image filename="unshade_focused_pressed.png" x="0" y="1" width="object_width" height="object_height" />
+ <line
+ x1="width-(width-width%3)/3-6" y1="(height-height%3)/3+1"
+ x2="(width-width%3)/3" y2="height-(height-height%3)/3-5"
+ color="C_icons_focused_pressed" />
+ <line
+ x1="width-(width-width%3)/3-6" y1="(height-height%3)/3+2"
+ x2="(width-width%3)/3+1" y2="height-(height-height%3)/3-5"
+ color="C_icons_focused_pressed" />
+ <line
+ x1="width-(width-width%3)/3-7" y1="(height-height%3)/3+1"
+ x2="(width-width%3)/3" y2="height-(height-height%3)/3-6"
+ color="C_icons_focused_pressed" />
+ <line
+ x1="(width-width%3)/3+3" y1="(height-height%3)/3+1"
+ x2="width-(width-width%3)/3-3" y2="height-(height-height%3)/3-5"
+ color="C_icons_focused_pressed" />
+ <line
+ x1="(width-width%3)/3+3" y1="(height-height%3)/3+2"
+ x2="width-(width-width%3)/3-4" y2="height-(height-height%3)/3-5"
+ color="C_icons_focused_pressed" />
+ <line
+ x1="(width-width%3)/3+4" y1="(height-height%3)/3+1"
+ x2="width-(width-width%3)/3-3" y2="height-(height-height%3)/3-6"
+ color="C_icons_focused_pressed" />
+ <rectangle
+ x="(width-width%3)/3+3" y="height/2-2"
+ width="width-2*(width-width%3)/3-8" height="6" filled="true"
+ color="C_icons_focused_pressed" />
</draw_ops>
<draw_ops name="unshade_unfocused">
- <image filename="unshade_unfocused.png" x="0" y="1" width="object_width" height="object_height" />
+ <line
+ x1="width-(width-width%3)/3-3" y1="(height-height%3)/3+4"
+ x2="(width-width%3)/3+3" y2="height-(height-height%3)/3-2"
+ color="C_icons_unfocused" />
+ <line
+ x1="width-(width-width%3)/3-3" y1="(height-height%3)/3+5"
+ x2="(width-width%3)/3+4" y2="height-(height-height%3)/3-2"
+ color="C_icons_unfocused" />
+ <line
+ x1="width-(width-width%3)/3-4" y1="(height-height%3)/3+4"
+ x2="(width-width%3)/3+3" y2="height-(height-height%3)/3-3"
+ color="C_icons_unfocused" />
+ <line
+ x1="(width-width%3)/3" y1="(height-height%3)/3+4"
+ x2="width-(width-width%3)/3-6" y2="height-(height-height%3)/3-2"
+ color="C_icons_unfocused" />
+ <line
+ x1="(width-width%3)/3" y1="(height-height%3)/3+5"
+ x2="width-(width-width%3)/3-7" y2="height-(height-height%3)/3-2"
+ color="C_icons_unfocused" />
+ <line
+ x1="(width-width%3)/3+1" y1="(height-height%3)/3+4"
+ x2="width-(width-width%3)/3-6" y2="height-(height-height%3)/3-3"
+ color="C_icons_unfocused" />
+ <rectangle
+ x="(width-width%3)/3+3" y="height/2-4"
+ width="width-2*(width-width%3)/3-8" height="6" filled="true"
+ color="C_icons_unfocused" />
</draw_ops>
<draw_ops name="unshade_unfocused_prelight">
diff --git a/metacity-1/metacity-theme-3.xml b/metacity-1/metacity-theme-3.xml
index f9e6e6d..3ec1eb3 100644
--- a/metacity-1/metacity-theme-3.xml
+++ b/metacity-1/metacity-theme-3.xml
@@ -4,7 +4,7 @@
<name>Numix</name>
<author>Satyajit Sahoo</author>
<copyright>GPL-3.0+</copyright>
- <date>8 March 2013</date>
+ <date>11 December 2013</date>
<description>Numix Mutter Theme</description>
</info>
@@ -14,6 +14,12 @@
<constant name="C_border_unfocused" value="gtk:custom(wm_border_unfocused,#393939)" />
<constant name="C_title_focused" value="gtk:custom(wm_title_focused,#dcdcdc)" />
<constant name="C_title_unfocused" value="gtk:custom(wm_title_unfocused,#888888)" />
+<constant name="C_icons_focused" value="gtk:custom(wm_icons_focused,#dcdcdc)" />
+<constant name="C_icons_focused_prelight" value="gtk:custom(wm_icons_focused_prelight,gtk:bg[SELECTED])" />
+<constant name="C_icons_focused_pressed" value="gtk:custom(wm_icons_focused_pressed,shade/gtk:bg[SELECTED]/0.8)" />
+<constant name="C_icons_unfocused" value="gtk:custom(wm_icons_unfocused,#888888)" />
+<constant name="C_icons_unfocused_prelight" value="gtk:custom(wm_icons_focused_prelight,gtk:bg[SELECTED])" />
+<constant name="C_icons_unfocused_pressed" value="gtk:custom(wm_icons_focused_pressed,shade/gtk:bg[SELECTED]/0.8)" />
<!-- ::: GEOMETRY ::: -->
<frame_geometry name="normal" title_scale="medium" rounded_top_left="1" rounded_top_right="1">
@@ -180,22 +186,22 @@
<draw_ops name="border_right_unfocused">
<line
- x1="width-1" y1="0"
- x2="width-1" y2="height"
+ x1="width-1" y1="0"
+ x2="width-1" y2="height"
color="C_border_unfocused" />
</draw_ops>
<draw_ops name="border_left_focused">
<line
- x1="0" y1="0"
- x2="0" y2="height"
+ x1="0" y1="0"
+ x2="0" y2="height"
color="C_border_focused" />
</draw_ops>
<draw_ops name="border_left_unfocused">
<line
- x1="0" y1="0"
- x2="0" y2="height"
+ x1="0" y1="0"
+ x2="0" y2="height"
color="C_border_unfocused" />
</draw_ops>
@@ -203,19 +209,111 @@
<!-- note: negative values in x or y causes gnome-shell to crash -->
<!-- close icon -->
<draw_ops name="close_focused">
- <image filename="close_focused_normal.png" x="0" y="1" width="object_width" height="object_height" />
+ <line
+ x1="width-(width-width%3)/3-2" y1="(height-height%3)/3+1"
+ x2="(width-width%3)/3+1" y2="height-(height-height%3)/3-2"
+ color="C_icons_focused" />
+ <line
+ x1="width-(width-width%3)/3-2" y1="(height-height%3)/3+2"
+ x2="(width-width%3)/3+2" y2="height-(height-height%3)/3-2"
+ color="C_icons_focused" />
+ <line
+ x1="width-(width-width%3)/3-3" y1="(height-height%3)/3+1"
+ x2="(width-width%3)/3+1" y2="height-(height-height%3)/3-3"
+ color="C_icons_focused" />
+ <line
+ x1="(width-width%3)/3+1" y1="(height-height%3)/3+1"
+ x2="width-(width-width%3)/3-2" y2="height-(height-height%3)/3-2"
+ color="C_icons_focused" />
+ <line
+ x1="(width-width%3)/3+1" y1="(height-height%3)/3+2"
+ x2="width-(width-width%3)/3-3" y2="height-(height-height%3)/3-2"
+ color="C_icons_focused" />
+ <line
+ x1="(width-width%3)/3+2" y1="(height-height%3)/3+1"
+ x2="width-(width-width%3)/3-2" y2="height-(height-height%3)/3-3"
+ color="C_icons_focused" />
</draw_ops>
<draw_ops name="close_focused_prelight">
- <image filename="close_focused_prelight.png" x="0" y="1" width="object_width" height="object_height" />
+ <line
+ x1="width-(width-width%3)/3-2" y1="(height-height%3)/3+1"
+ x2="(width-width%3)/3+1" y2="height-(height-height%3)/3-2"
+ color="C_icons_focused_prelight" />
+ <line
+ x1="width-(width-width%3)/3-2" y1="(height-height%3)/3+2"
+ x2="(width-width%3)/3+2" y2="height-(height-height%3)/3-2"
+ color="C_icons_focused_prelight" />
+ <line
+ x1="width-(width-width%3)/3-3" y1="(height-height%3)/3+1"
+ x2="(width-width%3)/3+1" y2="height-(height-height%3)/3-3"
+ color="C_icons_focused_prelight" />
+ <line
+ x1="(width-width%3)/3+1" y1="(height-height%3)/3+1"
+ x2="width-(width-width%3)/3-2" y2="height-(height-height%3)/3-2"
+ color="C_icons_focused_prelight" />
+ <line
+ x1="(width-width%3)/3+1" y1="(height-height%3)/3+2"
+ x2="width-(width-width%3)/3-3" y2="height-(height-height%3)/3-2"
+ color="C_icons_focused_prelight" />
+ <line
+ x1="(width-width%3)/3+2" y1="(height-height%3)/3+1"
+ x2="width-(width-width%3)/3-2" y2="height-(height-height%3)/3-3"
+ color="C_icons_focused_prelight" />
</draw_ops>
<draw_ops name="close_focused_pressed">
- <image filename="close_focused_pressed.png" x="0" y="1" width="object_width" height="object_height" />
+ <line
+ x1="width-(width-width%3)/3-2" y1="(height-height%3)/3+1"
+ x2="(width-width%3)/3+1" y2="height-(height-height%3)/3-2"
+ color="C_icons_focused_pressed" />
+ <line
+ x1="width-(width-width%3)/3-2" y1="(height-height%3)/3+2"
+ x2="(width-width%3)/3+2" y2="height-(height-height%3)/3-2"
+ color="C_icons_focused_pressed" />
+ <line
+ x1="width-(width-width%3)/3-3" y1="(height-height%3)/3+1"
+ x2="(width-width%3)/3+1" y2="height-(height-height%3)/3-3"
+ color="C_icons_focused_pressed" />
+ <line
+ x1="(width-width%3)/3+1" y1="(height-height%3)/3+1"
+ x2="width-(width-width%3)/3-2" y2="height-(height-height%3)/3-2"
+ color="C_icons_focused_pressed" />
+ <line
+ x1="(width-width%3)/3+1" y1="(height-height%3)/3+2"
+ x2="width-(width-width%3)/3-3" y2="height-(height-height%3)/3-2"
+ color="C_icons_focused_pressed" />
+ <line
+ x1="(width-width%3)/3+2" y1="(height-height%3)/3+1"
+ x2="width-(width-width%3)/3-2" y2="height-(height-height%3)/3-3"
+ color="C_icons_focused_pressed" />
</draw_ops>
<draw_ops name="close_unfocused">
- <image filename="close_unfocused.png" x="0" y="1" width="object_width" height="object_height" />
+ <line
+ x1="width-(width-width%3)/3-2" y1="(height-height%3)/3+1"
+ x2="(width-width%3)/3+1" y2="height-(height-height%3)/3-2"
+ color="C_icons_unfocused" />
+ <line
+ x1="width-(width-width%3)/3-2" y1="(height-height%3)/3+2"
+ x2="(width-width%3)/3+2" y2="height-(height-height%3)/3-2"
+ color="C_icons_unfocused" />
+ <line
+ x1="width-(width-width%3)/3-3" y1="(height-height%3)/3+1"
+ x2="(width-width%3)/3+1" y2="height-(height-height%3)/3-3"
+ color="C_icons_unfocused" />
+ <line
+ x1="(width-width%3)/3+1" y1="(height-height%3)/3+1"
+ x2="width-(width-width%3)/3-2" y2="height-(height-height%3)/3-2"
+ color="C_icons_unfocused" />
+ <line
+ x1="(width-width%3)/3+1" y1="(height-height%3)/3+2"
+ x2="width-(width-width%3)/3-3" y2="height-(height-height%3)/3-2"
+ color="C_icons_unfocused" />
+ <line
+ x1="(width-width%3)/3+2" y1="(height-height%3)/3+1"
+ x2="width-(width-width%3)/3-2" y2="height-(height-height%3)/3-3"
+ color="C_icons_unfocused" />
</draw_ops>
<draw_ops name="close_unfocused_prelight">
@@ -228,19 +326,47 @@
<!-- maximize icon -->
<draw_ops name="maximize_focused">
- <image filename="maximize_focused_normal.png" x="0" y="1" width="object_width" height="object_height" />
+ <rectangle
+ x="(width-width%3)/3+1" y="(height-height%3)/3+1"
+ width="width-2*(width-width%3)/3-3" height="height-2*(height-height%3)/3-3"
+ color="C_icons_focused" />
+ <rectangle
+ x="(width-width%3)/3+2" y="(height-height%3)/3+2"
+ width="width-2*(width-width%3)/3-5" height="height-2*(height-height%3)/3-5"
+ color="C_icons_focused" />
</draw_ops>
<draw_ops name="maximize_focused_prelight">
- <image filename="maximize_focused_prelight.png" x="0" y="1" width="object_width" height="object_height" />
+ <rectangle
+ x="(width-width%3)/3+1" y="(height-height%3)/3+1"
+ width="width-2*(width-width%3)/3-3" height="height-2*(height-height%3)/3-3"
+ color="C_icons_focused_prelight" />
+ <rectangle
+ x="(width-width%3)/3+2" y="(height-height%3)/3+2"
+ width="width-2*(width-width%3)/3-5" height="height-2*(height-height%3)/3-5"
+ color="C_icons_focused_prelight" />
</draw_ops>
<draw_ops name="maximize_focused_pressed">
- <image filename="maximize_focused_pressed.png" x="0" y="1" width="object_width" height="object_height" />
+ <rectangle
+ x="(width-width%3)/3+1" y="(height-height%3)/3+1"
+ width="width-2*(width-width%3)/3-3" height="height-2*(height-height%3)/3-3"
+ color="C_icons_focused_pressed" />
+ <rectangle
+ x="(width-width%3)/3+2" y="(height-height%3)/3+2"
+ width="width-2*(width-width%3)/3-5" height="height-2*(height-height%3)/3-5"
+ color="C_icons_focused_pressed" />
</draw_ops>
<draw_ops name="maximize_unfocused">
- <image filename="maximize_unfocused.png" x="0" y="1" width="object_width" height="object_height" />
+ <rectangle
+ x="(width-width%3)/3+1" y="(height-height%3)/3+1"
+ width="width-2*(width-width%3)/3-3" height="height-2*(height-height%3)/3-3"
+ color="C_icons_unfocused" />
+ <rectangle
+ x="(width-width%3)/3+2" y="(height-height%3)/3+2"
+ width="width-2*(width-width%3)/3-5" height="height-2*(height-height%3)/3-5"
+ color="C_icons_unfocused" />
</draw_ops>
<draw_ops name="maximize_unfocused_prelight">
@@ -253,19 +379,47 @@
<!-- unmaximize icon -->
<draw_ops name="unmaximize_focused">
- <image filename="unmaximize_focused_normal.png" x="0" y="1" width="object_width" height="object_height" />
+ <rectangle
+ x="(width-width%3)/3+1" y="(height-height%3)/3+1"
+ width="width-2*(width-width%3)/3-3" height="height-2*(height-height%3)/3-3"
+ color="C_icons_focused" />
+ <rectangle
+ x="(width-width%3)/3+2" y="(height-height%3)/3+2"
+ width="width-2*(width-width%3)/3-5" height="height-2*(height-height%3)/3-5"
+ color="C_icons_focused" />
</draw_ops>
<draw_ops name="unmaximize_focused_prelight">
- <image filename="unmaximize_focused_prelight.png" x="0" y="1" width="object_width" height="object_height" />
+ <rectangle
+ x="(width-width%3)/3+1" y="(height-height%3)/3+1"
+ width="width-2*(width-width%3)/3-3" height="height-2*(height-height%3)/3-3"
+ color="C_icons_focused_prelight" />
+ <rectangle
+ x="(width-width%3)/3+2" y="(height-height%3)/3+2"
+ width="width-2*(width-width%3)/3-5" height="height-2*(height-height%3)/3-5"
+ color="C_icons_focused_prelight" />
</draw_ops>
<draw_ops name="unmaximize_focused_pressed">
- <image filename="unmaximize_focused_pressed.png" x="0" y="1" width="object_width" height="object_height" />
+ <rectangle
+ x="(width-width%3)/3+1" y="(height-height%3)/3+1"
+ width="width-2*(width-width%3)/3-3" height="height-2*(height-height%3)/3-3"
+ color="C_icons_focused_pressed" />
+ <rectangle
+ x="(width-width%3)/3+2" y="(height-height%3)/3+2"
+ width="width-2*(width-width%3)/3-5" height="height-2*(height-height%3)/3-5"
+ color="C_icons_focused_pressed" />
</draw_ops>
<draw_ops name="unmaximize_unfocused">
- <image filename="unmaximize_unfocused.png" x="0" y="1" width="object_width" height="object_height" />
+ <rectangle
+ x="(width-width%3)/3+1" y="(height-height%3)/3+1"
+ width="width-2*(width-width%3)/3-3" height="height-2*(height-height%3)/3-3"
+ color="C_icons_unfocused" />
+ <rectangle
+ x="(width-width%3)/3+2" y="(height-height%3)/3+2"
+ width="width-2*(width-width%3)/3-5" height="height-2*(height-height%3)/3-5"
+ color="C_icons_unfocused" />
</draw_ops>
<draw_ops name="unmaximize_unfocused_prelight">
@@ -278,19 +432,31 @@
<!-- minimize icon -->
<draw_ops name="minimize_focused">
- <image filename="minimize_focused_normal.png" x="0" y="1" width="object_width" height="object_height" />
+ <rectangle
+ x="(width-width%3)/3+2" y="height-(height-height%3)/3-5"
+ width="width-2*(width-width%3)/3-2" height="2" filled="true"
+ color="C_icons_focused" />
</draw_ops>
<draw_ops name="minimize_focused_prelight">
- <image filename="minimize_focused_prelight.png" x="0" y="1" width="object_width" height="object_height" />
+ <rectangle
+ x="(width-width%3)/3+2" y="height-(height-height%3)/3-5"
+ width="width-2*(width-width%3)/3-2" height="2" filled="true"
+ color="C_icons_focused_prelight" />
</draw_ops>
<draw_ops name="minimize_focused_pressed">
- <image filename="minimize_focused_pressed.png" x="0" y="1" width="object_width" height="object_height" />
+ <rectangle
+ x="(width-width%3)/3+2" y="height-(height-height%3)/3-5"
+ width="width-2*(width-width%3)/3-2" height="2" filled="true"
+ color="C_icons_focused_pressed" />
</draw_ops>
<draw_ops name="minimize_unfocused">
- <image filename="minimize_unfocused.png" x="0" y="1" width="object_width" height="object_height" />
+ <rectangle
+ x="(width-width%3)/3+2" y="height-(height-height%3)/3-5"
+ width="width-2*(width-width%3)/3-2" height="2" filled="true"
+ color="C_icons_unfocused" />
</draw_ops>
<draw_ops name="minimize_unfocused_prelight">
@@ -302,33 +468,197 @@
</draw_ops>
<!-- menu icon -->
-<draw_ops name="menu_focused"></draw_ops>
+<draw_ops name="menu_focused">
+ <rectangle
+ x="(width-width%3)/3+2" y="(height-height%3)/3+1"
+ width="width-2*(width-width%3)/3-3" height="height-2*(height-height%3)/3-3"
+ color="C_icons_focused" />
+ <rectangle
+ x="(width-width%3)/3+3" y="(height-height%3)/3+2"
+ width="width-2*(width-width%3)/3-5" height="height-2*(height-height%3)/3-5"
+ color="C_icons_focused" />
+ <rectangle
+ x="(width-width%3)/3+5" y="height/2-2"
+ width="width-2*(width-width%3)/3-8" height="2" filled="true"
+ color="C_icons_focused" />
+</draw_ops>
-<draw_ops name="menu_focused_prelight"></draw_ops>
+<draw_ops name="menu_focused_prelight">
+ <rectangle
+ x="(width-width%3)/3+2" y="(height-height%3)/3+1"
+ width="width-2*(width-width%3)/3-3" height="height-2*(height-height%3)/3-3"
+ color="C_icons_focused_prelight" />
+ <rectangle
+ x="(width-width%3)/3+3" y="(height-height%3)/3+2"
+ width="width-2*(width-width%3)/3-5" height="height-2*(height-height%3)/3-5"
+ color="C_icons_focused_prelight" />
+ <rectangle
+ x="(width-width%3)/3+5" y="height/2-2"
+ width="width-2*(width-width%3)/3-8" height="2" filled="true"
+ color="C_icons_focused_prelight" />
+</draw_ops>
-<draw_ops name="menu_focused_pressed"></draw_ops>
+<draw_ops name="menu_focused_pressed">
+ <rectangle
+ x="(width-width%3)/3+2" y="(height-height%3)/3+1"
+ width="width-2*(width-width%3)/3-3" height="height-2*(height-height%3)/3-3"
+ color="C_icons_focused_pressed" />
+ <rectangle
+ x="(width-width%3)/3+3" y="(height-height%3)/3+2"
+ width="width-2*(width-width%3)/3-5" height="height-2*(height-height%3)/3-5"
+ color="C_icons_focused_pressed" />
+ <rectangle
+ x="(width-width%3)/3+5" y="height/2-2"
+ width="width-2*(width-width%3)/3-8" height="2" filled="true"
+ color="C_icons_focused_pressed" />
+</draw_ops>
-<draw_ops name="menu_unfocused"></draw_ops>
+<draw_ops name="menu_unfocused">
+ <rectangle
+ x="(width-width%3)/3+2" y="(height-height%3)/3+1"
+ width="width-2*(width-width%3)/3-3" height="height-2*(height-height%3)/3-3"
+ color="C_icons_unfocused" />
+ <rectangle
+ x="(width-width%3)/3+3" y="(height-height%3)/3+2"
+ width="width-2*(width-width%3)/3-5" height="height-2*(height-height%3)/3-5"
+ color="C_icons_unfocused" />
+ <rectangle
+ x="(width-width%3)/3+5" y="height/2-2"
+ width="width-2*(width-width%3)/3-8" height="2" filled="true"
+ color="C_icons_unfocused" />
+</draw_ops>
-<draw_ops name="menu_unfocused_prelight"></draw_ops>
+<draw_ops name="menu_unfocused_prelight">
+ <include name="menu_focused_prelight" />
+</draw_ops>
-<draw_ops name="menu_unfocused_pressed"></draw_ops>
+<draw_ops name="menu_unfocused_pressed">
+ <include name="menu_focused_pressed" />
+</draw_ops>
<!-- shade icon -->
<draw_ops name="shade_focused">
- <image filename="shade_focused_normal.png" x="0" y="1" width="object_width" height="object_height" />
+ <line
+ x1="width-(width-width%3)/3-6" y1="(height-height%3)/3+1"
+ x2="(width-width%3)/3" y2="height-(height-height%3)/3-5"
+ color="C_icons_focused" />
+ <line
+ x1="width-(width-width%3)/3-6" y1="(height-height%3)/3+2"
+ x2="(width-width%3)/3+1" y2="height-(height-height%3)/3-5"
+ color="C_icons_focused" />
+ <line
+ x1="width-(width-width%3)/3-7" y1="(height-height%3)/3+1"
+ x2="(width-width%3)/3" y2="height-(height-height%3)/3-6"
+ color="C_icons_focused" />
+ <line
+ x1="(width-width%3)/3+3" y1="(height-height%3)/3+1"
+ x2="width-(width-width%3)/3-3" y2="height-(height-height%3)/3-5"
+ color="C_icons_focused" />
+ <line
+ x1="(width-width%3)/3+3" y1="(height-height%3)/3+2"
+ x2="width-(width-width%3)/3-4" y2="height-(height-height%3)/3-5"
+ color="C_icons_focused" />
+ <line
+ x1="(width-width%3)/3+4" y1="(height-height%3)/3+1"
+ x2="width-(width-width%3)/3-3" y2="height-(height-height%3)/3-6"
+ color="C_icons_focused" />
+ <rectangle
+ x="(width-width%3)/3+3" y="height/2-2"
+ width="width-2*(width-width%3)/3-8" height="6" filled="true"
+ color="C_icons_focused" />
</draw_ops>
<draw_ops name="shade_focused_prelight">
- <image filename="shade_focused_prelight.png" x="0" y="1" width="object_width" height="object_height" />
+ <line
+ x1="width-(width-width%3)/3-6" y1="(height-height%3)/3+1"
+ x2="(width-width%3)/3" y2="height-(height-height%3)/3-5"
+ color="C_icons_focused_prelight" />
+ <line
+ x1="width-(width-width%3)/3-6" y1="(height-height%3)/3+2"
+ x2="(width-width%3)/3+1" y2="height-(height-height%3)/3-5"
+ color="C_icons_focused_prelight" />
+ <line
+ x1="width-(width-width%3)/3-7" y1="(height-height%3)/3+1"
+ x2="(width-width%3)/3" y2="height-(height-height%3)/3-6"
+ color="C_icons_focused_prelight" />
+ <line
+ x1="(width-width%3)/3+3" y1="(height-height%3)/3+1"
+ x2="width-(width-width%3)/3-3" y2="height-(height-height%3)/3-5"
+ color="C_icons_focused_prelight" />
+ <line
+ x1="(width-width%3)/3+3" y1="(height-height%3)/3+2"
+ x2="width-(width-width%3)/3-4" y2="height-(height-height%3)/3-5"
+ color="C_icons_focused_prelight" />
+ <line
+ x1="(width-width%3)/3+4" y1="(height-height%3)/3+1"
+ x2="width-(width-width%3)/3-3" y2="height-(height-height%3)/3-6"
+ color="C_icons_focused_prelight" />
+ <rectangle
+ x="(width-width%3)/3+3" y="height/2-2"
+ width="width-2*(width-width%3)/3-8" height="6" filled="true"
+ color="C_icons_focused_prelight" />
</draw_ops>
<draw_ops name="shade_focused_pressed">
- <image filename="shade_focused_pressed.png" x="0" y="1" width="object_width" height="object_height" />
+ <line
+ x1="width-(width-width%3)/3-6" y1="(height-height%3)/3+1"
+ x2="(width-width%3)/3" y2="height-(height-height%3)/3-5"
+ color="C_icons_focused_pressed" />
+ <line
+ x1="width-(width-width%3)/3-6" y1="(height-height%3)/3+2"
+ x2="(width-width%3)/3+1" y2="height-(height-height%3)/3-5"
+ color="C_icons_focused_pressed" />
+ <line
+ x1="width-(width-width%3)/3-7" y1="(height-height%3)/3+1"
+ x2="(width-width%3)/3" y2="height-(height-height%3)/3-6"
+ color="C_icons_focused_pressed" />
+ <line
+ x1="(width-width%3)/3+3" y1="(height-height%3)/3+1"
+ x2="width-(width-width%3)/3-3" y2="height-(height-height%3)/3-5"
+ color="C_icons_focused_pressed" />
+ <line
+ x1="(width-width%3)/3+3" y1="(height-height%3)/3+2"
+ x2="width-(width-width%3)/3-4" y2="height-(height-height%3)/3-5"
+ color="C_icons_focused_pressed" />
+ <line
+ x1="(width-width%3)/3+4" y1="(height-height%3)/3+1"
+ x2="width-(width-width%3)/3-3" y2="height-(height-height%3)/3-6"
+ color="C_icons_focused_pressed" />
+ <rectangle
+ x="(width-width%3)/3+3" y="height/2-2"
+ width="width-2*(width-width%3)/3-8" height="6" filled="true"
+ color="C_icons_focused_pressed" />
</draw_ops>
<draw_ops name="shade_unfocused">
- <image filename="shade_unfocused.png" x="0" y="1" width="object_width" height="object_height" />
+ <line
+ x1="width-(width-width%3)/3-6" y1="(height-height%3)/3+1"
+ x2="(width-width%3)/3" y2="height-(height-height%3)/3-5"
+ color="C_icons_unfocused" />
+ <line
+ x1="width-(width-width%3)/3-6" y1="(height-height%3)/3+2"
+ x2="(width-width%3)/3+1" y2="height-(height-height%3)/3-5"
+ color="C_icons_unfocused" />
+ <line
+ x1="width-(width-width%3)/3-7" y1="(height-height%3)/3+1"
+ x2="(width-width%3)/3" y2="height-(height-height%3)/3-6"
+ color="C_icons_unfocused" />
+ <line
+ x1="(width-width%3)/3+3" y1="(height-height%3)/3+1"
+ x2="width-(width-width%3)/3-3" y2="height-(height-height%3)/3-5"
+ color="C_icons_unfocused" />
+ <line
+ x1="(width-width%3)/3+3" y1="(height-height%3)/3+2"
+ x2="width-(width-width%3)/3-4" y2="height-(height-height%3)/3-5"
+ color="C_icons_unfocused" />
+ <line
+ x1="(width-width%3)/3+4" y1="(height-height%3)/3+1"
+ x2="width-(width-width%3)/3-3" y2="height-(height-height%3)/3-6"
+ color="C_icons_unfocused" />
+ <rectangle
+ x="(width-width%3)/3+3" y="height/2-2"
+ width="width-2*(width-width%3)/3-8" height="6" filled="true"
+ color="C_icons_unfocused" />
</draw_ops>
<draw_ops name="shade_unfocused_prelight">
@@ -341,19 +671,127 @@
<!-- unshade icon -->
<draw_ops name="unshade_focused">
- <image filename="unshade_focused_normal.png" x="0" y="1" width="object_width" height="object_height" />
+ <line
+ x1="width-(width-width%3)/3-3" y1="(height-height%3)/3+4"
+ x2="(width-width%3)/3+3" y2="height-(height-height%3)/3-2"
+ color="C_icons_focused" />
+ <line
+ x1="width-(width-width%3)/3-3" y1="(height-height%3)/3+5"
+ x2="(width-width%3)/3+4" y2="height-(height-height%3)/3-2"
+ color="C_icons_focused" />
+ <line
+ x1="width-(width-width%3)/3-4" y1="(height-height%3)/3+4"
+ x2="(width-width%3)/3+3" y2="height-(height-height%3)/3-3"
+ color="C_icons_focused" />
+ <line
+ x1="(width-width%3)/3" y1="(height-height%3)/3+4"
+ x2="width-(width-width%3)/3-6" y2="height-(height-height%3)/3-2"
+ color="C_icons_focused" />
+ <line
+ x1="(width-width%3)/3" y1="(height-height%3)/3+5"
+ x2="width-(width-width%3)/3-7" y2="height-(height-height%3)/3-2"
+ color="C_icons_focused" />
+ <line
+ x1="(width-width%3)/3+1" y1="(height-height%3)/3+4"
+ x2="width-(width-width%3)/3-6" y2="height-(height-height%3)/3-3"
+ color="C_icons_focused" />
+ <rectangle
+ x="(width-width%3)/3+3" y="height/2-4"
+ width="width-2*(width-width%3)/3-8" height="6" filled="true"
+ color="C_icons_focused" />
</draw_ops>
<draw_ops name="unshade_focused_prelight">
- <image filename="unshade_focused_prelight.png" x="0" y="1" width="object_width" height="object_height" />
+ <line
+ x1="width-(width-width%3)/3-3" y1="(height-height%3)/3+4"
+ x2="(width-width%3)/3+3" y2="height-(height-height%3)/3-2"
+ color="C_icons_focused_prelight" />
+ <line
+ x1="width-(width-width%3)/3-3" y1="(height-height%3)/3+5"
+ x2="(width-width%3)/3+4" y2="height-(height-height%3)/3-2"
+ color="C_icons_focused_prelight" />
+ <line
+ x1="width-(width-width%3)/3-4" y1="(height-height%3)/3+4"
+ x2="(width-width%3)/3+3" y2="height-(height-height%3)/3-3"
+ color="C_icons_focused_prelight" />
+ <line
+ x1="(width-width%3)/3" y1="(height-height%3)/3+4"
+ x2="width-(width-width%3)/3-6" y2="height-(height-height%3)/3-2"
+ color="C_icons_focused_prelight" />
+ <line
+ x1="(width-width%3)/3" y1="(height-height%3)/3+5"
+ x2="width-(width-width%3)/3-7" y2="height-(height-height%3)/3-2"
+ color="C_icons_focused_prelight" />
+ <line
+ x1="(width-width%3)/3+1" y1="(height-height%3)/3+4"
+ x2="width-(width-width%3)/3-6" y2="height-(height-height%3)/3-3"
+ color="C_icons_focused_prelight" />
+ <rectangle
+ x="(width-width%3)/3+3" y="height/2-4"
+ width="width-2*(width-width%3)/3-8" height="6" filled="true"
+ color="C_icons_focused_prelight" />
</draw_ops>
<draw_ops name="unshade_focused_pressed">
- <image filename="unshade_focused_pressed.png" x="0" y="1" width="object_width" height="object_height" />
+ <line
+ x1="width-(width-width%3)/3-6" y1="(height-height%3)/3+1"
+ x2="(width-width%3)/3" y2="height-(height-height%3)/3-5"
+ color="C_icons_focused_pressed" />
+ <line
+ x1="width-(width-width%3)/3-6" y1="(height-height%3)/3+2"
+ x2="(width-width%3)/3+1" y2="height-(height-height%3)/3-5"
+ color="C_icons_focused_pressed" />
+ <line
+ x1="width-(width-width%3)/3-7" y1="(height-height%3)/3+1"
+ x2="(width-width%3)/3" y2="height-(height-height%3)/3-6"
+ color="C_icons_focused_pressed" />
+ <line
+ x1="(width-width%3)/3+3" y1="(height-height%3)/3+1"
+ x2="width-(width-width%3)/3-3" y2="height-(height-height%3)/3-5"
+ color="C_icons_focused_pressed" />
+ <line
+ x1="(width-width%3)/3+3" y1="(height-height%3)/3+2"
+ x2="width-(width-width%3)/3-4" y2="height-(height-height%3)/3-5"
+ color="C_icons_focused_pressed" />
+ <line
+ x1="(width-width%3)/3+4" y1="(height-height%3)/3+1"
+ x2="width-(width-width%3)/3-3" y2="height-(height-height%3)/3-6"
+ color="C_icons_focused_pressed" />
+ <rectangle
+ x="(width-width%3)/3+3" y="height/2-2"
+ width="width-2*(width-width%3)/3-8" height="6" filled="true"
+ color="C_icons_focused_pressed" />
</draw_ops>
<draw_ops name="unshade_unfocused">
- <image filename="unshade_unfocused.png" x="0" y="1" width="object_width" height="object_height" />
+ <line
+ x1="width-(width-width%3)/3-3" y1="(height-height%3)/3+4"
+ x2="(width-width%3)/3+3" y2="height-(height-height%3)/3-2"
+ color="C_icons_unfocused" />
+ <line
+ x1="width-(width-width%3)/3-3" y1="(height-height%3)/3+5"
+ x2="(width-width%3)/3+4" y2="height-(height-height%3)/3-2"
+ color="C_icons_unfocused" />
+ <line
+ x1="width-(width-width%3)/3-4" y1="(height-height%3)/3+4"
+ x2="(width-width%3)/3+3" y2="height-(height-height%3)/3-3"
+ color="C_icons_unfocused" />
+ <line
+ x1="(width-width%3)/3" y1="(height-height%3)/3+4"
+ x2="width-(width-width%3)/3-6" y2="height-(height-height%3)/3-2"
+ color="C_icons_unfocused" />
+ <line
+ x1="(width-width%3)/3" y1="(height-height%3)/3+5"
+ x2="width-(width-width%3)/3-7" y2="height-(height-height%3)/3-2"
+ color="C_icons_unfocused" />
+ <line
+ x1="(width-width%3)/3+1" y1="(height-height%3)/3+4"
+ x2="width-(width-width%3)/3-6" y2="height-(height-height%3)/3-3"
+ color="C_icons_unfocused" />
+ <rectangle
+ x="(width-width%3)/3+3" y="height/2-4"
+ width="width-2*(width-width%3)/3-8" height="6" filled="true"
+ color="C_icons_unfocused" />
</draw_ops>
<draw_ops name="unshade_unfocused_prelight">
diff --git a/metacity-1/minimize_focused_normal.png b/metacity-1/minimize_focused_normal.png
deleted file mode 100644
index 520575e..0000000
Binary files a/metacity-1/minimize_focused_normal.png and /dev/null differ
diff --git a/metacity-1/minimize_focused_prelight.png b/metacity-1/minimize_focused_prelight.png
deleted file mode 100644
index 2e86e18..0000000
Binary files a/metacity-1/minimize_focused_prelight.png and /dev/null differ
diff --git a/metacity-1/minimize_focused_pressed.png b/metacity-1/minimize_focused_pressed.png
deleted file mode 100644
index b7a3aca..0000000
Binary files a/metacity-1/minimize_focused_pressed.png and /dev/null differ
diff --git a/metacity-1/minimize_unfocused.png b/metacity-1/minimize_unfocused.png
deleted file mode 100644
index dbd30d9..0000000
Binary files a/metacity-1/minimize_unfocused.png and /dev/null differ
diff --git a/metacity-1/shade_focused_normal.png b/metacity-1/shade_focused_normal.png
deleted file mode 100644
index 2284463..0000000
Binary files a/metacity-1/shade_focused_normal.png and /dev/null differ
diff --git a/metacity-1/shade_focused_prelight.png b/metacity-1/shade_focused_prelight.png
deleted file mode 100644
index a75800a..0000000
Binary files a/metacity-1/shade_focused_prelight.png and /dev/null differ
diff --git a/metacity-1/shade_focused_pressed.png b/metacity-1/shade_focused_pressed.png
deleted file mode 100644
index d0c1cdd..0000000
Binary files a/metacity-1/shade_focused_pressed.png and /dev/null differ
diff --git a/metacity-1/shade_unfocused.png b/metacity-1/shade_unfocused.png
deleted file mode 100644
index b5c6065..0000000
Binary files a/metacity-1/shade_unfocused.png and /dev/null differ
diff --git a/metacity-1/unmaximize_focused_normal.png b/metacity-1/unmaximize_focused_normal.png
deleted file mode 100644
index 8710cfa..0000000
Binary files a/metacity-1/unmaximize_focused_normal.png and /dev/null differ
diff --git a/metacity-1/unmaximize_focused_prelight.png b/metacity-1/unmaximize_focused_prelight.png
deleted file mode 100644
index f27f67d..0000000
Binary files a/metacity-1/unmaximize_focused_prelight.png and /dev/null differ
diff --git a/metacity-1/unmaximize_focused_pressed.png b/metacity-1/unmaximize_focused_pressed.png
deleted file mode 100644
index a132c2f..0000000
Binary files a/metacity-1/unmaximize_focused_pressed.png and /dev/null differ
diff --git a/metacity-1/unmaximize_unfocused.png b/metacity-1/unmaximize_unfocused.png
deleted file mode 100644
index 26d13b9..0000000
Binary files a/metacity-1/unmaximize_unfocused.png and /dev/null differ
diff --git a/metacity-1/unshade_focused_normal.png b/metacity-1/unshade_focused_normal.png
deleted file mode 100644
index ef9e236..0000000
Binary files a/metacity-1/unshade_focused_normal.png and /dev/null differ
diff --git a/metacity-1/unshade_focused_prelight.png b/metacity-1/unshade_focused_prelight.png
deleted file mode 100644
index 25baf49..0000000
Binary files a/metacity-1/unshade_focused_prelight.png and /dev/null differ
diff --git a/metacity-1/unshade_focused_pressed.png b/metacity-1/unshade_focused_pressed.png
deleted file mode 100644
index d30485f..0000000
Binary files a/metacity-1/unshade_focused_pressed.png and /dev/null differ
diff --git a/metacity-1/unshade_unfocused.png b/metacity-1/unshade_unfocused.png
deleted file mode 100644
index 999c6c5..0000000
Binary files a/metacity-1/unshade_unfocused.png and /dev/null differ
diff --git a/xfce-notify-4.0/gtkrc b/xfce-notify-4.0/gtkrc
new file mode 100644
index 0000000..52a62ca
--- /dev/null
+++ b/xfce-notify-4.0/gtkrc
@@ -0,0 +1,73 @@
+style "notify-window" {
+ XfceNotifyWindow::summary-bold = 1
+ XfceNotifyWindow::border-color = "#2d2d2d"
+ XfceNotifyWindow::border-color-hover = "#333333"
+ XfceNotifyWindow::border-radius = 2.0
+ XfceNotifyWindow::border-width = 1.0
+ XfceNotifyWindow::border-width-hover = 1.0
+
+ bg[NORMAL] = "#111111"
+}
+
+style "notify-button" {
+ bg[NORMAL] = "#2d2d2d"
+ bg[PRELIGHT] = "#333333"
+ bg[ACTIVE] = "#2d2d2d"
+
+ fg[NORMAL] = "#dcdcdc"
+ fg[PRELIGHT] = "#dedede"
+ fg[ACTIVE] = "#dedede"
+
+ engine "murrine" {
+ gradient_shades = { 1.0, 1.0, 1.0, 1.0 }
+ border_shades = { 0.9, 0.9 }
+ roundness = 2
+ textstyle = 0
+ }
+}
+
+style "notify-text" {
+ GtkWidget::link-color = "#d64937"
+
+ fg[NORMAL] = "#f9f9f9"
+ fg[PRELIGHT] = "#f9f9f9"
+ fg[ACTIVE] = "#f9f9f9"
+
+ engine "murrine" {
+ textstyle = 0
+ }
+}
+
+style "notify-summary" {
+ font_name = "Bold"
+}
+
+style "notify-progressbar" {
+ xthickness = 1
+ ythickness = 1
+
+ bg[NORMAL] = "#dcdcdc"
+ bg[ACTIVE] = "#2d2d2d"
+ bg[SELECTED] = "#dedede"
+
+ fg[PRELIGHT] = "#333333"
+ fg[ACTIVE] = "#f9f9f9"
+ fg[SELECTED] = "#333333"
+
+ engine "murrine" {
+ gradient_shades = { 1.0, 1.0, 1.0, 1.0 }
+ border_shades = { 1.0, 1.0 }
+ trough_shades = { 1.0, 1.0 }
+ trough_border_shades = { 1.0, 1.0 }
+ progressbarstyle = 0
+ roundness = 2
+ textstyle = 0
+ }
+}
+
+class "XfceNotifyWindow" style "notify-window"
+widget "XfceNotifyWindow.*.summary" style "notify-summary"
+widget_class "XfceNotifyWindow.*<GtkButton>" style "notify-button"
+widget_class "XfceNotifyWindow.*.<GtkLabel>" style "notify-text"
+widget_class "XfceNotifyWindow.*.<GtkProgress>" style "notify-progressbar"
+widget_class "XfceNotifyWindow.*.<GtkProgressBar>" style "notify-progressbar"
diff --git a/xfwm4/bottom-active.xpm b/xfwm4/bottom-active.xpm
index 8ad96da..773d2df 100644
--- a/xfwm4/bottom-active.xpm
+++ b/xfwm4/bottom-active.xpm
@@ -1,8 +1,6 @@
/* XPM */
static char * bottom_active_xpm[] = {
-"8 2 3 1",
+"8 1 2 1",
" c None",
-". c #2D2D2D",
-"+ c #484848",
-"........",
-"++++++++"};
+". c #484848",
+"........"};
diff --git a/xfwm4/bottom-inactive.xpm b/xfwm4/bottom-inactive.xpm
index 69a8fe3..7c2fda7 100644
--- a/xfwm4/bottom-inactive.xpm
+++ b/xfwm4/bottom-inactive.xpm
@@ -1,8 +1,6 @@
/* XPM */
static char * bottom_inactive_xpm[] = {
-"8 2 3 1",
+"8 1 2 1",
" c None",
-". c #2D2D2D",
-"+ c #393939",
-"........",
-"++++++++"};
+". c #393939",
+"........"};
diff --git a/xfwm4/bottom-left-active.xpm b/xfwm4/bottom-left-active.xpm
index c6ebde9..46fde54 100644
--- a/xfwm4/bottom-left-active.xpm
+++ b/xfwm4/bottom-left-active.xpm
@@ -1,8 +1,6 @@
/* XPM */
static char * bottom_left_active_xpm[] = {
-"2 2 3 1",
+"1 1 2 1",
" c None",
". c #484848",
-"+ c #2D2D2D",
-".+",
-".."};
+"."};
diff --git a/xfwm4/bottom-left-inactive.xpm b/xfwm4/bottom-left-inactive.xpm
index d38cacb..1984979 100644
--- a/xfwm4/bottom-left-inactive.xpm
+++ b/xfwm4/bottom-left-inactive.xpm
@@ -1,8 +1,6 @@
/* XPM */
static char * bottom_left_inactive_xpm[] = {
-"2 2 3 1",
+"1 1 2 1",
" c None",
". c #393939",
-"+ c #2D2D2D",
-".+",
-".."};
+"."};
diff --git a/xfwm4/bottom-right-active.xpm b/xfwm4/bottom-right-active.xpm
index 42eefb1..2ef97a5 100644
--- a/xfwm4/bottom-right-active.xpm
+++ b/xfwm4/bottom-right-active.xpm
@@ -1,8 +1,6 @@
/* XPM */
static char * bottom_right_active_xpm[] = {
-"2 2 3 1",
+"1 1 2 1",
" c None",
-". c #2D2D2D",
-"+ c #484848",
-".+",
-"++"};
+". c #484848",
+"."};
diff --git a/xfwm4/bottom-right-inactive.xpm b/xfwm4/bottom-right-inactive.xpm
index 6c3ab6d..7357440 100644
--- a/xfwm4/bottom-right-inactive.xpm
+++ b/xfwm4/bottom-right-inactive.xpm
@@ -1,8 +1,6 @@
/* XPM */
static char * bottom_right_inactive_xpm[] = {
-"2 2 3 1",
+"1 1 2 1",
" c None",
-". c #2D2D2D",
-"+ c #393939",
-".+",
-"++"};
+". c #393939",
+"."};
diff --git a/xfwm4/close-active.xpm b/xfwm4/close-active.xpm
index 91bfee6..3424b7c 100644
--- a/xfwm4/close-active.xpm
+++ b/xfwm4/close-active.xpm
@@ -1,34 +1,30 @@
/* XPM */
-static char * close_active_xpm[] = {
-"16 16 15 1",
+static char * close_prelight_xpm[] = {
+"24 24 3 1",
" c None",
". c #2D2D2D",
"+ c #DCDCDC",
-"@ c #A4A4A4",
-"# c #3F3F3F",
-"$ c #A6A6A6",
-"% c #D1D1D1",
-"& c #525252",
-"* c #414141",
-"= c #D3D3D3",
-"- c #CECECE",
-"; c #575757",
-"> c #505050",
-", c #A2A2A2",
-"' c #3D3D3D",
-"................",
-"................",
-"................",
-"................",
-"....+@#..#@+....",
-"....$+%&&%+@....",
-"....*=+--+%#....",
-".....;=++-&.....",
-".....;=++-&.....",
-"....*=+--+%#....",
-"....$+->>-+@....",
-"....+,'..',+....",
-"................",
-"................",
-"................",
-"................"};
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........++....++........",
+"........+++..+++........",
+".........++++++.........",
+"..........++++..........",
+"..........++++..........",
+".........++++++.........",
+"........+++..+++........",
+"........++....++........",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................"};
diff --git a/xfwm4/close-inactive.xpm b/xfwm4/close-inactive.xpm
index 0ac3837..9201e50 100644
--- a/xfwm4/close-inactive.xpm
+++ b/xfwm4/close-inactive.xpm
@@ -1,35 +1,30 @@
/* XPM */
-static char * close_inactive_xpm[] = {
-"16 16 16 1",
+static char * close_prelight_xpm[] = {
+"24 24 3 1",
" c None",
". c #2D2D2D",
-"+ c #AAAAAA",
-"@ c #828282",
-"# c #3A3A3A",
-"$ c #848484",
-"% c #A2A2A2",
-"& c #474747",
-"* c #3B3B3B",
-"= c #A4A4A4",
-"- c #A0A0A0",
-"; c #4B4B4B",
-"> c #A1A1A1",
-", c #464646",
-"' c #818181",
-") c #383838",
-"................",
-"................",
-"................",
-"................",
-"....+@#..#@+....",
-"....$+%&&%+@....",
-"....*=+--+%#....",
-".....;=++-&.....",
-".....;=++-&.....",
-"....*=+--+%#....",
-"....$+>,,>+@....",
-"....+')..)'+....",
-"................",
-"................",
-"................",
-"................"};
+"+ c #888888",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........++....++........",
+"........+++..+++........",
+".........++++++.........",
+"..........++++..........",
+"..........++++..........",
+".........++++++.........",
+"........+++..+++........",
+"........++....++........",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................"};
diff --git a/xfwm4/close-prelight.xpm b/xfwm4/close-prelight.xpm
index 250c7f8..e3bd443 100644
--- a/xfwm4/close-prelight.xpm
+++ b/xfwm4/close-prelight.xpm
@@ -1,36 +1,30 @@
/* XPM */
static char * close_prelight_xpm[] = {
-"16 16 17 1",
+"24 24 3 1",
" c None",
". c #2D2D2D",
-"+ c #D64937",
-"@ c #A04034",
-"# c #3F302E",
-"$ c #A34033",
-"% c #CC4736",
-"& c #50322F",
-"* c #40302D",
-"= c #CE4736",
-"- c #C94636",
-"; c #57332F",
-"> c #C84636",
-", c #CA4736",
-"' c #4F332F",
-") c #9E3F33",
-"! c #3C2F2D",
-"................",
-"................",
-"................",
-"................",
-"....+@#..#@+....",
-"....$+%&&%+@....",
-"....*=+--+%#....",
-".....;=++-&.....",
-".....;=++-&.....",
-"....*=+>>+%#....",
-"....$+,'',+@....",
-"....+)!..!)+....",
-"................",
-"................",
-"................",
-"................"};
+"+ c #D64937 s active_color_1",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........++....++........",
+"........+++..+++........",
+".........++++++.........",
+"..........++++..........",
+"..........++++..........",
+".........++++++.........",
+"........+++..+++........",
+"........++....++........",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................"};
diff --git a/xfwm4/close-pressed.png b/xfwm4/close-pressed.png
new file mode 100644
index 0000000..ffbacce
Binary files /dev/null and b/xfwm4/close-pressed.png differ
diff --git a/xfwm4/close-pressed.xpm b/xfwm4/close-pressed.xpm
index f7c47d5..e3bd443 100644
--- a/xfwm4/close-pressed.xpm
+++ b/xfwm4/close-pressed.xpm
@@ -1,36 +1,30 @@
/* XPM */
-static char * close_pressed_xpm[] = {
-"16 16 17 1",
+static char * close_prelight_xpm[] = {
+"24 24 3 1",
" c None",
". c #2D2D2D",
-"+ c #B44335",
-"@ c #893C32",
-"# c #3B2F2E",
-"$ c #8B3D33",
-"% c #AC4233",
-"& c #49312E",
-"* c #3C2F2D",
-"= c #AD4334",
-"- c #A94134",
-"; c #4E322F",
-"> c #A94135",
-", c #AA4134",
-"' c #47312E",
-") c #873B32",
-"! c #392E2D",
-"................",
-"................",
-"................",
-"................",
-"....+@#..#@+....",
-"....$+%&&%+@....",
-"....*=+--+%#....",
-".....;=++-&.....",
-".....;=++-&.....",
-"....*=+>>+%#....",
-"....$+,'',+@....",
-"....+)!..!)+....",
-"................",
-"................",
-"................",
-"................"};
+"+ c #D64937 s active_color_1",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........++....++........",
+"........+++..+++........",
+".........++++++.........",
+"..........++++..........",
+"..........++++..........",
+".........++++++.........",
+"........+++..+++........",
+"........++....++........",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................"};
diff --git a/xfwm4/hide-active.xpm b/xfwm4/hide-active.xpm
index a5f2f53..4a01c16 100644
--- a/xfwm4/hide-active.xpm
+++ b/xfwm4/hide-active.xpm
@@ -1,22 +1,30 @@
/* XPM */
-static char * hide_active_xpm[] = {
-"16 16 3 1",
+static char * hide_prelight_xpm[] = {
+"24 24 3 1",
" c None",
". c #2D2D2D",
"+ c #DCDCDC",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"....++++++++....",
-"....++++++++....",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................"};
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........++++++++........",
+"........++++++++........",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................"};
diff --git a/xfwm4/hide-inactive.xpm b/xfwm4/hide-inactive.xpm
index f8fc850..3da4487 100644
--- a/xfwm4/hide-inactive.xpm
+++ b/xfwm4/hide-inactive.xpm
@@ -1,22 +1,30 @@
/* XPM */
-static char * hide_inactive_xpm[] = {
-"16 16 3 1",
+static char * hide_prelight_xpm[] = {
+"24 24 3 1",
" c None",
". c #2D2D2D",
-"+ c #AAAAAA",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"....++++++++....",
-"....++++++++....",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................"};
+"+ c #888888",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........++++++++........",
+"........++++++++........",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................"};
diff --git a/xfwm4/hide-prelight.xpm b/xfwm4/hide-prelight.xpm
index 00568f4..d2470bf 100644
--- a/xfwm4/hide-prelight.xpm
+++ b/xfwm4/hide-prelight.xpm
@@ -1,22 +1,30 @@
/* XPM */
static char * hide_prelight_xpm[] = {
-"16 16 3 1",
+"24 24 3 1",
" c None",
". c #2D2D2D",
-"+ c #D64937",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"....++++++++....",
-"....++++++++....",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................"};
+"+ c #D64937 s active_color_1",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........++++++++........",
+"........++++++++........",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................"};
diff --git a/xfwm4/hide-pressed.png b/xfwm4/hide-pressed.png
new file mode 100644
index 0000000..4a9dae1
Binary files /dev/null and b/xfwm4/hide-pressed.png differ
diff --git a/xfwm4/hide-pressed.xpm b/xfwm4/hide-pressed.xpm
index b499d8b..d2470bf 100644
--- a/xfwm4/hide-pressed.xpm
+++ b/xfwm4/hide-pressed.xpm
@@ -1,22 +1,30 @@
/* XPM */
-static char * hide_pressed_xpm[] = {
-"16 16 3 1",
+static char * hide_prelight_xpm[] = {
+"24 24 3 1",
" c None",
". c #2D2D2D",
-"+ c #B44335",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"....++++++++....",
-"....++++++++....",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................"};
+"+ c #D64937 s active_color_1",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........++++++++........",
+"........++++++++........",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................"};
diff --git a/xfwm4/left-active.xpm b/xfwm4/left-active.xpm
index 77433da..8dbfed3 100644
--- a/xfwm4/left-active.xpm
+++ b/xfwm4/left-active.xpm
@@ -1,27 +1,26 @@
/* XPM */
static char * left_active_xpm[] = {
-"2 21 3 1",
+"1 21 2 1",
" c None",
". c #484848",
-"+ c #2D2D2D",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+"};
+".",
+".",
+".",
+".",
+".",
+".",
+".",
+".",
+".",
+".",
+".",
+".",
+".",
+".",
+".",
+".",
+".",
+".",
+".",
+".",
+"."};
diff --git a/xfwm4/left-inactive.xpm b/xfwm4/left-inactive.xpm
index 2577ecf..3cd0730 100644
--- a/xfwm4/left-inactive.xpm
+++ b/xfwm4/left-inactive.xpm
@@ -1,27 +1,26 @@
/* XPM */
static char * left_inactive_xpm[] = {
-"2 21 3 1",
+"1 21 2 1",
" c None",
". c #393939",
-"+ c #2D2D2D",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+"};
+".",
+".",
+".",
+".",
+".",
+".",
+".",
+".",
+".",
+".",
+".",
+".",
+".",
+".",
+".",
+".",
+".",
+".",
+".",
+".",
+"."};
diff --git a/xfwm4/maximize-active.xpm b/xfwm4/maximize-active.xpm
index 759799a..ce44a5f 100644
--- a/xfwm4/maximize-active.xpm
+++ b/xfwm4/maximize-active.xpm
@@ -1,22 +1,30 @@
/* XPM */
-static char * maximize_active_xpm[] = {
-"16 16 3 1",
+static char * maximize_prelight_xpm[] = {
+"24 24 3 1",
" c None",
". c #2D2D2D",
"+ c #DCDCDC",
-"................",
-"................",
-"................",
-"................",
-"....++++++++....",
-"....++++++++....",
-"....++....++....",
-"....++....++....",
-"....++....++....",
-"....++....++....",
-"....++++++++....",
-"....++++++++....",
-"................",
-"................",
-"................",
-"................"};
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........++++++++........",
+"........++++++++........",
+"........++....++........",
+"........++....++........",
+"........++....++........",
+"........++....++........",
+"........++++++++........",
+"........++++++++........",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................"};
diff --git a/xfwm4/maximize-inactive.xpm b/xfwm4/maximize-inactive.xpm
index 62a9251..153b4d2 100644
--- a/xfwm4/maximize-inactive.xpm
+++ b/xfwm4/maximize-inactive.xpm
@@ -1,22 +1,30 @@
/* XPM */
-static char * maximize_inactive_xpm[] = {
-"16 16 3 1",
+static char * maximize_prelight_xpm[] = {
+"24 24 3 1",
" c None",
". c #2D2D2D",
-"+ c #AAAAAA",
-"................",
-"................",
-"................",
-"................",
-"....++++++++....",
-"....++++++++....",
-"....++....++....",
-"....++....++....",
-"....++....++....",
-"....++....++....",
-"....++++++++....",
-"....++++++++....",
-"................",
-"................",
-"................",
-"................"};
+"+ c #888888",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........++++++++........",
+"........++++++++........",
+"........++....++........",
+"........++....++........",
+"........++....++........",
+"........++....++........",
+"........++++++++........",
+"........++++++++........",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................"};
diff --git a/xfwm4/maximize-prelight.xpm b/xfwm4/maximize-prelight.xpm
index 203179c..eec4b49 100644
--- a/xfwm4/maximize-prelight.xpm
+++ b/xfwm4/maximize-prelight.xpm
@@ -1,22 +1,30 @@
/* XPM */
static char * maximize_prelight_xpm[] = {
-"16 16 3 1",
+"24 24 3 1",
" c None",
". c #2D2D2D",
-"+ c #D64937",
-"................",
-"................",
-"................",
-"................",
-"....++++++++....",
-"....++++++++....",
-"....++....++....",
-"....++....++....",
-"....++....++....",
-"....++....++....",
-"....++++++++....",
-"....++++++++....",
-"................",
-"................",
-"................",
-"................"};
+"+ c #D64937 s active_color_1",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........++++++++........",
+"........++++++++........",
+"........++....++........",
+"........++....++........",
+"........++....++........",
+"........++....++........",
+"........++++++++........",
+"........++++++++........",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................"};
diff --git a/xfwm4/maximize-pressed.png b/xfwm4/maximize-pressed.png
new file mode 100644
index 0000000..1e460b8
Binary files /dev/null and b/xfwm4/maximize-pressed.png differ
diff --git a/xfwm4/maximize-pressed.xpm b/xfwm4/maximize-pressed.xpm
index 18cdb1b..eec4b49 100644
--- a/xfwm4/maximize-pressed.xpm
+++ b/xfwm4/maximize-pressed.xpm
@@ -1,22 +1,30 @@
/* XPM */
-static char * maximize_pressed_xpm[] = {
-"16 16 3 1",
+static char * maximize_prelight_xpm[] = {
+"24 24 3 1",
" c None",
". c #2D2D2D",
-"+ c #B44335",
-"................",
-"................",
-"................",
-"................",
-"....++++++++....",
-"....++++++++....",
-"....++....++....",
-"....++....++....",
-"....++....++....",
-"....++....++....",
-"....++++++++....",
-"....++++++++....",
-"................",
-"................",
-"................",
-"................"};
+"+ c #D64937 s active_color_1",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........++++++++........",
+"........++++++++........",
+"........++....++........",
+"........++....++........",
+"........++....++........",
+"........++....++........",
+"........++++++++........",
+"........++++++++........",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................"};
diff --git a/xfwm4/maximize-toggled-active.xpm b/xfwm4/maximize-toggled-active.xpm
new file mode 100644
index 0000000..a34f44a
--- /dev/null
+++ b/xfwm4/maximize-toggled-active.xpm
@@ -0,0 +1,30 @@
+/* XPM */
+static char * maximize_toggled_prelight_xpm[] = {
+"24 24 3 1",
+" c None",
+". c #2D2D2D",
+"+ c #DCDCDC",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........++++++++........",
+"........++++++++........",
+"........++....++........",
+"........++....++........",
+"........++....++........",
+"........++....++........",
+"........++++++++........",
+"........++++++++........",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................"};
diff --git a/xfwm4/maximize-toggled-inactive.xpm b/xfwm4/maximize-toggled-inactive.xpm
new file mode 100644
index 0000000..914eed8
--- /dev/null
+++ b/xfwm4/maximize-toggled-inactive.xpm
@@ -0,0 +1,30 @@
+/* XPM */
+static char * maximize_toggled_prelight_xpm[] = {
+"24 24 3 1",
+" c None",
+". c #2D2D2D",
+"+ c #888888",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........++++++++........",
+"........++++++++........",
+"........++....++........",
+"........++....++........",
+"........++....++........",
+"........++....++........",
+"........++++++++........",
+"........++++++++........",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................"};
diff --git a/xfwm4/maximize-toggled-prelight.xpm b/xfwm4/maximize-toggled-prelight.xpm
new file mode 100644
index 0000000..2dda206
--- /dev/null
+++ b/xfwm4/maximize-toggled-prelight.xpm
@@ -0,0 +1,30 @@
+/* XPM */
+static char * maximize_toggled_prelight_xpm[] = {
+"24 24 3 1",
+" c None",
+". c #2D2D2D",
+"+ c #D64937 s active_color_1",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........++++++++........",
+"........++++++++........",
+"........++....++........",
+"........++....++........",
+"........++....++........",
+"........++....++........",
+"........++++++++........",
+"........++++++++........",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................"};
diff --git a/xfwm4/maximize-toggled-pressed.png b/xfwm4/maximize-toggled-pressed.png
new file mode 100644
index 0000000..1e460b8
Binary files /dev/null and b/xfwm4/maximize-toggled-pressed.png differ
diff --git a/xfwm4/maximize-toggled-pressed.xpm b/xfwm4/maximize-toggled-pressed.xpm
new file mode 100644
index 0000000..2dda206
--- /dev/null
+++ b/xfwm4/maximize-toggled-pressed.xpm
@@ -0,0 +1,30 @@
+/* XPM */
+static char * maximize_toggled_prelight_xpm[] = {
+"24 24 3 1",
+" c None",
+". c #2D2D2D",
+"+ c #D64937 s active_color_1",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........++++++++........",
+"........++++++++........",
+"........++....++........",
+"........++....++........",
+"........++....++........",
+"........++....++........",
+"........++++++++........",
+"........++++++++........",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................"};
diff --git a/xfwm4/menu-active.xpm b/xfwm4/menu-active.xpm
index 093c993..3ec59e2 100644
--- a/xfwm4/menu-active.xpm
+++ b/xfwm4/menu-active.xpm
@@ -1,21 +1,21 @@
/* XPM */
static char * menu_active_xpm[] = {
-"16 16 2 1",
+"24 16 2 1",
" c None",
". c #2D2D2D",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................"};
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................"};
diff --git a/xfwm4/menu-inactive.xpm b/xfwm4/menu-inactive.xpm
index 21812b4..bd7c7e4 100644
--- a/xfwm4/menu-inactive.xpm
+++ b/xfwm4/menu-inactive.xpm
@@ -1,21 +1,21 @@
/* XPM */
static char * menu_inactive_xpm[] = {
-"16 16 2 1",
+"24 16 2 1",
" c None",
". c #2D2D2D",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................"};
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................"};
diff --git a/xfwm4/menu-prelight.xpm b/xfwm4/menu-prelight.xpm
index 576b305..958dbb6 100644
--- a/xfwm4/menu-prelight.xpm
+++ b/xfwm4/menu-prelight.xpm
@@ -1,21 +1,29 @@
/* XPM */
static char * menu_prelight_xpm[] = {
-"16 16 2 1",
+"24 24 2 1",
" c None",
". c #2D2D2D",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................"};
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................"};
diff --git a/xfwm4/menu-pressed.xpm b/xfwm4/menu-pressed.xpm
index b13fc79..d546a2c 100644
--- a/xfwm4/menu-pressed.xpm
+++ b/xfwm4/menu-pressed.xpm
@@ -1,21 +1,29 @@
/* XPM */
static char * menu_pressed_xpm[] = {
-"16 16 2 1",
+"24 24 2 1",
" c None",
". c #2D2D2D",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................"};
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................"};
diff --git a/xfwm4/right-active.xpm b/xfwm4/right-active.xpm
index d299d16..24cddd0 100644
--- a/xfwm4/right-active.xpm
+++ b/xfwm4/right-active.xpm
@@ -1,27 +1,26 @@
/* XPM */
static char * right_active_xpm[] = {
-"2 21 3 1",
+"1 21 2 1",
" c None",
-". c #2D2D2D",
-"+ c #484848",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+"};
+". c #484848",
+".",
+".",
+".",
+".",
+".",
+".",
+".",
+".",
+".",
+".",
+".",
+".",
+".",
+".",
+".",
+".",
+".",
+".",
+".",
+".",
+"."};
diff --git a/xfwm4/right-inactive.xpm b/xfwm4/right-inactive.xpm
index 239d0d5..5c180a1 100644
--- a/xfwm4/right-inactive.xpm
+++ b/xfwm4/right-inactive.xpm
@@ -1,27 +1,26 @@
/* XPM */
static char * right_inactive_xpm[] = {
-"2 21 3 1",
+"1 21 2 1",
" c None",
-". c #2D2D2D",
-"+ c #393939",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+"};
+". c #393939",
+".",
+".",
+".",
+".",
+".",
+".",
+".",
+".",
+".",
+".",
+".",
+".",
+".",
+".",
+".",
+".",
+".",
+".",
+".",
+".",
+"."};
diff --git a/xfwm4/shade-active.xpm b/xfwm4/shade-active.xpm
index f533efd..4dac8e8 100644
--- a/xfwm4/shade-active.xpm
+++ b/xfwm4/shade-active.xpm
@@ -1,22 +1,30 @@
/* XPM */
-static char * shade_active_xpm[] = {
-"16 16 3 1",
+static char * shade_prelight_xpm[] = {
+"24 24 3 1",
" c None",
". c #2D2D2D",
-"+ c #DBDBDB",
-"................",
-"................",
-"................",
-"................",
-".......++.......",
-"......++++......",
-".....++++++.....",
-"....++++++++....",
-"...+++.++.+++...",
-".......++.......",
-".......++.......",
-".......++.......",
-"................",
-"................",
-"................",
-"................"};
+"+ c #DCDCDC",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"...........++...........",
+"..........++++..........",
+".........++++++.........",
+"........++++++++........",
+".......+++.++.+++.......",
+"...........++...........",
+"...........++...........",
+"...........++...........",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................"};
diff --git a/xfwm4/shade-inactive.xpm b/xfwm4/shade-inactive.xpm
index ed6b2af..9751094 100644
--- a/xfwm4/shade-inactive.xpm
+++ b/xfwm4/shade-inactive.xpm
@@ -1,22 +1,30 @@
/* XPM */
-static char * shade_inactive_xpm[] = {
-"16 16 3 1",
+static char * shade_prelight_xpm[] = {
+"24 24 3 1",
" c None",
". c #2D2D2D",
-"+ c #AAAAAA",
-"................",
-"................",
-"................",
-"................",
-".......++.......",
-"......++++......",
-".....++++++.....",
-"....++++++++....",
-"...+++.++.+++...",
-".......++.......",
-".......++.......",
-".......++.......",
-"................",
-"................",
-"................",
-"................"};
+"+ c #888888",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"...........++...........",
+"..........++++..........",
+".........++++++.........",
+"........++++++++........",
+".......+++.++.+++.......",
+"...........++...........",
+"...........++...........",
+"...........++...........",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................"};
diff --git a/xfwm4/shade-prelight.xpm b/xfwm4/shade-prelight.xpm
index f7226bd..4aa3b7a 100644
--- a/xfwm4/shade-prelight.xpm
+++ b/xfwm4/shade-prelight.xpm
@@ -1,22 +1,30 @@
/* XPM */
static char * shade_prelight_xpm[] = {
-"16 16 3 1",
+"24 24 3 1",
" c None",
". c #2D2D2D",
-"+ c #D64937",
-"................",
-"................",
-"................",
-"................",
-".......++.......",
-"......++++......",
-".....++++++.....",
-"....++++++++....",
-"...+++.++.+++...",
-".......++.......",
-".......++.......",
-".......++.......",
-"................",
-"................",
-"................",
-"................"};
+"+ c #D64937 s active_color_1",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"...........++...........",
+"..........++++..........",
+".........++++++.........",
+"........++++++++........",
+".......+++.++.+++.......",
+"...........++...........",
+"...........++...........",
+"...........++...........",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................"};
diff --git a/xfwm4/shade-pressed.png b/xfwm4/shade-pressed.png
new file mode 100644
index 0000000..229c0b5
Binary files /dev/null and b/xfwm4/shade-pressed.png differ
diff --git a/xfwm4/shade-pressed.xpm b/xfwm4/shade-pressed.xpm
index 4dceebd..4aa3b7a 100644
--- a/xfwm4/shade-pressed.xpm
+++ b/xfwm4/shade-pressed.xpm
@@ -1,22 +1,30 @@
/* XPM */
-static char * shade_pressed_xpm[] = {
-"16 16 3 1",
+static char * shade_prelight_xpm[] = {
+"24 24 3 1",
" c None",
". c #2D2D2D",
-"+ c #B44335",
-"................",
-"................",
-"................",
-"................",
-".......++.......",
-"......++++......",
-".....++++++.....",
-"....++++++++....",
-"...+++.++.+++...",
-".......++.......",
-".......++.......",
-".......++.......",
-"................",
-"................",
-"................",
-"................"};
+"+ c #D64937 s active_color_1",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"...........++...........",
+"..........++++..........",
+".........++++++.........",
+"........++++++++........",
+".......+++.++.+++.......",
+"...........++...........",
+"...........++...........",
+"...........++...........",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................"};
diff --git a/xfwm4/shade-toggled-active.xpm b/xfwm4/shade-toggled-active.xpm
index 5986f3d..1421f70 100644
--- a/xfwm4/shade-toggled-active.xpm
+++ b/xfwm4/shade-toggled-active.xpm
@@ -1,22 +1,30 @@
/* XPM */
-static char * shade_toggled_active_xpm[] = {
-"16 16 3 1",
+static char * shade_toggled_prelight_xpm[] = {
+"24 24 3 1",
" c None",
". c #2D2D2D",
-"+ c #DBDBDB",
-"................",
-"................",
-"................",
-"................",
-".......++.......",
-".......++.......",
-".......++.......",
-"...+++.++.+++...",
-"....++++++++....",
-".....++++++.....",
-"......++++......",
-".......++.......",
-"................",
-"................",
-"................",
-"................"};
+"+ c #DCDCDC",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"...........++...........",
+"...........++...........",
+"...........++...........",
+".......+++.++.+++.......",
+"........++++++++........",
+".........++++++.........",
+"..........++++..........",
+"...........++...........",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................"};
diff --git a/xfwm4/shade-toggled-inactive.xpm b/xfwm4/shade-toggled-inactive.xpm
index 89587d0..1e3e4bf 100644
--- a/xfwm4/shade-toggled-inactive.xpm
+++ b/xfwm4/shade-toggled-inactive.xpm
@@ -1,22 +1,30 @@
/* XPM */
-static char * shade_toggled_inactive_xpm[] = {
-"16 16 3 1",
+static char * shade_toggled_prelight_xpm[] = {
+"24 24 3 1",
" c None",
". c #2D2D2D",
-"+ c #AAAAAA",
-"................",
-"................",
-"................",
-"................",
-".......++.......",
-".......++.......",
-".......++.......",
-"...+++.++.+++...",
-"....++++++++....",
-".....++++++.....",
-"......++++......",
-".......++.......",
-"................",
-"................",
-"................",
-"................"};
+"+ c #888888",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"...........++...........",
+"...........++...........",
+"...........++...........",
+".......+++.++.+++.......",
+"........++++++++........",
+".........++++++.........",
+"..........++++..........",
+"...........++...........",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................"};
diff --git a/xfwm4/shade-toggled-prelight.xpm b/xfwm4/shade-toggled-prelight.xpm
index 30a6db5..e3109e5 100644
--- a/xfwm4/shade-toggled-prelight.xpm
+++ b/xfwm4/shade-toggled-prelight.xpm
@@ -1,22 +1,30 @@
/* XPM */
static char * shade_toggled_prelight_xpm[] = {
-"16 16 3 1",
+"24 24 3 1",
" c None",
". c #2D2D2D",
-"+ c #D64937",
-"................",
-"................",
-"................",
-"................",
-".......++.......",
-".......++.......",
-".......++.......",
-"...+++.++.+++...",
-"....++++++++....",
-".....++++++.....",
-"......++++......",
-".......++.......",
-"................",
-"................",
-"................",
-"................"};
+"+ c #D64937 s active_color_1",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"...........++...........",
+"...........++...........",
+"...........++...........",
+".......+++.++.+++.......",
+"........++++++++........",
+".........++++++.........",
+"..........++++..........",
+"...........++...........",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................"};
diff --git a/xfwm4/shade-toggled-pressed.png b/xfwm4/shade-toggled-pressed.png
new file mode 100644
index 0000000..ab3080a
Binary files /dev/null and b/xfwm4/shade-toggled-pressed.png differ
diff --git a/xfwm4/shade-toggled-pressed.xpm b/xfwm4/shade-toggled-pressed.xpm
index a444c27..e3109e5 100644
--- a/xfwm4/shade-toggled-pressed.xpm
+++ b/xfwm4/shade-toggled-pressed.xpm
@@ -1,22 +1,30 @@
/* XPM */
-static char * shade_toggled_pressed_xpm[] = {
-"16 16 3 1",
+static char * shade_toggled_prelight_xpm[] = {
+"24 24 3 1",
" c None",
". c #2D2D2D",
-"+ c #B44335",
-"................",
-"................",
-"................",
-"................",
-".......++.......",
-".......++.......",
-".......++.......",
-"...+++.++.+++...",
-"....++++++++....",
-".....++++++.....",
-"......++++......",
-".......++.......",
-"................",
-"................",
-"................",
-"................"};
+"+ c #D64937 s active_color_1",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"...........++...........",
+"...........++...........",
+"...........++...........",
+".......+++.++.+++.......",
+"........++++++++........",
+".........++++++.........",
+"..........++++..........",
+"...........++...........",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................"};
diff --git a/xfwm4/stick-active.xpm b/xfwm4/stick-active.xpm
new file mode 100644
index 0000000..c8610f8
--- /dev/null
+++ b/xfwm4/stick-active.xpm
@@ -0,0 +1,30 @@
+/* XPM */
+static char * stick_active_xpm[] = {
+"24 24 3 1",
+" c None",
+". c #2D2D2D",
+"+ c #DCDCDC",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"...........++...........",
+".........++++++.........",
+".........++..++.........",
+"........++....++........",
+"........++....++........",
+".........++..++.........",
+".........++++++.........",
+"...........++...........",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................"};
diff --git a/xfwm4/stick-inactive.xpm b/xfwm4/stick-inactive.xpm
new file mode 100644
index 0000000..d4cc7fe
--- /dev/null
+++ b/xfwm4/stick-inactive.xpm
@@ -0,0 +1,30 @@
+/* XPM */
+static char * stick_toggled_prelight_xpm[] = {
+"24 24 3 1",
+" c None",
+". c #2D2D2D",
+"+ c #888888",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"...........++...........",
+".........++++++.........",
+".........++..++.........",
+"........++....++........",
+"........++....++........",
+".........++..++.........",
+".........++++++.........",
+"...........++...........",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................"};
diff --git a/xfwm4/stick-prelight.xpm b/xfwm4/stick-prelight.xpm
new file mode 100644
index 0000000..725c314
--- /dev/null
+++ b/xfwm4/stick-prelight.xpm
@@ -0,0 +1,30 @@
+/* XPM */
+static char * stick_toggled_prelight_xpm[] = {
+"24 24 3 1",
+" c None",
+". c #2D2D2D",
+"+ c #D64937 s active_color_1",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"...........++...........",
+".........++++++.........",
+".........++..++.........",
+"........++....++........",
+"........++....++........",
+".........++..++.........",
+".........++++++.........",
+"...........++...........",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................"};
diff --git a/xfwm4/stick-pressed.png b/xfwm4/stick-pressed.png
new file mode 100644
index 0000000..55f79b5
Binary files /dev/null and b/xfwm4/stick-pressed.png differ
diff --git a/xfwm4/stick-pressed.xpm b/xfwm4/stick-pressed.xpm
new file mode 100644
index 0000000..725c314
--- /dev/null
+++ b/xfwm4/stick-pressed.xpm
@@ -0,0 +1,30 @@
+/* XPM */
+static char * stick_toggled_prelight_xpm[] = {
+"24 24 3 1",
+" c None",
+". c #2D2D2D",
+"+ c #D64937 s active_color_1",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"...........++...........",
+".........++++++.........",
+".........++..++.........",
+"........++....++........",
+"........++....++........",
+".........++..++.........",
+".........++++++.........",
+"...........++...........",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................"};
diff --git a/xfwm4/stick-toggled-active.xpm b/xfwm4/stick-toggled-active.xpm
new file mode 100644
index 0000000..25de32c
--- /dev/null
+++ b/xfwm4/stick-toggled-active.xpm
@@ -0,0 +1,30 @@
+/* XPM */
+static char * stick_toggled_active_xpm[] = {
+"24 24 3 1",
+" c None",
+". c #2D2D2D",
+"+ c #DCDCDC",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"...........++...........",
+".........++++++.........",
+".........++++++.........",
+"........++++++++........",
+"........++++++++........",
+".........++++++.........",
+".........++++++.........",
+"...........++...........",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................"};
diff --git a/xfwm4/stick-toggled-inactive.xpm b/xfwm4/stick-toggled-inactive.xpm
new file mode 100644
index 0000000..c33b36e
--- /dev/null
+++ b/xfwm4/stick-toggled-inactive.xpm
@@ -0,0 +1,30 @@
+/* XPM */
+static char * stick_toggled_prelight_xpm[] = {
+"24 24 3 1",
+" c None",
+". c #2D2D2D",
+"+ c #888888",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"...........++...........",
+".........++++++.........",
+".........++++++.........",
+"........++++++++........",
+"........++++++++........",
+".........++++++.........",
+".........++++++.........",
+"...........++...........",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................"};
diff --git a/xfwm4/stick-toggled-prelight.xpm b/xfwm4/stick-toggled-prelight.xpm
new file mode 100644
index 0000000..d56f353
--- /dev/null
+++ b/xfwm4/stick-toggled-prelight.xpm
@@ -0,0 +1,30 @@
+/* XPM */
+static char * stick_toggled_prelight_xpm[] = {
+"24 24 3 1",
+" c None",
+". c #2D2D2D",
+"+ c #D64937 s active_color_1",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"...........++...........",
+".........++++++.........",
+".........++++++.........",
+"........++++++++........",
+"........++++++++........",
+".........++++++.........",
+".........++++++.........",
+"...........++...........",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................"};
diff --git a/xfwm4/stick-toggled-pressed.png b/xfwm4/stick-toggled-pressed.png
new file mode 100644
index 0000000..f9f08be
Binary files /dev/null and b/xfwm4/stick-toggled-pressed.png differ
diff --git a/xfwm4/stick-toggled-pressed.xpm b/xfwm4/stick-toggled-pressed.xpm
new file mode 100644
index 0000000..d56f353
--- /dev/null
+++ b/xfwm4/stick-toggled-pressed.xpm
@@ -0,0 +1,30 @@
+/* XPM */
+static char * stick_toggled_prelight_xpm[] = {
+"24 24 3 1",
+" c None",
+". c #2D2D2D",
+"+ c #D64937 s active_color_1",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"...........++...........",
+".........++++++.........",
+".........++++++.........",
+"........++++++++........",
+"........++++++++........",
+".........++++++.........",
+".........++++++.........",
+"...........++...........",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................"};
diff --git a/xfwm4/themerc b/xfwm4/themerc
index 0bbcd94..e345ddd 100644
--- a/xfwm4/themerc
+++ b/xfwm4/themerc
@@ -4,12 +4,12 @@
active_text_color=#dcdcdc
inactive_text_color=#888888
-button_offset=6
-button_spacing=6
+button_offset=3
+button_spacing=0
show_app_icon=true
full_width_title=true
-maximized_offset=6
-title_horizontal_offset=6
+maximized_offset=0
+title_horizontal_offset=3
title_shadow_active=false
title_shadow_inactive=false
title_vertical_offset_active=0
diff --git a/xfwm4/title-1-active.xpm b/xfwm4/title-1-active.xpm
index c6327b7..0dbc3ab 100644
--- a/xfwm4/title-1-active.xpm
+++ b/xfwm4/title-1-active.xpm
@@ -1,6 +1,6 @@
/* XPM */
static char * title_1_active_xpm[] = {
-"2 25 3 1",
+"2 26 3 1",
" c None",
". c #484848",
"+ c #2D2D2D",
@@ -28,4 +28,5 @@ static char * title_1_active_xpm[] = {
"++",
"++",
"++",
+"++",
"++"};
diff --git a/xfwm4/title-1-inactive.xpm b/xfwm4/title-1-inactive.xpm
index 8dd5b2e..e8a927a 100644
--- a/xfwm4/title-1-inactive.xpm
+++ b/xfwm4/title-1-inactive.xpm
@@ -1,6 +1,6 @@
/* XPM */
static char * title_1_inactive_xpm[] = {
-"2 25 3 1",
+"2 26 3 1",
" c None",
". c #393939",
"+ c #2D2D2D",
@@ -28,4 +28,5 @@ static char * title_1_inactive_xpm[] = {
"++",
"++",
"++",
+"++",
"++"};
diff --git a/xfwm4/title-2-active.xpm b/xfwm4/title-2-active.xpm
index 2c8b5fb..4c7fd81 100644
--- a/xfwm4/title-2-active.xpm
+++ b/xfwm4/title-2-active.xpm
@@ -1,6 +1,6 @@
/* XPM */
static char * title_2_active_xpm[] = {
-"2 25 3 1",
+"2 26 3 1",
" c None",
". c #484848",
"+ c #2D2D2D",
@@ -28,4 +28,5 @@ static char * title_2_active_xpm[] = {
"++",
"++",
"++",
+"++",
"++"};
diff --git a/xfwm4/title-2-inactive.xpm b/xfwm4/title-2-inactive.xpm
index cf5c533..9a165cc 100644
--- a/xfwm4/title-2-inactive.xpm
+++ b/xfwm4/title-2-inactive.xpm
@@ -1,6 +1,6 @@
/* XPM */
static char * title_2_inactive_xpm[] = {
-"2 25 3 1",
+"2 26 3 1",
" c None",
". c #393939",
"+ c #2D2D2D",
@@ -28,4 +28,5 @@ static char * title_2_inactive_xpm[] = {
"++",
"++",
"++",
+"++",
"++"};
diff --git a/xfwm4/title-3-active.xpm b/xfwm4/title-3-active.xpm
index 3864cac..372d7af 100644
--- a/xfwm4/title-3-active.xpm
+++ b/xfwm4/title-3-active.xpm
@@ -1,6 +1,6 @@
/* XPM */
static char * title_3_active_xpm[] = {
-"2 25 3 1",
+"2 26 3 1",
" c None",
". c #484848",
"+ c #2D2D2D",
@@ -28,4 +28,5 @@ static char * title_3_active_xpm[] = {
"++",
"++",
"++",
+"++",
"++"};
diff --git a/xfwm4/title-3-inactive.xpm b/xfwm4/title-3-inactive.xpm
index 2b97787..81157b1 100644
--- a/xfwm4/title-3-inactive.xpm
+++ b/xfwm4/title-3-inactive.xpm
@@ -1,6 +1,6 @@
/* XPM */
static char * title_3_inactive_xpm[] = {
-"2 25 3 1",
+"2 26 3 1",
" c None",
". c #393939",
"+ c #2D2D2D",
@@ -28,4 +28,5 @@ static char * title_3_inactive_xpm[] = {
"++",
"++",
"++",
+"++",
"++"};
diff --git a/xfwm4/title-4-active.xpm b/xfwm4/title-4-active.xpm
index 10f1bcc..85aa732 100644
--- a/xfwm4/title-4-active.xpm
+++ b/xfwm4/title-4-active.xpm
@@ -1,6 +1,6 @@
/* XPM */
static char * title_4_active_xpm[] = {
-"2 25 3 1",
+"2 26 3 1",
" c None",
". c #484848",
"+ c #2D2D2D",
@@ -28,4 +28,5 @@ static char * title_4_active_xpm[] = {
"++",
"++",
"++",
+"++",
"++"};
diff --git a/xfwm4/title-4-inactive.xpm b/xfwm4/title-4-inactive.xpm
index 95cc0e6..cd1e555 100644
--- a/xfwm4/title-4-inactive.xpm
+++ b/xfwm4/title-4-inactive.xpm
@@ -1,6 +1,6 @@
/* XPM */
static char * title_4_inactive_xpm[] = {
-"2 25 3 1",
+"2 26 3 1",
" c None",
". c #393939",
"+ c #2D2D2D",
@@ -28,4 +28,5 @@ static char * title_4_inactive_xpm[] = {
"++",
"++",
"++",
+"++",
"++"};
diff --git a/xfwm4/title-5-active.xpm b/xfwm4/title-5-active.xpm
index 1d4c0f8..c88372c 100644
--- a/xfwm4/title-5-active.xpm
+++ b/xfwm4/title-5-active.xpm
@@ -1,6 +1,6 @@
/* XPM */
static char * title_5_active_xpm[] = {
-"2 25 3 1",
+"2 26 3 1",
" c None",
". c #484848",
"+ c #2D2D2D",
@@ -28,4 +28,5 @@ static char * title_5_active_xpm[] = {
"++",
"++",
"++",
+"++",
"++"};
diff --git a/xfwm4/title-5-inactive.xpm b/xfwm4/title-5-inactive.xpm
index 98158f1..e1385ff 100644
--- a/xfwm4/title-5-inactive.xpm
+++ b/xfwm4/title-5-inactive.xpm
@@ -1,6 +1,6 @@
/* XPM */
static char * title_5_inactive_xpm[] = {
-"2 25 3 1",
+"2 26 3 1",
" c None",
". c #393939",
"+ c #2D2D2D",
@@ -28,4 +28,5 @@ static char * title_5_inactive_xpm[] = {
"++",
"++",
"++",
+"++",
"++"};
diff --git a/xfwm4/top-left-active.xpm b/xfwm4/top-left-active.xpm
index 2d98285..4dc55d6 100644
--- a/xfwm4/top-left-active.xpm
+++ b/xfwm4/top-left-active.xpm
@@ -1,31 +1,33 @@
/* XPM */
static char * top_left_active_xpm[] = {
-"2 25 3 1",
+"2 26 4 1",
" c None",
". c #484848",
-"+ c #2D2D2D",
+"+ c #343434",
+"@ c #2D2D2D",
" .",
".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+"};
+".@",
+".@",
+".@",
+".@",
+".@",
+".@",
+".@",
+".@",
+".@",
+".@",
+".@",
+".@",
+".@",
+".@",
+".@",
+".@",
+".@",
+".@",
+".@",
+".@",
+".@",
+".@",
+".@",
+".@"};
diff --git a/xfwm4/top-left-inactive.xpm b/xfwm4/top-left-inactive.xpm
index a4cfd1c..834acf1 100644
--- a/xfwm4/top-left-inactive.xpm
+++ b/xfwm4/top-left-inactive.xpm
@@ -1,31 +1,33 @@
/* XPM */
static char * top_left_inactive_xpm[] = {
-"2 25 3 1",
+"2 26 4 1",
" c None",
". c #393939",
-"+ c #2D2D2D",
+"+ c #303030",
+"@ c #2D2D2D",
" .",
".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+",
-".+"};
+".@",
+".@",
+".@",
+".@",
+".@",
+".@",
+".@",
+".@",
+".@",
+".@",
+".@",
+".@",
+".@",
+".@",
+".@",
+".@",
+".@",
+".@",
+".@",
+".@",
+".@",
+".@",
+".@",
+".@"};
diff --git a/xfwm4/top-right-active.xpm b/xfwm4/top-right-active.xpm
index 071710e..9558840 100644
--- a/xfwm4/top-right-active.xpm
+++ b/xfwm4/top-right-active.xpm
@@ -1,31 +1,33 @@
/* XPM */
static char * top_right_active_xpm[] = {
-"2 25 3 1",
+"2 26 4 1",
" c None",
". c #484848",
-"+ c #2D2D2D",
+"+ c #343434",
+"@ c #2D2D2D",
". ",
"+.",
-"+.",
-"+.",
-"+.",
-"+.",
-"+.",
-"+.",
-"+.",
-"+.",
-"+.",
-"+.",
-"+.",
-"+.",
-"+.",
-"+.",
-"+.",
-"+.",
-"+.",
-"+.",
-"+.",
-"+.",
-"+.",
-"+.",
-"+."};
+"@.",
+"@.",
+"@.",
+"@.",
+"@.",
+"@.",
+"@.",
+"@.",
+"@.",
+"@.",
+"@.",
+"@.",
+"@.",
+"@.",
+"@.",
+"@.",
+"@.",
+"@.",
+"@.",
+"@.",
+"@.",
+"@.",
+"@.",
+"@."};
diff --git a/xfwm4/top-right-inactive.xpm b/xfwm4/top-right-inactive.xpm
index 95e48e1..5776746 100644
--- a/xfwm4/top-right-inactive.xpm
+++ b/xfwm4/top-right-inactive.xpm
@@ -1,31 +1,33 @@
/* XPM */
static char * top_right_inactive_xpm[] = {
-"2 25 3 1",
+"2 26 4 1",
" c None",
". c #393939",
-"+ c #2D2D2D",
+"+ c #303030",
+"@ c #2D2D2D",
". ",
"+.",
-"+.",
-"+.",
-"+.",
-"+.",
-"+.",
-"+.",
-"+.",
-"+.",
-"+.",
-"+.",
-"+.",
-"+.",
-"+.",
-"+.",
-"+.",
-"+.",
-"+.",
-"+.",
-"+.",
-"+.",
-"+.",
-"+.",
-"+."};
+"@.",
+"@.",
+"@.",
+"@.",
+"@.",
+"@.",
+"@.",
+"@.",
+"@.",
+"@.",
+"@.",
+"@.",
+"@.",
+"@.",
+"@.",
+"@.",
+"@.",
+"@.",
+"@.",
+"@.",
+"@.",
+"@.",
+"@.",
+"@."};