diff --git a/themes/daloa/Makefile.am b/themes/daloa/Makefile.am
index f641e326109e014c419243e7b2b474fc19920483..22c68a894ec464211c4bca8d9727db6a3eb906fa 100644
--- a/themes/daloa/Makefile.am
+++ b/themes/daloa/Makefile.am
@@ -1,107 +1,184 @@
themedir = $(datadir)/themes/Daloa/xfwm4
-theme_DATA = \
- README \
- themerc \
+
+PNG_FILES = \
bottom-active.png \
- bottom-active.xpm \
bottom-inactive.png \
- bottom-inactive.xpm \
bottom-left-active.png \
- bottom-left-active.xpm \
bottom-left-inactive.png \
- bottom-left-inactive.xpm \
bottom-right-active.png \
- bottom-right-active.xpm \
bottom-right-inactive.png \
- bottom-right-inactive.xpm \
close-active.png \
- close-active.xpm \
close-inactive.png \
- close-inactive.xpm \
close-pressed.png \
- close-pressed.xpm \
hide-active.png \
- hide-active.xpm \
hide-inactive.png \
- hide-inactive.xpm \
hide-pressed.png \
- hide-pressed.xpm \
left-active.png \
- left-active.xpm \
left-inactive.png \
- left-inactive.xpm \
maximize-active.png \
- maximize-active.xpm \
maximize-inactive.png \
- maximize-inactive.xpm \
maximize-pressed.png \
- maximize-pressed.xpm \
maximize-toggled-active.png \
- maximize-toggled-active.xpm \
maximize-toggled-inactive.png \
- maximize-toggled-inactive.xpm \
maximize-toggled-pressed.png \
- maximize-toggled-pressed.xpm \
menu-active.png \
- menu-active.xpm \
menu-inactive.png \
- menu-inactive.xpm \
menu-pressed.png \
- menu-pressed.xpm \
right-active.png \
- right-active.xpm \
right-inactive.png \
- right-inactive.xpm \
shade-active.png \
- shade-active.xpm \
shade-inactive.png \
- shade-inactive.xpm \
shade-pressed.png \
- shade-pressed.xpm \
shade-toggled-active.png \
- shade-toggled-active.xpm \
shade-toggled-inactive.png \
- shade-toggled-inactive.xpm \
shade-toggled-pressed.png \
- shade-toggled-pressed.xpm \
stick-active.png \
- stick-active.xpm \
stick-inactive.png \
- stick-inactive.xpm \
stick-pressed.png \
- stick-pressed.xpm \
stick-toggled-active.png \
- stick-toggled-active.xpm \
stick-toggled-inactive.png \
- stick-toggled-inactive.xpm \
stick-toggled-pressed.png \
- stick-toggled-pressed.xpm \
title-1-active.png \
- title-1-active.xpm \
title-1-inactive.png \
- title-1-inactive.xpm \
title-2-active.png \
- title-2-active.xpm \
title-2-inactive.png \
- title-2-inactive.xpm \
title-3-active.png \
- title-3-active.xpm \
title-3-inactive.png \
- title-3-inactive.xpm \
title-4-active.png \
- title-4-active.xpm \
title-4-inactive.png \
- title-4-inactive.xpm \
title-5-active.png \
- title-5-active.xpm \
title-5-inactive.png \
- title-5-inactive.xpm \
top-left-active.png \
- top-left-active.xpm \
top-left-inactive.png \
- top-left-inactive.xpm \
top-right-active.png \
+ top-right-inactive.png
+
+SVG_FILES = \
+ bottom-active.svg \
+ bottom-inactive.svg \
+ bottom-left-active.svg \
+ bottom-left-inactive.svg \
+ bottom-right-active.svg \
+ bottom-right-inactive.svg \
+ close-active.svg \
+ close-inactive.svg \
+ close-pressed.svg \
+ hide-active.svg \
+ hide-inactive.svg \
+ hide-pressed.svg \
+ left-active.svg \
+ left-inactive.svg \
+ maximize-active.svg \
+ maximize-inactive.svg \
+ maximize-pressed.svg \
+ maximize-toggled-active.svg \
+ maximize-toggled-inactive.svg \
+ maximize-toggled-pressed.svg \
+ menu-active.svg \
+ menu-inactive.svg \
+ menu-pressed.svg \
+ right-active.svg \
+ right-inactive.svg \
+ shade-active.svg \
+ shade-inactive.svg \
+ shade-pressed.svg \
+ shade-toggled-active.svg \
+ shade-toggled-inactive.svg \
+ shade-toggled-pressed.svg \
+ stick-active.svg \
+ stick-inactive.svg \
+ stick-pressed.svg \
+ stick-toggled-active.svg \
+ stick-toggled-inactive.svg \
+ stick-toggled-pressed.svg \
+ title-1-active.svg \
+ title-1-inactive.svg \
+ title-2-active.svg \
+ title-2-inactive.svg \
+ title-3-active.svg \
+ title-3-inactive.svg \
+ title-4-active.svg \
+ title-4-inactive.svg \
+ title-5-active.svg \
+ title-5-inactive.svg \
+ top-left-active.svg \
+ top-left-inactive.svg \
+ top-right-active.svg \
+ top-right-inactive.svg
+
+XPM_FILES = \
+ bottom-active.xpm \
+ bottom-inactive.xpm \
+ bottom-left-active.xpm \
+ bottom-left-inactive.xpm \
+ bottom-right-active.xpm \
+ bottom-right-inactive.xpm \
+ close-active.xpm \
+ close-inactive.xpm \
+ close-pressed.xpm \
+ hide-active.xpm \
+ hide-inactive.xpm \
+ hide-pressed.xpm \
+ left-active.xpm \
+ left-inactive.xpm \
+ maximize-active.xpm \
+ maximize-inactive.xpm \
+ maximize-pressed.xpm \
+ maximize-toggled-active.xpm \
+ maximize-toggled-inactive.xpm \
+ maximize-toggled-pressed.xpm \
+ menu-active.xpm \
+ menu-inactive.xpm \
+ menu-pressed.xpm \
+ right-active.xpm \
+ right-inactive.xpm \
+ shade-active.xpm \
+ shade-inactive.xpm \
+ shade-pressed.xpm \
+ shade-toggled-active.xpm \
+ shade-toggled-inactive.xpm \
+ shade-toggled-pressed.xpm \
+ stick-active.xpm \
+ stick-inactive.xpm \
+ stick-pressed.xpm \
+ stick-toggled-active.xpm \
+ stick-toggled-inactive.xpm \
+ stick-toggled-pressed.xpm \
+ title-1-active.xpm \
+ title-1-inactive.xpm \
+ title-2-active.xpm \
+ title-2-inactive.xpm \
+ title-3-active.xpm \
+ title-3-inactive.xpm \
+ title-4-active.xpm \
+ title-4-inactive.xpm \
+ title-5-active.xpm \
+ title-5-inactive.xpm \
+ top-left-active.xpm \
+ top-left-inactive.xpm \
top-right-active.xpm \
- top-right-inactive.png \
top-right-inactive.xpm
-EXTRA_DIST = $(theme_DATA)
+
+theme_DATA = \
+ README \
+ themerc \
+ $(XPM_FILES) \
+ $(PNG_FILES)
+
+EXTRA_DIST = \
+ $(theme_DATA) \
+ $(SVG_FILES)
+
+noinst_DATA = \
+ $(SVG_FILES)
+
+vacuum-defs:
+ for svg_file in $(SVG_FILES); do \
+ inkscape --without-gui --vacuum-defs --file=$$svg_file; \
+ done
+
+update-png:
+ for svg_file in $(SVG_FILES); do \
+ image=$${svg_file%.svg}; \
+ rsvg -f png $$svg_file $$image.png; \
+ done
diff --git a/themes/daloa/README b/themes/daloa/README
index 1095c50247ddccab9b1a56942ff80ec7894ec53d..0ba551620417658ecf5de6739267df429a693098 100644
--- a/themes/daloa/README
+++ b/themes/daloa/README
@@ -4,6 +4,7 @@ Daloa
An original theme for xfwm4.
Created May 2006 by Mike Massonnet <mmassonnet@gmail.com>
Modified June 2006 by Olivier Fourdan <fourdan@xfce.org>
+Redone in SVG, Nov 2006 by Olivier Fourdan <fourdan@xfce.org>.
Based on xfwm4 4.4 Default theme.
Theme released under GNU GPL license.
diff --git a/themes/daloa/bottom-active.png b/themes/daloa/bottom-active.png
index 9c4dbf8afb86a0372c6a11c66a428d87793e74d2..3c80ad7044eb6982f6229c887b928b30e00210d6 100644
Binary files a/themes/daloa/bottom-active.png and b/themes/daloa/bottom-active.png differ
diff --git a/themes/daloa/bottom-active.svg b/themes/daloa/bottom-active.svg
new file mode 100644
index 0000000000000000000000000000000000000000..00c70637f8fb12d9dafc4cb3a71fd0d94dd5eeed
--- /dev/null
+++ b/themes/daloa/bottom-active.svg
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://web.resource.org/cc/"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="24"
+ height="5"
+ id="svg2"
+ sodipodi:version="0.32"
+ inkscape:version="0.44"
+ version="1.0"
+ sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"
+ sodipodi:docname="bottom-active.svg"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
+ <defs
+ id="defs4" />
+ <sodipodi:namedview
+ id="base"
+ pagecolor="white"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="10"
+ inkscape:cx="0"
+ inkscape:cy="0"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ inkscape:grid-bbox="true"
+ inkscape:window-width="640"
+ inkscape:window-height="400"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:guide-points="true"
+ inkscape:grid-points="true" />
+ <metadata
+ id="metadata7">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title>Border</dc:title>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Olivier Fourdan</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ <cc:license
+ rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" />
+ </cc:Work>
+ <cc:License
+ rdf:about="http://creativecommons.org/licenses/GPL/2.0/">
+ <cc:permits
+ rdf:resource="http://web.resource.org/cc/Reproduction" />
+ <cc:permits
+ rdf:resource="http://web.resource.org/cc/Distribution" />
+ <cc:requires
+ rdf:resource="http://web.resource.org/cc/Notice" />
+ <cc:permits
+ rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+ <cc:requires
+ rdf:resource="http://web.resource.org/cc/ShareAlike" />
+ <cc:requires
+ rdf:resource="http://web.resource.org/cc/SourceCode" />
+ </cc:License>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ id="layer1">
+ <path
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.50"
+ d="M 0,4.5 L 24,4.5"
+ id="path1340"
+ sodipodi:nodetypes="cc" />
+ </g>
+</svg>
diff --git a/themes/daloa/bottom-active.xpm b/themes/daloa/bottom-active.xpm
index db2d56bccc07ffeea898c205e6346cdc3c64cbba..b7ffe8342da140d1b6b0ba23e1b6631075bd99f9 100644
--- a/themes/daloa/bottom-active.xpm
+++ b/themes/daloa/bottom-active.xpm
@@ -1,13 +1,11 @@
/* XPM */
static char * bottom_active_xpm[] = {
-"32 5 5 1",
+"24 5 3 1",
" c None",
-"+ c #E0E0FF s active_hilight_1",
-"@ c #A0A0FF s active_shadow_1",
-"$ c #B0B0B0 s active_mid_2",
"# c #C0C0C0 s active_color_2",
-"################################",
-"################################",
-"################################",
-"++++++++++++++++++++++++++++++++",
-"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"};
+"@ c #C0C0FF s active_color_1",
+"########################",
+"########################",
+"########################",
+"@@@@@@@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@@@@@@@"};
diff --git a/themes/daloa/bottom-inactive.png b/themes/daloa/bottom-inactive.png
index 9c4dbf8afb86a0372c6a11c66a428d87793e74d2..3c80ad7044eb6982f6229c887b928b30e00210d6 100644
Binary files a/themes/daloa/bottom-inactive.png and b/themes/daloa/bottom-inactive.png differ
diff --git a/themes/daloa/bottom-inactive.svg b/themes/daloa/bottom-inactive.svg
new file mode 100644
index 0000000000000000000000000000000000000000..0ecae2f4c141dbcc6b32887a68695280dda4dc80
--- /dev/null
+++ b/themes/daloa/bottom-inactive.svg
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://web.resource.org/cc/"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="24"
+ height="5"
+ id="svg2"
+ sodipodi:version="0.32"
+ inkscape:version="0.44"
+ version="1.0"
+ sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"
+ sodipodi:docname="bottom-inactive.svg"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
+ <defs
+ id="defs4" />
+ <sodipodi:namedview
+ id="base"
+ pagecolor="white"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="10"
+ inkscape:cx="0"
+ inkscape:cy="0"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ inkscape:grid-bbox="true"
+ inkscape:window-width="640"
+ inkscape:window-height="400"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:guide-points="true"
+ inkscape:grid-points="true" />
+ <metadata
+ id="metadata7">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title>Border</dc:title>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Olivier Fourdan</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ <cc:license
+ rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" />
+ </cc:Work>
+ <cc:License
+ rdf:about="http://creativecommons.org/licenses/GPL/2.0/">
+ <cc:permits
+ rdf:resource="http://web.resource.org/cc/Reproduction" />
+ <cc:permits
+ rdf:resource="http://web.resource.org/cc/Distribution" />
+ <cc:requires
+ rdf:resource="http://web.resource.org/cc/Notice" />
+ <cc:permits
+ rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+ <cc:requires
+ rdf:resource="http://web.resource.org/cc/ShareAlike" />
+ <cc:requires
+ rdf:resource="http://web.resource.org/cc/SourceCode" />
+ </cc:License>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ id="layer1">
+ <path
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.50"
+ d="M 0,4.5 L 24,4.5"
+ id="path1340"
+ sodipodi:nodetypes="cc" />
+ </g>
+</svg>
diff --git a/themes/daloa/bottom-inactive.xpm b/themes/daloa/bottom-inactive.xpm
index cf6b47e6269333acde63a0ea716b90e13ba999dd..8000d0ff995f689a3f1936ac4ff022ef13ba26af 100644
--- a/themes/daloa/bottom-inactive.xpm
+++ b/themes/daloa/bottom-inactive.xpm
@@ -1,13 +1,11 @@
/* XPM */
static char * bottom_inactive_xpm[] = {
-"32 5 5 1",
+"24 5 3 1",
" c None",
-"+ c #E0E0FF s inactive_hilight_1",
-"@ c #A0A0FF s inactive_shadow_1",
-"$ c #B0B0B0 s inactive_mid_2",
"# c #C0C0C0 s inactive_color_2",
-"################################",
-"################################",
-"################################",
-"++++++++++++++++++++++++++++++++",
-"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"};
+"@ c #C0C0FF s inactive_color_1",
+"########################",
+"########################",
+"########################",
+"@@@@@@@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@@@@@@@"};
diff --git a/themes/daloa/bottom-left-active.png b/themes/daloa/bottom-left-active.png
index c61bdc46349b50bafa4a286446a77153ed49c07a..d389e2cdfa13409aa4c72c55b72594780c59ff67 100644
Binary files a/themes/daloa/bottom-left-active.png and b/themes/daloa/bottom-left-active.png differ
diff --git a/themes/daloa/bottom-left-active.svg b/themes/daloa/bottom-left-active.svg
new file mode 100644
index 0000000000000000000000000000000000000000..7b97391fca83ad06aff73061aa112bf13b574219
--- /dev/null
+++ b/themes/daloa/bottom-left-active.svg
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://web.resource.org/cc/"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="16"
+ height="16"
+ id="svg2"
+ sodipodi:version="0.32"
+ inkscape:version="0.44"
+ version="1.0"
+ sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"
+ sodipodi:docname="bottom-left-active.svg"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
+ <defs
+ id="defs4" />
+ <sodipodi:namedview
+ id="base"
+ pagecolor="white"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="10"
+ inkscape:cx="0"
+ inkscape:cy="0"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ inkscape:grid-bbox="true"
+ inkscape:window-width="640"
+ inkscape:window-height="400"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:grid-points="true" />
+ <metadata
+ id="metadata7">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title>Border</dc:title>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Olivier Fourdan</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ <cc:license
+ rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" />
+ </cc:Work>
+ <cc:License
+ rdf:about="http://creativecommons.org/licenses/GPL/2.0/">
+ <cc:permits
+ rdf:resource="http://web.resource.org/cc/Reproduction" />
+ <cc:permits
+ rdf:resource="http://web.resource.org/cc/Distribution" />
+ <cc:requires
+ rdf:resource="http://web.resource.org/cc/Notice" />
+ <cc:permits
+ rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+ <cc:requires
+ rdf:resource="http://web.resource.org/cc/ShareAlike" />
+ <cc:requires
+ rdf:resource="http://web.resource.org/cc/SourceCode" />
+ </cc:License>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ id="layer1">
+ <path
+ style="fill:black;fill-opacity:0.50"
+ d="M 0,0 L 0,16 L 16,16 L 16,15 C 16,15 16,15 3,15 C 1,15 1,13 1,13 L 1,0 L 0,0 z "
+ id="rect1870" />
+ </g>
+</svg>
diff --git a/themes/daloa/bottom-left-active.xpm b/themes/daloa/bottom-left-active.xpm
index 33db4f0daa7e5c99e66daabe42361ddf2f313658..4a4f9c26d048d9745b336eced505620af617210b 100644
--- a/themes/daloa/bottom-left-active.xpm
+++ b/themes/daloa/bottom-left-active.xpm
@@ -1,24 +1,22 @@
/* XPM */
static char * bottom_left_active_xpm[] = {
-"16 16 5 1",
+"16 16 3 1",
" c None",
-"+ c #E0E0FF s active_hilight_1",
-"@ c #A0A0FF s active_shadow_1",
-"$ c #B0B0B0 s active_mid_2",
"# c #C0C0C0 s active_color_2",
-"@+### ",
-"@+### ",
-"@+### ",
-"@+### ",
-"@+### ",
-"@+### ",
-"@+### ",
-"@+### ",
-"@+### ",
-"@+### ",
-"@+### ",
-"@+##############",
-"@+##############",
-"@+##############",
-"@+++++++++++++++",
+"@ c #C0C0FF s active_color_1",
+"@@### ",
+"@@### ",
+"@@### ",
+"@@### ",
+"@@### ",
+"@@### ",
+"@@### ",
+"@@### ",
+"@@### ",
+"@@### ",
+"@@### ",
+"@@##############",
+"@@##############",
+"@@##############",
+"@@@@@@@@@@@@@@@@",
" @@@@@@@@@@@@@@@"};
diff --git a/themes/daloa/bottom-left-inactive.png b/themes/daloa/bottom-left-inactive.png
index c61bdc46349b50bafa4a286446a77153ed49c07a..944fab11ab8a826a19adc840ac879384fae56f0a 100644
Binary files a/themes/daloa/bottom-left-inactive.png and b/themes/daloa/bottom-left-inactive.png differ
diff --git a/themes/daloa/bottom-left-inactive.svg b/themes/daloa/bottom-left-inactive.svg
new file mode 100644
index 0000000000000000000000000000000000000000..965dd5ead631f380f8a80057330538b68e0b2390
--- /dev/null
+++ b/themes/daloa/bottom-left-inactive.svg
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://web.resource.org/cc/"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="16"
+ height="16"
+ id="svg2"
+ sodipodi:version="0.32"
+ inkscape:version="0.44"
+ version="1.0"
+ sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"
+ sodipodi:docname="bottom-left-inactive.svg"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
+ <defs
+ id="defs4" />
+ <sodipodi:namedview
+ id="base"
+ pagecolor="white"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="10"
+ inkscape:cx="0"
+ inkscape:cy="0"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ inkscape:grid-bbox="true"
+ inkscape:window-width="640"
+ inkscape:window-height="400"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:grid-points="true" />
+ <metadata
+ id="metadata7">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title>Border</dc:title>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Olivier Fourdan</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ <cc:license
+ rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" />
+ </cc:Work>
+ <cc:License
+ rdf:about="http://creativecommons.org/licenses/GPL/2.0/">
+ <cc:permits
+ rdf:resource="http://web.resource.org/cc/Reproduction" />
+ <cc:permits
+ rdf:resource="http://web.resource.org/cc/Distribution" />
+ <cc:requires
+ rdf:resource="http://web.resource.org/cc/Notice" />
+ <cc:permits
+ rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+ <cc:requires
+ rdf:resource="http://web.resource.org/cc/ShareAlike" />
+ <cc:requires
+ rdf:resource="http://web.resource.org/cc/SourceCode" />
+ </cc:License>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ id="layer1">
+ <path
+ style="fill:black;fill-opacity:0.50"
+ d="M 0,0 L 0,16 L 16,16 L 16,15 C 16,15 16,15 3,15 C 1,15 1,13 1,13 L 1,0 L 0,0 z "
+ id="rect1870" />
+ </g>
+</svg>
diff --git a/themes/daloa/bottom-left-inactive.xpm b/themes/daloa/bottom-left-inactive.xpm
index 97465e3916a9493b77437623c39e44bf3728924e..dbc76269f59715fade60fe12ebddc4271c9ffa7e 100644
--- a/themes/daloa/bottom-left-inactive.xpm
+++ b/themes/daloa/bottom-left-inactive.xpm
@@ -1,24 +1,22 @@
/* XPM */
static char * bottom_left_inactive_xpm[] = {
-"16 16 5 1",
+"16 16 3 1",
" c None",
-"+ c #E0E0FF s inactive_hilight_1",
-"@ c #A0A0FF s inactive_shadow_1",
-"$ c #B0B0B0 s inactive_mid_2",
"# c #C0C0C0 s inactive_color_2",
-"@+### ",
-"@+### ",
-"@+### ",
-"@+### ",
-"@+### ",
-"@+### ",
-"@+### ",
-"@+### ",
-"@+### ",
-"@+### ",
-"@+### ",
-"@+##############",
-"@+##############",
-"@+##############",
-"@+++++++++++++++",
+"@ c #C0C0FF s inactive_color_1",
+"@@### ",
+"@@### ",
+"@@### ",
+"@@### ",
+"@@### ",
+"@@### ",
+"@@### ",
+"@@### ",
+"@@### ",
+"@@### ",
+"@@### ",
+"@@##############",
+"@@##############",
+"@@##############",
+"@@@@@@@@@@@@@@@@",
" @@@@@@@@@@@@@@@"};
diff --git a/themes/daloa/bottom-right-active.png b/themes/daloa/bottom-right-active.png
index 381e806d3f8f5365773a9cc534a4f2f4982ca85d..4a056856f4e86e9dda8c6e10bd8ee89c64590b16 100644
Binary files a/themes/daloa/bottom-right-active.png and b/themes/daloa/bottom-right-active.png differ
diff --git a/themes/daloa/bottom-right-active.svg b/themes/daloa/bottom-right-active.svg
new file mode 100644
index 0000000000000000000000000000000000000000..64823e2710201670ad2e628ab40b563aea4ce19d
--- /dev/null
+++ b/themes/daloa/bottom-right-active.svg
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://web.resource.org/cc/"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="16"
+ height="16"
+ id="svg2"
+ sodipodi:version="0.32"
+ inkscape:version="0.44"
+ version="1.0"
+ sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"
+ sodipodi:docname="bottom-right-active.svg"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
+ <defs
+ id="defs4" />
+ <sodipodi:namedview
+ id="base"
+ pagecolor="white"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="10"
+ inkscape:cx="0"
+ inkscape:cy="0"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ inkscape:grid-bbox="true"
+ inkscape:window-width="640"
+ inkscape:window-height="400"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:grid-points="true" />
+ <metadata
+ id="metadata7">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title>Border</dc:title>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Olivier Fourdan</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ <cc:license
+ rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" />
+ </cc:Work>
+ <cc:License
+ rdf:about="http://creativecommons.org/licenses/GPL/2.0/">
+ <cc:permits
+ rdf:resource="http://web.resource.org/cc/Reproduction" />
+ <cc:permits
+ rdf:resource="http://web.resource.org/cc/Distribution" />
+ <cc:requires
+ rdf:resource="http://web.resource.org/cc/Notice" />
+ <cc:permits
+ rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+ <cc:requires
+ rdf:resource="http://web.resource.org/cc/ShareAlike" />
+ <cc:requires
+ rdf:resource="http://web.resource.org/cc/SourceCode" />
+ </cc:License>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ id="layer1">
+ <path
+ style="fill:black;fill-opacity:0.50"
+ d="M 16,0 L 16,16 L 0,16 L 0,15 C 0,15 0,15 13,15 C 15,15 15,13 15,13 L 15,0 L 16,0 z "
+ id="rect1870" />
+ </g>
+</svg>
diff --git a/themes/daloa/bottom-right-active.xpm b/themes/daloa/bottom-right-active.xpm
index 1a16e8c5d8c007032601326a8ad9770e23ed98e8..4928fa05374282c1002b3d86d1468d676bcbc879 100644
--- a/themes/daloa/bottom-right-active.xpm
+++ b/themes/daloa/bottom-right-active.xpm
@@ -1,24 +1,22 @@
/* XPM */
static char * bottom_right_active_xpm[] = {
-"16 16 5 1",
+"16 16 3 1",
" c None",
-"+ c #E0E0FF s active_hilight_1",
-"@ c #A0A0FF s active_shadow_1",
-"$ c #B0B0B0 s active_mid_2",
"# c #C0C0C0 s active_color_2",
-" ###+@",
-" ###+@",
-" ###+@",
-" ###+@",
-" ###+@",
-" ###+@",
-" ###+@",
-" ###+@",
-" ###+@",
-" ###+@",
-" ###+@",
-"##############+@",
-"##############+@",
-"##############+@",
-"+++++++++++++++@",
+"@ c #C0C0FF s active_color_1",
+" ###@@",
+" ###@@",
+" ###@@",
+" ###@@",
+" ###@@",
+" ###@@",
+" ###@@",
+" ###@@",
+" ###@@",
+" ###@@",
+" ###@@",
+"##############@@",
+"##############@@",
+"##############@@",
+"@@@@@@@@@@@@@@@@",
"@@@@@@@@@@@@@@@ "};
diff --git a/themes/daloa/bottom-right-inactive.png b/themes/daloa/bottom-right-inactive.png
index 381e806d3f8f5365773a9cc534a4f2f4982ca85d..4a056856f4e86e9dda8c6e10bd8ee89c64590b16 100644
Binary files a/themes/daloa/bottom-right-inactive.png and b/themes/daloa/bottom-right-inactive.png differ
diff --git a/themes/daloa/bottom-right-inactive.svg b/themes/daloa/bottom-right-inactive.svg
new file mode 100644
index 0000000000000000000000000000000000000000..0d09f76c38e4928bda138b1858e504394f6dfba0
--- /dev/null
+++ b/themes/daloa/bottom-right-inactive.svg
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://web.resource.org/cc/"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="16"
+ height="16"
+ id="svg2"
+ sodipodi:version="0.32"
+ inkscape:version="0.44"
+ version="1.0"
+ sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"
+ sodipodi:docname="bottom-right-inactive.svg"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
+ <defs
+ id="defs4" />
+ <sodipodi:namedview
+ id="base"
+ pagecolor="white"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="10"
+ inkscape:cx="0"
+ inkscape:cy="0"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ inkscape:grid-bbox="true"
+ inkscape:window-width="640"
+ inkscape:window-height="400"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:grid-points="true" />
+ <metadata
+ id="metadata7">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title>Border</dc:title>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Olivier Fourdan</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ <cc:license
+ rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" />
+ </cc:Work>
+ <cc:License
+ rdf:about="http://creativecommons.org/licenses/GPL/2.0/">
+ <cc:permits
+ rdf:resource="http://web.resource.org/cc/Reproduction" />
+ <cc:permits
+ rdf:resource="http://web.resource.org/cc/Distribution" />
+ <cc:requires
+ rdf:resource="http://web.resource.org/cc/Notice" />
+ <cc:permits
+ rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+ <cc:requires
+ rdf:resource="http://web.resource.org/cc/ShareAlike" />
+ <cc:requires
+ rdf:resource="http://web.resource.org/cc/SourceCode" />
+ </cc:License>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ id="layer1">
+ <path
+ style="fill:black;fill-opacity:0.50"
+ d="M 16,0 L 16,16 L 0,16 L 0,15 C 0,15 0,15 13,15 C 15,15 15,13 15,13 L 15,0 L 16,0 z "
+ id="rect1870" />
+ </g>
+</svg>
diff --git a/themes/daloa/bottom-right-inactive.xpm b/themes/daloa/bottom-right-inactive.xpm
index 9047eb6dc0b59d1a040836a5d447b25e09c7ae6f..4e09b385579e739295a7f02cd4457e3f48cf5c18 100644
--- a/themes/daloa/bottom-right-inactive.xpm
+++ b/themes/daloa/bottom-right-inactive.xpm
@@ -1,24 +1,22 @@
/* XPM */
static char * bottom_right_inactive_xpm[] = {
-"16 16 5 1",
+"16 16 3 1",
" c None",
-"+ c #E0E0FF s inactive_hilight_1",
-"@ c #A0A0FF s inactive_shadow_1",
-"$ c #B0B0B0 s inactive_mid_2",
"# c #C0C0C0 s inactive_color_2",
-" ###+@",
-" ###+@",
-" ###+@",
-" ###+@",
-" ###+@",
-" ###+@",
-" ###+@",
-" ###+@",
-" ###+@",
-" ###+@",
-" ###+@",
-"##############+@",
-"##############+@",
-"##############+@",
-"+++++++++++++++@",
+"@ c #C0C0FF s inactive_color_1",
+" ###@@",
+" ###@@",
+" ###@@",
+" ###@@",
+" ###@@",
+" ###@@",
+" ###@@",
+" ###@@",
+" ###@@",
+" ###@@",
+" ###@@",
+"##############@@",
+"##############@@",
+"##############@@",
+"@@@@@@@@@@@@@@@@",
"@@@@@@@@@@@@@@@ "};
diff --git a/themes/daloa/close-active.png b/themes/daloa/close-active.png
index 124f950cde50849eb514e290fcb7b8c45e3cc53c..6483332896022c34d69dcf6c5b23849e3867f389 100644
Binary files a/themes/daloa/close-active.png and b/themes/daloa/close-active.png differ
diff --git a/themes/daloa/close-active.svg b/themes/daloa/close-active.svg
new file mode 100644
index 0000000000000000000000000000000000000000..4d2acc21526832e82886785e52ad6a178edcdf1b
--- /dev/null
+++ b/themes/daloa/close-active.svg
@@ -0,0 +1,227 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://web.resource.org/cc/"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="24"
+ height="19"
+ id="svg2"
+ sodipodi:version="0.32"
+ inkscape:version="0.44"
+ version="1.0"
+ sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"
+ sodipodi:docname="close-active.svg"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
+ <defs
+ id="defs4">
+ <linearGradient
+ id="linearGradient1886">
+ <stop
+ style="stop-color:white;stop-opacity:1;"
+ offset="0"
+ id="stop1888" />
+ <stop
+ style="stop-color:white;stop-opacity:0.05;"
+ offset="1"
+ id="stop1890" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient5873">
+ <stop
+ id="stop5875"
+ offset="0"
+ style="stop-color:white;stop-opacity:1;" />
+ <stop
+ id="stop5877"
+ offset="1"
+ style="stop-color:white;stop-opacity:0;" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient5847">
+ <stop
+ id="stop5849"
+ offset="0"
+ style="stop-color:white;stop-opacity:0.33;" />
+ <stop
+ id="stop5851"
+ offset="1"
+ style="stop-color:white;stop-opacity:0;" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5847"
+ id="linearGradient6945"
+ gradientUnits="userSpaceOnUse"
+ x1="0"
+ y1="0.5"
+ x2="0"
+ y2="18.5"
+ gradientTransform="matrix(1,0,0,1,0,0)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5873"
+ id="linearGradient6962"
+ x1="0"
+ y1="1"
+ x2="0"
+ y2="8"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1,0,0,0.2,0,1)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient1886"
+ id="linearGradient1892"
+ x1="0"
+ y1="1"
+ x2="0"
+ y2="9"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient1886"
+ id="linearGradient2791"
+ x1="0"
+ y1="1"
+ x2="0"
+ y2="19"
+ gradientUnits="userSpaceOnUse" />
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="white"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="10"
+ inkscape:cx="0"
+ inkscape:cy="0"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ inkscape:grid-bbox="true"
+ inkscape:grid-points="true"
+ gridoriginx="0px"
+ gridtolerance="0.5px"
+ guidetolerance="1px"
+ inkscape:window-width="640"
+ inkscape:window-height="400"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:guide-bbox="true"
+ inkscape:guide-points="false"
+ showguides="true" />
+ <metadata
+ id="metadata7">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title>Title</dc:title>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Olivier Fourdan</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:groupmode="layer"
+ id="layer2"
+ inkscape:label="Grad"
+ style="display:inline">
+ <path
+ style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 0,0.5 L 24,0.5 C 24,0.5 24,19 24,19 L 0,19 L 0,0.5 z "
+ id="path6057"
+ sodipodi:nodetypes="ccsc" />
+ </g>
+ <g
+ inkscape:groupmode="layer"
+ id="layer3"
+ inkscape:label="hilight">
+ <path
+ style="fill:url(#linearGradient6962);fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 0,1 L 24,1 C 24,1 24,4 24,4 L 0,4 L 0,3 z "
+ id="path6061"
+ sodipodi:nodetypes="ccsc" />
+ <rect
+ style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:0.75;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect1884"
+ width="24"
+ height="9"
+ x="0"
+ y="1" />
+ <path
+ style="fill:none;fill-opacity:1.0;fill-rule:evenodd;stroke:url(#linearGradient2791);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;opacity:1"
+ d="M 0,1 L 0,19"
+ id="path1889" />
+ <path
+ style="fill:none;fill-opacity:1.0;fill-rule:evenodd;stroke:url(#linearGradient2791);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;opacity:1"
+ d="M 24,1 L 24,19"
+ id="path1890" />
+ </g>
+ <g
+ inkscape:label="Border"
+ inkscape:groupmode="layer"
+ id="layer1"
+ style="display:inline">
+ <path
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+ d="M 0.5,0.5 L 23.5,0.5"
+ id="path6059"
+ sodipodi:nodetypes="ccsc" />
+ </g>
+ <g
+ inkscape:groupmode="layer"
+ id="g20"
+ inkscape:label="Button">
+ <g
+ id="g2327"
+ transform="translate(6,4)">
+ <g
+ transform="matrix(0.875,0,0,0.875,0.75,0.75)"
+ style="opacity:0.33;stroke:black;stroke-width:4.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="g2217">
+ <path
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:4.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 2,2 L 10,10"
+ id="path1340"
+ sodipodi:nodetypes="cc" />
+ <path
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:4.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 2,10 L 10,2"
+ id="path2215"
+ sodipodi:nodetypes="cc" />
+ </g>
+ <path
+ id="path2221"
+ d="M 2.5,2.5 L 9.5,9.5 L 9.5,9.5"
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:white;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <path
+ id="path2225"
+ d="M 2.5,9.5 L 9.5,2.5"
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:white;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ </g>
+ </g>
+ <g
+ inkscape:groupmode="layer"
+ id="layer5"
+ inkscape:label="Shadow">
+ <path
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.10"
+ d="M 0.5,18.5 L 23.5,18.5"
+ id="path6989"
+ sodipodi:nodetypes="ccsc" />
+ </g>
+</svg>
diff --git a/themes/daloa/close-active.xpm b/themes/daloa/close-active.xpm
index ed05c48fd0594c1141b85d9ad8cdabdc455ff519..7f9a6a6a3773acc9fbf48f33d34f3699298a2c23 100644
--- a/themes/daloa/close-active.xpm
+++ b/themes/daloa/close-active.xpm
@@ -1,26 +1,24 @@
/* XPM */
static char * close_active_xpm[] = {
-"24 17 6 1",
+"24 19 2 1",
" c None",
". c #C0C0FF s active_color_1",
-"+ c #D0D0FF s active_hilight_1",
-"@ c #B0B0FF s active_mid_1",
-"* c #A0A0FF s active_shadow_1",
-"# c #FFFFFF s active_text_color",
-" ",
-"........................",
-"........................",
-"........................",
-"........**....**........",
-".......*##*..*##*.......",
-".......*###**###*.......",
-"........*######*........",
-".........*####*.........",
-".........*####*.........",
-"........*######*........",
-".......*###**###*.......",
-".......*##*..*##*.......",
-"........**....**........",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
"........................",
"........................",
"........................"};
diff --git a/themes/daloa/close-inactive.png b/themes/daloa/close-inactive.png
index 124f950cde50849eb514e290fcb7b8c45e3cc53c..c4181cb713e485502375e6540705e903996e4b2f 100644
Binary files a/themes/daloa/close-inactive.png and b/themes/daloa/close-inactive.png differ
diff --git a/themes/daloa/close-inactive.svg b/themes/daloa/close-inactive.svg
new file mode 100644
index 0000000000000000000000000000000000000000..7f738fa1091b8e344abe9da2ba5e980e836d4cae
--- /dev/null
+++ b/themes/daloa/close-inactive.svg
@@ -0,0 +1,212 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://web.resource.org/cc/"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="24"
+ height="19"
+ id="svg2"
+ sodipodi:version="0.32"
+ inkscape:version="0.44"
+ version="1.0"
+ sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"
+ sodipodi:docname="close-inactive.svg"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
+ <defs
+ id="defs4">
+ <linearGradient
+ id="linearGradient1886">
+ <stop
+ style="stop-color:white;stop-opacity:1;"
+ offset="0"
+ id="stop1888" />
+ <stop
+ style="stop-color:white;stop-opacity:0.05;"
+ offset="1"
+ id="stop1890" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient5873">
+ <stop
+ id="stop5875"
+ offset="0"
+ style="stop-color:white;stop-opacity:1;" />
+ <stop
+ id="stop5877"
+ offset="1"
+ style="stop-color:white;stop-opacity:0;" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient5847">
+ <stop
+ id="stop5849"
+ offset="0"
+ style="stop-color:white;stop-opacity:0.33;" />
+ <stop
+ id="stop5851"
+ offset="1"
+ style="stop-color:white;stop-opacity:0;" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5847"
+ id="linearGradient6945"
+ gradientUnits="userSpaceOnUse"
+ x1="0"
+ y1="0.5"
+ x2="0"
+ y2="18.5"
+ gradientTransform="matrix(1,0,0,1,0,0)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5873"
+ id="linearGradient6962"
+ x1="0"
+ y1="1"
+ x2="0"
+ y2="8"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1,0,0,0.2,0,1)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient1886"
+ id="linearGradient1892"
+ x1="0"
+ y1="1"
+ x2="0"
+ y2="9"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient1886"
+ id="linearGradient2791"
+ x1="0"
+ y1="1"
+ x2="0"
+ y2="19"
+ gradientUnits="userSpaceOnUse" />
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="white"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="10"
+ inkscape:cx="0"
+ inkscape:cy="0"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ inkscape:grid-bbox="true"
+ inkscape:grid-points="true"
+ gridoriginx="0px"
+ gridtolerance="0.5px"
+ guidetolerance="1px"
+ inkscape:window-width="640"
+ inkscape:window-height="400"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:guide-bbox="true"
+ inkscape:guide-points="false"
+ showguides="true" />
+ <metadata
+ id="metadata7">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title>Title</dc:title>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Olivier Fourdan</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:groupmode="layer"
+ id="layer2"
+ inkscape:label="Grad"
+ style="display:inline">
+ <path
+ style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 0,0.5 L 24,0.5 C 24,0.5 24,19 24,19 L 0,19 L 0,0.5 z "
+ id="path6057"
+ sodipodi:nodetypes="ccsc" />
+ </g>
+ <g
+ inkscape:groupmode="layer"
+ id="layer3"
+ inkscape:label="hilight">
+ <path
+ style="fill:url(#linearGradient6962);fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 0,1 L 24,1 C 24,1 24,4 24,4 L 0,4 L 0,3 z "
+ id="path6061"
+ sodipodi:nodetypes="ccsc" />
+ <rect
+ style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:0.75;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect1884"
+ width="24"
+ height="9"
+ x="0"
+ y="1" />
+ <path
+ style="fill:none;fill-opacity:1.0;fill-rule:evenodd;stroke:url(#linearGradient2791);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;opacity:1"
+ d="M 0,1 L 0,19"
+ id="path1889" />
+ <path
+ style="fill:none;fill-opacity:1.0;fill-rule:evenodd;stroke:url(#linearGradient2791);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;opacity:1"
+ d="M 24,1 L 24,19"
+ id="path1890" />
+ </g>
+ <g
+ inkscape:label="Border"
+ inkscape:groupmode="layer"
+ id="layer1"
+ style="display:inline">
+ <path
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+ d="M 0.5,0.5 L 23.5,0.5"
+ id="path6059"
+ sodipodi:nodetypes="ccsc" />
+ </g>
+ <g
+ inkscape:groupmode="layer"
+ id="g20"
+ inkscape:label="Button">
+ <g
+ id="g2327"
+ transform="translate(6,4)">
+ <path
+ id="path2221"
+ d="M 2.5,2.5 L 9.5,9.5 L 9.5,9.5"
+ style="opacity:0.50;fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#7f7f7f;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1" />
+ <path
+ id="path2225"
+ d="M 2.5,9.5 L 9.5,2.5"
+ style="opacity:0.50;fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#7f7f7f;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1" />
+ </g>
+ </g>
+ <g
+ inkscape:groupmode="layer"
+ id="layer5"
+ inkscape:label="Shadow">
+ <path
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.10"
+ d="M 0.5,18.5 L 23.5,18.5"
+ id="path6989"
+ sodipodi:nodetypes="ccsc" />
+ </g>
+</svg>
diff --git a/themes/daloa/close-inactive.xpm b/themes/daloa/close-inactive.xpm
index e84aff2c20fb721470c84ef7c1bc4bd63df7b88c..89a06bc721d3b9459e4c08484ecfdb075278b531 100644
--- a/themes/daloa/close-inactive.xpm
+++ b/themes/daloa/close-inactive.xpm
@@ -1,24 +1,23 @@
/* XPM */
static char * close_inactive_xpm[] = {
-"24 17 5 1",
+"24 19 2 1",
" c None",
". c #C0C0FF s inactive_color_1",
-"+ c #D0D0FF s inactive_hilight_1",
-"@ c #B0B0FF s inactive_mid_1",
-"# c #D0D0FF s inactive_text_color",
-" ",
"........................",
"........................",
"........................",
"........................",
-"........##....##........",
-"........###..###........",
-".........######.........",
-"..........####..........",
-"..........####..........",
-".........######.........",
-"........###..###........",
-"........##....##........",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
"........................",
"........................",
"........................",
diff --git a/themes/daloa/close-pressed.png b/themes/daloa/close-pressed.png
index f180fd506dacd995de0e7aaea806228bc86cefbd..133813f3822ecec6f87c14651652f99377c0027c 100644
Binary files a/themes/daloa/close-pressed.png and b/themes/daloa/close-pressed.png differ
diff --git a/themes/daloa/close-pressed.svg b/themes/daloa/close-pressed.svg
new file mode 100644
index 0000000000000000000000000000000000000000..ac08a6777de09041a1ef205d25d0cfbacecd6287
--- /dev/null
+++ b/themes/daloa/close-pressed.svg
@@ -0,0 +1,265 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://web.resource.org/cc/"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="24"
+ height="19"
+ id="svg2"
+ sodipodi:version="0.32"
+ inkscape:version="0.44"
+ version="1.0"
+ sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"
+ sodipodi:docname="close-pressed.svg"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
+ <defs
+ id="defs4">
+ <linearGradient
+ id="linearGradient1886">
+ <stop
+ style="stop-color:white;stop-opacity:1;"
+ offset="0"
+ id="stop1888" />
+ <stop
+ style="stop-color:white;stop-opacity:0.05;"
+ offset="1"
+ id="stop1890" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient5873">
+ <stop
+ id="stop5875"
+ offset="0"
+ style="stop-color:white;stop-opacity:1;" />
+ <stop
+ id="stop5877"
+ offset="1"
+ style="stop-color:white;stop-opacity:0;" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient5847">
+ <stop
+ id="stop5849"
+ offset="0"
+ style="stop-color:white;stop-opacity:0.33;" />
+ <stop
+ id="stop5851"
+ offset="1"
+ style="stop-color:white;stop-opacity:0;" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5847"
+ id="linearGradient6945"
+ gradientUnits="userSpaceOnUse"
+ x1="0"
+ y1="0.5"
+ x2="0"
+ y2="18.5"
+ gradientTransform="matrix(1,0,0,1,0,0)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5873"
+ id="linearGradient6962"
+ x1="0"
+ y1="1"
+ x2="0"
+ y2="8"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1,0,0,0.2,0,1)" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5873"
+ id="radialGradient3087"
+ cx="9"
+ cy="12.5"
+ fx="9"
+ fy="12.5"
+ r="9"
+ gradientTransform="matrix(1,0,0,1.0,0,0.5)"
+ gradientUnits="userSpaceOnUse" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5873"
+ id="radialGradient3095"
+ cx="9"
+ cy="9"
+ fx="9"
+ fy="9"
+ r="9"
+ gradientTransform="matrix(1,0,0,1.0,0,0.5)"
+ gradientUnits="userSpaceOnUse" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient1886"
+ id="linearGradient1892"
+ x1="0"
+ y1="1"
+ x2="0"
+ y2="9"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient1886"
+ id="linearGradient2791"
+ x1="0"
+ y1="1"
+ x2="0"
+ y2="19"
+ gradientUnits="userSpaceOnUse" />
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="white"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="10"
+ inkscape:cx="0"
+ inkscape:cy="0"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ inkscape:grid-bbox="true"
+ inkscape:grid-points="true"
+ gridoriginx="0px"
+ gridtolerance="0.5px"
+ guidetolerance="1px"
+ inkscape:window-width="640"
+ inkscape:window-height="400"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:guide-bbox="true"
+ inkscape:guide-points="false"
+ showguides="true" />
+ <metadata
+ id="metadata7">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title>Title</dc:title>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Olivier Fourdan</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:groupmode="layer"
+ id="layer2"
+ inkscape:label="Grad"
+ style="display:inline">
+ <path
+ style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 0,0.5 L 24,0.5 C 24,0.5 24,19 24,19 L 0,19 L 0,0.5 z "
+ id="path6057"
+ sodipodi:nodetypes="ccsc" />
+ </g>
+ <g
+ inkscape:groupmode="layer"
+ id="layer3"
+ inkscape:label="hilight">
+ <path
+ style="fill:url(#linearGradient6962);fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 0,1 L 24,1 C 24,1 24,4 24,4 L 0,4 L 0,3 z "
+ id="path6061"
+ sodipodi:nodetypes="ccsc" />
+ <rect
+ style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:0.75;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect1884"
+ width="24"
+ height="9"
+ x="0"
+ y="1" />
+ <path
+ style="fill:none;fill-opacity:1.0;fill-rule:evenodd;stroke:url(#linearGradient2791);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;opacity:1"
+ d="M 0,1 L 0,19"
+ id="path1889" />
+ <path
+ style="fill:none;fill-opacity:1.0;fill-rule:evenodd;stroke:url(#linearGradient2791);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;opacity:1"
+ d="M 24,1 L 24,19"
+ id="path1890" />
+ </g>
+ <g
+ inkscape:label="Border"
+ inkscape:groupmode="layer"
+ id="layer1"
+ style="display:inline">
+ <path
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+ d="M 0.5,0.5 L 23.5,0.5"
+ id="path6059"
+ sodipodi:nodetypes="ccsc" />
+ </g>
+ <g
+ inkscape:groupmode="layer"
+ id="g3722"
+ inkscape:label="Button">
+ <g
+ id="g2327"
+ transform="translate(6,5)">
+ <g
+ transform="matrix(0.875,0,0,00.875,0.75,0.75)"
+ style="opacity:0.33;stroke:black;stroke-width:4.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="g2217">
+ <path
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:4.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 2,2 L 10,10"
+ id="path1340"
+ sodipodi:nodetypes="cc" />
+ <path
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:4.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 2,10 L 10,2"
+ id="path2215"
+ sodipodi:nodetypes="cc" />
+ </g>
+ <path
+ id="path2221"
+ d="M 2.5,2.5 L 9.5,9.5 L 9.5,9.5"
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:white;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <path
+ id="path2225"
+ d="M 2.5,9.5 L 9.5,2.5"
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:white;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ </g>
+ </g>
+ <g
+ inkscape:groupmode="layer"
+ id="layer4"
+ inkscape:label="pressed">
+ <g
+ id="g1789"
+ transform="translate(3,1)">
+ <rect
+ style="opacity:0.5;fill:url(#radialGradient3095);fill-opacity:1.0;stroke:url(#radialGradient3087);stroke-width:1;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect3079"
+ width="24"
+ height="19"
+ x="0"
+ y="0" />
+ </g>
+ </g>
+ <g
+ inkscape:groupmode="layer"
+ id="layer5"
+ inkscape:label="Shadow">
+ <path
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.10"
+ d="M 0.5,18.5 L 23.5,18.5"
+ id="path6989"
+ sodipodi:nodetypes="ccsc" />
+ </g>
+</svg>
diff --git a/themes/daloa/close-pressed.xpm b/themes/daloa/close-pressed.xpm
index f7ee5e4ed4448febc91d1ccb7313da4a1930e5a8..a9f6355b8bde1d523e3c55362faccdbdb4805c39 100644
--- a/themes/daloa/close-pressed.xpm
+++ b/themes/daloa/close-pressed.xpm
@@ -1,26 +1,24 @@
/* XPM */
static char * close_pressed_xpm[] = {
-"24 17 6 1",
+"24 19 2 1",
" c None",
". c #C0C0FF s active_color_1",
-"+ c #D0D0FF s active_hilight_1",
-"@ c #B0B0FF s active_mid_1",
-"* c #A0A0FF s active_shadow_1",
-"# c #FFFFFF s active_text_color",
-" ",
"........................",
"........................",
"........................",
"........................",
-"........**....**........",
-".......*##*..*##*.......",
-".......*###**###*.......",
-"........*######*........",
-".........*####*.........",
-".........*####*.........",
-"........*######*........",
-".......*###**###*.......",
-".......*##*..*##*.......",
-"........**....**........",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
"........................",
"........................"};
diff --git a/themes/daloa/hide-active.png b/themes/daloa/hide-active.png
index 124f950cde50849eb514e290fcb7b8c45e3cc53c..8fc9a265d58f6865bcad767b6746e42c0560be26 100644
Binary files a/themes/daloa/hide-active.png and b/themes/daloa/hide-active.png differ
diff --git a/themes/daloa/hide-active.svg b/themes/daloa/hide-active.svg
new file mode 100644
index 0000000000000000000000000000000000000000..09d63ccf6598d398fe59b214d5497739e81511af
--- /dev/null
+++ b/themes/daloa/hide-active.svg
@@ -0,0 +1,219 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://web.resource.org/cc/"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="24"
+ height="19"
+ id="svg2"
+ sodipodi:version="0.32"
+ inkscape:version="0.44"
+ version="1.0"
+ sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"
+ sodipodi:docname="hide-active.svg"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
+ <defs
+ id="defs4">
+ <linearGradient
+ id="linearGradient1886">
+ <stop
+ style="stop-color:white;stop-opacity:1;"
+ offset="0"
+ id="stop1888" />
+ <stop
+ style="stop-color:white;stop-opacity:0.05;"
+ offset="1"
+ id="stop1890" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient5873">
+ <stop
+ id="stop5875"
+ offset="0"
+ style="stop-color:white;stop-opacity:1;" />
+ <stop
+ id="stop5877"
+ offset="1"
+ style="stop-color:white;stop-opacity:0;" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient5847">
+ <stop
+ id="stop5849"
+ offset="0"
+ style="stop-color:white;stop-opacity:0.33;" />
+ <stop
+ id="stop5851"
+ offset="1"
+ style="stop-color:white;stop-opacity:0;" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5847"
+ id="linearGradient6945"
+ gradientUnits="userSpaceOnUse"
+ x1="0"
+ y1="0.5"
+ x2="0"
+ y2="18.5"
+ gradientTransform="matrix(1,0,0,1,0,0)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5873"
+ id="linearGradient6962"
+ x1="0"
+ y1="1"
+ x2="0"
+ y2="8"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1,0,0,0.2,0,1)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient1886"
+ id="linearGradient1892"
+ x1="0"
+ y1="1"
+ x2="0"
+ y2="9"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient1886"
+ id="linearGradient2791"
+ x1="0"
+ y1="1"
+ x2="0"
+ y2="19"
+ gradientUnits="userSpaceOnUse" />
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="white"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="10"
+ inkscape:cx="0"
+ inkscape:cy="0"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ inkscape:grid-bbox="true"
+ inkscape:grid-points="true"
+ gridoriginx="0px"
+ gridtolerance="0.5px"
+ guidetolerance="1px"
+ inkscape:window-width="640"
+ inkscape:window-height="400"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:guide-bbox="true"
+ inkscape:guide-points="false"
+ showguides="true" />
+ <metadata
+ id="metadata7">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title>Title</dc:title>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Olivier Fourdan</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:groupmode="layer"
+ id="layer2"
+ inkscape:label="Grad"
+ style="display:inline">
+ <path
+ style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 0,0.5 L 24,0.5 C 24,0.5 24,19 24,19 L 0,19 L 0,0.5 z "
+ id="path6057"
+ sodipodi:nodetypes="ccsc" />
+ </g>
+ <g
+ inkscape:groupmode="layer"
+ id="layer3"
+ inkscape:label="hilight">
+ <path
+ style="fill:url(#linearGradient6962);fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 0,1 L 24,1 C 24,1 24,4 24,4 L 0,4 L 0,3 z "
+ id="path6061"
+ sodipodi:nodetypes="ccsc" />
+ <rect
+ style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:0.75;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect1884"
+ width="24"
+ height="9"
+ x="0"
+ y="1" />
+ <path
+ style="fill:none;fill-opacity:1.0;fill-rule:evenodd;stroke:url(#linearGradient2791);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;opacity:1"
+ d="M 0,1 L 0,19"
+ id="path1889" />
+ <path
+ style="fill:none;fill-opacity:1.0;fill-rule:evenodd;stroke:url(#linearGradient2791);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;opacity:1"
+ d="M 24,1 L 24,19"
+ id="path1890" />
+ </g>
+ <g
+ inkscape:label="Border"
+ inkscape:groupmode="layer"
+ id="layer1"
+ style="display:inline">
+ <path
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+ d="M 0.5,0.5 L 23.5,0.5"
+ id="path6059"
+ sodipodi:nodetypes="ccsc" />
+ </g>
+ <g
+ inkscape:groupmode="layer"
+ id="g20"
+ inkscape:label="Button">
+ <g
+ style="display:inline"
+ id="g1616"
+ transform="translate(6,4)">
+ <rect
+ style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
+ id="rect2376"
+ width="8"
+ height="4"
+ x="2"
+ y="7" />
+ <rect
+ style="opacity:1;fill:white;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
+ id="rect2378"
+ width="6"
+ height="2"
+ x="3"
+ y="8" />
+ </g>
+ </g>
+ <g
+ inkscape:groupmode="layer"
+ id="layer5"
+ inkscape:label="Shadow">
+ <path
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.10"
+ d="M 0.5,18.5 L 23.5,18.5"
+ id="path6989"
+ sodipodi:nodetypes="ccsc" />
+ </g>
+</svg>
diff --git a/themes/daloa/hide-active.xpm b/themes/daloa/hide-active.xpm
index b4899178163c89c2117a559a87270c4ed93e11f2..d4194fbb04eede2b601b56cf18741d09b017f58f 100644
--- a/themes/daloa/hide-active.xpm
+++ b/themes/daloa/hide-active.xpm
@@ -1,13 +1,8 @@
/* XPM */
static char * hide_active_xpm[] = {
-"24 17 6 1",
+"24 19 2 1",
" c None",
". c #C0C0FF s active_color_1",
-"+ c #D0D0FF s active_hilight_1",
-"@ c #B0B0FF s active_mid_1",
-"* c #A0A0FF s active_shadow_1",
-"# c #FFFFFF s active_text_color",
-" ",
"........................",
"........................",
"........................",
@@ -17,10 +12,13 @@ static char * hide_active_xpm[] = {
"........................",
"........................",
"........................",
-".........******.........",
-"........*######*........",
-"........*######*........",
-".........******.........",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
"........................",
"........................",
"........................"};
diff --git a/themes/daloa/hide-inactive.png b/themes/daloa/hide-inactive.png
index 124f950cde50849eb514e290fcb7b8c45e3cc53c..a8705e8fd23bf1c6cbae3dc04fd528eb255a6532 100644
Binary files a/themes/daloa/hide-inactive.png and b/themes/daloa/hide-inactive.png differ
diff --git a/themes/daloa/hide-inactive.svg b/themes/daloa/hide-inactive.svg
new file mode 100644
index 0000000000000000000000000000000000000000..0f80f216b9c5518b522c82b17def12a7d2c027ec
--- /dev/null
+++ b/themes/daloa/hide-inactive.svg
@@ -0,0 +1,212 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://web.resource.org/cc/"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="24"
+ height="19"
+ id="svg2"
+ sodipodi:version="0.32"
+ inkscape:version="0.44"
+ version="1.0"
+ sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"
+ sodipodi:docname="hide-inactive.svg"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
+ <defs
+ id="defs4">
+ <linearGradient
+ id="linearGradient1886">
+ <stop
+ style="stop-color:white;stop-opacity:1;"
+ offset="0"
+ id="stop1888" />
+ <stop
+ style="stop-color:white;stop-opacity:0.05;"
+ offset="1"
+ id="stop1890" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient5873">
+ <stop
+ id="stop5875"
+ offset="0"
+ style="stop-color:white;stop-opacity:1;" />
+ <stop
+ id="stop5877"
+ offset="1"
+ style="stop-color:white;stop-opacity:0;" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient5847">
+ <stop
+ id="stop5849"
+ offset="0"
+ style="stop-color:white;stop-opacity:0.33;" />
+ <stop
+ id="stop5851"
+ offset="1"
+ style="stop-color:white;stop-opacity:0;" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5847"
+ id="linearGradient6945"
+ gradientUnits="userSpaceOnUse"
+ x1="0"
+ y1="0.5"
+ x2="0"
+ y2="18.5"
+ gradientTransform="matrix(1,0,0,1,0,0)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5873"
+ id="linearGradient6962"
+ x1="0"
+ y1="1"
+ x2="0"
+ y2="8"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1,0,0,0.2,0,1)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient1886"
+ id="linearGradient1892"
+ x1="0"
+ y1="1"
+ x2="0"
+ y2="9"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient1886"
+ id="linearGradient2791"
+ x1="0"
+ y1="1"
+ x2="0"
+ y2="19"
+ gradientUnits="userSpaceOnUse" />
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="white"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="10"
+ inkscape:cx="0"
+ inkscape:cy="0"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ inkscape:grid-bbox="true"
+ inkscape:grid-points="true"
+ gridoriginx="0px"
+ gridtolerance="0.5px"
+ guidetolerance="1px"
+ inkscape:window-width="640"
+ inkscape:window-height="400"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:guide-bbox="true"
+ inkscape:guide-points="false"
+ showguides="true" />
+ <metadata
+ id="metadata7">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title>Title</dc:title>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Olivier Fourdan</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:groupmode="layer"
+ id="layer2"
+ inkscape:label="Grad"
+ style="display:inline">
+ <path
+ style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 0,0.5 L 24,0.5 C 24,0.5 24,19 24,19 L 0,19 L 0,0.5 z "
+ id="path6057"
+ sodipodi:nodetypes="ccsc" />
+ </g>
+ <g
+ inkscape:groupmode="layer"
+ id="layer3"
+ inkscape:label="hilight">
+ <path
+ style="fill:url(#linearGradient6962);fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 0,1 L 24,1 C 24,1 24,4 24,4 L 0,4 L 0,3 z "
+ id="path6061"
+ sodipodi:nodetypes="ccsc" />
+ <rect
+ style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:0.75;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect1884"
+ width="24"
+ height="9"
+ x="0"
+ y="1" />
+ <path
+ style="fill:none;fill-opacity:1.0;fill-rule:evenodd;stroke:url(#linearGradient2791);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;opacity:1"
+ d="M 0,1 L 0,19"
+ id="path1889" />
+ <path
+ style="fill:none;fill-opacity:1.0;fill-rule:evenodd;stroke:url(#linearGradient2791);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;opacity:1"
+ d="M 24,1 L 24,19"
+ id="path1890" />
+ </g>
+ <g
+ inkscape:label="Border"
+ inkscape:groupmode="layer"
+ id="layer1"
+ style="display:inline">
+ <path
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+ d="M 0.5,0.5 L 23.5,0.5"
+ id="path6059"
+ sodipodi:nodetypes="ccsc" />
+ </g>
+ <g
+ inkscape:groupmode="layer"
+ id="g20"
+ inkscape:label="Button">
+ <g
+ style="display:inline"
+ id="g1616"
+ transform="translate(6,4)">
+ <rect
+ style="opacity:0.50;fill:#7f7f7f;fill-opacity:1;stroke:#7f7f7f;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
+ id="rect2378"
+ width="6"
+ height="2"
+ x="3"
+ y="8" />
+ </g>
+ </g>
+ <g
+ inkscape:groupmode="layer"
+ id="layer5"
+ inkscape:label="Shadow">
+ <path
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.10"
+ d="M 0.5,18.5 L 23.5,18.5"
+ id="path6989"
+ sodipodi:nodetypes="ccsc" />
+ </g>
+</svg>
diff --git a/themes/daloa/hide-inactive.xpm b/themes/daloa/hide-inactive.xpm
index 0f95005c790b0948266b3531a418ea9fd074d1d3..5d3cd8517032b97cbad025b7122209283e15e693 100644
--- a/themes/daloa/hide-inactive.xpm
+++ b/themes/daloa/hide-inactive.xpm
@@ -1,12 +1,8 @@
/* XPM */
static char * hide_inactive_xpm[] = {
-"24 17 5 1",
+"24 19 2 1",
" c None",
". c #C0C0FF s inactive_color_1",
-"+ c #D0D0FF s inactive_hilight_1",
-"@ c #B0B0FF s inactive_mid_1",
-"# c #D0D0FF s inactive_text_color",
-" ",
"........................",
"........................",
"........................",
@@ -17,8 +13,11 @@ static char * hide_inactive_xpm[] = {
"........................",
"........................",
"........................",
-".........######.........",
-".........######.........",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
"........................",
"........................",
"........................",
diff --git a/themes/daloa/hide-pressed.png b/themes/daloa/hide-pressed.png
index f180fd506dacd995de0e7aaea806228bc86cefbd..acdef2ee70c36c7e0ca98bea389e74cee243d334 100644
Binary files a/themes/daloa/hide-pressed.png and b/themes/daloa/hide-pressed.png differ
diff --git a/themes/daloa/hide-pressed.svg b/themes/daloa/hide-pressed.svg
new file mode 100644
index 0000000000000000000000000000000000000000..265b347acca391df16f95a314ac0d6f0f77c2e8b
--- /dev/null
+++ b/themes/daloa/hide-pressed.svg
@@ -0,0 +1,257 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://web.resource.org/cc/"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="24"
+ height="19"
+ id="svg2"
+ sodipodi:version="0.32"
+ inkscape:version="0.44"
+ version="1.0"
+ sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"
+ sodipodi:docname="hide-pressed.svg"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
+ <defs
+ id="defs4">
+ <linearGradient
+ id="linearGradient1886">
+ <stop
+ style="stop-color:white;stop-opacity:1;"
+ offset="0"
+ id="stop1888" />
+ <stop
+ style="stop-color:white;stop-opacity:0.05;"
+ offset="1"
+ id="stop1890" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient5873">
+ <stop
+ id="stop5875"
+ offset="0"
+ style="stop-color:white;stop-opacity:1;" />
+ <stop
+ id="stop5877"
+ offset="1"
+ style="stop-color:white;stop-opacity:0;" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient5847">
+ <stop
+ id="stop5849"
+ offset="0"
+ style="stop-color:white;stop-opacity:0.33;" />
+ <stop
+ id="stop5851"
+ offset="1"
+ style="stop-color:white;stop-opacity:0;" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5847"
+ id="linearGradient6945"
+ gradientUnits="userSpaceOnUse"
+ x1="0"
+ y1="0.5"
+ x2="0"
+ y2="18.5"
+ gradientTransform="matrix(1,0,0,1,0,0)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5873"
+ id="linearGradient6962"
+ x1="0"
+ y1="1"
+ x2="0"
+ y2="8"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1,0,0,0.2,0,1)" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5873"
+ id="radialGradient3087"
+ cx="9"
+ cy="12.5"
+ fx="9"
+ fy="12.5"
+ r="9"
+ gradientTransform="matrix(1,0,0,1.0,0,0.5)"
+ gradientUnits="userSpaceOnUse" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5873"
+ id="radialGradient3095"
+ cx="9"
+ cy="9"
+ fx="9"
+ fy="9"
+ r="9"
+ gradientTransform="matrix(1,0,0,1.0,0,0.5)"
+ gradientUnits="userSpaceOnUse" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient1886"
+ id="linearGradient1892"
+ x1="0"
+ y1="1"
+ x2="0"
+ y2="9"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient1886"
+ id="linearGradient2791"
+ x1="0"
+ y1="1"
+ x2="0"
+ y2="19"
+ gradientUnits="userSpaceOnUse" />
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="white"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="10"
+ inkscape:cx="0"
+ inkscape:cy="0"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ inkscape:grid-bbox="true"
+ inkscape:grid-points="true"
+ gridoriginx="0px"
+ gridtolerance="0.5px"
+ guidetolerance="1px"
+ inkscape:window-width="640"
+ inkscape:window-height="400"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:guide-bbox="true"
+ inkscape:guide-points="false"
+ showguides="true" />
+ <metadata
+ id="metadata7">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title>Title</dc:title>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Olivier Fourdan</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:groupmode="layer"
+ id="layer2"
+ inkscape:label="Grad"
+ style="display:inline">
+ <path
+ style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 0,0.5 L 24,0.5 C 24,0.5 24,19 24,19 L 0,19 L 0,0.5 z "
+ id="path6057"
+ sodipodi:nodetypes="ccsc" />
+ </g>
+ <g
+ inkscape:groupmode="layer"
+ id="layer3"
+ inkscape:label="hilight">
+ <path
+ style="fill:url(#linearGradient6962);fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 0,1 L 24,1 C 24,1 24,4 24,4 L 0,4 L 0,3 z "
+ id="path6061"
+ sodipodi:nodetypes="ccsc" />
+ <rect
+ style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:0.75;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect1884"
+ width="24"
+ height="9"
+ x="0"
+ y="1" />
+ <path
+ style="fill:none;fill-opacity:1.0;fill-rule:evenodd;stroke:url(#linearGradient2791);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;opacity:1"
+ d="M 0,1 L 0,19"
+ id="path1889" />
+ <path
+ style="fill:none;fill-opacity:1.0;fill-rule:evenodd;stroke:url(#linearGradient2791);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;opacity:1"
+ d="M 24,1 L 24,19"
+ id="path1890" />
+ </g>
+ <g
+ inkscape:label="Border"
+ inkscape:groupmode="layer"
+ id="layer1"
+ style="display:inline">
+ <path
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+ d="M 0.5,0.5 L 23.5,0.5"
+ id="path6059"
+ sodipodi:nodetypes="ccsc" />
+ </g>
+ <g
+ inkscape:groupmode="layer"
+ id="g3722"
+ inkscape:label="Button">
+ <g
+ style="display:inline"
+ id="g1616"
+ transform="translate(6,5)">
+ <rect
+ style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
+ id="rect2376"
+ width="8"
+ height="4"
+ x="2"
+ y="7" />
+ <rect
+ style="opacity:1;fill:white;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
+ id="rect2378"
+ width="6"
+ height="2"
+ x="3"
+ y="8" />
+ </g>
+ </g>
+ <g
+ inkscape:groupmode="layer"
+ id="layer4"
+ inkscape:label="pressed">
+ <g
+ id="g1789"
+ transform="translate(3,1)">
+ <rect
+ style="opacity:0.5;fill:url(#radialGradient3095);fill-opacity:1.0;stroke:url(#radialGradient3087);stroke-width:1;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect3079"
+ width="24"
+ height="19"
+ x="0"
+ y="0" />
+ </g>
+ </g>
+ <g
+ inkscape:groupmode="layer"
+ id="layer5"
+ inkscape:label="Shadow">
+ <path
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.10"
+ d="M 0.5,18.5 L 23.5,18.5"
+ id="path6989"
+ sodipodi:nodetypes="ccsc" />
+ </g>
+</svg>
diff --git a/themes/daloa/hide-pressed.xpm b/themes/daloa/hide-pressed.xpm
index a45e39b2a81e0316558c852ba5e25cfff6b9a105..d3bca1fdd840e291b552635053c6a5835264f921 100644
--- a/themes/daloa/hide-pressed.xpm
+++ b/themes/daloa/hide-pressed.xpm
@@ -1,13 +1,8 @@
/* XPM */
static char * hide_pressed_xpm[] = {
-"24 17 6 1",
+"24 19 2 1",
" c None",
". c #C0C0FF s active_color_1",
-"+ c #D0D0FF s active_hilight_1",
-"@ c #B0B0FF s active_mid_1",
-"* c #A0A0FF s active_shadow_1",
-"# c #FFFFFF s active_text_color",
-" ",
"........................",
"........................",
"........................",
@@ -18,9 +13,12 @@ static char * hide_pressed_xpm[] = {
"........................",
"........................",
"........................",
-".........******.........",
-"........*######*........",
-"........*######*........",
-".........******.........",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
"........................",
"........................"};
diff --git a/themes/daloa/left-active.png b/themes/daloa/left-active.png
index 1b0938ff21c094207e6bc939f165115dfa2bc256..319d0ba976dd787fae37b217c9b4898035c5363f 100644
Binary files a/themes/daloa/left-active.png and b/themes/daloa/left-active.png differ
diff --git a/themes/daloa/left-active.svg b/themes/daloa/left-active.svg
new file mode 100644
index 0000000000000000000000000000000000000000..81ea15f833d4646ebf210629e07eda7781b6ae9a
--- /dev/null
+++ b/themes/daloa/left-active.svg
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://web.resource.org/cc/"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="5"
+ height="24"
+ id="svg2"
+ sodipodi:version="0.32"
+ inkscape:version="0.44"
+ version="1.0"
+ sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"
+ sodipodi:docname="left-active.svg"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
+ <defs
+ id="defs4" />
+ <sodipodi:namedview
+ id="base"
+ pagecolor="white"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="10"
+ inkscape:cx="0"
+ inkscape:cy="0"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ inkscape:grid-bbox="true"
+ inkscape:window-width="640"
+ inkscape:window-height="400"
+ inkscape:window-x="0"
+ inkscape:window-y="0" />
+ <metadata
+ id="metadata7">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title>Border</dc:title>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Olivier Fourdan</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ <cc:license
+ rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" />
+ </cc:Work>
+ <cc:License
+ rdf:about="http://creativecommons.org/licenses/GPL/2.0/">
+ <cc:permits
+ rdf:resource="http://web.resource.org/cc/Reproduction" />
+ <cc:permits
+ rdf:resource="http://web.resource.org/cc/Distribution" />
+ <cc:requires
+ rdf:resource="http://web.resource.org/cc/Notice" />
+ <cc:permits
+ rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+ <cc:requires
+ rdf:resource="http://web.resource.org/cc/ShareAlike" />
+ <cc:requires
+ rdf:resource="http://web.resource.org/cc/SourceCode" />
+ </cc:License>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ id="layer1">
+ <path
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.50"
+ d="M 0.5,0 L 0.5,24"
+ id="path1340" />
+ </g>
+</svg>
diff --git a/themes/daloa/left-active.xpm b/themes/daloa/left-active.xpm
index a83433c3d413c6764f7d149c5c372d571d25002e..7f84df06e94eb13a0da3bff2f3f907da1cefb97c 100644
--- a/themes/daloa/left-active.xpm
+++ b/themes/daloa/left-active.xpm
@@ -1,40 +1,30 @@
/* XPM */
static char * left_active_xpm[] = {
-"5 32 5 1",
+"5 24 3 1",
" c None",
-"+ c #E0E0FF s active_hilight_1",
-"@ c #A0A0FF s active_shadow_1",
-"$ c #B0B0B0 s active_mid_2",
"# c #C0C0C0 s active_color_2",
-"@+###",
-"@+###",
-"@+###",
-"@+###",
-"@+###",
-"@+###",
-"@+###",
-"@+###",
-"@+###",
-"@+###",
-"@+###",
-"@+###",
-"@+###",
-"@+###",
-"@+###",
-"@+###",
-"@+###",
-"@+###",
-"@+###",
-"@+###",
-"@+###",
-"@+###",
-"@+###",
-"@+###",
-"@+###",
-"@+###",
-"@+###",
-"@+###",
-"@+###",
-"@+###",
-"@+###",
-"@+###"};
+"@ c #C0C0FF s active_color_1",
+"@@###",
+"@@###",
+"@@###",
+"@@###",
+"@@###",
+"@@###",
+"@@###",
+"@@###",
+"@@###",
+"@@###",
+"@@###",
+"@@###",
+"@@###",
+"@@###",
+"@@###",
+"@@###",
+"@@###",
+"@@###",
+"@@###",
+"@@###",
+"@@###",
+"@@###",
+"@@###",
+"@@###"};
diff --git a/themes/daloa/left-inactive.png b/themes/daloa/left-inactive.png
index 1b0938ff21c094207e6bc939f165115dfa2bc256..319d0ba976dd787fae37b217c9b4898035c5363f 100644
Binary files a/themes/daloa/left-inactive.png and b/themes/daloa/left-inactive.png differ
diff --git a/themes/daloa/left-inactive.svg b/themes/daloa/left-inactive.svg
new file mode 100644
index 0000000000000000000000000000000000000000..7f59e958feaed10e1218ea6e176b286af278ad5c
--- /dev/null
+++ b/themes/daloa/left-inactive.svg
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://web.resource.org/cc/"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="5"
+ height="24"
+ id="svg2"
+ sodipodi:version="0.32"
+ inkscape:version="0.44"
+ version="1.0"
+ sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"
+ sodipodi:docname="left-inactive.svg"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
+ <defs
+ id="defs4" />
+ <sodipodi:namedview
+ id="base"
+ pagecolor="white"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="10"
+ inkscape:cx="0"
+ inkscape:cy="0"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ inkscape:grid-bbox="true"
+ inkscape:window-width="640"
+ inkscape:window-height="400"
+ inkscape:window-x="0"
+ inkscape:window-y="0" />
+ <metadata
+ id="metadata7">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title>Border</dc:title>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Olivier Fourdan</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ <cc:license
+ rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" />
+ </cc:Work>
+ <cc:License
+ rdf:about="http://creativecommons.org/licenses/GPL/2.0/">
+ <cc:permits
+ rdf:resource="http://web.resource.org/cc/Reproduction" />
+ <cc:permits
+ rdf:resource="http://web.resource.org/cc/Distribution" />
+ <cc:requires
+ rdf:resource="http://web.resource.org/cc/Notice" />
+ <cc:permits
+ rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+ <cc:requires
+ rdf:resource="http://web.resource.org/cc/ShareAlike" />
+ <cc:requires
+ rdf:resource="http://web.resource.org/cc/SourceCode" />
+ </cc:License>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ id="layer1">
+ <path
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.50"
+ d="M 0.5,0 L 0.5,24"
+ id="path1340" />
+ </g>
+</svg>
diff --git a/themes/daloa/left-inactive.xpm b/themes/daloa/left-inactive.xpm
index 3394c37e58da6aa2609a82bfcbb2a45f1aad0290..2ffec09471a310ee4fd7bac525f0de8506b640b1 100644
--- a/themes/daloa/left-inactive.xpm
+++ b/themes/daloa/left-inactive.xpm
@@ -1,40 +1,30 @@
/* XPM */
static char * left_inactive_xpm[] = {
-"5 32 5 1",
+"5 24 3 1",
" c None",
-"+ c #E0E0FF s inactive_hilight_1",
-"@ c #A0A0FF s inactive_shadow_1",
-"$ c #B0B0B0 s inactive_mid_2",
"# c #C0C0C0 s inactive_color_2",
-"@+###",
-"@+###",
-"@+###",
-"@+###",
-"@+###",
-"@+###",
-"@+###",
-"@+###",
-"@+###",
-"@+###",
-"@+###",
-"@+###",
-"@+###",
-"@+###",
-"@+###",
-"@+###",
-"@+###",
-"@+###",
-"@+###",
-"@+###",
-"@+###",
-"@+###",
-"@+###",
-"@+###",
-"@+###",
-"@+###",
-"@+###",
-"@+###",
-"@+###",
-"@+###",
-"@+###",
-"@+###"};
+"@ c #C0C0FF s inactive_color_1",
+"@@###",
+"@@###",
+"@@###",
+"@@###",
+"@@###",
+"@@###",
+"@@###",
+"@@###",
+"@@###",
+"@@###",
+"@@###",
+"@@###",
+"@@###",
+"@@###",
+"@@###",
+"@@###",
+"@@###",
+"@@###",
+"@@###",
+"@@###",
+"@@###",
+"@@###",
+"@@###",
+"@@###"};
diff --git a/themes/daloa/maximize-active.png b/themes/daloa/maximize-active.png
index 124f950cde50849eb514e290fcb7b8c45e3cc53c..eb25ebd178f879bdab98e6c32fc27d6ace16d710 100644
Binary files a/themes/daloa/maximize-active.png and b/themes/daloa/maximize-active.png differ
diff --git a/themes/daloa/maximize-active.svg b/themes/daloa/maximize-active.svg
new file mode 100644
index 0000000000000000000000000000000000000000..f87964233669ff26d68a1f609255fe93242d5a3b
--- /dev/null
+++ b/themes/daloa/maximize-active.svg
@@ -0,0 +1,214 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://web.resource.org/cc/"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="24"
+ height="19"
+ id="svg2"
+ sodipodi:version="0.32"
+ inkscape:version="0.44"
+ version="1.0"
+ sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"
+ sodipodi:docname="maximize-active.svg"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
+ <defs
+ id="defs4">
+ <linearGradient
+ id="linearGradient1886">
+ <stop
+ style="stop-color:white;stop-opacity:1;"
+ offset="0"
+ id="stop1888" />
+ <stop
+ style="stop-color:white;stop-opacity:0.05;"
+ offset="1"
+ id="stop1890" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient5873">
+ <stop
+ id="stop5875"
+ offset="0"
+ style="stop-color:white;stop-opacity:1;" />
+ <stop
+ id="stop5877"
+ offset="1"
+ style="stop-color:white;stop-opacity:0;" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient5847">
+ <stop
+ id="stop5849"
+ offset="0"
+ style="stop-color:white;stop-opacity:0.33;" />
+ <stop
+ id="stop5851"
+ offset="1"
+ style="stop-color:white;stop-opacity:0;" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5847"
+ id="linearGradient6945"
+ gradientUnits="userSpaceOnUse"
+ x1="0"
+ y1="0.5"
+ x2="0"
+ y2="18.5"
+ gradientTransform="matrix(1,0,0,1,0,0)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5873"
+ id="linearGradient6962"
+ x1="0"
+ y1="1"
+ x2="0"
+ y2="8"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1,0,0,0.2,0,1)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient1886"
+ id="linearGradient1892"
+ x1="0"
+ y1="1"
+ x2="0"
+ y2="9"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient1886"
+ id="linearGradient2791"
+ x1="0"
+ y1="1"
+ x2="0"
+ y2="19"
+ gradientUnits="userSpaceOnUse" />
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="white"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="10"
+ inkscape:cx="0"
+ inkscape:cy="0"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ inkscape:grid-bbox="true"
+ inkscape:grid-points="true"
+ gridoriginx="0px"
+ gridtolerance="0.5px"
+ guidetolerance="1px"
+ inkscape:window-width="640"
+ inkscape:window-height="400"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:guide-bbox="true"
+ inkscape:guide-points="false"
+ showguides="true" />
+ <metadata
+ id="metadata7">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title>Title</dc:title>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Olivier Fourdan</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:groupmode="layer"
+ id="layer2"
+ inkscape:label="Grad"
+ style="display:inline">
+ <path
+ style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 0,0.5 L 24,0.5 C 24,0.5 24,19 24,19 L 0,19 L 0,0.5 z "
+ id="path6057"
+ sodipodi:nodetypes="ccsc" />
+ </g>
+ <g
+ inkscape:groupmode="layer"
+ id="layer3"
+ inkscape:label="hilight">
+ <path
+ style="fill:url(#linearGradient6962);fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 0,1 L 24,1 C 24,1 24,4 24,4 L 0,4 L 0,3 z "
+ id="path6061"
+ sodipodi:nodetypes="ccsc" />
+ <rect
+ style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:0.75;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect1884"
+ width="24"
+ height="9"
+ x="0"
+ y="1" />
+ <path
+ style="fill:none;fill-opacity:1.0;fill-rule:evenodd;stroke:url(#linearGradient2791);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;opacity:1"
+ d="M 0,1 L 0,19"
+ id="path1889" />
+ <path
+ style="fill:none;fill-opacity:1.0;fill-rule:evenodd;stroke:url(#linearGradient2791);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;opacity:1"
+ d="M 24,1 L 24,19"
+ id="path1890" />
+ </g>
+ <g
+ inkscape:label="Border"
+ inkscape:groupmode="layer"
+ id="layer1"
+ style="display:inline">
+ <path
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+ d="M 0.5,0.5 L 23.5,0.5"
+ id="path6059"
+ sodipodi:nodetypes="ccsc" />
+ </g>
+ <g
+ inkscape:groupmode="layer"
+ id="g20"
+ inkscape:label="Button">
+ <g
+ style="display:inline"
+ id="g1614"
+ transform="translate(6,4)">
+ <path
+ sodipodi:nodetypes="cccccccccc"
+ id="rect2266"
+ d="M 1,1 L 1,11 L 11,11 L 11,1 L 1,1 z M 4,5 L 8,5 L 8,8 L 4,8 L 4,5 z "
+ style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
+ <path
+ id="rect2275"
+ d="M 2,2 L 2,10 L 10,10 L 10,2 L 2,2 z M 3,4 L 9,4 L 9,9 L 3,9 L 3,4 z "
+ style="opacity:1;fill:white;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ </g>
+ </g>
+ <g
+ inkscape:groupmode="layer"
+ id="layer5"
+ inkscape:label="Shadow">
+ <path
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.10"
+ d="M 0.5,18.5 L 23.5,18.5"
+ id="path6989"
+ sodipodi:nodetypes="ccsc" />
+ </g>
+</svg>
diff --git a/themes/daloa/maximize-active.xpm b/themes/daloa/maximize-active.xpm
index f339d1bfba54c31368d70285f36ae2bc2d56aecd..07c05e109c7a086d1b9afdccdf827e256bdbd3de 100644
--- a/themes/daloa/maximize-active.xpm
+++ b/themes/daloa/maximize-active.xpm
@@ -1,26 +1,24 @@
/* XPM */
static char * maximize_active_xpm[] = {
-"24 17 6 1",
+"24 19 2 1",
" c None",
". c #C0C0FF s active_color_1",
-"+ c #D0D0FF s active_hilight_1",
-"@ c #B0B0FF s active_mid_1",
-"* c #A0A0FF s active_shadow_1",
-"# c #FFFFFF s active_text_color",
-" ",
-"........................",
-"........................",
-"........................",
-"........********........",
-".......*########*.......",
-".......*########*.......",
-".......*#******#*.......",
-".......*#*....*#*.......",
-".......*#*....*#*.......",
-".......*#*....*#*.......",
-".......*#******#*.......",
-".......*########*.......",
-"........********........",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
"........................",
"........................",
"........................"};
diff --git a/themes/daloa/maximize-inactive.png b/themes/daloa/maximize-inactive.png
index 124f950cde50849eb514e290fcb7b8c45e3cc53c..eaadfc1b4d7b98e32a177e57f339e4478d07cbc7 100644
Binary files a/themes/daloa/maximize-inactive.png and b/themes/daloa/maximize-inactive.png differ
diff --git a/themes/daloa/maximize-inactive.svg b/themes/daloa/maximize-inactive.svg
new file mode 100644
index 0000000000000000000000000000000000000000..ad7f65bd015ea645effda9c9a1fb2a8e7e9d9743
--- /dev/null
+++ b/themes/daloa/maximize-inactive.svg
@@ -0,0 +1,209 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://web.resource.org/cc/"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="24"
+ height="19"
+ id="svg2"
+ sodipodi:version="0.32"
+ inkscape:version="0.44"
+ version="1.0"
+ sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"
+ sodipodi:docname="maximize-inactive.svg"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
+ <defs
+ id="defs4">
+ <linearGradient
+ id="linearGradient1886">
+ <stop
+ style="stop-color:white;stop-opacity:1;"
+ offset="0"
+ id="stop1888" />
+ <stop
+ style="stop-color:white;stop-opacity:0.05;"
+ offset="1"
+ id="stop1890" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient5873">
+ <stop
+ id="stop5875"
+ offset="0"
+ style="stop-color:white;stop-opacity:1;" />
+ <stop
+ id="stop5877"
+ offset="1"
+ style="stop-color:white;stop-opacity:0;" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient5847">
+ <stop
+ id="stop5849"
+ offset="0"
+ style="stop-color:white;stop-opacity:0.33;" />
+ <stop
+ id="stop5851"
+ offset="1"
+ style="stop-color:white;stop-opacity:0;" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5847"
+ id="linearGradient6945"
+ gradientUnits="userSpaceOnUse"
+ x1="0"
+ y1="0.5"
+ x2="0"
+ y2="18.5"
+ gradientTransform="matrix(1,0,0,1,0,0)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5873"
+ id="linearGradient6962"
+ x1="0"
+ y1="1"
+ x2="0"
+ y2="8"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1,0,0,0.2,0,1)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient1886"
+ id="linearGradient1892"
+ x1="0"
+ y1="1"
+ x2="0"
+ y2="9"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient1886"
+ id="linearGradient2791"
+ x1="0"
+ y1="1"
+ x2="0"
+ y2="19"
+ gradientUnits="userSpaceOnUse" />
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="white"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="10"
+ inkscape:cx="0"
+ inkscape:cy="0"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ inkscape:grid-bbox="true"
+ inkscape:grid-points="true"
+ gridoriginx="0px"
+ gridtolerance="0.5px"
+ guidetolerance="1px"
+ inkscape:window-width="640"
+ inkscape:window-height="400"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:guide-bbox="true"
+ inkscape:guide-points="false"
+ showguides="true" />
+ <metadata
+ id="metadata7">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title>Title</dc:title>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Olivier Fourdan</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:groupmode="layer"
+ id="layer2"
+ inkscape:label="Grad"
+ style="display:inline">
+ <path
+ style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 0,0.5 L 24,0.5 C 24,0.5 24,19 24,19 L 0,19 L 0,0.5 z "
+ id="path6057"
+ sodipodi:nodetypes="ccsc" />
+ </g>
+ <g
+ inkscape:groupmode="layer"
+ id="layer3"
+ inkscape:label="hilight">
+ <path
+ style="fill:url(#linearGradient6962);fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 0,1 L 24,1 C 24,1 24,4 24,4 L 0,4 L 0,3 z "
+ id="path6061"
+ sodipodi:nodetypes="ccsc" />
+ <rect
+ style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:0.75;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect1884"
+ width="24"
+ height="9"
+ x="0"
+ y="1" />
+ <path
+ style="fill:none;fill-opacity:1.0;fill-rule:evenodd;stroke:url(#linearGradient2791);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;opacity:1"
+ d="M 0,1 L 0,19"
+ id="path1889" />
+ <path
+ style="fill:none;fill-opacity:1.0;fill-rule:evenodd;stroke:url(#linearGradient2791);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;opacity:1"
+ d="M 24,1 L 24,19"
+ id="path1890" />
+ </g>
+ <g
+ inkscape:label="Border"
+ inkscape:groupmode="layer"
+ id="layer1"
+ style="display:inline">
+ <path
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+ d="M 0.5,0.5 L 23.5,0.5"
+ id="path6059"
+ sodipodi:nodetypes="ccsc" />
+ </g>
+ <g
+ inkscape:groupmode="layer"
+ id="g20"
+ inkscape:label="Button">
+ <g
+ style="display:inline"
+ id="g1626"
+ transform="translate(6,4)">
+ <path
+ style="opacity:0.50;fill:#7f7f7f;fill-opacity:1;stroke:#7f7f7f;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
+ d="M 2,2 L 2,10 L 10,10 L 10,2 L 2,2 z M 3,4 L 9,4 L 9,9 L 3,9 L 3,4 z "
+ id="rect2275" />
+ </g>
+ </g>
+ <g
+ inkscape:groupmode="layer"
+ id="layer5"
+ inkscape:label="Shadow">
+ <path
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.10"
+ d="M 0.5,18.5 L 23.5,18.5"
+ id="path6989"
+ sodipodi:nodetypes="ccsc" />
+ </g>
+</svg>
diff --git a/themes/daloa/maximize-inactive.xpm b/themes/daloa/maximize-inactive.xpm
index f15b9362ec2f1675f8d4ae0c2e698d111788f143..af07ba3688d3ae1597280f0d5d3d66d3fa84439b 100644
--- a/themes/daloa/maximize-inactive.xpm
+++ b/themes/daloa/maximize-inactive.xpm
@@ -1,24 +1,23 @@
/* XPM */
static char * maximize_inactive_xpm[] = {
-"24 17 5 1",
+"24 19 2 1",
" c None",
". c #C0C0FF s inactive_color_1",
-"+ c #D0D0FF s inactive_hilight_1",
-"@ c #B0B0FF s inactive_mid_1",
-"# c #D0D0FF s inactive_text_color",
-" ",
"........................",
"........................",
"........................",
"........................",
-"........########........",
-"........########........",
-"........#......#........",
-"........#......#........",
-"........#......#........",
-"........#......#........",
-"........#......#........",
-"........########........",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
"........................",
"........................",
"........................",
diff --git a/themes/daloa/maximize-pressed.png b/themes/daloa/maximize-pressed.png
index f180fd506dacd995de0e7aaea806228bc86cefbd..050b727d5c1eccede52104020bdc96807782450e 100644
Binary files a/themes/daloa/maximize-pressed.png and b/themes/daloa/maximize-pressed.png differ
diff --git a/themes/daloa/maximize-pressed.svg b/themes/daloa/maximize-pressed.svg
new file mode 100644
index 0000000000000000000000000000000000000000..bcba9ee58958cea320e2a3ef073ff7c9d0298d90
--- /dev/null
+++ b/themes/daloa/maximize-pressed.svg
@@ -0,0 +1,252 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://web.resource.org/cc/"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="24"
+ height="19"
+ id="svg2"
+ sodipodi:version="0.32"
+ inkscape:version="0.44"
+ version="1.0"
+ sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"
+ sodipodi:docname="maximize-pressed.svg"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
+ <defs
+ id="defs4">
+ <linearGradient
+ id="linearGradient1886">
+ <stop
+ style="stop-color:white;stop-opacity:1;"
+ offset="0"
+ id="stop1888" />
+ <stop
+ style="stop-color:white;stop-opacity:0.05;"
+ offset="1"
+ id="stop1890" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient5873">
+ <stop
+ id="stop5875"
+ offset="0"
+ style="stop-color:white;stop-opacity:1;" />
+ <stop
+ id="stop5877"
+ offset="1"
+ style="stop-color:white;stop-opacity:0;" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient5847">
+ <stop
+ id="stop5849"
+ offset="0"
+ style="stop-color:white;stop-opacity:0.33;" />
+ <stop
+ id="stop5851"
+ offset="1"
+ style="stop-color:white;stop-opacity:0;" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5847"
+ id="linearGradient6945"
+ gradientUnits="userSpaceOnUse"
+ x1="0"
+ y1="0.5"
+ x2="0"
+ y2="18.5"
+ gradientTransform="matrix(1,0,0,1,0,0)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5873"
+ id="linearGradient6962"
+ x1="0"
+ y1="1"
+ x2="0"
+ y2="8"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1,0,0,0.2,0,1)" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5873"
+ id="radialGradient3087"
+ cx="9"
+ cy="12.5"
+ fx="9"
+ fy="12.5"
+ r="9"
+ gradientTransform="matrix(1,0,0,1.0,0,0.5)"
+ gradientUnits="userSpaceOnUse" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5873"
+ id="radialGradient3095"
+ cx="9"
+ cy="9"
+ fx="9"
+ fy="9"
+ r="9"
+ gradientTransform="matrix(1,0,0,1.0,0,0.5)"
+ gradientUnits="userSpaceOnUse" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient1886"
+ id="linearGradient1892"
+ x1="0"
+ y1="1"
+ x2="0"
+ y2="9"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient1886"
+ id="linearGradient2791"
+ x1="0"
+ y1="1"
+ x2="0"
+ y2="19"
+ gradientUnits="userSpaceOnUse" />
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="white"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="10"
+ inkscape:cx="0"
+ inkscape:cy="0"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ inkscape:grid-bbox="true"
+ inkscape:grid-points="true"
+ gridoriginx="0px"
+ gridtolerance="0.5px"
+ guidetolerance="1px"
+ inkscape:window-width="640"
+ inkscape:window-height="400"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:guide-bbox="true"
+ inkscape:guide-points="false"
+ showguides="true" />
+ <metadata
+ id="metadata7">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title>Title</dc:title>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Olivier Fourdan</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:groupmode="layer"
+ id="layer2"
+ inkscape:label="Grad"
+ style="display:inline">
+ <path
+ style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 0,0.5 L 24,0.5 C 24,0.5 24,19 24,19 L 0,19 L 0,0.5 z "
+ id="path6057"
+ sodipodi:nodetypes="ccsc" />
+ </g>
+ <g
+ inkscape:groupmode="layer"
+ id="layer3"
+ inkscape:label="hilight">
+ <path
+ style="fill:url(#linearGradient6962);fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 0,1 L 24,1 C 24,1 24,4 24,4 L 0,4 L 0,3 z "
+ id="path6061"
+ sodipodi:nodetypes="ccsc" />
+ <rect
+ style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:0.75;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect1884"
+ width="24"
+ height="9"
+ x="0"
+ y="1" />
+ <path
+ style="fill:none;fill-opacity:1.0;fill-rule:evenodd;stroke:url(#linearGradient2791);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;opacity:1"
+ d="M 0,1 L 0,19"
+ id="path1889" />
+ <path
+ style="fill:none;fill-opacity:1.0;fill-rule:evenodd;stroke:url(#linearGradient2791);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;opacity:1"
+ d="M 24,1 L 24,19"
+ id="path1890" />
+ </g>
+ <g
+ inkscape:label="Border"
+ inkscape:groupmode="layer"
+ id="layer1"
+ style="display:inline">
+ <path
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+ d="M 0.5,0.5 L 23.5,0.5"
+ id="path6059"
+ sodipodi:nodetypes="ccsc" />
+ </g>
+ <g
+ inkscape:groupmode="layer"
+ id="g3722"
+ inkscape:label="Button">
+ <g
+ style="display:inline"
+ id="g1614"
+ transform="translate(6,5)">
+ <path
+ sodipodi:nodetypes="cccccccccc"
+ id="rect2266"
+ d="M 1,1 L 1,11 L 11,11 L 11,1 L 1,1 z M 4,5 L 8,5 L 8,8 L 4,8 L 4,5 z "
+ style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
+ <path
+ id="rect2275"
+ d="M 2,2 L 2,10 L 10,10 L 10,2 L 2,2 z M 3,4 L 9,4 L 9,9 L 3,9 L 3,4 z "
+ style="opacity:1;fill:white;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ </g>
+ </g>
+ <g
+ inkscape:groupmode="layer"
+ id="layer4"
+ inkscape:label="pressed">
+ <g
+ id="g1789"
+ transform="translate(3,1)">
+ <rect
+ style="opacity:0.5;fill:url(#radialGradient3095);fill-opacity:1.0;stroke:url(#radialGradient3087);stroke-width:1;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect3079"
+ width="24"
+ height="19"
+ x="0"
+ y="0" />
+ </g>
+ </g>
+ <g
+ inkscape:groupmode="layer"
+ id="layer5"
+ inkscape:label="Shadow">
+ <path
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.10"
+ d="M 0.5,18.5 L 23.5,18.5"
+ id="path6989"
+ sodipodi:nodetypes="ccsc" />
+ </g>
+</svg>
diff --git a/themes/daloa/maximize-pressed.xpm b/themes/daloa/maximize-pressed.xpm
index dcde47b0011e87559337839b125ca640490e6e6d..d9fe869fcf6c3d80970b97320677ef6905724d01 100644
--- a/themes/daloa/maximize-pressed.xpm
+++ b/themes/daloa/maximize-pressed.xpm
@@ -1,26 +1,24 @@
/* XPM */
static char * maximize_pressed_xpm[] = {
-"24 17 6 1",
+"24 19 2 1",
" c None",
". c #C0C0FF s active_color_1",
-"+ c #D0D0FF s active_hilight_1",
-"@ c #B0B0FF s active_mid_1",
-"* c #A0A0FF s active_shadow_1",
-"# c #FFFFFF s active_text_color",
-" ",
"........................",
"........................",
"........................",
"........................",
-"........********........",
-".......*########*.......",
-".......*########*.......",
-".......*#******#*.......",
-".......*#*....*#*.......",
-".......*#*....*#*.......",
-".......*#*....*#*.......",
-".......*#******#*.......",
-".......*########*.......",
-"........********........",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
"........................",
"........................"};
diff --git a/themes/daloa/maximize-toggled-active.png b/themes/daloa/maximize-toggled-active.png
index 124f950cde50849eb514e290fcb7b8c45e3cc53c..7fdf28db7fe1813a496857e92f47cfdeb2ee929f 100644
Binary files a/themes/daloa/maximize-toggled-active.png and b/themes/daloa/maximize-toggled-active.png differ
diff --git a/themes/daloa/maximize-toggled-active.svg b/themes/daloa/maximize-toggled-active.svg
new file mode 100644
index 0000000000000000000000000000000000000000..752b673a7c7e49ee6ee3e1c6e14cb39177b902e7
--- /dev/null
+++ b/themes/daloa/maximize-toggled-active.svg
@@ -0,0 +1,217 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://web.resource.org/cc/"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="24"
+ height="19"
+ id="svg2"
+ sodipodi:version="0.32"
+ inkscape:version="0.44"
+ version="1.0"
+ sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"
+ sodipodi:docname="maximize-toggled-active.svg"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
+ <defs
+ id="defs4">
+ <linearGradient
+ id="linearGradient1886">
+ <stop
+ style="stop-color:white;stop-opacity:1;"
+ offset="0"
+ id="stop1888" />
+ <stop
+ style="stop-color:white;stop-opacity:0.05;"
+ offset="1"
+ id="stop1890" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient5873">
+ <stop
+ id="stop5875"
+ offset="0"
+ style="stop-color:white;stop-opacity:1;" />
+ <stop
+ id="stop5877"
+ offset="1"
+ style="stop-color:white;stop-opacity:0;" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient5847">
+ <stop
+ id="stop5849"
+ offset="0"
+ style="stop-color:white;stop-opacity:0.33;" />
+ <stop
+ id="stop5851"
+ offset="1"
+ style="stop-color:white;stop-opacity:0;" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5847"
+ id="linearGradient6945"
+ gradientUnits="userSpaceOnUse"
+ x1="0"
+ y1="0.5"
+ x2="0"
+ y2="18.5"
+ gradientTransform="matrix(1,0,0,1,0,0)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5873"
+ id="linearGradient6962"
+ x1="0"
+ y1="1"
+ x2="0"
+ y2="8"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1,0,0,0.2,0,1)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient1886"
+ id="linearGradient1892"
+ x1="0"
+ y1="1"
+ x2="0"
+ y2="9"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient1886"
+ id="linearGradient2791"
+ x1="0"
+ y1="1"
+ x2="0"
+ y2="19"
+ gradientUnits="userSpaceOnUse" />
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="white"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="10"
+ inkscape:cx="0"
+ inkscape:cy="0"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ inkscape:grid-bbox="true"
+ inkscape:grid-points="true"
+ gridoriginx="0px"
+ gridtolerance="0.5px"
+ guidetolerance="1px"
+ inkscape:window-width="640"
+ inkscape:window-height="400"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:guide-bbox="true"
+ inkscape:guide-points="false"
+ showguides="true" />
+ <metadata
+ id="metadata7">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title>Title</dc:title>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Olivier Fourdan</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:groupmode="layer"
+ id="layer2"
+ inkscape:label="Grad"
+ style="display:inline">
+ <path
+ style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 0,0.5 L 24,0.5 C 24,0.5 24,19 24,19 L 0,19 L 0,0.5 z "
+ id="path6057"
+ sodipodi:nodetypes="ccsc" />
+ </g>
+ <g
+ inkscape:groupmode="layer"
+ id="layer3"
+ inkscape:label="hilight">
+ <path
+ style="fill:url(#linearGradient6962);fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 0,1 L 24,1 C 24,1 24,4 24,4 L 0,4 L 0,3 z "
+ id="path6061"
+ sodipodi:nodetypes="ccsc" />
+ <rect
+ style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:0.75;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect1884"
+ width="24"
+ height="9"
+ x="0"
+ y="1" />
+ <path
+ style="fill:none;fill-opacity:1.0;fill-rule:evenodd;stroke:url(#linearGradient2791);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;opacity:1"
+ d="M 0,1 L 0,19"
+ id="path1889" />
+ <path
+ style="fill:none;fill-opacity:1.0;fill-rule:evenodd;stroke:url(#linearGradient2791);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;opacity:1"
+ d="M 24,1 L 24,19"
+ id="path1890" />
+ </g>
+ <g
+ inkscape:label="Border"
+ inkscape:groupmode="layer"
+ id="layer1"
+ style="display:inline">
+ <path
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+ d="M 0.5,0.5 L 23.5,0.5"
+ id="path6059"
+ sodipodi:nodetypes="ccsc" />
+ </g>
+ <g
+ inkscape:groupmode="layer"
+ id="g20"
+ inkscape:label="Button">
+ <g
+ style="display:inline"
+ id="g1626"
+ transform="translate(6,4)">
+ <path
+ id="rect2318"
+ d="M 3,0 L 3,3 L 0,3 L 0,12 L 9,12 L 9,9 L 12,9 L 12,0 L 3,0 z M 3,7 L 6,7 L 6,9 L 3,9 L 3,7 z "
+ style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
+ <path
+ id="rect2331"
+ d="M 4,1 L 4,3 L 5,3 L 9,3 L 10,3 L 10,7 L 9,7 L 9,8 L 11,8 L 11,1 L 4,1 z "
+ style="opacity:1;fill:white;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <path
+ id="rect2371"
+ d="M 1,4 L 1,11 L 8,11 L 8,4 L 1,4 z M 2,6 L 7,6 L 7,10 L 2,10 L 2,6 z "
+ style="opacity:1;fill:white;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ </g>
+ </g>
+ <g
+ inkscape:groupmode="layer"
+ id="layer5"
+ inkscape:label="Shadow">
+ <path
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.10"
+ d="M 0.5,18.5 L 23.5,18.5"
+ id="path6989"
+ sodipodi:nodetypes="ccsc" />
+ </g>
+</svg>
diff --git a/themes/daloa/maximize-toggled-active.xpm b/themes/daloa/maximize-toggled-active.xpm
index 6ac48e808b72d40ff34b61f1515e5beebebe9721..a3344440d109db19f591a2a319103bdb1505f414 100644
--- a/themes/daloa/maximize-toggled-active.xpm
+++ b/themes/daloa/maximize-toggled-active.xpm
@@ -1,26 +1,24 @@
/* XPM */
static char * maximize_toggled_active_xpm[] = {
-"24 17 6 1",
+"24 19 2 1",
" c None",
". c #C0C0FF s active_color_1",
-"+ c #D0D0FF s active_hilight_1",
-"@ c #B0B0FF s active_mid_1",
-"* c #A0A0FF s active_shadow_1",
-"# c #FFFFFF s active_text_color",
-" ",
-"........................",
-"........................",
-"..........*******.......",
-".........*#######*......",
-".........*#######*......",
-".......*********#*......",
-"......*#######**#*......",
-"......*#######**#*......",
-"......*#*****#**#*......",
-"......*#*...*#*##*......",
-"......*#*...*#***.......",
-"......*#*****#*.........",
-"......*#######*.........",
-".......*******..........",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
"........................",
"........................"};
diff --git a/themes/daloa/maximize-toggled-inactive.png b/themes/daloa/maximize-toggled-inactive.png
index 124f950cde50849eb514e290fcb7b8c45e3cc53c..c342ce8837df7a548357be49f027b46217585f64 100644
Binary files a/themes/daloa/maximize-toggled-inactive.png and b/themes/daloa/maximize-toggled-inactive.png differ
diff --git a/themes/daloa/maximize-toggled-inactive.svg b/themes/daloa/maximize-toggled-inactive.svg
new file mode 100644
index 0000000000000000000000000000000000000000..1f5fb560a8069b4f8953c87cdaf72527ae8c8e9f
--- /dev/null
+++ b/themes/daloa/maximize-toggled-inactive.svg
@@ -0,0 +1,213 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://web.resource.org/cc/"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="24"
+ height="19"
+ id="svg2"
+ sodipodi:version="0.32"
+ inkscape:version="0.44"
+ version="1.0"
+ sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"
+ sodipodi:docname="maximize-toggled-inactive.svg"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
+ <defs
+ id="defs4">
+ <linearGradient
+ id="linearGradient1886">
+ <stop
+ style="stop-color:white;stop-opacity:1;"
+ offset="0"
+ id="stop1888" />
+ <stop
+ style="stop-color:white;stop-opacity:0.05;"
+ offset="1"
+ id="stop1890" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient5873">
+ <stop
+ id="stop5875"
+ offset="0"
+ style="stop-color:white;stop-opacity:1;" />
+ <stop
+ id="stop5877"
+ offset="1"
+ style="stop-color:white;stop-opacity:0;" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient5847">
+ <stop
+ id="stop5849"
+ offset="0"
+ style="stop-color:white;stop-opacity:0.33;" />
+ <stop
+ id="stop5851"
+ offset="1"
+ style="stop-color:white;stop-opacity:0;" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5847"
+ id="linearGradient6945"
+ gradientUnits="userSpaceOnUse"
+ x1="0"
+ y1="0.5"
+ x2="0"
+ y2="18.5"
+ gradientTransform="matrix(1,0,0,1,0,0)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5873"
+ id="linearGradient6962"
+ x1="0"
+ y1="1"
+ x2="0"
+ y2="8"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1,0,0,0.2,0,1)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient1886"
+ id="linearGradient1892"
+ x1="0"
+ y1="1"
+ x2="0"
+ y2="9"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient1886"
+ id="linearGradient2791"
+ x1="0"
+ y1="1"
+ x2="0"
+ y2="19"
+ gradientUnits="userSpaceOnUse" />
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="white"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="10"
+ inkscape:cx="0"
+ inkscape:cy="0"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ inkscape:grid-bbox="true"
+ inkscape:grid-points="true"
+ gridoriginx="0px"
+ gridtolerance="0.5px"
+ guidetolerance="1px"
+ inkscape:window-width="640"
+ inkscape:window-height="400"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:guide-bbox="true"
+ inkscape:guide-points="false"
+ showguides="true" />
+ <metadata
+ id="metadata7">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title>Title</dc:title>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Olivier Fourdan</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:groupmode="layer"
+ id="layer2"
+ inkscape:label="Grad"
+ style="display:inline">
+ <path
+ style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 0,0.5 L 24,0.5 C 24,0.5 24,19 24,19 L 0,19 L 0,0.5 z "
+ id="path6057"
+ sodipodi:nodetypes="ccsc" />
+ </g>
+ <g
+ inkscape:groupmode="layer"
+ id="layer3"
+ inkscape:label="hilight">
+ <path
+ style="fill:url(#linearGradient6962);fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 0,1 L 24,1 C 24,1 24,4 24,4 L 0,4 L 0,3 z "
+ id="path6061"
+ sodipodi:nodetypes="ccsc" />
+ <rect
+ style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:0.75;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect1884"
+ width="24"
+ height="9"
+ x="0"
+ y="1" />
+ <path
+ style="fill:none;fill-opacity:1.0;fill-rule:evenodd;stroke:url(#linearGradient2791);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;opacity:1"
+ d="M 0,1 L 0,19"
+ id="path1889" />
+ <path
+ style="fill:none;fill-opacity:1.0;fill-rule:evenodd;stroke:url(#linearGradient2791);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;opacity:1"
+ d="M 24,1 L 24,19"
+ id="path1890" />
+ </g>
+ <g
+ inkscape:label="Border"
+ inkscape:groupmode="layer"
+ id="layer1"
+ style="display:inline">
+ <path
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+ d="M 0.5,0.5 L 23.5,0.5"
+ id="path6059"
+ sodipodi:nodetypes="ccsc" />
+ </g>
+ <g
+ inkscape:groupmode="layer"
+ id="g20"
+ inkscape:label="Button">
+ <g
+ style="display:inline"
+ id="g1639"
+ transform="translate(6,4)">
+ <path
+ id="rect2331"
+ d="M 4,1 L 4,3 L 5,3 L 9,3 L 10,3 L 10,7 L 9,7 L 9,8 L 11,8 L 11,1 L 4,1 z "
+ style="opacity:0.50;fill:#7f7f7f;fill-opacity:1;stroke:#7f7f7f;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <path
+ id="rect2371"
+ d="M 1,4 L 1,11 L 8,11 L 8,4 L 1,4 z M 2,6 L 7,6 L 7,10 L 2,10 L 2,6 z "
+ style="opacity:0.50;fill:#7f7f7f;fill-opacity:1;stroke:#7f7f7f;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ </g>
+ </g>
+ <g
+ inkscape:groupmode="layer"
+ id="layer5"
+ inkscape:label="Shadow">
+ <path
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.10"
+ d="M 0.5,18.5 L 23.5,18.5"
+ id="path6989"
+ sodipodi:nodetypes="ccsc" />
+ </g>
+</svg>
diff --git a/themes/daloa/maximize-toggled-inactive.xpm b/themes/daloa/maximize-toggled-inactive.xpm
index 3d8c49060b320a1727b5767b6c8c54fd49f43feb..8d0a10c8e8001b39bd3cdda9c5990ead8fd8a034 100644
--- a/themes/daloa/maximize-toggled-inactive.xpm
+++ b/themes/daloa/maximize-toggled-inactive.xpm
@@ -1,25 +1,24 @@
/* XPM */
static char * maximize_toggled_inactive_xpm[] = {
-"24 17 5 1",
+"24 19 2 1",
" c None",
". c #C0C0FF s inactive_color_1",
-"+ c #D0D0FF s inactive_hilight_1",
-"@ c #B0B0FF s inactive_mid_1",
-"# c #D0D0FF s inactive_text_color",
-" ",
-"........................",
-"........................",
-"........................",
-"..........#######.......",
-"..........#######.......",
-"................#.......",
-".......#######..#.......",
-".......#######..#.......",
-".......#.....#..#.......",
-".......#.....#.##.......",
-".......#.....#..........",
-".......#.....#..........",
-".......#######..........",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
"........................",
"........................",
"........................"};
diff --git a/themes/daloa/maximize-toggled-pressed.png b/themes/daloa/maximize-toggled-pressed.png
index f180fd506dacd995de0e7aaea806228bc86cefbd..dd8cb0cc9963f22a58f5db7143808a99aa9bee6b 100644
Binary files a/themes/daloa/maximize-toggled-pressed.png and b/themes/daloa/maximize-toggled-pressed.png differ
diff --git a/themes/daloa/maximize-toggled-pressed.svg b/themes/daloa/maximize-toggled-pressed.svg
new file mode 100644
index 0000000000000000000000000000000000000000..d5dc277575193c5ad9bed58f94ec80d9a85df9c7
--- /dev/null
+++ b/themes/daloa/maximize-toggled-pressed.svg
@@ -0,0 +1,255 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://web.resource.org/cc/"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="24"
+ height="19"
+ id="svg2"
+ sodipodi:version="0.32"
+ inkscape:version="0.44"
+ version="1.0"
+ sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"
+ sodipodi:docname="maximize-toggled-pressed.svg"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
+ <defs
+ id="defs4">
+ <linearGradient
+ id="linearGradient1886">
+ <stop
+ style="stop-color:white;stop-opacity:1;"
+ offset="0"
+ id="stop1888" />
+ <stop
+ style="stop-color:white;stop-opacity:0.05;"
+ offset="1"
+ id="stop1890" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient5873">
+ <stop
+ id="stop5875"
+ offset="0"
+ style="stop-color:white;stop-opacity:1;" />
+ <stop
+ id="stop5877"
+ offset="1"
+ style="stop-color:white;stop-opacity:0;" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient5847">
+ <stop
+ id="stop5849"
+ offset="0"
+ style="stop-color:white;stop-opacity:0.33;" />
+ <stop
+ id="stop5851"
+ offset="1"
+ style="stop-color:white;stop-opacity:0;" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5847"
+ id="linearGradient6945"
+ gradientUnits="userSpaceOnUse"
+ x1="0"
+ y1="0.5"
+ x2="0"
+ y2="18.5"
+ gradientTransform="matrix(1,0,0,1,0,0)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5873"
+ id="linearGradient6962"
+ x1="0"
+ y1="1"
+ x2="0"
+ y2="8"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1,0,0,0.2,0,1)" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5873"
+ id="radialGradient3087"
+ cx="9"
+ cy="12.5"
+ fx="9"
+ fy="12.5"
+ r="9"
+ gradientTransform="matrix(1,0,0,1.0,0,0.5)"
+ gradientUnits="userSpaceOnUse" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5873"
+ id="radialGradient3095"
+ cx="9"
+ cy="9"
+ fx="9"
+ fy="9"
+ r="9"
+ gradientTransform="matrix(1,0,0,1.0,0,0.5)"
+ gradientUnits="userSpaceOnUse" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient1886"
+ id="linearGradient1892"
+ x1="0"
+ y1="1"
+ x2="0"
+ y2="9"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient1886"
+ id="linearGradient2791"
+ x1="0"
+ y1="1"
+ x2="0"
+ y2="19"
+ gradientUnits="userSpaceOnUse" />
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="white"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="10"
+ inkscape:cx="0"
+ inkscape:cy="0"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ inkscape:grid-bbox="true"
+ inkscape:grid-points="true"
+ gridoriginx="0px"
+ gridtolerance="0.5px"
+ guidetolerance="1px"
+ inkscape:window-width="640"
+ inkscape:window-height="400"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:guide-bbox="true"
+ inkscape:guide-points="false"
+ showguides="true" />
+ <metadata
+ id="metadata7">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title>Title</dc:title>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Olivier Fourdan</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:groupmode="layer"
+ id="layer2"
+ inkscape:label="Grad"
+ style="display:inline">
+ <path
+ style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 0,0.5 L 24,0.5 C 24,0.5 24,19 24,19 L 0,19 L 0,0.5 z "
+ id="path6057"
+ sodipodi:nodetypes="ccsc" />
+ </g>
+ <g
+ inkscape:groupmode="layer"
+ id="layer3"
+ inkscape:label="hilight">
+ <path
+ style="fill:url(#linearGradient6962);fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 0,1 L 24,1 C 24,1 24,4 24,4 L 0,4 L 0,3 z "
+ id="path6061"
+ sodipodi:nodetypes="ccsc" />
+ <rect
+ style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:0.75;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect1884"
+ width="24"
+ height="9"
+ x="0"
+ y="1" />
+ <path
+ style="fill:none;fill-opacity:1.0;fill-rule:evenodd;stroke:url(#linearGradient2791);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;opacity:1"
+ d="M 0,1 L 0,19"
+ id="path1889" />
+ <path
+ style="fill:none;fill-opacity:1.0;fill-rule:evenodd;stroke:url(#linearGradient2791);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;opacity:1"
+ d="M 24,1 L 24,19"
+ id="path1890" />
+ </g>
+ <g
+ inkscape:label="Border"
+ inkscape:groupmode="layer"
+ id="layer1"
+ style="display:inline">
+ <path
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+ d="M 0.5,0.5 L 23.5,0.5"
+ id="path6059"
+ sodipodi:nodetypes="ccsc" />
+ </g>
+ <g
+ inkscape:groupmode="layer"
+ id="g3722"
+ inkscape:label="Button">
+ <g
+ style="display:inline"
+ id="g1626"
+ transform="translate(6,5)">
+ <path
+ id="rect2318"
+ d="M 3,0 L 3,3 L 0,3 L 0,12 L 9,12 L 9,9 L 12,9 L 12,0 L 3,0 z M 3,7 L 6,7 L 6,9 L 3,9 L 3,7 z "
+ style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
+ <path
+ id="rect2331"
+ d="M 4,1 L 4,3 L 5,3 L 9,3 L 10,3 L 10,7 L 9,7 L 9,8 L 11,8 L 11,1 L 4,1 z "
+ style="opacity:1;fill:white;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <path
+ id="rect2371"
+ d="M 1,4 L 1,11 L 8,11 L 8,4 L 1,4 z M 2,6 L 7,6 L 7,10 L 2,10 L 2,6 z "
+ style="opacity:1;fill:white;fill-opacity:1;stroke:black;stroke-width:0;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ </g>
+ </g>
+ <g
+ inkscape:groupmode="layer"
+ id="layer4"
+ inkscape:label="pressed">
+ <g
+ id="g1789"
+ transform="translate(3,1)">
+ <rect
+ style="opacity:0.5;fill:url(#radialGradient3095);fill-opacity:1.0;stroke:url(#radialGradient3087);stroke-width:1;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect3079"
+ width="24"
+ height="19"
+ x="0"
+ y="0" />
+ </g>
+ </g>
+ <g
+ inkscape:groupmode="layer"
+ id="layer5"
+ inkscape:label="Shadow">
+ <path
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.10"
+ d="M 0.5,18.5 L 23.5,18.5"
+ id="path6989"
+ sodipodi:nodetypes="ccsc" />
+ </g>
+</svg>
diff --git a/themes/daloa/maximize-toggled-pressed.xpm b/themes/daloa/maximize-toggled-pressed.xpm
index 27db22e52c69b88b1d03c6d75a9191d4453c4028..0cf459495d0b0e60c4d97e8c3b4d8a436e41c92d 100644
--- a/themes/daloa/maximize-toggled-pressed.xpm
+++ b/themes/daloa/maximize-toggled-pressed.xpm
@@ -1,26 +1,24 @@
/* XPM */
static char * maximize_toggled_pressed_xpm[] = {
-"24 17 6 1",
+"24 19 2 1",
" c None",
". c #C0C0FF s active_color_1",
-"+ c #D0D0FF s active_hilight_1",
-"@ c #B0B0FF s active_mid_1",
-"* c #A0A0FF s active_shadow_1",
-"# c #FFFFFF s active_text_color",
-" ",
-"........................",
-"........................",
-"........................",
-"..........*******.......",
-".........*#######*......",
-".........*#######*......",
-".......*********#*......",
-"......*#######**#*......",
-"......*#######**#*......",
-"......*#*****#**#*......",
-"......*#*...*#*##*......",
-"......*#*...*#***.......",
-"......*#*****#*.........",
-"......*#######*.........",
-".......*******..........",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
"........................"};
diff --git a/themes/daloa/menu-active.png b/themes/daloa/menu-active.png
index 9fdfa88c4e34815997f406c5239adc4d1ad25868..b9d1b22413ab0223c28f609c321e410d95879dd4 100644
Binary files a/themes/daloa/menu-active.png and b/themes/daloa/menu-active.png differ
diff --git a/themes/daloa/menu-active.svg b/themes/daloa/menu-active.svg
new file mode 100644
index 0000000000000000000000000000000000000000..124eec446f35e88d9c4093d1734922a38a4d8d25
--- /dev/null
+++ b/themes/daloa/menu-active.svg
@@ -0,0 +1,199 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://web.resource.org/cc/"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="24"
+ height="19"
+ id="svg2"
+ sodipodi:version="0.32"
+ inkscape:version="0.44"
+ version="1.0"
+ sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"
+ sodipodi:docname="menu-active.svg"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
+ <defs
+ id="defs4">
+ <linearGradient
+ id="linearGradient1886">
+ <stop
+ style="stop-color:white;stop-opacity:1;"
+ offset="0"
+ id="stop1888" />
+ <stop
+ style="stop-color:white;stop-opacity:0.05;"
+ offset="1"
+ id="stop1890" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient5873">
+ <stop
+ id="stop5875"
+ offset="0"
+ style="stop-color:white;stop-opacity:1;" />
+ <stop
+ id="stop5877"
+ offset="1"
+ style="stop-color:white;stop-opacity:0;" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient5847">
+ <stop
+ id="stop5849"
+ offset="0"
+ style="stop-color:white;stop-opacity:0.33;" />
+ <stop
+ id="stop5851"
+ offset="1"
+ style="stop-color:white;stop-opacity:0;" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5847"
+ id="linearGradient6945"
+ gradientUnits="userSpaceOnUse"
+ x1="0"
+ y1="0.5"
+ x2="0"
+ y2="18.5"
+ gradientTransform="matrix(1,0,0,1,0,0)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5873"
+ id="linearGradient6962"
+ x1="0"
+ y1="1"
+ x2="0"
+ y2="8"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1,0,0,0.2,0,1)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient1886"
+ id="linearGradient1892"
+ x1="0"
+ y1="1"
+ x2="0"
+ y2="9"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient1886"
+ id="linearGradient2791"
+ x1="0"
+ y1="1"
+ x2="0"
+ y2="19"
+ gradientUnits="userSpaceOnUse" />
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="white"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="10"
+ inkscape:cx="0"
+ inkscape:cy="0"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ inkscape:grid-bbox="true"
+ inkscape:grid-points="true"
+ gridoriginx="0px"
+ gridtolerance="0.5px"
+ guidetolerance="1px"
+ inkscape:window-width="640"
+ inkscape:window-height="400"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:guide-bbox="true"
+ inkscape:guide-points="false"
+ showguides="true" />
+ <metadata
+ id="metadata7">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title>Title</dc:title>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Olivier Fourdan</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:groupmode="layer"
+ id="layer2"
+ inkscape:label="Grad"
+ transform="translate(0,-2)"
+ style="display:inline">
+ <path
+ style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 0,0.5 L 24,0.5 C 24,0.5 24,19 24,19 L 0,19 L 0,0.5 z "
+ id="path6057"
+ sodipodi:nodetypes="ccsc" />
+ </g>
+ <g
+ inkscape:groupmode="layer"
+ id="layer3"
+ transform="translate(0,-2)"
+ inkscape:label="hilight">
+ <path
+ style="fill:url(#linearGradient6962);fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 0,1 L 24,1 C 24,1 24,4 24,4 L 0,4 L 0,3 z "
+ id="path6061"
+ sodipodi:nodetypes="ccsc" />
+ <rect
+ style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:0.75;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect1884"
+ width="24"
+ height="9"
+ x="0"
+ y="1" />
+ <path
+ style="fill:none;fill-opacity:1.0;fill-rule:evenodd;stroke:url(#linearGradient2791);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;opacity:1"
+ d="M 0,1 L 0,19"
+ id="path1889" />
+ <path
+ style="fill:none;fill-opacity:1.0;fill-rule:evenodd;stroke:url(#linearGradient2791);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;opacity:1"
+ d="M 24,1 L 24,19"
+ id="path1890" />
+ </g>
+ <g
+ inkscape:label="Border"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(0,-2)"
+ style="display:inline">
+ <path
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+ d="M 0.5,0.5 L 23.5,0.5"
+ id="path6059"
+ sodipodi:nodetypes="ccsc" />
+ </g>
+ <g
+ inkscape:groupmode="layer"
+ id="layer5"
+ transform="translate(0,-2)"
+ inkscape:label="Shadow">
+ <path
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.10"
+ d="M 0.5,18.5 L 23.5,18.5"
+ id="path6989"
+ sodipodi:nodetypes="ccsc" />
+ </g>
+</svg>
diff --git a/themes/daloa/menu-active.xpm b/themes/daloa/menu-active.xpm
index 353a6dc4af541e75d171b2fc706d397f654a999b..1a243a4c15105f7c480b674fc6d6dcabf0d7b382 100644
--- a/themes/daloa/menu-active.xpm
+++ b/themes/daloa/menu-active.xpm
@@ -2,20 +2,20 @@
static char * menu_active_xpm[] = {
"24 16 2 1",
" c None",
-"@ c #C0C0FF s active_color_1",
-"@@@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@@@"};
+". c #C0C0FF s active_color_1",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................"};
diff --git a/themes/daloa/menu-inactive.png b/themes/daloa/menu-inactive.png
index 9fdfa88c4e34815997f406c5239adc4d1ad25868..b9d1b22413ab0223c28f609c321e410d95879dd4 100644
Binary files a/themes/daloa/menu-inactive.png and b/themes/daloa/menu-inactive.png differ
diff --git a/themes/daloa/menu-inactive.svg b/themes/daloa/menu-inactive.svg
new file mode 100644
index 0000000000000000000000000000000000000000..9c0cd0b15514f74e0523eec2d696c05ef734add9
--- /dev/null
+++ b/themes/daloa/menu-inactive.svg
@@ -0,0 +1,199 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://web.resource.org/cc/"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="24"
+ height="19"
+ id="svg2"
+ sodipodi:version="0.32"
+ inkscape:version="0.44"
+ version="1.0"
+ sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"
+ sodipodi:docname="menu-inactive.svg"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
+ <defs
+ id="defs4">
+ <linearGradient
+ id="linearGradient1886">
+ <stop
+ style="stop-color:white;stop-opacity:1;"
+ offset="0"
+ id="stop1888" />
+ <stop
+ style="stop-color:white;stop-opacity:0.05;"
+ offset="1"
+ id="stop1890" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient5873">
+ <stop
+ id="stop5875"
+ offset="0"
+ style="stop-color:white;stop-opacity:1;" />
+ <stop
+ id="stop5877"
+ offset="1"
+ style="stop-color:white;stop-opacity:0;" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient5847">
+ <stop
+ id="stop5849"
+ offset="0"
+ style="stop-color:white;stop-opacity:0.33;" />
+ <stop
+ id="stop5851"
+ offset="1"
+ style="stop-color:white;stop-opacity:0;" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5847"
+ id="linearGradient6945"
+ gradientUnits="userSpaceOnUse"
+ x1="0"
+ y1="0.5"
+ x2="0"
+ y2="18.5"
+ gradientTransform="matrix(1,0,0,1,0,0)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5873"
+ id="linearGradient6962"
+ x1="0"
+ y1="1"
+ x2="0"
+ y2="8"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1,0,0,0.2,0,1)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient1886"
+ id="linearGradient1892"
+ x1="0"
+ y1="1"
+ x2="0"
+ y2="9"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient1886"
+ id="linearGradient2791"
+ x1="0"
+ y1="1"
+ x2="0"
+ y2="19"
+ gradientUnits="userSpaceOnUse" />
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="white"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="10"
+ inkscape:cx="0"
+ inkscape:cy="0"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ inkscape:grid-bbox="true"
+ inkscape:grid-points="true"
+ gridoriginx="0px"
+ gridtolerance="0.5px"
+ guidetolerance="1px"
+ inkscape:window-width="640"
+ inkscape:window-height="400"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:guide-bbox="true"
+ inkscape:guide-points="false"
+ showguides="true" />
+ <metadata
+ id="metadata7">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title>Title</dc:title>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Olivier Fourdan</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:groupmode="layer"
+ id="layer2"
+ inkscape:label="Grad"
+ transform="translate(0,-2)"
+ style="display:inline">
+ <path
+ style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 0,0.5 L 24,0.5 C 24,0.5 24,19 24,19 L 0,19 L 0,0.5 z "
+ id="path6057"
+ sodipodi:nodetypes="ccsc" />
+ </g>
+ <g
+ inkscape:groupmode="layer"
+ id="layer3"
+ transform="translate(0,-2)"
+ inkscape:label="hilight">
+ <path
+ style="fill:url(#linearGradient6962);fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 0,1 L 24,1 C 24,1 24,4 24,4 L 0,4 L 0,3 z "
+ id="path6061"
+ sodipodi:nodetypes="ccsc" />
+ <rect
+ style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:0.75;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect1884"
+ width="24"
+ height="9"
+ x="0"
+ y="1" />
+ <path
+ style="fill:none;fill-opacity:1.0;fill-rule:evenodd;stroke:url(#linearGradient2791);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;opacity:1"
+ d="M 0,1 L 0,19"
+ id="path1889" />
+ <path
+ style="fill:none;fill-opacity:1.0;fill-rule:evenodd;stroke:url(#linearGradient2791);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;opacity:1"
+ d="M 24,1 L 24,19"
+ id="path1890" />
+ </g>
+ <g
+ inkscape:label="Border"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(0,-2)"
+ style="display:inline">
+ <path
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+ d="M 0.5,0.5 L 23.5,0.5"
+ id="path6059"
+ sodipodi:nodetypes="ccsc" />
+ </g>
+ <g
+ inkscape:groupmode="layer"
+ id="layer5"
+ transform="translate(0,-2)"
+ inkscape:label="Shadow">
+ <path
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.10"
+ d="M 0.5,18.5 L 23.5,18.5"
+ id="path6989"
+ sodipodi:nodetypes="ccsc" />
+ </g>
+</svg>
diff --git a/themes/daloa/menu-inactive.xpm b/themes/daloa/menu-inactive.xpm
index 2d7a76f3282c73163159c72297738591c0d54029..a09d91c97fbf3af301fadb22732908b2b6502935 100644
--- a/themes/daloa/menu-inactive.xpm
+++ b/themes/daloa/menu-inactive.xpm
@@ -2,20 +2,20 @@
static char * menu_inactive_xpm[] = {
"24 16 2 1",
" c None",
-"@ c #C0C0FF s inactive_color_1",
-"@@@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@@@"};
+". c #C0C0FF s inactive_color_1",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................"};
diff --git a/themes/daloa/menu-pressed.png b/themes/daloa/menu-pressed.png
index abea4adefd9c36f6cf2a612931eaec72adf06b13..8c5d1c8205fcb79a41d0d1d7788f5476db6a136a 100644
Binary files a/themes/daloa/menu-pressed.png and b/themes/daloa/menu-pressed.png differ
diff --git a/themes/daloa/menu-pressed.svg b/themes/daloa/menu-pressed.svg
new file mode 100644
index 0000000000000000000000000000000000000000..43aa7ac590d3dc53be5610646cda6155e44fa936
--- /dev/null
+++ b/themes/daloa/menu-pressed.svg
@@ -0,0 +1,238 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://web.resource.org/cc/"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="24"
+ height="19"
+ id="svg2"
+ sodipodi:version="0.32"
+ inkscape:version="0.44"
+ version="1.0"
+ sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"
+ sodipodi:docname="menu-pressed.svg"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
+ <defs
+ id="defs4">
+ <linearGradient
+ id="linearGradient1886">
+ <stop
+ style="stop-color:white;stop-opacity:1;"
+ offset="0"
+ id="stop1888" />
+ <stop
+ style="stop-color:white;stop-opacity:0.05;"
+ offset="1"
+ id="stop1890" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient5873">
+ <stop
+ id="stop5875"
+ offset="0"
+ style="stop-color:white;stop-opacity:1;" />
+ <stop
+ id="stop5877"
+ offset="1"
+ style="stop-color:white;stop-opacity:0;" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient5847">
+ <stop
+ id="stop5849"
+ offset="0"
+ style="stop-color:white;stop-opacity:0.33;" />
+ <stop
+ id="stop5851"
+ offset="1"
+ style="stop-color:white;stop-opacity:0;" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5847"
+ id="linearGradient6945"
+ gradientUnits="userSpaceOnUse"
+ x1="0"
+ y1="0.5"
+ x2="0"
+ y2="18.5"
+ gradientTransform="matrix(1,0,0,1,0,0)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5873"
+ id="linearGradient6962"
+ x1="0"
+ y1="1"
+ x2="0"
+ y2="8"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1,0,0,0.2,0,1)" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5873"
+ id="radialGradient3087"
+ cx="9"
+ cy="12.5"
+ fx="9"
+ fy="12.5"
+ r="9"
+ gradientTransform="matrix(1,0,0,1.0,0,0.5)"
+ gradientUnits="userSpaceOnUse" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5873"
+ id="radialGradient3095"
+ cx="9"
+ cy="9"
+ fx="9"
+ fy="9"
+ r="9"
+ gradientTransform="matrix(1,0,0,1.0,0,0.5)"
+ gradientUnits="userSpaceOnUse" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient1886"
+ id="linearGradient1892"
+ x1="0"
+ y1="1"
+ x2="0"
+ y2="9"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient1886"
+ id="linearGradient2791"
+ x1="0"
+ y1="1"
+ x2="0"
+ y2="19"
+ gradientUnits="userSpaceOnUse" />
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="white"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="10"
+ inkscape:cx="0"
+ inkscape:cy="0"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ inkscape:grid-bbox="true"
+ inkscape:grid-points="true"
+ gridoriginx="0px"
+ gridtolerance="0.5px"
+ guidetolerance="1px"
+ inkscape:window-width="640"
+ inkscape:window-height="400"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:guide-bbox="true"
+ inkscape:guide-points="false"
+ showguides="true" />
+ <metadata
+ id="metadata7">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title>Title</dc:title>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Olivier Fourdan</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:groupmode="layer"
+ id="layer2"
+ inkscape:label="Grad"
+ transform="translate(0,-2)"
+ style="display:inline">
+ <path
+ style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 0,0.5 L 24,0.5 C 24,0.5 24,19 24,19 L 0,19 L 0,0.5 z "
+ id="path6057"
+ sodipodi:nodetypes="ccsc" />
+ </g>
+ <g
+ inkscape:groupmode="layer"
+ id="layer3"
+ transform="translate(0,-2)"
+ inkscape:label="hilight">
+ <path
+ style="fill:url(#linearGradient6962);fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 0,1 L 24,1 C 24,1 24,4 24,4 L 0,4 L 0,3 z "
+ id="path6061"
+ sodipodi:nodetypes="ccsc" />
+ <rect
+ style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:0.75;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect1884"
+ width="24"
+ height="9"
+ x="0"
+ y="1" />
+ <path
+ style="fill:none;fill-opacity:1.0;fill-rule:evenodd;stroke:url(#linearGradient2791);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;opacity:1"
+ d="M 0,1 L 0,19"
+ id="path1889" />
+ <path
+ style="fill:none;fill-opacity:1.0;fill-rule:evenodd;stroke:url(#linearGradient2791);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;opacity:1"
+ d="M 24,1 L 24,19"
+ id="path1890" />
+ </g>
+ <g
+ inkscape:label="Border"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(0,-2)"
+ style="display:inline">
+ <path
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+ d="M 0.5,0.5 L 23.5,0.5"
+ id="path6059"
+ sodipodi:nodetypes="ccsc" />
+ </g>
+ <g
+ inkscape:groupmode="layer"
+ id="layer4"
+ transform="translate(0,-2)"
+ inkscape:label="pressed">
+ <g
+ id="g1789"
+ transform="translate(3,1)">
+ <rect
+ style="opacity:0.5;fill:url(#radialGradient3095);fill-opacity:1.0;stroke:url(#radialGradient3087);stroke-width:1;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect3079"
+ width="24"
+ height="19"
+ x="0"
+ y="0" />
+ </g>
+ </g>
+ <g
+ inkscape:groupmode="layer"
+ id="layer5"
+ transform="translate(0,-2)"
+ inkscape:label="Shadow">
+ <path
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.10"
+ d="M 0.5,18.5 L 23.5,18.5"
+ id="path6989"
+ sodipodi:nodetypes="ccsc" />
+ </g>
+</svg>
diff --git a/themes/daloa/menu-pressed.xpm b/themes/daloa/menu-pressed.xpm
index 17baf9aae11b7a30bd772e8fd9d5408d26f25438..84a25aeede8ab23054e35f8d7a530f15eb0d873f 100644
--- a/themes/daloa/menu-pressed.xpm
+++ b/themes/daloa/menu-pressed.xpm
@@ -2,20 +2,20 @@
static char * menu_pressed_xpm[] = {
"24 16 2 1",
" c None",
-"@ c #C0C0FF s active_color_1",
-"@@@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@@@"};
+". c #C0C0FF s active_color_1",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................"};
diff --git a/themes/daloa/right-active.png b/themes/daloa/right-active.png
index 5de47d58444b8c5daafca9e15cfacef34de3e03d..c00dce630a476b320f85a2e240be89f07d1fdd1e 100644
Binary files a/themes/daloa/right-active.png and b/themes/daloa/right-active.png differ
diff --git a/themes/daloa/right-active.svg b/themes/daloa/right-active.svg
new file mode 100644
index 0000000000000000000000000000000000000000..2ddd0b1d3039e827748e044a1bd8ec8dbfa25657
--- /dev/null
+++ b/themes/daloa/right-active.svg
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://web.resource.org/cc/"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="5"
+ height="24"
+ id="svg2"
+ sodipodi:version="0.32"
+ inkscape:version="0.44"
+ version="1.0"
+ sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"
+ sodipodi:docname="right-active.svg"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
+ <defs
+ id="defs4" />
+ <sodipodi:namedview
+ id="base"
+ pagecolor="white"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="10"
+ inkscape:cx="0"
+ inkscape:cy="0"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ inkscape:grid-bbox="true"
+ inkscape:window-width="640"
+ inkscape:window-height="400"
+ inkscape:window-x="0"
+ inkscape:window-y="0" />
+ <metadata
+ id="metadata7">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title>Border</dc:title>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Olivier Fourdan</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ <cc:license
+ rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" />
+ </cc:Work>
+ <cc:License
+ rdf:about="http://creativecommons.org/licenses/GPL/2.0/">
+ <cc:permits
+ rdf:resource="http://web.resource.org/cc/Reproduction" />
+ <cc:permits
+ rdf:resource="http://web.resource.org/cc/Distribution" />
+ <cc:requires
+ rdf:resource="http://web.resource.org/cc/Notice" />
+ <cc:permits
+ rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+ <cc:requires
+ rdf:resource="http://web.resource.org/cc/ShareAlike" />
+ <cc:requires
+ rdf:resource="http://web.resource.org/cc/SourceCode" />
+ </cc:License>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ id="layer1">
+ <path
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.50"
+ d="M 4.5,0 L 4.5,24"
+ id="path1340" />
+ </g>
+</svg>
diff --git a/themes/daloa/right-active.xpm b/themes/daloa/right-active.xpm
index e9f872b6c5d68c463ef3e4a0df21b26e478df614..b422b4244ae5659bdab34959c7313c21bf58eed5 100644
--- a/themes/daloa/right-active.xpm
+++ b/themes/daloa/right-active.xpm
@@ -1,40 +1,30 @@
/* XPM */
static char * right_active_xpm[] = {
-"5 32 5 1",
+"5 24 3 1",
" c None",
-"+ c #E0E0FF s active_hilight_1",
-"@ c #A0A0FF s active_shadow_1",
-"$ c #B0B0B0 s active_mid_2",
"# c #C0C0C0 s active_color_2",
-"###+@",
-"###+@",
-"###+@",
-"###+@",
-"###+@",
-"###+@",
-"###+@",
-"###+@",
-"###+@",
-"###+@",
-"###+@",
-"###+@",
-"###+@",
-"###+@",
-"###+@",
-"###+@",
-"###+@",
-"###+@",
-"###+@",
-"###+@",
-"###+@",
-"###+@",
-"###+@",
-"###+@",
-"###+@",
-"###+@",
-"###+@",
-"###+@",
-"###+@",
-"###+@",
-"###+@",
-"###+@"};
+"@ c #C0C0FF s active_color_1",
+"###@@",
+"###@@",
+"###@@",
+"###@@",
+"###@@",
+"###@@",
+"###@@",
+"###@@",
+"###@@",
+"###@@",
+"###@@",
+"###@@",
+"###@@",
+"###@@",
+"###@@",
+"###@@",
+"###@@",
+"###@@",
+"###@@",
+"###@@",
+"###@@",
+"###@@",
+"###@@",
+"###@@"};
diff --git a/themes/daloa/right-inactive.png b/themes/daloa/right-inactive.png
index 5de47d58444b8c5daafca9e15cfacef34de3e03d..32ee9ea64f2fb37c8e8afedbcee932971eb77ee7 100644
Binary files a/themes/daloa/right-inactive.png and b/themes/daloa/right-inactive.png differ
diff --git a/themes/daloa/right-inactive.svg b/themes/daloa/right-inactive.svg
new file mode 100644
index 0000000000000000000000000000000000000000..6b1d4a0c2114c8c14d4af7ab05b9e48b8d028337
--- /dev/null
+++ b/themes/daloa/right-inactive.svg
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://web.resource.org/cc/"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="5"
+ height="24"
+ id="svg2"
+ sodipodi:version="0.32"
+ inkscape:version="0.44"
+ version="1.0"
+ sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"
+ sodipodi:docname="right-inactive.svg"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
+ <defs
+ id="defs4" />
+ <sodipodi:namedview
+ id="base"
+ pagecolor="white"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="10"
+ inkscape:cx="0"
+ inkscape:cy="0"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ inkscape:grid-bbox="true"
+ inkscape:window-width="640"
+ inkscape:window-height="400"
+ inkscape:window-x="0"
+ inkscape:window-y="0" />
+ <metadata
+ id="metadata7">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title>Border</dc:title>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Olivier Fourdan</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ <cc:license
+ rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" />
+ </cc:Work>
+ <cc:License
+ rdf:about="http://creativecommons.org/licenses/GPL/2.0/">
+ <cc:permits
+ rdf:resource="http://web.resource.org/cc/Reproduction" />
+ <cc:permits
+ rdf:resource="http://web.resource.org/cc/Distribution" />
+ <cc:requires
+ rdf:resource="http://web.resource.org/cc/Notice" />
+ <cc:permits
+ rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+ <cc:requires
+ rdf:resource="http://web.resource.org/cc/ShareAlike" />
+ <cc:requires
+ rdf:resource="http://web.resource.org/cc/SourceCode" />
+ </cc:License>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ id="layer1">
+ <path
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.50"
+ d="M 4.5,0 L 4.5,24"
+ id="path1340" />
+ </g>
+</svg>
diff --git a/themes/daloa/right-inactive.xpm b/themes/daloa/right-inactive.xpm
index edb57549146fe7a1647d653fb5ca7608b5d70fe0..298fbf5b7404cfcdf978aa88bbfc6de83398142b 100644
--- a/themes/daloa/right-inactive.xpm
+++ b/themes/daloa/right-inactive.xpm
@@ -1,40 +1,30 @@
/* XPM */
static char * right_inactive_xpm[] = {
-"5 32 5 1",
+"5 24 3 1",
" c None",
-"+ c #E0E0FF s inactive_hilight_1",
-"@ c #A0A0FF s inactive_shadow_1",
-"$ c #B0B0B0 s inactive_mid_2",
"# c #C0C0C0 s inactive_color_2",
-"###+@",
-"###+@",
-"###+@",
-"###+@",
-"###+@",
-"###+@",
-"###+@",
-"###+@",
-"###+@",
-"###+@",
-"###+@",
-"###+@",
-"###+@",
-"###+@",
-"###+@",
-"###+@",
-"###+@",
-"###+@",
-"###+@",
-"###+@",
-"###+@",
-"###+@",
-"###+@",
-"###+@",
-"###+@",
-"###+@",
-"###+@",
-"###+@",
-"###+@",
-"###+@",
-"###+@",
-"###+@"};
+"@ c #C0C0FF s inactive_color_1",
+"###@@",
+"###@@",
+"###@@",
+"###@@",
+"###@@",
+"###@@",
+"###@@",
+"###@@",
+"###@@",
+"###@@",
+"###@@",
+"###@@",
+"###@@",
+"###@@",
+"###@@",
+"###@@",
+"###@@",
+"###@@",
+"###@@",
+"###@@",
+"###@@",
+"###@@",
+"###@@",
+"###@@"};
diff --git a/themes/daloa/shade-active.png b/themes/daloa/shade-active.png
index 124f950cde50849eb514e290fcb7b8c45e3cc53c..823e929cd3e07deb9f295ddd8a201d39a7447854 100644
Binary files a/themes/daloa/shade-active.png and b/themes/daloa/shade-active.png differ
diff --git a/themes/daloa/shade-active.svg b/themes/daloa/shade-active.svg
new file mode 100644
index 0000000000000000000000000000000000000000..1a82daaab8cba3d5cd5917021cc3ce21cadcaaad
--- /dev/null
+++ b/themes/daloa/shade-active.svg
@@ -0,0 +1,214 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://web.resource.org/cc/"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="24"
+ height="19"
+ id="svg2"
+ sodipodi:version="0.32"
+ inkscape:version="0.44"
+ version="1.0"
+ sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"
+ sodipodi:docname="shade-active.svg"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
+ <defs
+ id="defs4">
+ <linearGradient
+ id="linearGradient1886">
+ <stop
+ style="stop-color:white;stop-opacity:1;"
+ offset="0"
+ id="stop1888" />
+ <stop
+ style="stop-color:white;stop-opacity:0.05;"
+ offset="1"
+ id="stop1890" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient5873">
+ <stop
+ id="stop5875"
+ offset="0"
+ style="stop-color:white;stop-opacity:1;" />
+ <stop
+ id="stop5877"
+ offset="1"
+ style="stop-color:white;stop-opacity:0;" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient5847">
+ <stop
+ id="stop5849"
+ offset="0"
+ style="stop-color:white;stop-opacity:0.33;" />
+ <stop
+ id="stop5851"
+ offset="1"
+ style="stop-color:white;stop-opacity:0;" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5847"
+ id="linearGradient6945"
+ gradientUnits="userSpaceOnUse"
+ x1="0"
+ y1="0.5"
+ x2="0"
+ y2="18.5"
+ gradientTransform="matrix(1,0,0,1,0,0)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5873"
+ id="linearGradient6962"
+ x1="0"
+ y1="1"
+ x2="0"
+ y2="8"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1,0,0,0.2,0,1)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient1886"
+ id="linearGradient1892"
+ x1="0"
+ y1="1"
+ x2="0"
+ y2="9"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient1886"
+ id="linearGradient2791"
+ x1="0"
+ y1="1"
+ x2="0"
+ y2="19"
+ gradientUnits="userSpaceOnUse" />
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="white"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="10"
+ inkscape:cx="0"
+ inkscape:cy="0"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ inkscape:grid-bbox="true"
+ inkscape:grid-points="true"
+ gridoriginx="0px"
+ gridtolerance="0.5px"
+ guidetolerance="1px"
+ inkscape:window-width="640"
+ inkscape:window-height="400"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:guide-bbox="true"
+ inkscape:guide-points="false"
+ showguides="true" />
+ <metadata
+ id="metadata7">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title>Title</dc:title>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Olivier Fourdan</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:groupmode="layer"
+ id="layer2"
+ inkscape:label="Grad"
+ style="display:inline">
+ <path
+ style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 0,0.5 L 24,0.5 C 24,0.5 24,19 24,19 L 0,19 L 0,0.5 z "
+ id="path6057"
+ sodipodi:nodetypes="ccsc" />
+ </g>
+ <g
+ inkscape:groupmode="layer"
+ id="layer3"
+ inkscape:label="hilight">
+ <path
+ style="fill:url(#linearGradient6962);fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 0,1 L 24,1 C 24,1 24,4 24,4 L 0,4 L 0,3 z "
+ id="path6061"
+ sodipodi:nodetypes="ccsc" />
+ <rect
+ style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:0.75;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect1884"
+ width="24"
+ height="9"
+ x="0"
+ y="1" />
+ <path
+ style="fill:none;fill-opacity:1.0;fill-rule:evenodd;stroke:url(#linearGradient2791);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;opacity:1"
+ d="M 0,1 L 0,19"
+ id="path1889" />
+ <path
+ style="fill:none;fill-opacity:1.0;fill-rule:evenodd;stroke:url(#linearGradient2791);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;opacity:1"
+ d="M 24,1 L 24,19"
+ id="path1890" />
+ </g>
+ <g
+ inkscape:label="Border"
+ inkscape:groupmode="layer"
+ id="layer1"
+ style="display:inline">
+ <path
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+ d="M 0.5,0.5 L 23.5,0.5"
+ id="path6059"
+ sodipodi:nodetypes="ccsc" />
+ </g>
+ <g
+ inkscape:groupmode="layer"
+ id="g20"
+ inkscape:label="Button">
+ <g
+ style="display:inline"
+ id="g1616"
+ transform="translate(6,4)">
+ <path
+ sodipodi:nodetypes="ccccc"
+ d="M 6,9 L 6,3 M 3,6 L 6,3 L 9,6"
+ style="opacity:0.33;fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
+ id="path2605" />
+ <path
+ d="M 3,6 L 6,3 L 9,6 M 6,9 L 6,3"
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:white;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
+ id="path2620" />
+ </g>
+ </g>
+ <g
+ inkscape:groupmode="layer"
+ id="layer5"
+ inkscape:label="Shadow">
+ <path
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.10"
+ d="M 0.5,18.5 L 23.5,18.5"
+ id="path6989"
+ sodipodi:nodetypes="ccsc" />
+ </g>
+</svg>
diff --git a/themes/daloa/shade-active.xpm b/themes/daloa/shade-active.xpm
index f10d0db11f673d5cf612f625b47c7cab3a21a20b..186dd1aeb405d1441d0f3c49a9e2825d3358047a 100644
--- a/themes/daloa/shade-active.xpm
+++ b/themes/daloa/shade-active.xpm
@@ -1,26 +1,24 @@
/* XPM */
static char * shade_active_xpm[] = {
-"24 17 6 1",
+"24 19 2 1",
" c None",
". c #C0C0FF s active_color_1",
-"+ c #D0D0FF s active_hilight_1",
-"@ c #B0B0FF s active_mid_1",
-"* c #A0A0FF s active_shadow_1",
-"# c #FFFFFF s active_text_color",
-" ",
-"........................",
-"........................",
-"........................",
-"...........**...........",
-"..........*##*..........",
-".........*####*.........",
-"........*######*........",
-".......*########*.......",
-".......*##*##*##*.......",
-"........***##***........",
-"..........*##*..........",
-"..........*##*..........",
-"...........**...........",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
"........................",
"........................",
"........................"};
diff --git a/themes/daloa/shade-inactive.png b/themes/daloa/shade-inactive.png
index 124f950cde50849eb514e290fcb7b8c45e3cc53c..6ad535ec3cc6a9c12dea06c5fd5486327ab9c220 100644
Binary files a/themes/daloa/shade-inactive.png and b/themes/daloa/shade-inactive.png differ
diff --git a/themes/daloa/shade-inactive.svg b/themes/daloa/shade-inactive.svg
new file mode 100644
index 0000000000000000000000000000000000000000..10b13074e2582c71a7073706241fb921a75b7b82
--- /dev/null
+++ b/themes/daloa/shade-inactive.svg
@@ -0,0 +1,209 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://web.resource.org/cc/"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="24"
+ height="19"
+ id="svg2"
+ sodipodi:version="0.32"
+ inkscape:version="0.44"
+ version="1.0"
+ sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"
+ sodipodi:docname="shade-inactive.svg"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
+ <defs
+ id="defs4">
+ <linearGradient
+ id="linearGradient1886">
+ <stop
+ style="stop-color:white;stop-opacity:1;"
+ offset="0"
+ id="stop1888" />
+ <stop
+ style="stop-color:white;stop-opacity:0.05;"
+ offset="1"
+ id="stop1890" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient5873">
+ <stop
+ id="stop5875"
+ offset="0"
+ style="stop-color:white;stop-opacity:1;" />
+ <stop
+ id="stop5877"
+ offset="1"
+ style="stop-color:white;stop-opacity:0;" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient5847">
+ <stop
+ id="stop5849"
+ offset="0"
+ style="stop-color:white;stop-opacity:0.33;" />
+ <stop
+ id="stop5851"
+ offset="1"
+ style="stop-color:white;stop-opacity:0;" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5847"
+ id="linearGradient6945"
+ gradientUnits="userSpaceOnUse"
+ x1="0"
+ y1="0.5"
+ x2="0"
+ y2="18.5"
+ gradientTransform="matrix(1,0,0,1,0,0)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5873"
+ id="linearGradient6962"
+ x1="0"
+ y1="1"
+ x2="0"
+ y2="8"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1,0,0,0.2,0,1)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient1886"
+ id="linearGradient1892"
+ x1="0"
+ y1="1"
+ x2="0"
+ y2="9"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient1886"
+ id="linearGradient2791"
+ x1="0"
+ y1="1"
+ x2="0"
+ y2="19"
+ gradientUnits="userSpaceOnUse" />
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="white"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="10"
+ inkscape:cx="0"
+ inkscape:cy="0"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ inkscape:grid-bbox="true"
+ inkscape:grid-points="true"
+ gridoriginx="0px"
+ gridtolerance="0.5px"
+ guidetolerance="1px"
+ inkscape:window-width="640"
+ inkscape:window-height="400"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:guide-bbox="true"
+ inkscape:guide-points="false"
+ showguides="true" />
+ <metadata
+ id="metadata7">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title>Title</dc:title>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Olivier Fourdan</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:groupmode="layer"
+ id="layer2"
+ inkscape:label="Grad"
+ style="display:inline">
+ <path
+ style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 0,0.5 L 24,0.5 C 24,0.5 24,19 24,19 L 0,19 L 0,0.5 z "
+ id="path6057"
+ sodipodi:nodetypes="ccsc" />
+ </g>
+ <g
+ inkscape:groupmode="layer"
+ id="layer3"
+ inkscape:label="hilight">
+ <path
+ style="fill:url(#linearGradient6962);fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 0,1 L 24,1 C 24,1 24,4 24,4 L 0,4 L 0,3 z "
+ id="path6061"
+ sodipodi:nodetypes="ccsc" />
+ <rect
+ style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:0.75;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect1884"
+ width="24"
+ height="9"
+ x="0"
+ y="1" />
+ <path
+ style="fill:none;fill-opacity:1.0;fill-rule:evenodd;stroke:url(#linearGradient2791);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;opacity:1"
+ d="M 0,1 L 0,19"
+ id="path1889" />
+ <path
+ style="fill:none;fill-opacity:1.0;fill-rule:evenodd;stroke:url(#linearGradient2791);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;opacity:1"
+ d="M 24,1 L 24,19"
+ id="path1890" />
+ </g>
+ <g
+ inkscape:label="Border"
+ inkscape:groupmode="layer"
+ id="layer1"
+ style="display:inline">
+ <path
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+ d="M 0.5,0.5 L 23.5,0.5"
+ id="path6059"
+ sodipodi:nodetypes="ccsc" />
+ </g>
+ <g
+ inkscape:groupmode="layer"
+ id="g20"
+ inkscape:label="Button">
+ <g
+ style="display:inline"
+ id="g1616"
+ transform="translate(6,4)">
+ <path
+ id="path2620"
+ style="opacity:0.50;fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#7f7f7f;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
+ d="M 3,6 L 6,3 L 9,6 M 6,9 L 6,3" />
+ </g>
+ </g>
+ <g
+ inkscape:groupmode="layer"
+ id="layer5"
+ inkscape:label="Shadow">
+ <path
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.10"
+ d="M 0.5,18.5 L 23.5,18.5"
+ id="path6989"
+ sodipodi:nodetypes="ccsc" />
+ </g>
+</svg>
diff --git a/themes/daloa/shade-inactive.xpm b/themes/daloa/shade-inactive.xpm
index 12588a6e5f2d94eb5e782c59d6bbd259552fa425..4f7d170402f36033eaf67f81b971d02e26fdc7ff 100644
--- a/themes/daloa/shade-inactive.xpm
+++ b/themes/daloa/shade-inactive.xpm
@@ -1,24 +1,23 @@
/* XPM */
static char * shade_inactive_xpm[] = {
-"24 17 5 1",
+"24 19 2 1",
" c None",
". c #C0C0FF s inactive_color_1",
-"+ c #D0D0FF s inactive_hilight_1",
-"@ c #B0B0FF s inactive_mid_1",
-"# c #D0D0FF s inactive_text_color",
-" ",
"........................",
"........................",
"........................",
"........................",
-"...........##...........",
-"..........####..........",
-".........######.........",
-"........########........",
-"........##.##.##........",
-"...........##...........",
-"...........##...........",
-"...........##...........",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
"........................",
"........................",
"........................",
diff --git a/themes/daloa/shade-pressed.png b/themes/daloa/shade-pressed.png
index f180fd506dacd995de0e7aaea806228bc86cefbd..73d1cd14ec5480e568c13c1a706654170c58734f 100644
Binary files a/themes/daloa/shade-pressed.png and b/themes/daloa/shade-pressed.png differ
diff --git a/themes/daloa/shade-pressed.svg b/themes/daloa/shade-pressed.svg
new file mode 100644
index 0000000000000000000000000000000000000000..ff000649a4ec82bdc21f07edc37cb0dc4c7e8c8e
--- /dev/null
+++ b/themes/daloa/shade-pressed.svg
@@ -0,0 +1,252 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://web.resource.org/cc/"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="24"
+ height="19"
+ id="svg2"
+ sodipodi:version="0.32"
+ inkscape:version="0.44"
+ version="1.0"
+ sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"
+ sodipodi:docname="shade-pressed.svg"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
+ <defs
+ id="defs4">
+ <linearGradient
+ id="linearGradient1886">
+ <stop
+ style="stop-color:white;stop-opacity:1;"
+ offset="0"
+ id="stop1888" />
+ <stop
+ style="stop-color:white;stop-opacity:0.05;"
+ offset="1"
+ id="stop1890" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient5873">
+ <stop
+ id="stop5875"
+ offset="0"
+ style="stop-color:white;stop-opacity:1;" />
+ <stop
+ id="stop5877"
+ offset="1"
+ style="stop-color:white;stop-opacity:0;" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient5847">
+ <stop
+ id="stop5849"
+ offset="0"
+ style="stop-color:white;stop-opacity:0.33;" />
+ <stop
+ id="stop5851"
+ offset="1"
+ style="stop-color:white;stop-opacity:0;" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5847"
+ id="linearGradient6945"
+ gradientUnits="userSpaceOnUse"
+ x1="0"
+ y1="0.5"
+ x2="0"
+ y2="18.5"
+ gradientTransform="matrix(1,0,0,1,0,0)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5873"
+ id="linearGradient6962"
+ x1="0"
+ y1="1"
+ x2="0"
+ y2="8"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1,0,0,0.2,0,1)" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5873"
+ id="radialGradient3087"
+ cx="9"
+ cy="12.5"
+ fx="9"
+ fy="12.5"
+ r="9"
+ gradientTransform="matrix(1,0,0,1.0,0,0.5)"
+ gradientUnits="userSpaceOnUse" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5873"
+ id="radialGradient3095"
+ cx="9"
+ cy="9"
+ fx="9"
+ fy="9"
+ r="9"
+ gradientTransform="matrix(1,0,0,1.0,0,0.5)"
+ gradientUnits="userSpaceOnUse" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient1886"
+ id="linearGradient1892"
+ x1="0"
+ y1="1"
+ x2="0"
+ y2="9"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient1886"
+ id="linearGradient2791"
+ x1="0"
+ y1="1"
+ x2="0"
+ y2="19"
+ gradientUnits="userSpaceOnUse" />
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="white"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="10"
+ inkscape:cx="0"
+ inkscape:cy="0"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ inkscape:grid-bbox="true"
+ inkscape:grid-points="true"
+ gridoriginx="0px"
+ gridtolerance="0.5px"
+ guidetolerance="1px"
+ inkscape:window-width="640"
+ inkscape:window-height="400"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:guide-bbox="true"
+ inkscape:guide-points="false"
+ showguides="true" />
+ <metadata
+ id="metadata7">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title>Title</dc:title>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Olivier Fourdan</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:groupmode="layer"
+ id="layer2"
+ inkscape:label="Grad"
+ style="display:inline">
+ <path
+ style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 0,0.5 L 24,0.5 C 24,0.5 24,19 24,19 L 0,19 L 0,0.5 z "
+ id="path6057"
+ sodipodi:nodetypes="ccsc" />
+ </g>
+ <g
+ inkscape:groupmode="layer"
+ id="layer3"
+ inkscape:label="hilight">
+ <path
+ style="fill:url(#linearGradient6962);fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 0,1 L 24,1 C 24,1 24,4 24,4 L 0,4 L 0,3 z "
+ id="path6061"
+ sodipodi:nodetypes="ccsc" />
+ <rect
+ style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:0.75;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect1884"
+ width="24"
+ height="9"
+ x="0"
+ y="1" />
+ <path
+ style="fill:none;fill-opacity:1.0;fill-rule:evenodd;stroke:url(#linearGradient2791);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;opacity:1"
+ d="M 0,1 L 0,19"
+ id="path1889" />
+ <path
+ style="fill:none;fill-opacity:1.0;fill-rule:evenodd;stroke:url(#linearGradient2791);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;opacity:1"
+ d="M 24,1 L 24,19"
+ id="path1890" />
+ </g>
+ <g
+ inkscape:label="Border"
+ inkscape:groupmode="layer"
+ id="layer1"
+ style="display:inline">
+ <path
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+ d="M 0.5,0.5 L 23.5,0.5"
+ id="path6059"
+ sodipodi:nodetypes="ccsc" />
+ </g>
+ <g
+ inkscape:groupmode="layer"
+ id="g3722"
+ inkscape:label="Button">
+ <g
+ style="display:inline"
+ id="g1616"
+ transform="translate(6,5)">
+ <path
+ sodipodi:nodetypes="ccccc"
+ d="M 6,9 L 6,3 M 3,6 L 6,3 L 9,6"
+ style="opacity:0.33;fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
+ id="path2605" />
+ <path
+ d="M 3,6 L 6,3 L 9,6 M 6,9 L 6,3"
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:white;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
+ id="path2620" />
+ </g>
+ </g>
+ <g
+ inkscape:groupmode="layer"
+ id="layer4"
+ inkscape:label="pressed">
+ <g
+ id="g1789"
+ transform="translate(3,1)">
+ <rect
+ style="opacity:0.5;fill:url(#radialGradient3095);fill-opacity:1.0;stroke:url(#radialGradient3087);stroke-width:1;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect3079"
+ width="24"
+ height="19"
+ x="0"
+ y="0" />
+ </g>
+ </g>
+ <g
+ inkscape:groupmode="layer"
+ id="layer5"
+ inkscape:label="Shadow">
+ <path
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.10"
+ d="M 0.5,18.5 L 23.5,18.5"
+ id="path6989"
+ sodipodi:nodetypes="ccsc" />
+ </g>
+</svg>
diff --git a/themes/daloa/shade-pressed.xpm b/themes/daloa/shade-pressed.xpm
index 7ac77986158ced209c355e9ef447af1ed7bea074..21f9720595601974423d0a9ab88ce55f2e7865a0 100644
--- a/themes/daloa/shade-pressed.xpm
+++ b/themes/daloa/shade-pressed.xpm
@@ -1,26 +1,24 @@
/* XPM */
static char * shade_pressed_xpm[] = {
-"24 17 6 1",
+"24 19 2 1",
" c None",
". c #C0C0FF s active_color_1",
-"+ c #D0D0FF s active_hilight_1",
-"@ c #B0B0FF s active_mid_1",
-"* c #A0A0FF s active_shadow_1",
-"# c #FFFFFF s active_text_color",
-" ",
"........................",
"........................",
"........................",
"........................",
-"...........**...........",
-"..........*##*..........",
-".........*####*.........",
-"........*######*........",
-".......*########*.......",
-".......*##*##*##*.......",
-"........***##***........",
-"..........*##*..........",
-"..........*##*..........",
-"...........**...........",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
"........................",
"........................"};
diff --git a/themes/daloa/shade-toggled-active.png b/themes/daloa/shade-toggled-active.png
index 124f950cde50849eb514e290fcb7b8c45e3cc53c..32a83fb6a3e9c5cbf9c7727f87e3b28f06ffeaa2 100644
Binary files a/themes/daloa/shade-toggled-active.png and b/themes/daloa/shade-toggled-active.png differ
diff --git a/themes/daloa/shade-toggled-active.svg b/themes/daloa/shade-toggled-active.svg
new file mode 100644
index 0000000000000000000000000000000000000000..d2c24d1a613f74cfb83bebc231d6585086589192
--- /dev/null
+++ b/themes/daloa/shade-toggled-active.svg
@@ -0,0 +1,214 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://web.resource.org/cc/"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="24"
+ height="19"
+ id="svg2"
+ sodipodi:version="0.32"
+ inkscape:version="0.44"
+ version="1.0"
+ sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"
+ sodipodi:docname="shade-toggled-active.svg"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
+ <defs
+ id="defs4">
+ <linearGradient
+ id="linearGradient1886">
+ <stop
+ style="stop-color:white;stop-opacity:1;"
+ offset="0"
+ id="stop1888" />
+ <stop
+ style="stop-color:white;stop-opacity:0.05;"
+ offset="1"
+ id="stop1890" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient5873">
+ <stop
+ id="stop5875"
+ offset="0"
+ style="stop-color:white;stop-opacity:1;" />
+ <stop
+ id="stop5877"
+ offset="1"
+ style="stop-color:white;stop-opacity:0;" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient5847">
+ <stop
+ id="stop5849"
+ offset="0"
+ style="stop-color:white;stop-opacity:0.33;" />
+ <stop
+ id="stop5851"
+ offset="1"
+ style="stop-color:white;stop-opacity:0;" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5847"
+ id="linearGradient6945"
+ gradientUnits="userSpaceOnUse"
+ x1="0"
+ y1="0.5"
+ x2="0"
+ y2="18.5"
+ gradientTransform="matrix(1,0,0,1,0,0)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5873"
+ id="linearGradient6962"
+ x1="0"
+ y1="1"
+ x2="0"
+ y2="8"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1,0,0,0.2,0,1)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient1886"
+ id="linearGradient1892"
+ x1="0"
+ y1="1"
+ x2="0"
+ y2="9"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient1886"
+ id="linearGradient2791"
+ x1="0"
+ y1="1"
+ x2="0"
+ y2="19"
+ gradientUnits="userSpaceOnUse" />
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="white"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="10"
+ inkscape:cx="0"
+ inkscape:cy="0"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ inkscape:grid-bbox="true"
+ inkscape:grid-points="true"
+ gridoriginx="0px"
+ gridtolerance="0.5px"
+ guidetolerance="1px"
+ inkscape:window-width="640"
+ inkscape:window-height="400"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:guide-bbox="true"
+ inkscape:guide-points="false"
+ showguides="true" />
+ <metadata
+ id="metadata7">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title>Title</dc:title>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Olivier Fourdan</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:groupmode="layer"
+ id="layer2"
+ inkscape:label="Grad"
+ style="display:inline">
+ <path
+ style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 0,0.5 L 24,0.5 C 24,0.5 24,19 24,19 L 0,19 L 0,0.5 z "
+ id="path6057"
+ sodipodi:nodetypes="ccsc" />
+ </g>
+ <g
+ inkscape:groupmode="layer"
+ id="layer3"
+ inkscape:label="hilight">
+ <path
+ style="fill:url(#linearGradient6962);fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 0,1 L 24,1 C 24,1 24,4 24,4 L 0,4 L 0,3 z "
+ id="path6061"
+ sodipodi:nodetypes="ccsc" />
+ <rect
+ style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:0.75;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect1884"
+ width="24"
+ height="9"
+ x="0"
+ y="1" />
+ <path
+ style="fill:none;fill-opacity:1.0;fill-rule:evenodd;stroke:url(#linearGradient2791);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;opacity:1"
+ d="M 0,1 L 0,19"
+ id="path1889" />
+ <path
+ style="fill:none;fill-opacity:1.0;fill-rule:evenodd;stroke:url(#linearGradient2791);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;opacity:1"
+ d="M 24,1 L 24,19"
+ id="path1890" />
+ </g>
+ <g
+ inkscape:label="Border"
+ inkscape:groupmode="layer"
+ id="layer1"
+ style="display:inline">
+ <path
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+ d="M 0.5,0.5 L 23.5,0.5"
+ id="path6059"
+ sodipodi:nodetypes="ccsc" />
+ </g>
+ <g
+ inkscape:groupmode="layer"
+ id="g20"
+ inkscape:label="Button">
+ <g
+ style="display:inline"
+ id="g1628"
+ transform="translate(6,4)">
+ <path
+ sodipodi:nodetypes="ccccc"
+ d="M 6,3 L 6,9 M 3,6 L 6,9 L 9,6"
+ style="opacity:0.33;fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
+ id="path2605" />
+ <path
+ d="M 3,6 L 6,9 L 9,6 M 6,3 L 6,8"
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:white;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
+ id="path2620" />
+ </g>
+ </g>
+ <g
+ inkscape:groupmode="layer"
+ id="layer5"
+ inkscape:label="Shadow">
+ <path
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.10"
+ d="M 0.5,18.5 L 23.5,18.5"
+ id="path6989"
+ sodipodi:nodetypes="ccsc" />
+ </g>
+</svg>
diff --git a/themes/daloa/shade-toggled-active.xpm b/themes/daloa/shade-toggled-active.xpm
index ac8629e89f69f49404d61209599c6dd427ed1616..14122871b9dfa494622d510018d8f54f6b2cf2f6 100644
--- a/themes/daloa/shade-toggled-active.xpm
+++ b/themes/daloa/shade-toggled-active.xpm
@@ -1,26 +1,24 @@
/* XPM */
static char * shade_toggled_active_xpm[] = {
-"24 17 6 1",
+"24 19 2 1",
" c None",
". c #C0C0FF s active_color_1",
-"+ c #D0D0FF s active_hilight_1",
-"@ c #B0B0FF s active_mid_1",
-"* c #A0A0FF s active_shadow_1",
-"# c #FFFFFF s active_text_color",
-" ",
-"........................",
-"........................",
-"........................",
-"...........**...........",
-"..........*##*..........",
-"..........*##*..........",
-"........***##***........",
-".......*##*##*##*.......",
-".......*########*.......",
-"........*######*........",
-".........*####*.........",
-"..........*##*..........",
-"...........**...........",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
"........................",
"........................",
"........................"};
diff --git a/themes/daloa/shade-toggled-inactive.png b/themes/daloa/shade-toggled-inactive.png
index 124f950cde50849eb514e290fcb7b8c45e3cc53c..906daca1cbd63ac4e414036599fc6187f9b58dab 100644
Binary files a/themes/daloa/shade-toggled-inactive.png and b/themes/daloa/shade-toggled-inactive.png differ
diff --git a/themes/daloa/shade-toggled-inactive.svg b/themes/daloa/shade-toggled-inactive.svg
new file mode 100644
index 0000000000000000000000000000000000000000..189ea3e23fd4b5f4b8648c5c4a21e3d1016b1782
--- /dev/null
+++ b/themes/daloa/shade-toggled-inactive.svg
@@ -0,0 +1,209 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://web.resource.org/cc/"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="24"
+ height="19"
+ id="svg2"
+ sodipodi:version="0.32"
+ inkscape:version="0.44"
+ version="1.0"
+ sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"
+ sodipodi:docname="shade-toggled-inactive.svg"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
+ <defs
+ id="defs4">
+ <linearGradient
+ id="linearGradient1886">
+ <stop
+ style="stop-color:white;stop-opacity:1;"
+ offset="0"
+ id="stop1888" />
+ <stop
+ style="stop-color:white;stop-opacity:0.05;"
+ offset="1"
+ id="stop1890" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient5873">
+ <stop
+ id="stop5875"
+ offset="0"
+ style="stop-color:white;stop-opacity:1;" />
+ <stop
+ id="stop5877"
+ offset="1"
+ style="stop-color:white;stop-opacity:0;" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient5847">
+ <stop
+ id="stop5849"
+ offset="0"
+ style="stop-color:white;stop-opacity:0.33;" />
+ <stop
+ id="stop5851"
+ offset="1"
+ style="stop-color:white;stop-opacity:0;" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5847"
+ id="linearGradient6945"
+ gradientUnits="userSpaceOnUse"
+ x1="0"
+ y1="0.5"
+ x2="0"
+ y2="18.5"
+ gradientTransform="matrix(1,0,0,1,0,0)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5873"
+ id="linearGradient6962"
+ x1="0"
+ y1="1"
+ x2="0"
+ y2="8"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1,0,0,0.2,0,1)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient1886"
+ id="linearGradient1892"
+ x1="0"
+ y1="1"
+ x2="0"
+ y2="9"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient1886"
+ id="linearGradient2791"
+ x1="0"
+ y1="1"
+ x2="0"
+ y2="19"
+ gradientUnits="userSpaceOnUse" />
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="white"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="10"
+ inkscape:cx="0"
+ inkscape:cy="0"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ inkscape:grid-bbox="true"
+ inkscape:grid-points="true"
+ gridoriginx="0px"
+ gridtolerance="0.5px"
+ guidetolerance="1px"
+ inkscape:window-width="640"
+ inkscape:window-height="400"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:guide-bbox="true"
+ inkscape:guide-points="false"
+ showguides="true" />
+ <metadata
+ id="metadata7">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title>Title</dc:title>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Olivier Fourdan</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:groupmode="layer"
+ id="layer2"
+ inkscape:label="Grad"
+ style="display:inline">
+ <path
+ style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 0,0.5 L 24,0.5 C 24,0.5 24,19 24,19 L 0,19 L 0,0.5 z "
+ id="path6057"
+ sodipodi:nodetypes="ccsc" />
+ </g>
+ <g
+ inkscape:groupmode="layer"
+ id="layer3"
+ inkscape:label="hilight">
+ <path
+ style="fill:url(#linearGradient6962);fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 0,1 L 24,1 C 24,1 24,4 24,4 L 0,4 L 0,3 z "
+ id="path6061"
+ sodipodi:nodetypes="ccsc" />
+ <rect
+ style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:0.75;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect1884"
+ width="24"
+ height="9"
+ x="0"
+ y="1" />
+ <path
+ style="fill:none;fill-opacity:1.0;fill-rule:evenodd;stroke:url(#linearGradient2791);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;opacity:1"
+ d="M 0,1 L 0,19"
+ id="path1889" />
+ <path
+ style="fill:none;fill-opacity:1.0;fill-rule:evenodd;stroke:url(#linearGradient2791);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;opacity:1"
+ d="M 24,1 L 24,19"
+ id="path1890" />
+ </g>
+ <g
+ inkscape:label="Border"
+ inkscape:groupmode="layer"
+ id="layer1"
+ style="display:inline">
+ <path
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+ d="M 0.5,0.5 L 23.5,0.5"
+ id="path6059"
+ sodipodi:nodetypes="ccsc" />
+ </g>
+ <g
+ inkscape:groupmode="layer"
+ id="g20"
+ inkscape:label="Button">
+ <g
+ style="display:inline"
+ id="g1628"
+ transform="translate(6,4)">
+ <path
+ id="path2620"
+ style="opacity:0.50;fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:#7f7f7f;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
+ d="M 3,6 L 6,9 L 9,6 M 6,3 L 6,8" />
+ </g>
+ </g>
+ <g
+ inkscape:groupmode="layer"
+ id="layer5"
+ inkscape:label="Shadow">
+ <path
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.10"
+ d="M 0.5,18.5 L 23.5,18.5"
+ id="path6989"
+ sodipodi:nodetypes="ccsc" />
+ </g>
+</svg>
diff --git a/themes/daloa/shade-toggled-inactive.xpm b/themes/daloa/shade-toggled-inactive.xpm
index 74b200941eb4a5b2e470e228f533a264da8a2b27..99245d00dd704924a8ed34e7e3f733ae52e83d4c 100644
--- a/themes/daloa/shade-toggled-inactive.xpm
+++ b/themes/daloa/shade-toggled-inactive.xpm
@@ -1,24 +1,23 @@
/* XPM */
static char * shade_toggled_inactive_xpm[] = {
-"24 17 5 1",
+"24 19 2 1",
" c None",
". c #C0C0FF s inactive_color_1",
-"+ c #D0D0FF s inactive_hilight_1",
-"@ c #B0B0FF s inactive_mid_1",
-"# c #D0D0FF s inactive_text_color",
-" ",
"........................",
"........................",
"........................",
"........................",
-"...........##...........",
-"...........##...........",
-"...........##...........",
-"........##.##.##........",
-"........########........",
-".........######.........",
-"..........####..........",
-"...........##...........",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
"........................",
"........................",
"........................",
diff --git a/themes/daloa/shade-toggled-pressed.png b/themes/daloa/shade-toggled-pressed.png
index f180fd506dacd995de0e7aaea806228bc86cefbd..49897a0383e07e89fa62a007a45022ecda84bf62 100644
Binary files a/themes/daloa/shade-toggled-pressed.png and b/themes/daloa/shade-toggled-pressed.png differ
diff --git a/themes/daloa/shade-toggled-pressed.svg b/themes/daloa/shade-toggled-pressed.svg
new file mode 100644
index 0000000000000000000000000000000000000000..2c6028dff0185ea3fafed5d77e656ffc9b58d602
--- /dev/null
+++ b/themes/daloa/shade-toggled-pressed.svg
@@ -0,0 +1,252 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://web.resource.org/cc/"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="24"
+ height="19"
+ id="svg2"
+ sodipodi:version="0.32"
+ inkscape:version="0.44"
+ version="1.0"
+ sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"
+ sodipodi:docname="shade-toggled-pressed.svg"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
+ <defs
+ id="defs4">
+ <linearGradient
+ id="linearGradient1886">
+ <stop
+ style="stop-color:white;stop-opacity:1;"
+ offset="0"
+ id="stop1888" />
+ <stop
+ style="stop-color:white;stop-opacity:0.05;"
+ offset="1"
+ id="stop1890" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient5873">
+ <stop
+ id="stop5875"
+ offset="0"
+ style="stop-color:white;stop-opacity:1;" />
+ <stop
+ id="stop5877"
+ offset="1"
+ style="stop-color:white;stop-opacity:0;" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient5847">
+ <stop
+ id="stop5849"
+ offset="0"
+ style="stop-color:white;stop-opacity:0.33;" />
+ <stop
+ id="stop5851"
+ offset="1"
+ style="stop-color:white;stop-opacity:0;" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5847"
+ id="linearGradient6945"
+ gradientUnits="userSpaceOnUse"
+ x1="0"
+ y1="0.5"
+ x2="0"
+ y2="18.5"
+ gradientTransform="matrix(1,0,0,1,0,0)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5873"
+ id="linearGradient6962"
+ x1="0"
+ y1="1"
+ x2="0"
+ y2="8"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1,0,0,0.2,0,1)" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5873"
+ id="radialGradient3087"
+ cx="9"
+ cy="12.5"
+ fx="9"
+ fy="12.5"
+ r="9"
+ gradientTransform="matrix(1,0,0,1.0,0,0.5)"
+ gradientUnits="userSpaceOnUse" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5873"
+ id="radialGradient3095"
+ cx="9"
+ cy="9"
+ fx="9"
+ fy="9"
+ r="9"
+ gradientTransform="matrix(1,0,0,1.0,0,0.5)"
+ gradientUnits="userSpaceOnUse" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient1886"
+ id="linearGradient1892"
+ x1="0"
+ y1="1"
+ x2="0"
+ y2="9"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient1886"
+ id="linearGradient2791"
+ x1="0"
+ y1="1"
+ x2="0"
+ y2="19"
+ gradientUnits="userSpaceOnUse" />
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="white"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="10"
+ inkscape:cx="0"
+ inkscape:cy="0"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ inkscape:grid-bbox="true"
+ inkscape:grid-points="true"
+ gridoriginx="0px"
+ gridtolerance="0.5px"
+ guidetolerance="1px"
+ inkscape:window-width="640"
+ inkscape:window-height="400"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:guide-bbox="true"
+ inkscape:guide-points="false"
+ showguides="true" />
+ <metadata
+ id="metadata7">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title>Title</dc:title>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Olivier Fourdan</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:groupmode="layer"
+ id="layer2"
+ inkscape:label="Grad"
+ style="display:inline">
+ <path
+ style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 0,0.5 L 24,0.5 C 24,0.5 24,19 24,19 L 0,19 L 0,0.5 z "
+ id="path6057"
+ sodipodi:nodetypes="ccsc" />
+ </g>
+ <g
+ inkscape:groupmode="layer"
+ id="layer3"
+ inkscape:label="hilight">
+ <path
+ style="fill:url(#linearGradient6962);fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 0,1 L 24,1 C 24,1 24,4 24,4 L 0,4 L 0,3 z "
+ id="path6061"
+ sodipodi:nodetypes="ccsc" />
+ <rect
+ style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:0.75;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect1884"
+ width="24"
+ height="9"
+ x="0"
+ y="1" />
+ <path
+ style="fill:none;fill-opacity:1.0;fill-rule:evenodd;stroke:url(#linearGradient2791);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;opacity:1"
+ d="M 0,1 L 0,19"
+ id="path1889" />
+ <path
+ style="fill:none;fill-opacity:1.0;fill-rule:evenodd;stroke:url(#linearGradient2791);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;opacity:1"
+ d="M 24,1 L 24,19"
+ id="path1890" />
+ </g>
+ <g
+ inkscape:label="Border"
+ inkscape:groupmode="layer"
+ id="layer1"
+ style="display:inline">
+ <path
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+ d="M 0.5,0.5 L 23.5,0.5"
+ id="path6059"
+ sodipodi:nodetypes="ccsc" />
+ </g>
+ <g
+ inkscape:groupmode="layer"
+ id="g3722"
+ inkscape:label="Button">
+ <g
+ style="display:inline"
+ id="g1628"
+ transform="translate(6,5)">
+ <path
+ sodipodi:nodetypes="ccccc"
+ d="M 6,3 L 6,9 M 3,6 L 6,9 L 9,6"
+ style="opacity:0.33;fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
+ id="path2605" />
+ <path
+ d="M 3,6 L 6,9 L 9,6 M 6,3 L 6,8"
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:white;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
+ id="path2620" />
+ </g>
+ </g>
+ <g
+ inkscape:groupmode="layer"
+ id="layer4"
+ inkscape:label="pressed">
+ <g
+ id="g1789"
+ transform="translate(3,1)">
+ <rect
+ style="opacity:0.5;fill:url(#radialGradient3095);fill-opacity:1.0;stroke:url(#radialGradient3087);stroke-width:1;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect3079"
+ width="24"
+ height="19"
+ x="0"
+ y="0" />
+ </g>
+ </g>
+ <g
+ inkscape:groupmode="layer"
+ id="layer5"
+ inkscape:label="Shadow">
+ <path
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.10"
+ d="M 0.5,18.5 L 23.5,18.5"
+ id="path6989"
+ sodipodi:nodetypes="ccsc" />
+ </g>
+</svg>
diff --git a/themes/daloa/shade-toggled-pressed.xpm b/themes/daloa/shade-toggled-pressed.xpm
index 6b374b642ed27799e5be6a99f757c103de0509cd..49d9cc89e5acafeabe648945ee07ebf915e693ee 100644
--- a/themes/daloa/shade-toggled-pressed.xpm
+++ b/themes/daloa/shade-toggled-pressed.xpm
@@ -1,26 +1,24 @@
/* XPM */
static char * shade_toggled_pressed_xpm[] = {
-"24 17 6 1",
+"24 19 2 1",
" c None",
". c #C0C0FF s active_color_1",
-"+ c #D0D0FF s active_hilight_1",
-"@ c #B0B0FF s active_mid_1",
-"* c #A0A0FF s active_shadow_1",
-"# c #FFFFFF s active_text_color",
-" ",
"........................",
"........................",
"........................",
"........................",
-"...........**...........",
-"..........*##*..........",
-"..........*##*..........",
-"........***##***........",
-".......*##*##*##*.......",
-".......*########*.......",
-"........*######*........",
-".........*####*.........",
-"..........*##*..........",
-"...........**...........",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
"........................",
"........................"};
diff --git a/themes/daloa/stick-active.png b/themes/daloa/stick-active.png
index 124f950cde50849eb514e290fcb7b8c45e3cc53c..835d71ab5ecbcee96226da7367f101cd149a835d 100644
Binary files a/themes/daloa/stick-active.png and b/themes/daloa/stick-active.png differ
diff --git a/themes/daloa/stick-active.svg b/themes/daloa/stick-active.svg
new file mode 100644
index 0000000000000000000000000000000000000000..334f448c56302d0438a27fd4d4ba301124d69192
--- /dev/null
+++ b/themes/daloa/stick-active.svg
@@ -0,0 +1,213 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://web.resource.org/cc/"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="24"
+ height="19"
+ id="svg2"
+ sodipodi:version="0.32"
+ inkscape:version="0.44"
+ version="1.0"
+ sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"
+ sodipodi:docname="stick-active.svg"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
+ <defs
+ id="defs4">
+ <linearGradient
+ id="linearGradient1886">
+ <stop
+ style="stop-color:white;stop-opacity:1;"
+ offset="0"
+ id="stop1888" />
+ <stop
+ style="stop-color:white;stop-opacity:0.05;"
+ offset="1"
+ id="stop1890" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient5873">
+ <stop
+ id="stop5875"
+ offset="0"
+ style="stop-color:white;stop-opacity:1;" />
+ <stop
+ id="stop5877"
+ offset="1"
+ style="stop-color:white;stop-opacity:0;" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient5847">
+ <stop
+ id="stop5849"
+ offset="0"
+ style="stop-color:white;stop-opacity:0.33;" />
+ <stop
+ id="stop5851"
+ offset="1"
+ style="stop-color:white;stop-opacity:0;" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5847"
+ id="linearGradient6945"
+ gradientUnits="userSpaceOnUse"
+ x1="0"
+ y1="0.5"
+ x2="0"
+ y2="18.5"
+ gradientTransform="matrix(1,0,0,1,0,0)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5873"
+ id="linearGradient6962"
+ x1="0"
+ y1="1"
+ x2="0"
+ y2="8"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1,0,0,0.2,0,1)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient1886"
+ id="linearGradient1892"
+ x1="0"
+ y1="1"
+ x2="0"
+ y2="9"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient1886"
+ id="linearGradient2791"
+ x1="0"
+ y1="1"
+ x2="0"
+ y2="19"
+ gradientUnits="userSpaceOnUse" />
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="white"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="10"
+ inkscape:cx="0"
+ inkscape:cy="0"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ inkscape:grid-bbox="true"
+ inkscape:grid-points="true"
+ gridoriginx="0px"
+ gridtolerance="0.5px"
+ guidetolerance="1px"
+ inkscape:window-width="640"
+ inkscape:window-height="400"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:guide-bbox="true"
+ inkscape:guide-points="false"
+ showguides="true" />
+ <metadata
+ id="metadata7">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title>Title</dc:title>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Olivier Fourdan</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:groupmode="layer"
+ id="layer2"
+ inkscape:label="Grad"
+ style="display:inline">
+ <path
+ style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 0,0.5 L 24,0.5 C 24,0.5 24,19 24,19 L 0,19 L 0,0.5 z "
+ id="path6057"
+ sodipodi:nodetypes="ccsc" />
+ </g>
+ <g
+ inkscape:groupmode="layer"
+ id="layer3"
+ inkscape:label="hilight">
+ <path
+ style="fill:url(#linearGradient6962);fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 0,1 L 24,1 C 24,1 24,4 24,4 L 0,4 L 0,3 z "
+ id="path6061"
+ sodipodi:nodetypes="ccsc" />
+ <rect
+ style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:0.75;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect1884"
+ width="24"
+ height="9"
+ x="0"
+ y="1" />
+ <path
+ style="fill:none;fill-opacity:1.0;fill-rule:evenodd;stroke:url(#linearGradient2791);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;opacity:1"
+ d="M 0,1 L 0,19"
+ id="path1889" />
+ <path
+ style="fill:none;fill-opacity:1.0;fill-rule:evenodd;stroke:url(#linearGradient2791);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;opacity:1"
+ d="M 24,1 L 24,19"
+ id="path1890" />
+ </g>
+ <g
+ inkscape:label="Border"
+ inkscape:groupmode="layer"
+ id="layer1"
+ style="display:inline">
+ <path
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+ d="M 0.5,0.5 L 23.5,0.5"
+ id="path6059"
+ sodipodi:nodetypes="ccsc" />
+ </g>
+ <g
+ inkscape:groupmode="layer"
+ id="g20"
+ inkscape:label="Button">
+ <g
+ style="display:inline"
+ id="g1613"
+ transform="translate(6,4)">
+ <path
+ id="path1412"
+ d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z "
+ style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <path
+ id="path2287"
+ d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z "
+ style="opacity:1;fill:white;fill-opacity:1;stroke:white;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ </g>
+ </g>
+ <g
+ inkscape:groupmode="layer"
+ id="layer5"
+ inkscape:label="Shadow">
+ <path
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.10"
+ d="M 0.5,18.5 L 23.5,18.5"
+ id="path6989"
+ sodipodi:nodetypes="ccsc" />
+ </g>
+</svg>
diff --git a/themes/daloa/stick-active.xpm b/themes/daloa/stick-active.xpm
index e930aecf89c96a38a57a9e4a4479d45a3ebd562e..1df623a04089975bf05ec6a7eefa39d4a5ede34f 100644
--- a/themes/daloa/stick-active.xpm
+++ b/themes/daloa/stick-active.xpm
@@ -1,26 +1,24 @@
/* XPM */
static char * stick_active_xpm[] = {
-"24 17 6 1",
+"24 19 2 1",
" c None",
". c #C0C0FF s active_color_1",
-"+ c #D0D0FF s active_hilight_1",
-"@ c #B0B0FF s active_mid_1",
-"* c #A0A0FF s active_shadow_1",
-"# c #FFFFFF s active_text_color",
-" ",
-"........................",
-"........................",
-"........................",
-"..........****..........",
-".........*####*.........",
-"........*######*........",
-".......*##****##*.......",
-".......*##*..*##*.......",
-".......*##*..*##*.......",
-".......*##****##*.......",
-"........*######*........",
-".........*####*.........",
-"..........****..........",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
"........................",
"........................",
"........................"};
diff --git a/themes/daloa/stick-inactive.png b/themes/daloa/stick-inactive.png
index 124f950cde50849eb514e290fcb7b8c45e3cc53c..757568870a566e5d46033497ab040afab6765986 100644
Binary files a/themes/daloa/stick-inactive.png and b/themes/daloa/stick-inactive.png differ
diff --git a/themes/daloa/stick-inactive.svg b/themes/daloa/stick-inactive.svg
new file mode 100644
index 0000000000000000000000000000000000000000..6470bb62bf930c53de644f7763050ba178371216
--- /dev/null
+++ b/themes/daloa/stick-inactive.svg
@@ -0,0 +1,209 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://web.resource.org/cc/"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="24"
+ height="19"
+ id="svg2"
+ sodipodi:version="0.32"
+ inkscape:version="0.44"
+ version="1.0"
+ sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"
+ sodipodi:docname="stick-inactive.svg"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
+ <defs
+ id="defs4">
+ <linearGradient
+ id="linearGradient1886">
+ <stop
+ style="stop-color:white;stop-opacity:1;"
+ offset="0"
+ id="stop1888" />
+ <stop
+ style="stop-color:white;stop-opacity:0.05;"
+ offset="1"
+ id="stop1890" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient5873">
+ <stop
+ id="stop5875"
+ offset="0"
+ style="stop-color:white;stop-opacity:1;" />
+ <stop
+ id="stop5877"
+ offset="1"
+ style="stop-color:white;stop-opacity:0;" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient5847">
+ <stop
+ id="stop5849"
+ offset="0"
+ style="stop-color:white;stop-opacity:0.33;" />
+ <stop
+ id="stop5851"
+ offset="1"
+ style="stop-color:white;stop-opacity:0;" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5847"
+ id="linearGradient6945"
+ gradientUnits="userSpaceOnUse"
+ x1="0"
+ y1="0.5"
+ x2="0"
+ y2="18.5"
+ gradientTransform="matrix(1,0,0,1,0,0)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5873"
+ id="linearGradient6962"
+ x1="0"
+ y1="1"
+ x2="0"
+ y2="8"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1,0,0,0.2,0,1)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient1886"
+ id="linearGradient1892"
+ x1="0"
+ y1="1"
+ x2="0"
+ y2="9"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient1886"
+ id="linearGradient2791"
+ x1="0"
+ y1="1"
+ x2="0"
+ y2="19"
+ gradientUnits="userSpaceOnUse" />
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="white"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="10"
+ inkscape:cx="0"
+ inkscape:cy="0"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ inkscape:grid-bbox="true"
+ inkscape:grid-points="true"
+ gridoriginx="0px"
+ gridtolerance="0.5px"
+ guidetolerance="1px"
+ inkscape:window-width="640"
+ inkscape:window-height="400"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:guide-bbox="true"
+ inkscape:guide-points="false"
+ showguides="true" />
+ <metadata
+ id="metadata7">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title>Title</dc:title>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Olivier Fourdan</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:groupmode="layer"
+ id="layer2"
+ inkscape:label="Grad"
+ style="display:inline">
+ <path
+ style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 0,0.5 L 24,0.5 C 24,0.5 24,19 24,19 L 0,19 L 0,0.5 z "
+ id="path6057"
+ sodipodi:nodetypes="ccsc" />
+ </g>
+ <g
+ inkscape:groupmode="layer"
+ id="layer3"
+ inkscape:label="hilight">
+ <path
+ style="fill:url(#linearGradient6962);fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 0,1 L 24,1 C 24,1 24,4 24,4 L 0,4 L 0,3 z "
+ id="path6061"
+ sodipodi:nodetypes="ccsc" />
+ <rect
+ style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:0.75;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect1884"
+ width="24"
+ height="9"
+ x="0"
+ y="1" />
+ <path
+ style="fill:none;fill-opacity:1.0;fill-rule:evenodd;stroke:url(#linearGradient2791);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;opacity:1"
+ d="M 0,1 L 0,19"
+ id="path1889" />
+ <path
+ style="fill:none;fill-opacity:1.0;fill-rule:evenodd;stroke:url(#linearGradient2791);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;opacity:1"
+ d="M 24,1 L 24,19"
+ id="path1890" />
+ </g>
+ <g
+ inkscape:label="Border"
+ inkscape:groupmode="layer"
+ id="layer1"
+ style="display:inline">
+ <path
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+ d="M 0.5,0.5 L 23.5,0.5"
+ id="path6059"
+ sodipodi:nodetypes="ccsc" />
+ </g>
+ <g
+ inkscape:groupmode="layer"
+ id="g20"
+ inkscape:label="Button">
+ <g
+ style="display:inline"
+ id="g1613"
+ transform="translate(6,4)">
+ <path
+ id="path2287"
+ d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z "
+ style="opacity:0.50;fill:#7f7f7f;fill-opacity:1;stroke:#7f7f7f;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ </g>
+ </g>
+ <g
+ inkscape:groupmode="layer"
+ id="layer5"
+ inkscape:label="Shadow">
+ <path
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.10"
+ d="M 0.5,18.5 L 23.5,18.5"
+ id="path6989"
+ sodipodi:nodetypes="ccsc" />
+ </g>
+</svg>
diff --git a/themes/daloa/stick-inactive.xpm b/themes/daloa/stick-inactive.xpm
index be154e319e8c85b33704ea60c0ab19dd26d2b5fb..c93619b1daa5926dafe46a53774f7322792216d0 100644
--- a/themes/daloa/stick-inactive.xpm
+++ b/themes/daloa/stick-inactive.xpm
@@ -1,24 +1,23 @@
/* XPM */
static char * stick_inactive_xpm[] = {
-"24 17 5 1",
+"24 19 2 1",
" c None",
". c #C0C0FF s inactive_color_1",
-"+ c #D0D0FF s inactive_hilight_1",
-"@ c #B0B0FF s inactive_mid_1",
-"# c #D0D0FF s inactive_text_color",
-" ",
"........................",
"........................",
"........................",
"........................",
-"..........####..........",
-".........######.........",
-"........##....##........",
-"........##....##........",
-"........##....##........",
-"........##....##........",
-".........######.........",
-"..........####..........",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
"........................",
"........................",
"........................",
diff --git a/themes/daloa/stick-pressed.png b/themes/daloa/stick-pressed.png
index f180fd506dacd995de0e7aaea806228bc86cefbd..393a6f3e9abbf6ddadce8799a95957f789708fcb 100644
Binary files a/themes/daloa/stick-pressed.png and b/themes/daloa/stick-pressed.png differ
diff --git a/themes/daloa/stick-pressed.svg b/themes/daloa/stick-pressed.svg
new file mode 100644
index 0000000000000000000000000000000000000000..a6d9e42bd5609d8462e0e0eb863a15a8e2937444
--- /dev/null
+++ b/themes/daloa/stick-pressed.svg
@@ -0,0 +1,251 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://web.resource.org/cc/"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="24"
+ height="19"
+ id="svg2"
+ sodipodi:version="0.32"
+ inkscape:version="0.44"
+ version="1.0"
+ sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"
+ sodipodi:docname="stick-pressed.svg"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
+ <defs
+ id="defs4">
+ <linearGradient
+ id="linearGradient1886">
+ <stop
+ style="stop-color:white;stop-opacity:1;"
+ offset="0"
+ id="stop1888" />
+ <stop
+ style="stop-color:white;stop-opacity:0.05;"
+ offset="1"
+ id="stop1890" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient5873">
+ <stop
+ id="stop5875"
+ offset="0"
+ style="stop-color:white;stop-opacity:1;" />
+ <stop
+ id="stop5877"
+ offset="1"
+ style="stop-color:white;stop-opacity:0;" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient5847">
+ <stop
+ id="stop5849"
+ offset="0"
+ style="stop-color:white;stop-opacity:0.33;" />
+ <stop
+ id="stop5851"
+ offset="1"
+ style="stop-color:white;stop-opacity:0;" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5847"
+ id="linearGradient6945"
+ gradientUnits="userSpaceOnUse"
+ x1="0"
+ y1="0.5"
+ x2="0"
+ y2="18.5"
+ gradientTransform="matrix(1,0,0,1,0,0)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5873"
+ id="linearGradient6962"
+ x1="0"
+ y1="1"
+ x2="0"
+ y2="8"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1,0,0,0.2,0,1)" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5873"
+ id="radialGradient3087"
+ cx="9"
+ cy="12.5"
+ fx="9"
+ fy="12.5"
+ r="9"
+ gradientTransform="matrix(1,0,0,1.0,0,0.5)"
+ gradientUnits="userSpaceOnUse" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5873"
+ id="radialGradient3095"
+ cx="9"
+ cy="9"
+ fx="9"
+ fy="9"
+ r="9"
+ gradientTransform="matrix(1,0,0,1.0,0,0.5)"
+ gradientUnits="userSpaceOnUse" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient1886"
+ id="linearGradient1892"
+ x1="0"
+ y1="1"
+ x2="0"
+ y2="9"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient1886"
+ id="linearGradient2791"
+ x1="0"
+ y1="1"
+ x2="0"
+ y2="19"
+ gradientUnits="userSpaceOnUse" />
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="white"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="10"
+ inkscape:cx="0"
+ inkscape:cy="0"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ inkscape:grid-bbox="true"
+ inkscape:grid-points="true"
+ gridoriginx="0px"
+ gridtolerance="0.5px"
+ guidetolerance="1px"
+ inkscape:window-width="640"
+ inkscape:window-height="400"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:guide-bbox="true"
+ inkscape:guide-points="false"
+ showguides="true" />
+ <metadata
+ id="metadata7">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title>Title</dc:title>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Olivier Fourdan</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:groupmode="layer"
+ id="layer2"
+ inkscape:label="Grad"
+ style="display:inline">
+ <path
+ style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 0,0.5 L 24,0.5 C 24,0.5 24,19 24,19 L 0,19 L 0,0.5 z "
+ id="path6057"
+ sodipodi:nodetypes="ccsc" />
+ </g>
+ <g
+ inkscape:groupmode="layer"
+ id="layer3"
+ inkscape:label="hilight">
+ <path
+ style="fill:url(#linearGradient6962);fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 0,1 L 24,1 C 24,1 24,4 24,4 L 0,4 L 0,3 z "
+ id="path6061"
+ sodipodi:nodetypes="ccsc" />
+ <rect
+ style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:0.75;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect1884"
+ width="24"
+ height="9"
+ x="0"
+ y="1" />
+ <path
+ style="fill:none;fill-opacity:1.0;fill-rule:evenodd;stroke:url(#linearGradient2791);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;opacity:1"
+ d="M 0,1 L 0,19"
+ id="path1889" />
+ <path
+ style="fill:none;fill-opacity:1.0;fill-rule:evenodd;stroke:url(#linearGradient2791);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;opacity:1"
+ d="M 24,1 L 24,19"
+ id="path1890" />
+ </g>
+ <g
+ inkscape:label="Border"
+ inkscape:groupmode="layer"
+ id="layer1"
+ style="display:inline">
+ <path
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+ d="M 0.5,0.5 L 23.5,0.5"
+ id="path6059"
+ sodipodi:nodetypes="ccsc" />
+ </g>
+ <g
+ inkscape:groupmode="layer"
+ id="g3722"
+ inkscape:label="Button">
+ <g
+ style="display:inline"
+ id="g1613"
+ transform="translate(6,5)">
+ <path
+ id="path1412"
+ d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z "
+ style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <path
+ id="path2287"
+ d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z "
+ style="opacity:1;fill:white;fill-opacity:1;stroke:white;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ </g>
+ </g>
+ <g
+ inkscape:groupmode="layer"
+ id="layer4"
+ inkscape:label="pressed">
+ <g
+ id="g1789"
+ transform="translate(3,1)">
+ <rect
+ style="opacity:0.5;fill:url(#radialGradient3095);fill-opacity:1.0;stroke:url(#radialGradient3087);stroke-width:1;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect3079"
+ width="24"
+ height="19"
+ x="0"
+ y="0" />
+ </g>
+ </g>
+ <g
+ inkscape:groupmode="layer"
+ id="layer5"
+ inkscape:label="Shadow">
+ <path
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.10"
+ d="M 0.5,18.5 L 23.5,18.5"
+ id="path6989"
+ sodipodi:nodetypes="ccsc" />
+ </g>
+</svg>
diff --git a/themes/daloa/stick-pressed.xpm b/themes/daloa/stick-pressed.xpm
index e2c753cf6c143df8a9cd9902d8c3dfa0adea70c0..590336343aa9c6e4db0b144f2b6388a26b545458 100644
--- a/themes/daloa/stick-pressed.xpm
+++ b/themes/daloa/stick-pressed.xpm
@@ -1,26 +1,24 @@
/* XPM */
static char * stick_pressed_xpm[] = {
-"24 17 6 1",
+"24 19 2 1",
" c None",
". c #C0C0FF s active_color_1",
-"+ c #D0D0FF s active_hilight_1",
-"@ c #B0B0FF s active_mid_1",
-"* c #A0A0FF s active_shadow_1",
-"# c #FFFFFF s active_text_color",
-" ",
"........................",
"........................",
"........................",
"........................",
-"..........****..........",
-".........*####*.........",
-"........*######*........",
-".......*##****##*.......",
-".......*##*..*##*.......",
-".......*##*..*##*.......",
-".......*##****##*.......",
-"........*######*........",
-".........*####*.........",
-"..........****..........",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
"........................",
"........................"};
diff --git a/themes/daloa/stick-toggled-active.png b/themes/daloa/stick-toggled-active.png
index 124f950cde50849eb514e290fcb7b8c45e3cc53c..a1150fd132732def790ff27c7c78c65fb9ca5843 100644
Binary files a/themes/daloa/stick-toggled-active.png and b/themes/daloa/stick-toggled-active.png differ
diff --git a/themes/daloa/stick-toggled-active.svg b/themes/daloa/stick-toggled-active.svg
new file mode 100644
index 0000000000000000000000000000000000000000..0c183daf1d946d860849b5646c4cdb78ab3efc9a
--- /dev/null
+++ b/themes/daloa/stick-toggled-active.svg
@@ -0,0 +1,222 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://web.resource.org/cc/"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="24"
+ height="19"
+ id="svg2"
+ sodipodi:version="0.32"
+ inkscape:version="0.44"
+ version="1.0"
+ sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"
+ sodipodi:docname="stick-toggled-active.svg"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
+ <defs
+ id="defs4">
+ <linearGradient
+ id="linearGradient1886">
+ <stop
+ style="stop-color:white;stop-opacity:1;"
+ offset="0"
+ id="stop1888" />
+ <stop
+ style="stop-color:white;stop-opacity:0.05;"
+ offset="1"
+ id="stop1890" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient5873">
+ <stop
+ id="stop5875"
+ offset="0"
+ style="stop-color:white;stop-opacity:1;" />
+ <stop
+ id="stop5877"
+ offset="1"
+ style="stop-color:white;stop-opacity:0;" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient5847">
+ <stop
+ id="stop5849"
+ offset="0"
+ style="stop-color:white;stop-opacity:0.33;" />
+ <stop
+ id="stop5851"
+ offset="1"
+ style="stop-color:white;stop-opacity:0;" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5847"
+ id="linearGradient6945"
+ gradientUnits="userSpaceOnUse"
+ x1="0"
+ y1="0.5"
+ x2="0"
+ y2="18.5"
+ gradientTransform="matrix(1,0,0,1,0,0)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5873"
+ id="linearGradient6962"
+ x1="0"
+ y1="1"
+ x2="0"
+ y2="8"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1,0,0,0.2,0,1)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient1886"
+ id="linearGradient1892"
+ x1="0"
+ y1="1"
+ x2="0"
+ y2="9"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient1886"
+ id="linearGradient2791"
+ x1="0"
+ y1="1"
+ x2="0"
+ y2="19"
+ gradientUnits="userSpaceOnUse" />
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="white"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="10"
+ inkscape:cx="0"
+ inkscape:cy="0"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ inkscape:grid-bbox="true"
+ inkscape:grid-points="true"
+ gridoriginx="0px"
+ gridtolerance="0.5px"
+ guidetolerance="1px"
+ inkscape:window-width="640"
+ inkscape:window-height="400"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:guide-bbox="true"
+ inkscape:guide-points="false"
+ showguides="true" />
+ <metadata
+ id="metadata7">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title>Title</dc:title>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Olivier Fourdan</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:groupmode="layer"
+ id="layer2"
+ inkscape:label="Grad"
+ style="display:inline">
+ <path
+ style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 0,0.5 L 24,0.5 C 24,0.5 24,19 24,19 L 0,19 L 0,0.5 z "
+ id="path6057"
+ sodipodi:nodetypes="ccsc" />
+ </g>
+ <g
+ inkscape:groupmode="layer"
+ id="layer3"
+ inkscape:label="hilight">
+ <path
+ style="fill:url(#linearGradient6962);fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 0,1 L 24,1 C 24,1 24,4 24,4 L 0,4 L 0,3 z "
+ id="path6061"
+ sodipodi:nodetypes="ccsc" />
+ <rect
+ style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:0.75;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect1884"
+ width="24"
+ height="9"
+ x="0"
+ y="1" />
+ <path
+ style="fill:none;fill-opacity:1.0;fill-rule:evenodd;stroke:url(#linearGradient2791);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;opacity:1"
+ d="M 0,1 L 0,19"
+ id="path1889" />
+ <path
+ style="fill:none;fill-opacity:1.0;fill-rule:evenodd;stroke:url(#linearGradient2791);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;opacity:1"
+ d="M 24,1 L 24,19"
+ id="path1890" />
+ </g>
+ <g
+ inkscape:label="Border"
+ inkscape:groupmode="layer"
+ id="layer1"
+ style="display:inline">
+ <path
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+ d="M 0.5,0.5 L 23.5,0.5"
+ id="path6059"
+ sodipodi:nodetypes="ccsc" />
+ </g>
+ <g
+ inkscape:groupmode="layer"
+ id="g20"
+ inkscape:label="Button">
+ <g
+ style="display:inline"
+ id="g1625"
+ transform="translate(6,4)">
+ <path
+ id="path1412"
+ d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z "
+ style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <path
+ id="path2287"
+ d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z "
+ style="opacity:1;fill:white;fill-opacity:1;stroke:white;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <path
+ d="M 7 6 A 1 1 0 1 1 5,6 A 1 1 0 1 1 7 6 z"
+ sodipodi:ry="1"
+ sodipodi:rx="1"
+ sodipodi:cy="6"
+ sodipodi:cx="6"
+ id="path2292"
+ style="opacity:1;fill:white;fill-opacity:1;stroke:white;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ sodipodi:type="arc" />
+ </g>
+ </g>
+ <g
+ inkscape:groupmode="layer"
+ id="layer5"
+ inkscape:label="Shadow">
+ <path
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.10"
+ d="M 0.5,18.5 L 23.5,18.5"
+ id="path6989"
+ sodipodi:nodetypes="ccsc" />
+ </g>
+</svg>
diff --git a/themes/daloa/stick-toggled-active.xpm b/themes/daloa/stick-toggled-active.xpm
index cd0a12cb36f129949a2ff5283f0b2948228196fd..84bf6e037590e45c96ce80915620222274dc7183 100644
--- a/themes/daloa/stick-toggled-active.xpm
+++ b/themes/daloa/stick-toggled-active.xpm
@@ -1,26 +1,24 @@
/* XPM */
static char * stick_toggled_active_xpm[] = {
-"24 17 6 1",
+"24 19 2 1",
" c None",
". c #C0C0FF s active_color_1",
-"+ c #D0D0FF s active_hilight_1",
-"@ c #B0B0FF s active_mid_1",
-"* c #A0A0FF s active_shadow_1",
-"# c #FFFFFF s active_text_color",
-" ",
-"........................",
-"........................",
-"........................",
-"..........****..........",
-".........*####*.........",
-"........*######*........",
-".......*##****##*.......",
-".......*##*##*##*.......",
-".......*##*##*##*.......",
-".......*##****##*.......",
-"........*######*........",
-".........*####*.........",
-"..........****..........",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
"........................",
"........................",
"........................"};
diff --git a/themes/daloa/stick-toggled-inactive.png b/themes/daloa/stick-toggled-inactive.png
index 124f950cde50849eb514e290fcb7b8c45e3cc53c..1d56ddd9cce478febe97aba99d8fcdfe7ec29a07 100644
Binary files a/themes/daloa/stick-toggled-inactive.png and b/themes/daloa/stick-toggled-inactive.png differ
diff --git a/themes/daloa/stick-toggled-inactive.svg b/themes/daloa/stick-toggled-inactive.svg
new file mode 100644
index 0000000000000000000000000000000000000000..199784a887a4949b8873b5f5eff5ef0f1c6be7b6
--- /dev/null
+++ b/themes/daloa/stick-toggled-inactive.svg
@@ -0,0 +1,218 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://web.resource.org/cc/"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="24"
+ height="19"
+ id="svg2"
+ sodipodi:version="0.32"
+ inkscape:version="0.44"
+ version="1.0"
+ sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"
+ sodipodi:docname="stick-toggled-inactive.svg"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
+ <defs
+ id="defs4">
+ <linearGradient
+ id="linearGradient1886">
+ <stop
+ style="stop-color:white;stop-opacity:1;"
+ offset="0"
+ id="stop1888" />
+ <stop
+ style="stop-color:white;stop-opacity:0.05;"
+ offset="1"
+ id="stop1890" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient5873">
+ <stop
+ id="stop5875"
+ offset="0"
+ style="stop-color:white;stop-opacity:1;" />
+ <stop
+ id="stop5877"
+ offset="1"
+ style="stop-color:white;stop-opacity:0;" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient5847">
+ <stop
+ id="stop5849"
+ offset="0"
+ style="stop-color:white;stop-opacity:0.33;" />
+ <stop
+ id="stop5851"
+ offset="1"
+ style="stop-color:white;stop-opacity:0;" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5847"
+ id="linearGradient6945"
+ gradientUnits="userSpaceOnUse"
+ x1="0"
+ y1="0.5"
+ x2="0"
+ y2="18.5"
+ gradientTransform="matrix(1,0,0,1,0,0)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5873"
+ id="linearGradient6962"
+ x1="0"
+ y1="1"
+ x2="0"
+ y2="8"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1,0,0,0.2,0,1)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient1886"
+ id="linearGradient1892"
+ x1="0"
+ y1="1"
+ x2="0"
+ y2="9"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient1886"
+ id="linearGradient2791"
+ x1="0"
+ y1="1"
+ x2="0"
+ y2="19"
+ gradientUnits="userSpaceOnUse" />
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="white"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="10"
+ inkscape:cx="0"
+ inkscape:cy="0"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ inkscape:grid-bbox="true"
+ inkscape:grid-points="true"
+ gridoriginx="0px"
+ gridtolerance="0.5px"
+ guidetolerance="1px"
+ inkscape:window-width="640"
+ inkscape:window-height="400"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:guide-bbox="true"
+ inkscape:guide-points="false"
+ showguides="true" />
+ <metadata
+ id="metadata7">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title>Title</dc:title>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Olivier Fourdan</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:groupmode="layer"
+ id="layer2"
+ inkscape:label="Grad"
+ style="display:inline">
+ <path
+ style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 0,0.5 L 24,0.5 C 24,0.5 24,19 24,19 L 0,19 L 0,0.5 z "
+ id="path6057"
+ sodipodi:nodetypes="ccsc" />
+ </g>
+ <g
+ inkscape:groupmode="layer"
+ id="layer3"
+ inkscape:label="hilight">
+ <path
+ style="fill:url(#linearGradient6962);fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 0,1 L 24,1 C 24,1 24,4 24,4 L 0,4 L 0,3 z "
+ id="path6061"
+ sodipodi:nodetypes="ccsc" />
+ <rect
+ style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:0.75;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect1884"
+ width="24"
+ height="9"
+ x="0"
+ y="1" />
+ <path
+ style="fill:none;fill-opacity:1.0;fill-rule:evenodd;stroke:url(#linearGradient2791);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;opacity:1"
+ d="M 0,1 L 0,19"
+ id="path1889" />
+ <path
+ style="fill:none;fill-opacity:1.0;fill-rule:evenodd;stroke:url(#linearGradient2791);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;opacity:1"
+ d="M 24,1 L 24,19"
+ id="path1890" />
+ </g>
+ <g
+ inkscape:label="Border"
+ inkscape:groupmode="layer"
+ id="layer1"
+ style="display:inline">
+ <path
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+ d="M 0.5,0.5 L 23.5,0.5"
+ id="path6059"
+ sodipodi:nodetypes="ccsc" />
+ </g>
+ <g
+ inkscape:groupmode="layer"
+ id="g20"
+ inkscape:label="Button">
+ <g
+ style="display:inline"
+ id="g1625"
+ transform="translate(6,4)">
+ <path
+ id="path2287"
+ d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z "
+ style="opacity:0.50;fill:#7f7f7f;fill-opacity:1;stroke:#7f7f7f;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <path
+ d="M 7 6 A 1 1 0 1 1 5,6 A 1 1 0 1 1 7 6 z"
+ sodipodi:ry="1"
+ sodipodi:rx="1"
+ sodipodi:cy="6"
+ sodipodi:cx="6"
+ id="path2202"
+ style="opacity:0.50;fill:#7f7f7f;fill-opacity:1;stroke:#7f7f7f;stroke-width:0.5;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
+ sodipodi:type="arc" />
+ </g>
+ </g>
+ <g
+ inkscape:groupmode="layer"
+ id="layer5"
+ inkscape:label="Shadow">
+ <path
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.10"
+ d="M 0.5,18.5 L 23.5,18.5"
+ id="path6989"
+ sodipodi:nodetypes="ccsc" />
+ </g>
+</svg>
diff --git a/themes/daloa/stick-toggled-inactive.xpm b/themes/daloa/stick-toggled-inactive.xpm
index 4a12668c0034b9bfdd897779555b222830533726..283673f46305ead195fb42fac6d9eca1c4f5cff8 100644
--- a/themes/daloa/stick-toggled-inactive.xpm
+++ b/themes/daloa/stick-toggled-inactive.xpm
@@ -1,24 +1,23 @@
/* XPM */
static char * stick_toggled_inactive_xpm[] = {
-"24 17 5 1",
+"24 19 2 1",
" c None",
". c #C0C0FF s inactive_color_1",
-"+ c #D0D0FF s inactive_hilight_1",
-"@ c #B0B0FF s inactive_mid_1",
-"# c #D0D0FF s inactive_text_color",
-" ",
"........................",
"........................",
"........................",
"........................",
-"..........####..........",
-".........######.........",
-"........##....##........",
-"........##.##.##........",
-"........##.##.##........",
-"........##....##........",
-".........######.........",
-"..........####..........",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
"........................",
"........................",
"........................",
diff --git a/themes/daloa/stick-toggled-pressed.png b/themes/daloa/stick-toggled-pressed.png
index f180fd506dacd995de0e7aaea806228bc86cefbd..d6bfca9272dcb83cabb7a6aff0e6fa119c79c82d 100644
Binary files a/themes/daloa/stick-toggled-pressed.png and b/themes/daloa/stick-toggled-pressed.png differ
diff --git a/themes/daloa/stick-toggled-pressed.svg b/themes/daloa/stick-toggled-pressed.svg
new file mode 100644
index 0000000000000000000000000000000000000000..305a94a139c0f019b2541694e48d863cf223600a
--- /dev/null
+++ b/themes/daloa/stick-toggled-pressed.svg
@@ -0,0 +1,260 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://web.resource.org/cc/"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="24"
+ height="19"
+ id="svg2"
+ sodipodi:version="0.32"
+ inkscape:version="0.44"
+ version="1.0"
+ sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"
+ sodipodi:docname="stick-toggled-pressed.svg"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
+ <defs
+ id="defs4">
+ <linearGradient
+ id="linearGradient1886">
+ <stop
+ style="stop-color:white;stop-opacity:1;"
+ offset="0"
+ id="stop1888" />
+ <stop
+ style="stop-color:white;stop-opacity:0.05;"
+ offset="1"
+ id="stop1890" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient5873">
+ <stop
+ id="stop5875"
+ offset="0"
+ style="stop-color:white;stop-opacity:1;" />
+ <stop
+ id="stop5877"
+ offset="1"
+ style="stop-color:white;stop-opacity:0;" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient5847">
+ <stop
+ id="stop5849"
+ offset="0"
+ style="stop-color:white;stop-opacity:0.33;" />
+ <stop
+ id="stop5851"
+ offset="1"
+ style="stop-color:white;stop-opacity:0;" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5847"
+ id="linearGradient6945"
+ gradientUnits="userSpaceOnUse"
+ x1="0"
+ y1="0.5"
+ x2="0"
+ y2="18.5"
+ gradientTransform="matrix(1,0,0,1,0,0)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5873"
+ id="linearGradient6962"
+ x1="0"
+ y1="1"
+ x2="0"
+ y2="8"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1,0,0,0.2,0,1)" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5873"
+ id="radialGradient3087"
+ cx="9"
+ cy="12.5"
+ fx="9"
+ fy="12.5"
+ r="9"
+ gradientTransform="matrix(1,0,0,1.0,0,0.5)"
+ gradientUnits="userSpaceOnUse" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5873"
+ id="radialGradient3095"
+ cx="9"
+ cy="9"
+ fx="9"
+ fy="9"
+ r="9"
+ gradientTransform="matrix(1,0,0,1.0,0,0.5)"
+ gradientUnits="userSpaceOnUse" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient1886"
+ id="linearGradient1892"
+ x1="0"
+ y1="1"
+ x2="0"
+ y2="9"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient1886"
+ id="linearGradient2791"
+ x1="0"
+ y1="1"
+ x2="0"
+ y2="19"
+ gradientUnits="userSpaceOnUse" />
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="white"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="10"
+ inkscape:cx="0"
+ inkscape:cy="0"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ inkscape:grid-bbox="true"
+ inkscape:grid-points="true"
+ gridoriginx="0px"
+ gridtolerance="0.5px"
+ guidetolerance="1px"
+ inkscape:window-width="640"
+ inkscape:window-height="400"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:guide-bbox="true"
+ inkscape:guide-points="false"
+ showguides="true" />
+ <metadata
+ id="metadata7">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title>Title</dc:title>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Olivier Fourdan</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:groupmode="layer"
+ id="layer2"
+ inkscape:label="Grad"
+ style="display:inline">
+ <path
+ style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 0,0.5 L 24,0.5 C 24,0.5 24,19 24,19 L 0,19 L 0,0.5 z "
+ id="path6057"
+ sodipodi:nodetypes="ccsc" />
+ </g>
+ <g
+ inkscape:groupmode="layer"
+ id="layer3"
+ inkscape:label="hilight">
+ <path
+ style="fill:url(#linearGradient6962);fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 0,1 L 24,1 C 24,1 24,4 24,4 L 0,4 L 0,3 z "
+ id="path6061"
+ sodipodi:nodetypes="ccsc" />
+ <rect
+ style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:0.75;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect1884"
+ width="24"
+ height="9"
+ x="0"
+ y="1" />
+ <path
+ style="fill:none;fill-opacity:1.0;fill-rule:evenodd;stroke:url(#linearGradient2791);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;opacity:1"
+ d="M 0,1 L 0,19"
+ id="path1889" />
+ <path
+ style="fill:none;fill-opacity:1.0;fill-rule:evenodd;stroke:url(#linearGradient2791);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;opacity:1"
+ d="M 24,1 L 24,19"
+ id="path1890" />
+ </g>
+ <g
+ inkscape:label="Border"
+ inkscape:groupmode="layer"
+ id="layer1"
+ style="display:inline">
+ <path
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+ d="M 0.5,0.5 L 23.5,0.5"
+ id="path6059"
+ sodipodi:nodetypes="ccsc" />
+ </g>
+ <g
+ inkscape:groupmode="layer"
+ id="g3722"
+ inkscape:label="Button">
+ <g
+ style="display:inline"
+ id="g1625"
+ transform="translate(6,5)">
+ <path
+ id="path1412"
+ d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z "
+ style="opacity:0.33;fill:black;fill-opacity:1;stroke:black;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <path
+ id="path2287"
+ d="M 6,2 C 3.792,2 2,3.792 2,6 C 2,8.208 3.792,10 6,10 C 8.208,10 10,8.208 10,6 C 10,3.792 8.208,2 6,2 z M 6,4 C 7.104,4 8,4.896 8,6 C 8,7.104 7.104,8 6,8 C 4.896,8 4,7.104 4,6 C 4,4.896 4.896,4 6,4 z "
+ style="opacity:1;fill:white;fill-opacity:1;stroke:white;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <path
+ d="M 7 6 A 1 1 0 1 1 5,6 A 1 1 0 1 1 7 6 z"
+ sodipodi:ry="1"
+ sodipodi:rx="1"
+ sodipodi:cy="0"
+ sodipodi:cx="6"
+ id="path2292"
+ style="opacity:1;fill:white;fill-opacity:1;stroke:white;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ sodipodi:type="arc" />
+ </g>
+ </g>
+ <g
+ inkscape:groupmode="layer"
+ id="layer4"
+ inkscape:label="pressed">
+ <g
+ id="g1789"
+ transform="translate(3,1)">
+ <rect
+ style="opacity:0.5;fill:url(#radialGradient3095);fill-opacity:1.0;stroke:url(#radialGradient3087);stroke-width:1;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect3079"
+ width="24"
+ height="19"
+ x="0"
+ y="0" />
+ </g>
+ </g>
+ <g
+ inkscape:groupmode="layer"
+ id="layer5"
+ inkscape:label="Shadow">
+ <path
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.10"
+ d="M 0.5,18.5 L 23.5,18.5"
+ id="path6989"
+ sodipodi:nodetypes="ccsc" />
+ </g>
+</svg>
diff --git a/themes/daloa/stick-toggled-pressed.xpm b/themes/daloa/stick-toggled-pressed.xpm
index aed9ce7581f0e151eadf32c1f33512177b80e63e..9a558db9503f193124906312aaa7578534cf2e0c 100644
--- a/themes/daloa/stick-toggled-pressed.xpm
+++ b/themes/daloa/stick-toggled-pressed.xpm
@@ -1,26 +1,24 @@
/* XPM */
static char * stick_toggled_pressed_xpm[] = {
-"24 17 6 1",
+"24 19 2 1",
" c None",
". c #C0C0FF s active_color_1",
-"+ c #D0D0FF s active_hilight_1",
-"@ c #B0B0FF s active_mid_1",
-"* c #A0A0FF s active_shadow_1",
-"# c #FFFFFF s active_text_color",
-" ",
"........................",
"........................",
"........................",
"........................",
-"..........****..........",
-".........*####*.........",
-"........*######*........",
-".......*##****##*.......",
-".......*##*##*##*.......",
-".......*##*##*##*.......",
-".......*##****##*.......",
-"........*######*........",
-".........*####*.........",
-"..........****..........",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
"........................",
"........................"};
diff --git a/themes/daloa/title-1-active.png b/themes/daloa/title-1-active.png
index 5bee49478d0205efe3c42cabc30f2e6464ba02c1..34bcd46281508b392aa5cfaafeb80aed10e06ec2 100644
Binary files a/themes/daloa/title-1-active.png and b/themes/daloa/title-1-active.png differ
diff --git a/themes/daloa/title-1-active.svg b/themes/daloa/title-1-active.svg
new file mode 100644
index 0000000000000000000000000000000000000000..975019b35e0c0a663a848e865674164295b3f00e
--- /dev/null
+++ b/themes/daloa/title-1-active.svg
@@ -0,0 +1,178 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://web.resource.org/cc/"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="8"
+ height="19"
+ id="svg2"
+ sodipodi:version="0.32"
+ inkscape:version="0.44"
+ version="1.0"
+ sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"
+ sodipodi:docname="title-1-active.svg"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
+ <defs
+ id="defs4">
+ <linearGradient
+ id="linearGradient1886">
+ <stop
+ style="stop-color:white;stop-opacity:1;"
+ offset="0"
+ id="stop1888" />
+ <stop
+ style="stop-color:white;stop-opacity:0.05;"
+ offset="1"
+ id="stop1890" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient5873">
+ <stop
+ id="stop5875"
+ offset="0"
+ style="stop-color:white;stop-opacity:1;" />
+ <stop
+ id="stop5877"
+ offset="1"
+ style="stop-color:white;stop-opacity:0;" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient5847">
+ <stop
+ id="stop5849"
+ offset="0"
+ style="stop-color:white;stop-opacity:0.33;" />
+ <stop
+ id="stop5851"
+ offset="1"
+ style="stop-color:white;stop-opacity:0;" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5847"
+ id="linearGradient6945"
+ gradientUnits="userSpaceOnUse"
+ x1="0"
+ y1="0.5"
+ x2="0"
+ y2="18.5"
+ gradientTransform="matrix(1,0,0,1,0,0)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5873"
+ id="linearGradient6962"
+ x1="0"
+ y1="1"
+ x2="0"
+ y2="8"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1,0,0,0.2,0,1)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient1886"
+ id="linearGradient1892"
+ x1="0"
+ y1="1"
+ x2="0"
+ y2="9"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="white"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="10"
+ inkscape:cx="0"
+ inkscape:cy="0"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ inkscape:grid-bbox="true"
+ inkscape:grid-points="true"
+ gridoriginx="0px"
+ gridtolerance="0.5px"
+ guidetolerance="1px"
+ inkscape:window-width="640"
+ inkscape:window-height="400"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:guide-bbox="true"
+ inkscape:guide-points="false"
+ showguides="true" />
+ <metadata
+ id="metadata7">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title>Title</dc:title>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Olivier Fourdan</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:groupmode="layer"
+ id="layer2"
+ inkscape:label="Grad"
+ style="display:inline">
+ <path
+ style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 0,0.5 L 8,0.5 C 8,0.5 8,19 8,19 L 0,19 L 0,0.5 z "
+ id="path6057"
+ sodipodi:nodetypes="ccsc" />
+ </g>
+ <g
+ inkscape:groupmode="layer"
+ id="layer3"
+ inkscape:label="hilight">
+ <path
+ style="fill:url(#linearGradient6962);fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 0,1 L 8,1 C 8,1 8,4 8,4 L 0,4 L 0,3 z "
+ id="path6061"
+ sodipodi:nodetypes="ccsc" />
+ <rect
+ style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:0.75;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect1884"
+ width="8"
+ height="9"
+ x="0"
+ y="1" />
+ </g>
+ <g
+ inkscape:label="Border"
+ inkscape:groupmode="layer"
+ id="layer1"
+ style="display:inline">
+ <path
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+ d="M 0.5,0.5 L 7.5,0.5"
+ id="path6059"
+ sodipodi:nodetypes="ccsc" />
+ </g>
+ <g
+ inkscape:groupmode="layer"
+ id="layer5"
+ inkscape:label="Shadow">
+ <path
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.10"
+ d="M 0.5,18.5 L 7.5,18.5"
+ id="path6989"
+ sodipodi:nodetypes="ccsc" />
+ </g>
+</svg>
diff --git a/themes/daloa/title-1-active.xpm b/themes/daloa/title-1-active.xpm
index 77a3733b8537881c4f3a5383582bb16e5bd58d7d..8cfc7c99fb8c54de41f24d693f347819dd14e4c1 100644
--- a/themes/daloa/title-1-active.xpm
+++ b/themes/daloa/title-1-active.xpm
@@ -1,26 +1,24 @@
/* XPM */
-static char * title_1_active_xpm[] = {
-"4 19 4 1",
+static char * title_active_xpm[] = {
+"4 19 2 1",
" c None",
-". c #A0A0FF s active_shadow_1",
-"+ c #D0D0FF s active_hilight_1",
-"@ c #C0C0FF s active_color_1",
-"....",
-"++++",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@"};
+". c #C0C0FF s active_color_1",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
diff --git a/themes/daloa/title-1-inactive.png b/themes/daloa/title-1-inactive.png
index 5bee49478d0205efe3c42cabc30f2e6464ba02c1..34bcd46281508b392aa5cfaafeb80aed10e06ec2 100644
Binary files a/themes/daloa/title-1-inactive.png and b/themes/daloa/title-1-inactive.png differ
diff --git a/themes/daloa/title-1-inactive.svg b/themes/daloa/title-1-inactive.svg
new file mode 100644
index 0000000000000000000000000000000000000000..b5e25b0a7c3a676bf3c1ac08bdca781ca8137f1e
--- /dev/null
+++ b/themes/daloa/title-1-inactive.svg
@@ -0,0 +1,178 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://web.resource.org/cc/"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="8"
+ height="19"
+ id="svg2"
+ sodipodi:version="0.32"
+ inkscape:version="0.44"
+ version="1.0"
+ sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"
+ sodipodi:docname="title-1-inactive.svg"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
+ <defs
+ id="defs4">
+ <linearGradient
+ id="linearGradient1886">
+ <stop
+ style="stop-color:white;stop-opacity:1;"
+ offset="0"
+ id="stop1888" />
+ <stop
+ style="stop-color:white;stop-opacity:0.05;"
+ offset="1"
+ id="stop1890" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient5873">
+ <stop
+ id="stop5875"
+ offset="0"
+ style="stop-color:white;stop-opacity:1;" />
+ <stop
+ id="stop5877"
+ offset="1"
+ style="stop-color:white;stop-opacity:0;" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient5847">
+ <stop
+ id="stop5849"
+ offset="0"
+ style="stop-color:white;stop-opacity:0.33;" />
+ <stop
+ id="stop5851"
+ offset="1"
+ style="stop-color:white;stop-opacity:0;" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5847"
+ id="linearGradient6945"
+ gradientUnits="userSpaceOnUse"
+ x1="0"
+ y1="0.5"
+ x2="0"
+ y2="18.5"
+ gradientTransform="matrix(1,0,0,1,0,0)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5873"
+ id="linearGradient6962"
+ x1="0"
+ y1="1"
+ x2="0"
+ y2="8"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1,0,0,0.2,0,1)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient1886"
+ id="linearGradient1892"
+ x1="0"
+ y1="1"
+ x2="0"
+ y2="9"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="white"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="10"
+ inkscape:cx="0"
+ inkscape:cy="0"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ inkscape:grid-bbox="true"
+ inkscape:grid-points="true"
+ gridoriginx="0px"
+ gridtolerance="0.5px"
+ guidetolerance="1px"
+ inkscape:window-width="640"
+ inkscape:window-height="400"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:guide-bbox="true"
+ inkscape:guide-points="false"
+ showguides="true" />
+ <metadata
+ id="metadata7">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title>Title</dc:title>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Olivier Fourdan</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:groupmode="layer"
+ id="layer2"
+ inkscape:label="Grad"
+ style="display:inline">
+ <path
+ style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 0,0.5 L 8,0.5 C 8,0.5 8,19 8,19 L 0,19 L 0,0.5 z "
+ id="path6057"
+ sodipodi:nodetypes="ccsc" />
+ </g>
+ <g
+ inkscape:groupmode="layer"
+ id="layer3"
+ inkscape:label="hilight">
+ <path
+ style="fill:url(#linearGradient6962);fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 0,1 L 8,1 C 8,1 8,4 8,4 L 0,4 L 0,3 z "
+ id="path6061"
+ sodipodi:nodetypes="ccsc" />
+ <rect
+ style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:0.75;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect1884"
+ width="8"
+ height="9"
+ x="0"
+ y="1" />
+ </g>
+ <g
+ inkscape:label="Border"
+ inkscape:groupmode="layer"
+ id="layer1"
+ style="display:inline">
+ <path
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+ d="M 0.5,0.5 L 7.5,0.5"
+ id="path6059"
+ sodipodi:nodetypes="ccsc" />
+ </g>
+ <g
+ inkscape:groupmode="layer"
+ id="layer5"
+ inkscape:label="Shadow">
+ <path
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.10"
+ d="M 0.5,18.5 L 7.5,18.5"
+ id="path6989"
+ sodipodi:nodetypes="ccsc" />
+ </g>
+</svg>
diff --git a/themes/daloa/title-1-inactive.xpm b/themes/daloa/title-1-inactive.xpm
index 04d5003fb545976279bead59e0cdde7c82df4edb..6d6062c339cc3aa3a1944cd59e9bdee9b75ab3e0 100644
--- a/themes/daloa/title-1-inactive.xpm
+++ b/themes/daloa/title-1-inactive.xpm
@@ -1,26 +1,24 @@
/* XPM */
-static char * title_1_inactive_xpm[] = {
-"4 19 4 1",
+static char * title_inactive_xpm[] = {
+"4 19 2 1",
" c None",
-". c #A0A0FF s inactive_shadow_1",
-"+ c #D0D0FF s inactive_hilight_1",
-"@ c #C0C0FF s inactive_color_1",
-"....",
-"++++",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@"};
+". c #C0C0FF s inactive_color_1",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
diff --git a/themes/daloa/title-2-active.png b/themes/daloa/title-2-active.png
index 5bee49478d0205efe3c42cabc30f2e6464ba02c1..34bcd46281508b392aa5cfaafeb80aed10e06ec2 100644
Binary files a/themes/daloa/title-2-active.png and b/themes/daloa/title-2-active.png differ
diff --git a/themes/daloa/title-2-active.svg b/themes/daloa/title-2-active.svg
new file mode 100644
index 0000000000000000000000000000000000000000..39ecbd79ddb998c1c90e9a69f68a9650ebc62e7d
--- /dev/null
+++ b/themes/daloa/title-2-active.svg
@@ -0,0 +1,187 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://web.resource.org/cc/"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="8"
+ height="19"
+ id="svg2"
+ sodipodi:version="0.32"
+ inkscape:version="0.44"
+ version="1.0"
+ sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"
+ sodipodi:docname="title-2-active.svg"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
+ <defs
+ id="defs4">
+ <linearGradient
+ id="linearGradient1886">
+ <stop
+ style="stop-color:white;stop-opacity:1;"
+ offset="0"
+ id="stop1888" />
+ <stop
+ style="stop-color:white;stop-opacity:0.05;"
+ offset="1"
+ id="stop1890" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient5873">
+ <stop
+ id="stop5875"
+ offset="0"
+ style="stop-color:white;stop-opacity:1;" />
+ <stop
+ id="stop5877"
+ offset="1"
+ style="stop-color:white;stop-opacity:0;" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient5847">
+ <stop
+ id="stop5849"
+ offset="0"
+ style="stop-color:white;stop-opacity:0.33;" />
+ <stop
+ id="stop5851"
+ offset="1"
+ style="stop-color:white;stop-opacity:0;" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5847"
+ id="linearGradient6945"
+ gradientUnits="userSpaceOnUse"
+ x1="0"
+ y1="0.5"
+ x2="0"
+ y2="18.5"
+ gradientTransform="matrix(1,0,0,1,0,0)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5873"
+ id="linearGradient6962"
+ x1="0"
+ y1="1"
+ x2="0"
+ y2="8"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1,0,0,0.2,0,1)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient1886"
+ id="linearGradient1892"
+ x1="0"
+ y1="1"
+ x2="0"
+ y2="9"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient1886"
+ id="linearGradient2791"
+ x1="0"
+ y1="1"
+ x2="0"
+ y2="19"
+ gradientUnits="userSpaceOnUse" />
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="white"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="10"
+ inkscape:cx="0"
+ inkscape:cy="0"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ inkscape:grid-bbox="true"
+ inkscape:grid-points="true"
+ gridoriginx="0px"
+ gridtolerance="0.5px"
+ guidetolerance="1px"
+ inkscape:window-width="640"
+ inkscape:window-height="400"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:guide-bbox="true"
+ inkscape:guide-points="false"
+ showguides="true" />
+ <metadata
+ id="metadata7">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title>Title</dc:title>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Olivier Fourdan</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:groupmode="layer"
+ id="layer2"
+ inkscape:label="Grad"
+ style="display:inline">
+ <path
+ style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 0,0.5 L 8,0.5 C 8,0.5 8,19 8,19 L 0,19 L 0,0.5 z "
+ id="path6057"
+ sodipodi:nodetypes="ccsc" />
+ </g>
+ <g
+ inkscape:groupmode="layer"
+ id="layer3"
+ inkscape:label="hilight">
+ <path
+ style="fill:url(#linearGradient6962);fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 0,1 L 8,1 C 8,1 8,4 8,4 L 0,4 L 0,3 z "
+ id="path6061"
+ sodipodi:nodetypes="ccsc" />
+ <rect
+ style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:0.75;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect1884"
+ width="8"
+ height="9"
+ x="0"
+ y="1" />
+ </g>
+ <g
+ inkscape:label="Border"
+ inkscape:groupmode="layer"
+ id="layer1"
+ style="display:inline">
+ <path
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+ d="M 0.5,0.5 L 7.5,0.5"
+ id="path6059"
+ sodipodi:nodetypes="ccsc" />
+ </g>
+ <g
+ inkscape:groupmode="layer"
+ id="layer5"
+ inkscape:label="Shadow">
+ <path
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.10"
+ d="M 0.5,18.5 L 7.5,18.5"
+ id="path6989"
+ sodipodi:nodetypes="ccsc" />
+ </g>
+</svg>
diff --git a/themes/daloa/title-2-active.xpm b/themes/daloa/title-2-active.xpm
index 7562c6689c2a361bd0d4d8c6d00cf564daa412f0..8cfc7c99fb8c54de41f24d693f347819dd14e4c1 100644
--- a/themes/daloa/title-2-active.xpm
+++ b/themes/daloa/title-2-active.xpm
@@ -1,26 +1,24 @@
/* XPM */
-static char * title_2_active_xpm[] = {
-"4 19 4 1",
+static char * title_active_xpm[] = {
+"4 19 2 1",
" c None",
-". c #A0A0FF s active_shadow_1",
-"+ c #D0D0FF s active_hilight_1",
-"@ c #C0C0FF s active_color_1",
-"....",
-"++++",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@"};
+". c #C0C0FF s active_color_1",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
diff --git a/themes/daloa/title-2-inactive.png b/themes/daloa/title-2-inactive.png
index 5bee49478d0205efe3c42cabc30f2e6464ba02c1..34bcd46281508b392aa5cfaafeb80aed10e06ec2 100644
Binary files a/themes/daloa/title-2-inactive.png and b/themes/daloa/title-2-inactive.png differ
diff --git a/themes/daloa/title-2-inactive.svg b/themes/daloa/title-2-inactive.svg
new file mode 100644
index 0000000000000000000000000000000000000000..e463ac42030bf5deb8d7c7d9fb6eca0d36bb2636
--- /dev/null
+++ b/themes/daloa/title-2-inactive.svg
@@ -0,0 +1,187 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://web.resource.org/cc/"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="8"
+ height="19"
+ id="svg2"
+ sodipodi:version="0.32"
+ inkscape:version="0.44"
+ version="1.0"
+ sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"
+ sodipodi:docname="title-2-inactive.svg"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
+ <defs
+ id="defs4">
+ <linearGradient
+ id="linearGradient1886">
+ <stop
+ style="stop-color:white;stop-opacity:1;"
+ offset="0"
+ id="stop1888" />
+ <stop
+ style="stop-color:white;stop-opacity:0.05;"
+ offset="1"
+ id="stop1890" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient5873">
+ <stop
+ id="stop5875"
+ offset="0"
+ style="stop-color:white;stop-opacity:1;" />
+ <stop
+ id="stop5877"
+ offset="1"
+ style="stop-color:white;stop-opacity:0;" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient5847">
+ <stop
+ id="stop5849"
+ offset="0"
+ style="stop-color:white;stop-opacity:0.33;" />
+ <stop
+ id="stop5851"
+ offset="1"
+ style="stop-color:white;stop-opacity:0;" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5847"
+ id="linearGradient6945"
+ gradientUnits="userSpaceOnUse"
+ x1="0"
+ y1="0.5"
+ x2="0"
+ y2="18.5"
+ gradientTransform="matrix(1,0,0,1,0,0)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5873"
+ id="linearGradient6962"
+ x1="0"
+ y1="1"
+ x2="0"
+ y2="8"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1,0,0,0.2,0,1)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient1886"
+ id="linearGradient1892"
+ x1="0"
+ y1="1"
+ x2="0"
+ y2="9"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient1886"
+ id="linearGradient2791"
+ x1="0"
+ y1="1"
+ x2="0"
+ y2="19"
+ gradientUnits="userSpaceOnUse" />
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="white"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="10"
+ inkscape:cx="0"
+ inkscape:cy="0"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ inkscape:grid-bbox="true"
+ inkscape:grid-points="true"
+ gridoriginx="0px"
+ gridtolerance="0.5px"
+ guidetolerance="1px"
+ inkscape:window-width="640"
+ inkscape:window-height="400"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:guide-bbox="true"
+ inkscape:guide-points="false"
+ showguides="true" />
+ <metadata
+ id="metadata7">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title>Title</dc:title>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Olivier Fourdan</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:groupmode="layer"
+ id="layer2"
+ inkscape:label="Grad"
+ style="display:inline">
+ <path
+ style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 0,0.5 L 8,0.5 C 8,0.5 8,19 8,19 L 0,19 L 0,0.5 z "
+ id="path6057"
+ sodipodi:nodetypes="ccsc" />
+ </g>
+ <g
+ inkscape:groupmode="layer"
+ id="layer3"
+ inkscape:label="hilight">
+ <path
+ style="fill:url(#linearGradient6962);fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 0,1 L 8,1 C 8,1 8,4 8,4 L 0,4 L 0,3 z "
+ id="path6061"
+ sodipodi:nodetypes="ccsc" />
+ <rect
+ style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:0.75;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect1884"
+ width="8"
+ height="9"
+ x="0"
+ y="1" />
+ </g>
+ <g
+ inkscape:label="Border"
+ inkscape:groupmode="layer"
+ id="layer1"
+ style="display:inline">
+ <path
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+ d="M 0.5,0.5 L 7.5,0.5"
+ id="path6059"
+ sodipodi:nodetypes="ccsc" />
+ </g>
+ <g
+ inkscape:groupmode="layer"
+ id="layer5"
+ inkscape:label="Shadow">
+ <path
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.10"
+ d="M 0.5,18.5 L 7.5,18.5"
+ id="path6989"
+ sodipodi:nodetypes="ccsc" />
+ </g>
+</svg>
diff --git a/themes/daloa/title-2-inactive.xpm b/themes/daloa/title-2-inactive.xpm
index 409487ba1c9e25771c5ef9abef056880f04f42ec..6d6062c339cc3aa3a1944cd59e9bdee9b75ab3e0 100644
--- a/themes/daloa/title-2-inactive.xpm
+++ b/themes/daloa/title-2-inactive.xpm
@@ -1,26 +1,24 @@
/* XPM */
-static char * title_2_inactive_xpm[] = {
-"4 19 4 1",
+static char * title_inactive_xpm[] = {
+"4 19 2 1",
" c None",
-". c #A0A0FF s inactive_shadow_1",
-"+ c #D0D0FF s inactive_hilight_1",
-"@ c #C0C0FF s inactive_color_1",
-"....",
-"++++",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@"};
+". c #C0C0FF s inactive_color_1",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
diff --git a/themes/daloa/title-3-active.png b/themes/daloa/title-3-active.png
index 5bee49478d0205efe3c42cabc30f2e6464ba02c1..34bcd46281508b392aa5cfaafeb80aed10e06ec2 100644
Binary files a/themes/daloa/title-3-active.png and b/themes/daloa/title-3-active.png differ
diff --git a/themes/daloa/title-3-active.svg b/themes/daloa/title-3-active.svg
new file mode 100644
index 0000000000000000000000000000000000000000..3bac997cb9cedd9dbb1edf8468378dbe3a540416
--- /dev/null
+++ b/themes/daloa/title-3-active.svg
@@ -0,0 +1,177 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://web.resource.org/cc/"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="8"
+ height="19"
+ id="svg2"
+ sodipodi:version="0.32"
+ inkscape:version="0.44"
+ version="1.0"
+ sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"
+ sodipodi:docname="title-3-active.svg">
+ <defs
+ id="defs4">
+ <linearGradient
+ id="linearGradient1886">
+ <stop
+ style="stop-color:white;stop-opacity:1;"
+ offset="0"
+ id="stop1888" />
+ <stop
+ style="stop-color:white;stop-opacity:0.05;"
+ offset="1"
+ id="stop1890" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient5873">
+ <stop
+ id="stop5875"
+ offset="0"
+ style="stop-color:white;stop-opacity:1;" />
+ <stop
+ id="stop5877"
+ offset="1"
+ style="stop-color:white;stop-opacity:0;" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient5847">
+ <stop
+ id="stop5849"
+ offset="0"
+ style="stop-color:white;stop-opacity:0.33;" />
+ <stop
+ id="stop5851"
+ offset="1"
+ style="stop-color:white;stop-opacity:0;" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5847"
+ id="linearGradient6945"
+ gradientUnits="userSpaceOnUse"
+ x1="0"
+ y1="0.5"
+ x2="0"
+ y2="18.5"
+ gradientTransform="matrix(1,0,0,1,0,0)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5873"
+ id="linearGradient6962"
+ x1="0"
+ y1="1"
+ x2="0"
+ y2="8"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1,0,0,0.2,0,1)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient1886"
+ id="linearGradient1892"
+ x1="0"
+ y1="1"
+ x2="0"
+ y2="9"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="white"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="10"
+ inkscape:cx="0"
+ inkscape:cy="0"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer2"
+ showgrid="true"
+ inkscape:grid-bbox="true"
+ inkscape:grid-points="true"
+ gridoriginx="0px"
+ gridtolerance="0.5px"
+ guidetolerance="1px"
+ inkscape:window-width="640"
+ inkscape:window-height="400"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:guide-bbox="true"
+ inkscape:guide-points="false"
+ showguides="true" />
+ <metadata
+ id="metadata7">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title>Title</dc:title>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Olivier Fourdan</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:groupmode="layer"
+ id="layer2"
+ inkscape:label="Grad"
+ style="display:inline">
+ <path
+ style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 0,0.5 L 8,0.5 C 8,0.5 8,19 8,19 L 0,19 L 0,0.5 z "
+ id="path6057"
+ sodipodi:nodetypes="ccsc" />
+ </g>
+ <g
+ inkscape:groupmode="layer"
+ id="layer3"
+ inkscape:label="hilight">
+ <path
+ style="fill:url(#linearGradient6962);fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 0,1 L 8,1 C 8,1 8,4 8,4 L 0,4 L 0,3 z "
+ id="path6061"
+ sodipodi:nodetypes="ccsc" />
+ <rect
+ style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:0.75;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect1884"
+ width="8"
+ height="9"
+ x="0"
+ y="1" />
+ </g>
+ <g
+ inkscape:label="Border"
+ inkscape:groupmode="layer"
+ id="layer1"
+ style="display:inline">
+ <path
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+ d="M 0.5,0.5 L 7.5,0.5"
+ id="path6059"
+ sodipodi:nodetypes="ccsc" />
+ </g>
+ <g
+ inkscape:groupmode="layer"
+ id="layer5"
+ inkscape:label="Shadow">
+ <path
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.10"
+ d="M 0.5,18.5 L 7.5,18.5"
+ id="path6989"
+ sodipodi:nodetypes="ccsc" />
+ </g>
+</svg>
diff --git a/themes/daloa/title-3-active.xpm b/themes/daloa/title-3-active.xpm
index 9b9c0e26f20b4969586992c4abdd097f32da3097..8cfc7c99fb8c54de41f24d693f347819dd14e4c1 100644
--- a/themes/daloa/title-3-active.xpm
+++ b/themes/daloa/title-3-active.xpm
@@ -1,26 +1,24 @@
/* XPM */
-static char * title_3_active_xpm[] = {
-"4 19 4 1",
+static char * title_active_xpm[] = {
+"4 19 2 1",
" c None",
-". c #A0A0FF s active_shadow_1",
-"+ c #D0D0FF s active_hilight_1",
-"@ c #C0C0FF s active_color_1",
-"....",
-"++++",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@"};
+". c #C0C0FF s active_color_1",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
diff --git a/themes/daloa/title-3-inactive.png b/themes/daloa/title-3-inactive.png
index 5bee49478d0205efe3c42cabc30f2e6464ba02c1..34bcd46281508b392aa5cfaafeb80aed10e06ec2 100644
Binary files a/themes/daloa/title-3-inactive.png and b/themes/daloa/title-3-inactive.png differ
diff --git a/themes/daloa/title-3-inactive.svg b/themes/daloa/title-3-inactive.svg
new file mode 100644
index 0000000000000000000000000000000000000000..e165f09eaf79702664bfe8b706f3c33b0a9aebc8
--- /dev/null
+++ b/themes/daloa/title-3-inactive.svg
@@ -0,0 +1,177 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://web.resource.org/cc/"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="8"
+ height="19"
+ id="svg2"
+ sodipodi:version="0.32"
+ inkscape:version="0.44"
+ version="1.0"
+ sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"
+ sodipodi:docname="title-3-inactive.svg">
+ <defs
+ id="defs4">
+ <linearGradient
+ id="linearGradient1886">
+ <stop
+ style="stop-color:white;stop-opacity:1;"
+ offset="0"
+ id="stop1888" />
+ <stop
+ style="stop-color:white;stop-opacity:0.05;"
+ offset="1"
+ id="stop1890" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient5873">
+ <stop
+ id="stop5875"
+ offset="0"
+ style="stop-color:white;stop-opacity:1;" />
+ <stop
+ id="stop5877"
+ offset="1"
+ style="stop-color:white;stop-opacity:0;" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient5847">
+ <stop
+ id="stop5849"
+ offset="0"
+ style="stop-color:white;stop-opacity:0.33;" />
+ <stop
+ id="stop5851"
+ offset="1"
+ style="stop-color:white;stop-opacity:0;" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5847"
+ id="linearGradient6945"
+ gradientUnits="userSpaceOnUse"
+ x1="0"
+ y1="0.5"
+ x2="0"
+ y2="18.5"
+ gradientTransform="matrix(1,0,0,1,0,0)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5873"
+ id="linearGradient6962"
+ x1="0"
+ y1="1"
+ x2="0"
+ y2="8"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1,0,0,0.2,0,1)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient1886"
+ id="linearGradient1892"
+ x1="0"
+ y1="1"
+ x2="0"
+ y2="9"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="white"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="10"
+ inkscape:cx="0"
+ inkscape:cy="0"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ inkscape:grid-bbox="true"
+ inkscape:grid-points="true"
+ gridoriginx="0px"
+ gridtolerance="0.5px"
+ guidetolerance="1px"
+ inkscape:window-width="640"
+ inkscape:window-height="400"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:guide-bbox="true"
+ inkscape:guide-points="false"
+ showguides="true" />
+ <metadata
+ id="metadata7">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title>Title</dc:title>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Olivier Fourdan</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:groupmode="layer"
+ id="layer2"
+ inkscape:label="Grad"
+ style="display:inline">
+ <path
+ style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 0,0.5 L 8,0.5 C 8,0.5 8,19 8,19 L 0,19 L 0,0.5 z "
+ id="path6057"
+ sodipodi:nodetypes="ccsc" />
+ </g>
+ <g
+ inkscape:groupmode="layer"
+ id="layer3"
+ inkscape:label="hilight">
+ <path
+ style="fill:url(#linearGradient6962);fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 0,1 L 8,1 C 8,1 8,4 8,4 L 0,4 L 0,3 z "
+ id="path6061"
+ sodipodi:nodetypes="ccsc" />
+ <rect
+ style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:0.75;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect1884"
+ width="8"
+ height="9"
+ x="0"
+ y="1" />
+ </g>
+ <g
+ inkscape:label="Border"
+ inkscape:groupmode="layer"
+ id="layer1"
+ style="display:inline">
+ <path
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+ d="M 0.5,0.5 L 7.5,0.5"
+ id="path6059"
+ sodipodi:nodetypes="ccsc" />
+ </g>
+ <g
+ inkscape:groupmode="layer"
+ id="layer5"
+ inkscape:label="Shadow">
+ <path
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.10"
+ d="M 0.5,18.5 L 7.5,18.5"
+ id="path6989"
+ sodipodi:nodetypes="ccsc" />
+ </g>
+</svg>
diff --git a/themes/daloa/title-3-inactive.xpm b/themes/daloa/title-3-inactive.xpm
index cdbea483062c356d91383273497175bfadaef4bd..6d6062c339cc3aa3a1944cd59e9bdee9b75ab3e0 100644
--- a/themes/daloa/title-3-inactive.xpm
+++ b/themes/daloa/title-3-inactive.xpm
@@ -1,27 +1,24 @@
/* XPM */
-static char * title_3_inactive_xpm[] = {
-"4 20 4 1",
+static char * title_inactive_xpm[] = {
+"4 19 2 1",
" c None",
-". c #A0A0FF s inactive_shadow_1",
-"+ c #D0D0FF s inactive_hilight_1",
-"@ c #C0C0FF s inactive_color_1",
-"....",
-"++++",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@"};
+". c #C0C0FF s inactive_color_1",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
diff --git a/themes/daloa/title-4-active.png b/themes/daloa/title-4-active.png
index 5bee49478d0205efe3c42cabc30f2e6464ba02c1..34bcd46281508b392aa5cfaafeb80aed10e06ec2 100644
Binary files a/themes/daloa/title-4-active.png and b/themes/daloa/title-4-active.png differ
diff --git a/themes/daloa/title-4-active.svg b/themes/daloa/title-4-active.svg
new file mode 100644
index 0000000000000000000000000000000000000000..b93ebcf12dd4a463e5052060309e6e925e710a0b
--- /dev/null
+++ b/themes/daloa/title-4-active.svg
@@ -0,0 +1,187 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://web.resource.org/cc/"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="8"
+ height="19"
+ id="svg2"
+ sodipodi:version="0.32"
+ inkscape:version="0.44"
+ version="1.0"
+ sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"
+ sodipodi:docname="title-4-active.svg"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
+ <defs
+ id="defs4">
+ <linearGradient
+ id="linearGradient1886">
+ <stop
+ style="stop-color:white;stop-opacity:1;"
+ offset="0"
+ id="stop1888" />
+ <stop
+ style="stop-color:white;stop-opacity:0.05;"
+ offset="1"
+ id="stop1890" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient5873">
+ <stop
+ id="stop5875"
+ offset="0"
+ style="stop-color:white;stop-opacity:1;" />
+ <stop
+ id="stop5877"
+ offset="1"
+ style="stop-color:white;stop-opacity:0;" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient5847">
+ <stop
+ id="stop5849"
+ offset="0"
+ style="stop-color:white;stop-opacity:0.33;" />
+ <stop
+ id="stop5851"
+ offset="1"
+ style="stop-color:white;stop-opacity:0;" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5847"
+ id="linearGradient6945"
+ gradientUnits="userSpaceOnUse"
+ x1="0"
+ y1="0.5"
+ x2="0"
+ y2="18.5"
+ gradientTransform="matrix(1,0,0,1,0,0)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5873"
+ id="linearGradient6962"
+ x1="0"
+ y1="1"
+ x2="0"
+ y2="8"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1,0,0,0.2,0,1)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient1886"
+ id="linearGradient1892"
+ x1="0"
+ y1="1"
+ x2="0"
+ y2="9"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient1886"
+ id="linearGradient2791"
+ x1="0"
+ y1="1"
+ x2="0"
+ y2="19"
+ gradientUnits="userSpaceOnUse" />
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="white"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="10"
+ inkscape:cx="0"
+ inkscape:cy="0"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ inkscape:grid-bbox="true"
+ inkscape:grid-points="true"
+ gridoriginx="0px"
+ gridtolerance="0.5px"
+ guidetolerance="1px"
+ inkscape:window-width="640"
+ inkscape:window-height="400"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:guide-bbox="true"
+ inkscape:guide-points="false"
+ showguides="true" />
+ <metadata
+ id="metadata7">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title>Title</dc:title>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Olivier Fourdan</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:groupmode="layer"
+ id="layer2"
+ inkscape:label="Grad"
+ style="display:inline">
+ <path
+ style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 0,0.5 L 8,0.5 C 8,0.5 8,19 8,19 L 0,19 L 0,0.5 z "
+ id="path6057"
+ sodipodi:nodetypes="ccsc" />
+ </g>
+ <g
+ inkscape:groupmode="layer"
+ id="layer3"
+ inkscape:label="hilight">
+ <path
+ style="fill:url(#linearGradient6962);fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 0,1 L 8,1 C 8,1 8,4 8,4 L 0,4 L 0,3 z "
+ id="path6061"
+ sodipodi:nodetypes="ccsc" />
+ <rect
+ style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:0.75;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect1884"
+ width="8"
+ height="9"
+ x="0"
+ y="1" />
+ </g>
+ <g
+ inkscape:label="Border"
+ inkscape:groupmode="layer"
+ id="layer1"
+ style="display:inline">
+ <path
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+ d="M 0.5,0.5 L 7.5,0.5"
+ id="path6059"
+ sodipodi:nodetypes="ccsc" />
+ </g>
+ <g
+ inkscape:groupmode="layer"
+ id="layer5"
+ inkscape:label="Shadow">
+ <path
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.10"
+ d="M 0.5,18.5 L 7.5,18.5"
+ id="path6989"
+ sodipodi:nodetypes="ccsc" />
+ </g>
+</svg>
diff --git a/themes/daloa/title-4-active.xpm b/themes/daloa/title-4-active.xpm
index 421a34aba89e0bfbb14f9aa10277e9eef1421ad5..8cfc7c99fb8c54de41f24d693f347819dd14e4c1 100644
--- a/themes/daloa/title-4-active.xpm
+++ b/themes/daloa/title-4-active.xpm
@@ -1,26 +1,24 @@
/* XPM */
-static char * title_4_active_xpm[] = {
-"4 19 4 1",
+static char * title_active_xpm[] = {
+"4 19 2 1",
" c None",
-". c #A0A0FF s active_shadow_1",
-"+ c #D0D0FF s active_hilight_1",
-"@ c #C0C0FF s active_color_1",
-"....",
-"++++",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@"};
+". c #C0C0FF s active_color_1",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
diff --git a/themes/daloa/title-4-inactive.png b/themes/daloa/title-4-inactive.png
index 5bee49478d0205efe3c42cabc30f2e6464ba02c1..34bcd46281508b392aa5cfaafeb80aed10e06ec2 100644
Binary files a/themes/daloa/title-4-inactive.png and b/themes/daloa/title-4-inactive.png differ
diff --git a/themes/daloa/title-4-inactive.svg b/themes/daloa/title-4-inactive.svg
new file mode 100644
index 0000000000000000000000000000000000000000..f1af39aeaefab14265f9d9328e2b87c6f19510b5
--- /dev/null
+++ b/themes/daloa/title-4-inactive.svg
@@ -0,0 +1,187 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://web.resource.org/cc/"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="8"
+ height="19"
+ id="svg2"
+ sodipodi:version="0.32"
+ inkscape:version="0.44"
+ version="1.0"
+ sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"
+ sodipodi:docname="title-4-inactive.svg"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
+ <defs
+ id="defs4">
+ <linearGradient
+ id="linearGradient1886">
+ <stop
+ style="stop-color:white;stop-opacity:1;"
+ offset="0"
+ id="stop1888" />
+ <stop
+ style="stop-color:white;stop-opacity:0.05;"
+ offset="1"
+ id="stop1890" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient5873">
+ <stop
+ id="stop5875"
+ offset="0"
+ style="stop-color:white;stop-opacity:1;" />
+ <stop
+ id="stop5877"
+ offset="1"
+ style="stop-color:white;stop-opacity:0;" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient5847">
+ <stop
+ id="stop5849"
+ offset="0"
+ style="stop-color:white;stop-opacity:0.33;" />
+ <stop
+ id="stop5851"
+ offset="1"
+ style="stop-color:white;stop-opacity:0;" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5847"
+ id="linearGradient6945"
+ gradientUnits="userSpaceOnUse"
+ x1="0"
+ y1="0.5"
+ x2="0"
+ y2="18.5"
+ gradientTransform="matrix(1,0,0,1,0,0)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5873"
+ id="linearGradient6962"
+ x1="0"
+ y1="1"
+ x2="0"
+ y2="8"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1,0,0,0.2,0,1)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient1886"
+ id="linearGradient1892"
+ x1="0"
+ y1="1"
+ x2="0"
+ y2="9"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient1886"
+ id="linearGradient2791"
+ x1="0"
+ y1="1"
+ x2="0"
+ y2="19"
+ gradientUnits="userSpaceOnUse" />
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="white"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="10"
+ inkscape:cx="0"
+ inkscape:cy="0"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ inkscape:grid-bbox="true"
+ inkscape:grid-points="true"
+ gridoriginx="0px"
+ gridtolerance="0.5px"
+ guidetolerance="1px"
+ inkscape:window-width="640"
+ inkscape:window-height="400"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:guide-bbox="true"
+ inkscape:guide-points="false"
+ showguides="true" />
+ <metadata
+ id="metadata7">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title>Title</dc:title>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Olivier Fourdan</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:groupmode="layer"
+ id="layer2"
+ inkscape:label="Grad"
+ style="display:inline">
+ <path
+ style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 0,0.5 L 8,0.5 C 8,0.5 8,19 8,19 L 0,19 L 0,0.5 z "
+ id="path6057"
+ sodipodi:nodetypes="ccsc" />
+ </g>
+ <g
+ inkscape:groupmode="layer"
+ id="layer3"
+ inkscape:label="hilight">
+ <path
+ style="fill:url(#linearGradient6962);fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 0,1 L 8,1 C 8,1 8,4 8,4 L 0,4 L 0,3 z "
+ id="path6061"
+ sodipodi:nodetypes="ccsc" />
+ <rect
+ style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:0.75;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect1884"
+ width="8"
+ height="9"
+ x="0"
+ y="1" />
+ </g>
+ <g
+ inkscape:label="Border"
+ inkscape:groupmode="layer"
+ id="layer1"
+ style="display:inline">
+ <path
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+ d="M 0.5,0.5 L 7.5,0.5"
+ id="path6059"
+ sodipodi:nodetypes="ccsc" />
+ </g>
+ <g
+ inkscape:groupmode="layer"
+ id="layer5"
+ inkscape:label="Shadow">
+ <path
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.10"
+ d="M 0.5,18.5 L 7.5,18.5"
+ id="path6989"
+ sodipodi:nodetypes="ccsc" />
+ </g>
+</svg>
diff --git a/themes/daloa/title-4-inactive.xpm b/themes/daloa/title-4-inactive.xpm
index a7be209a8fa3f658c19c4e49661e1bec6e58b195..6d6062c339cc3aa3a1944cd59e9bdee9b75ab3e0 100644
--- a/themes/daloa/title-4-inactive.xpm
+++ b/themes/daloa/title-4-inactive.xpm
@@ -1,26 +1,24 @@
/* XPM */
-static char * title_4_inactive_xpm[] = {
-"4 19 4 1",
+static char * title_inactive_xpm[] = {
+"4 19 2 1",
" c None",
-". c #A0A0FF s inactive_shadow_1",
-"+ c #D0D0FF s inactive_hilight_1",
-"@ c #C0C0FF s inactive_color_1",
-"....",
-"++++",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@"};
+". c #C0C0FF s inactive_color_1",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
diff --git a/themes/daloa/title-5-active.png b/themes/daloa/title-5-active.png
index 5bee49478d0205efe3c42cabc30f2e6464ba02c1..34bcd46281508b392aa5cfaafeb80aed10e06ec2 100644
Binary files a/themes/daloa/title-5-active.png and b/themes/daloa/title-5-active.png differ
diff --git a/themes/daloa/title-5-active.svg b/themes/daloa/title-5-active.svg
new file mode 100644
index 0000000000000000000000000000000000000000..4040f2f8eba11d9fe11ee1508918cff12b863370
--- /dev/null
+++ b/themes/daloa/title-5-active.svg
@@ -0,0 +1,178 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://web.resource.org/cc/"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="8"
+ height="19"
+ id="svg2"
+ sodipodi:version="0.32"
+ inkscape:version="0.44"
+ version="1.0"
+ sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"
+ sodipodi:docname="title-5-active.svg"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
+ <defs
+ id="defs4">
+ <linearGradient
+ id="linearGradient1886">
+ <stop
+ style="stop-color:white;stop-opacity:1;"
+ offset="0"
+ id="stop1888" />
+ <stop
+ style="stop-color:white;stop-opacity:0.05;"
+ offset="1"
+ id="stop1890" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient5873">
+ <stop
+ id="stop5875"
+ offset="0"
+ style="stop-color:white;stop-opacity:1;" />
+ <stop
+ id="stop5877"
+ offset="1"
+ style="stop-color:white;stop-opacity:0;" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient5847">
+ <stop
+ id="stop5849"
+ offset="0"
+ style="stop-color:white;stop-opacity:0.33;" />
+ <stop
+ id="stop5851"
+ offset="1"
+ style="stop-color:white;stop-opacity:0;" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5847"
+ id="linearGradient6945"
+ gradientUnits="userSpaceOnUse"
+ x1="0"
+ y1="0.5"
+ x2="0"
+ y2="18.5"
+ gradientTransform="matrix(1,0,0,1,0,0)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5873"
+ id="linearGradient6962"
+ x1="0"
+ y1="1"
+ x2="0"
+ y2="8"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1,0,0,0.2,0,1)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient1886"
+ id="linearGradient1892"
+ x1="0"
+ y1="1"
+ x2="0"
+ y2="9"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="white"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="10"
+ inkscape:cx="0"
+ inkscape:cy="0"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ inkscape:grid-bbox="true"
+ inkscape:grid-points="true"
+ gridoriginx="0px"
+ gridtolerance="0.5px"
+ guidetolerance="1px"
+ inkscape:window-width="640"
+ inkscape:window-height="400"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:guide-bbox="true"
+ inkscape:guide-points="false"
+ showguides="true" />
+ <metadata
+ id="metadata7">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title>Title</dc:title>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Olivier Fourdan</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:groupmode="layer"
+ id="layer2"
+ inkscape:label="Grad"
+ style="display:inline">
+ <path
+ style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 0,0.5 L 8,0.5 C 8,0.5 8,19 8,19 L 0,19 L 0,0.5 z "
+ id="path6057"
+ sodipodi:nodetypes="ccsc" />
+ </g>
+ <g
+ inkscape:groupmode="layer"
+ id="layer3"
+ inkscape:label="hilight">
+ <path
+ style="fill:url(#linearGradient6962);fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 0,1 L 8,1 C 8,1 8,4 8,4 L 0,4 L 0,3 z "
+ id="path6061"
+ sodipodi:nodetypes="ccsc" />
+ <rect
+ style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:0.75;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect1884"
+ width="8"
+ height="9"
+ x="0"
+ y="1" />
+ </g>
+ <g
+ inkscape:label="Border"
+ inkscape:groupmode="layer"
+ id="layer1"
+ style="display:inline">
+ <path
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+ d="M 0.5,0.5 L 7.5,0.5"
+ id="path6059"
+ sodipodi:nodetypes="ccsc" />
+ </g>
+ <g
+ inkscape:groupmode="layer"
+ id="layer5"
+ inkscape:label="Shadow">
+ <path
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.10"
+ d="M 0.5,18.5 L 7.5,18.5"
+ id="path6989"
+ sodipodi:nodetypes="ccsc" />
+ </g>
+</svg>
diff --git a/themes/daloa/title-5-active.xpm b/themes/daloa/title-5-active.xpm
index 4208fdc89c39ce613f615fe615949c2d45206c95..8cfc7c99fb8c54de41f24d693f347819dd14e4c1 100644
--- a/themes/daloa/title-5-active.xpm
+++ b/themes/daloa/title-5-active.xpm
@@ -1,26 +1,24 @@
/* XPM */
-static char * title_5_active_xpm[] = {
-"4 19 4 1",
+static char * title_active_xpm[] = {
+"4 19 2 1",
" c None",
-". c #A0A0FF s active_shadow_1",
-"+ c #D0D0FF s active_hilight_1",
-"@ c #C0C0FF s active_color_1",
-"....",
-"++++",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@"};
+". c #C0C0FF s active_color_1",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
diff --git a/themes/daloa/title-5-inactive.png b/themes/daloa/title-5-inactive.png
index 5bee49478d0205efe3c42cabc30f2e6464ba02c1..34bcd46281508b392aa5cfaafeb80aed10e06ec2 100644
Binary files a/themes/daloa/title-5-inactive.png and b/themes/daloa/title-5-inactive.png differ
diff --git a/themes/daloa/title-5-inactive.svg b/themes/daloa/title-5-inactive.svg
new file mode 100644
index 0000000000000000000000000000000000000000..9ef0b10bf6f0c0a45f1f36f4af471bec6e6bd45c
--- /dev/null
+++ b/themes/daloa/title-5-inactive.svg
@@ -0,0 +1,178 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://web.resource.org/cc/"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="8"
+ height="19"
+ id="svg2"
+ sodipodi:version="0.32"
+ inkscape:version="0.44"
+ version="1.0"
+ sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"
+ sodipodi:docname="title-5-inactive.svg"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
+ <defs
+ id="defs4">
+ <linearGradient
+ id="linearGradient1886">
+ <stop
+ style="stop-color:white;stop-opacity:1;"
+ offset="0"
+ id="stop1888" />
+ <stop
+ style="stop-color:white;stop-opacity:0.05;"
+ offset="1"
+ id="stop1890" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient5873">
+ <stop
+ id="stop5875"
+ offset="0"
+ style="stop-color:white;stop-opacity:1;" />
+ <stop
+ id="stop5877"
+ offset="1"
+ style="stop-color:white;stop-opacity:0;" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient5847">
+ <stop
+ id="stop5849"
+ offset="0"
+ style="stop-color:white;stop-opacity:0.33;" />
+ <stop
+ id="stop5851"
+ offset="1"
+ style="stop-color:white;stop-opacity:0;" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5847"
+ id="linearGradient6945"
+ gradientUnits="userSpaceOnUse"
+ x1="0"
+ y1="0.5"
+ x2="0"
+ y2="18.5"
+ gradientTransform="matrix(1,0,0,1,0,0)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5873"
+ id="linearGradient6962"
+ x1="0"
+ y1="1"
+ x2="0"
+ y2="8"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1,0,0,0.2,0,1)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient1886"
+ id="linearGradient1892"
+ x1="0"
+ y1="1"
+ x2="0"
+ y2="9"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="white"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="10"
+ inkscape:cx="0"
+ inkscape:cy="0"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ inkscape:grid-bbox="true"
+ inkscape:grid-points="true"
+ gridoriginx="0px"
+ gridtolerance="0.5px"
+ guidetolerance="1px"
+ inkscape:window-width="640"
+ inkscape:window-height="400"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:guide-bbox="true"
+ inkscape:guide-points="false"
+ showguides="true" />
+ <metadata
+ id="metadata7">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title>Title</dc:title>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Olivier Fourdan</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:groupmode="layer"
+ id="layer2"
+ inkscape:label="Grad"
+ style="display:inline">
+ <path
+ style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 0,0.5 L 8,0.5 C 8,0.5 8,19 8,19 L 0,19 L 0,0.5 z "
+ id="path6057"
+ sodipodi:nodetypes="ccsc" />
+ </g>
+ <g
+ inkscape:groupmode="layer"
+ id="layer3"
+ inkscape:label="hilight">
+ <path
+ style="fill:url(#linearGradient6962);fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 0,1 L 8,1 C 8,1 8,4 8,4 L 0,4 L 0,3 z "
+ id="path6061"
+ sodipodi:nodetypes="ccsc" />
+ <rect
+ style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:0.75;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect1884"
+ width="8"
+ height="9"
+ x="0"
+ y="1" />
+ </g>
+ <g
+ inkscape:label="Border"
+ inkscape:groupmode="layer"
+ id="layer1"
+ style="display:inline">
+ <path
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+ d="M 0.5,0.5 L 7.5,0.5"
+ id="path6059"
+ sodipodi:nodetypes="ccsc" />
+ </g>
+ <g
+ inkscape:groupmode="layer"
+ id="layer5"
+ inkscape:label="Shadow">
+ <path
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.10"
+ d="M 0.5,18.5 L 7.5,18.5"
+ id="path6989"
+ sodipodi:nodetypes="ccsc" />
+ </g>
+</svg>
diff --git a/themes/daloa/title-5-inactive.xpm b/themes/daloa/title-5-inactive.xpm
index 683eca5c3f9e346bc4429cc3f44d9c91c51b8669..6d6062c339cc3aa3a1944cd59e9bdee9b75ab3e0 100644
--- a/themes/daloa/title-5-inactive.xpm
+++ b/themes/daloa/title-5-inactive.xpm
@@ -1,26 +1,24 @@
/* XPM */
-static char * title_5_inactive_xpm[] = {
-"4 19 4 1",
+static char * title_inactive_xpm[] = {
+"4 19 2 1",
" c None",
-". c #A0A0FF s inactive_shadow_1",
-"+ c #D0D0FF s inactive_hilight_1",
-"@ c #C0C0FF s inactive_color_1",
-"....",
-"++++",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@"};
+". c #C0C0FF s inactive_color_1",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
+"....",
diff --git a/themes/daloa/top-left-active.png b/themes/daloa/top-left-active.png
index 31cb19115d3342a2df0795564c0e50c81fe474c8..40bb34ddd099e288d4f048a1eebcf7bcf7a33481 100644
Binary files a/themes/daloa/top-left-active.png and b/themes/daloa/top-left-active.png differ
diff --git a/themes/daloa/top-left-active.svg b/themes/daloa/top-left-active.svg
new file mode 100644
index 0000000000000000000000000000000000000000..8f534e22b1563c7ef2e68a394967254d12affadd
--- /dev/null
+++ b/themes/daloa/top-left-active.svg
@@ -0,0 +1,182 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://web.resource.org/cc/"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ sodipodi:docname="top-left-active.svg"
+ sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"
+ version="1.0"
+ inkscape:version="0.44"
+ sodipodi:version="0.32"
+ id="svg2"
+ height="19"
+ width="8"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
+ <defs
+ id="defs4">
+ <linearGradient
+ id="linearGradient1886">
+ <stop
+ style="stop-color:white;stop-opacity:1;"
+ offset="0"
+ id="stop1888" />
+ <stop
+ style="stop-color:white;stop-opacity:0.05;"
+ offset="1"
+ id="stop1890" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient5873">
+ <stop
+ id="stop5875"
+ offset="0"
+ style="stop-color:white;stop-opacity:1;" />
+ <stop
+ id="stop5877"
+ offset="1"
+ style="stop-color:white;stop-opacity:0;" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient5847">
+ <stop
+ id="stop5849"
+ offset="0"
+ style="stop-color:white;stop-opacity:0.33;" />
+ <stop
+ id="stop5851"
+ offset="1"
+ style="stop-color:white;stop-opacity:0;" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5847"
+ id="linearGradient6945"
+ gradientUnits="userSpaceOnUse"
+ x1="0"
+ y1="0.5"
+ x2="0"
+ y2="18.5"
+ gradientTransform="matrix(1,0,0,1,0,0)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5873"
+ id="linearGradient6962"
+ x1="0"
+ y1="1"
+ x2="0"
+ y2="8"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1,0,0,0.2,0,1)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient1886"
+ id="linearGradient1892"
+ x1="0"
+ y1="1"
+ x2="0"
+ y2="9"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient1886"
+ id="linearGradient2791"
+ x1="0"
+ y1="1"
+ x2="0"
+ y2="19"
+ gradientUnits="userSpaceOnUse" />
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="white"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="10"
+ inkscape:cx="0"
+ inkscape:cy="0"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ inkscape:grid-bbox="true"
+ inkscape:grid-points="true"
+ gridoriginx="0px"
+ gridtolerance="0.5px"
+ guidetolerance="1px"
+ inkscape:window-width="640"
+ inkscape:window-height="733"
+ inkscape:window-x="187"
+ inkscape:window-y="728"
+ inkscape:guide-bbox="true"
+ inkscape:guide-points="false"
+ showguides="true" />
+ <metadata
+ id="metadata7">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title>Top Corner</dc:title>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Olivier Fourdan</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ style="display:inline"
+ inkscape:label="Grad"
+ id="layer2"
+ inkscape:groupmode="layer">
+ <path
+ id="path6057"
+ style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1"
+ d="M 8,1 L 3,1 C 3,1 1,1 1,4 C 1,27 1,27 3,19 L 1,19 L 8,19 L 8,1 z " />
+ </g>
+ <g
+ inkscape:label="hilight"
+ id="layer3"
+ inkscape:groupmode="layer">
+ <path
+ sodipodi:nodetypes="ccsc"
+ id="path6061"
+ d="M 8,1 L 5.75,1 C 5.75,1 2,1 2,4 C 2,4 2.75,4 2.75,4 L 8,4 L 8,4 z "
+ style="fill:url(#linearGradient6962);fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" />
+ <path
+ style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:0.75;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 8,1 L 3,1 C 3,1 1,1 1,4 C 1,8 1,8 3,10 L 1,10 L 8,10 L 8,1 z "
+ id="path1884" />
+ </g>
+ <g
+ style="display:inline"
+ id="layer1"
+ inkscape:groupmode="layer"
+ inkscape:label="Border">
+ <path
+ id="rect1319"
+ d="M 8,0 L 8,1 L 3,1 C 3,1 1,1 1,4 C 1,19 1,19 1,19 L 0,19 L 0,0 L 8,0 z "
+ style="fill:black;fill-opacity:0.50" />
+ </g>
+ <g
+ inkscape:label="Shadow"
+ id="layer5"
+ inkscape:groupmode="layer">
+ <path
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.10"
+ d="M 2.5,18.5 L 7.5,18.5"
+ id="path6989"
+ sodipodi:nodetypes="cc" />
+ </g>
+</svg>
diff --git a/themes/daloa/top-left-active.xpm b/themes/daloa/top-left-active.xpm
index 1010f2a501749259a72325488611ab59ec63adca..a476d583b236598a166367fe4ce92a301fc4ee03 100644
--- a/themes/daloa/top-left-active.xpm
+++ b/themes/daloa/top-left-active.xpm
@@ -1,26 +1,24 @@
/* XPM */
static char * top_left_active_xpm[] = {
-"7 19 4 1",
+"8 19 2 1",
" c None",
-". c #A0A0FF s active_shadow_1",
-"+ c #D0D0FF s active_hilight_1",
-"@ c #C0C0FF s active_color_1",
-" .....",
-" .+++++",
-".+@@@@@",
-".+@@@@@",
-".+@@@@@",
-".+@@@@@",
-".+@@@@@",
-".+@@@@@",
-".+@@@@@",
-".+@@@@@",
-".+@@@@@",
-".+@@@@@",
-".+@@@@@",
-".+@@@@@",
-".+@@@@@",
-".+@@@@@",
-".+@@@@@",
-".+@@@@@",
-".+@@@@@"};
+". c #C0C0FF s active_color_1",
+" ......",
+" .......",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
diff --git a/themes/daloa/top-left-inactive.png b/themes/daloa/top-left-inactive.png
index 31cb19115d3342a2df0795564c0e50c81fe474c8..40bb34ddd099e288d4f048a1eebcf7bcf7a33481 100644
Binary files a/themes/daloa/top-left-inactive.png and b/themes/daloa/top-left-inactive.png differ
diff --git a/themes/daloa/top-left-inactive.svg b/themes/daloa/top-left-inactive.svg
new file mode 100644
index 0000000000000000000000000000000000000000..e8f873422642bf734ae9fedea0ef0b27d80928b4
--- /dev/null
+++ b/themes/daloa/top-left-inactive.svg
@@ -0,0 +1,182 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://web.resource.org/cc/"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ sodipodi:docname="top-left-inactive.svg"
+ sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"
+ version="1.0"
+ inkscape:version="0.44"
+ sodipodi:version="0.32"
+ id="svg2"
+ height="19"
+ width="8"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
+ <defs
+ id="defs4">
+ <linearGradient
+ id="linearGradient1886">
+ <stop
+ style="stop-color:white;stop-opacity:1;"
+ offset="0"
+ id="stop1888" />
+ <stop
+ style="stop-color:white;stop-opacity:0.05;"
+ offset="1"
+ id="stop1890" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient5873">
+ <stop
+ id="stop5875"
+ offset="0"
+ style="stop-color:white;stop-opacity:1;" />
+ <stop
+ id="stop5877"
+ offset="1"
+ style="stop-color:white;stop-opacity:0;" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient5847">
+ <stop
+ id="stop5849"
+ offset="0"
+ style="stop-color:white;stop-opacity:0.33;" />
+ <stop
+ id="stop5851"
+ offset="1"
+ style="stop-color:white;stop-opacity:0;" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5847"
+ id="linearGradient6945"
+ gradientUnits="userSpaceOnUse"
+ x1="0"
+ y1="0.5"
+ x2="0"
+ y2="18.5"
+ gradientTransform="matrix(1,0,0,1,0,0)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5873"
+ id="linearGradient6962"
+ x1="0"
+ y1="1"
+ x2="0"
+ y2="8"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1,0,0,0.2,0,1)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient1886"
+ id="linearGradient1892"
+ x1="0"
+ y1="1"
+ x2="0"
+ y2="9"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient1886"
+ id="linearGradient2791"
+ x1="0"
+ y1="1"
+ x2="0"
+ y2="19"
+ gradientUnits="userSpaceOnUse" />
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="white"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="10"
+ inkscape:cx="0"
+ inkscape:cy="0"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ inkscape:grid-bbox="true"
+ inkscape:grid-points="true"
+ gridoriginx="0px"
+ gridtolerance="0.5px"
+ guidetolerance="1px"
+ inkscape:window-width="640"
+ inkscape:window-height="733"
+ inkscape:window-x="187"
+ inkscape:window-y="728"
+ inkscape:guide-bbox="true"
+ inkscape:guide-points="false"
+ showguides="true" />
+ <metadata
+ id="metadata7">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title>Top Corner</dc:title>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Olivier Fourdan</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ style="display:inline"
+ inkscape:label="Grad"
+ id="layer2"
+ inkscape:groupmode="layer">
+ <path
+ id="path6057"
+ style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1"
+ d="M 8,1 L 3,1 C 3,1 1,1 1,4 C 1,27 1,27 3,19 L 1,19 L 8,19 L 8,1 z " />
+ </g>
+ <g
+ inkscape:label="hilight"
+ id="layer3"
+ inkscape:groupmode="layer">
+ <path
+ sodipodi:nodetypes="ccsc"
+ id="path6061"
+ d="M 8,1 L 5.75,1 C 5.75,1 2,1 2,4 C 2,4 2.75,4 2.75,4 L 8,4 L 8,4 z "
+ style="fill:url(#linearGradient6962);fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" />
+ <path
+ style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:0.75;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 8,1 L 3,1 C 3,1 1,1 1,4 C 1,8 1,8 3,10 L 1,10 L 8,10 L 8,1 z "
+ id="path1884" />
+ </g>
+ <g
+ style="display:inline"
+ id="layer1"
+ inkscape:groupmode="layer"
+ inkscape:label="Border">
+ <path
+ id="rect1319"
+ d="M 8,0 L 8,1 L 3,1 C 3,1 1,1 1,4 C 1,19 1,19 1,19 L 0,19 L 0,0 L 8,0 z "
+ style="fill:black;fill-opacity:0.50" />
+ </g>
+ <g
+ inkscape:label="Shadow"
+ id="layer5"
+ inkscape:groupmode="layer">
+ <path
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.10"
+ d="M 2.5,18.5 L 7.5,18.5"
+ id="path6989"
+ sodipodi:nodetypes="cc" />
+ </g>
+</svg>
diff --git a/themes/daloa/top-left-inactive.xpm b/themes/daloa/top-left-inactive.xpm
index 2c930ac84bd825eae149faaf2382980aece42af0..43ebf688027f870b7584e671d75b2c6e2560c2a6 100644
--- a/themes/daloa/top-left-inactive.xpm
+++ b/themes/daloa/top-left-inactive.xpm
@@ -1,26 +1,24 @@
/* XPM */
static char * top_left_inactive_xpm[] = {
-"7 19 4 1",
+"8 19 2 1",
" c None",
-". c #A0A0FF s inactive_shadow_1",
-"+ c #D0D0FF s inactive_hilight_1",
-"@ c #C0C0FF s inactive_color_1",
-" .....",
-" .+++++",
-".+@@@@@",
-".+@@@@@",
-".+@@@@@",
-".+@@@@@",
-".+@@@@@",
-".+@@@@@",
-".+@@@@@",
-".+@@@@@",
-".+@@@@@",
-".+@@@@@",
-".+@@@@@",
-".+@@@@@",
-".+@@@@@",
-".+@@@@@",
-".+@@@@@",
-".+@@@@@",
-".+@@@@@"};
+". c #C0C0FF s inactive_color_1",
+" ......",
+" .......",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
diff --git a/themes/daloa/top-right-active.png b/themes/daloa/top-right-active.png
index 910d998d5433881c041024fb36c15c32317b0ce8..2806dafd7d96a2d890d1a2949df68475943fdccb 100644
Binary files a/themes/daloa/top-right-active.png and b/themes/daloa/top-right-active.png differ
diff --git a/themes/daloa/top-right-active.svg b/themes/daloa/top-right-active.svg
new file mode 100644
index 0000000000000000000000000000000000000000..6d78a6add95756295abc5e82d6e6b826eb8e1789
--- /dev/null
+++ b/themes/daloa/top-right-active.svg
@@ -0,0 +1,182 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://web.resource.org/cc/"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="8"
+ height="19"
+ id="svg2"
+ sodipodi:version="0.32"
+ inkscape:version="0.44"
+ version="1.0"
+ sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"
+ sodipodi:docname="top-right-active.svg"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
+ <defs
+ id="defs4">
+ <linearGradient
+ id="linearGradient1886">
+ <stop
+ style="stop-color:white;stop-opacity:1;"
+ offset="0"
+ id="stop1888" />
+ <stop
+ style="stop-color:white;stop-opacity:0.05;"
+ offset="1"
+ id="stop1890" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient5873">
+ <stop
+ id="stop5875"
+ offset="0"
+ style="stop-color:white;stop-opacity:1;" />
+ <stop
+ id="stop5877"
+ offset="1"
+ style="stop-color:white;stop-opacity:0;" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient5847">
+ <stop
+ id="stop5849"
+ offset="0"
+ style="stop-color:white;stop-opacity:0.33;" />
+ <stop
+ id="stop5851"
+ offset="1"
+ style="stop-color:white;stop-opacity:0;" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5847"
+ id="linearGradient6945"
+ gradientUnits="userSpaceOnUse"
+ x1="0"
+ y1="0.5"
+ x2="0"
+ y2="18.5"
+ gradientTransform="matrix(1,0,0,1,0,0)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5873"
+ id="linearGradient6962"
+ x1="0"
+ y1="1"
+ x2="0"
+ y2="8"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1,0,0,0.2,0,1)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient1886"
+ id="linearGradient1892"
+ x1="0"
+ y1="1"
+ x2="0"
+ y2="9"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient1886"
+ id="linearGradient2791"
+ x1="0"
+ y1="1"
+ x2="0"
+ y2="19"
+ gradientUnits="userSpaceOnUse" />
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="white"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="10"
+ inkscape:cx="0"
+ inkscape:cy="0"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ inkscape:grid-bbox="true"
+ inkscape:grid-points="true"
+ gridoriginx="0px"
+ gridtolerance="0.5px"
+ guidetolerance="1px"
+ inkscape:window-width="640"
+ inkscape:window-height="733"
+ inkscape:window-x="187"
+ inkscape:window-y="728"
+ inkscape:guide-bbox="true"
+ inkscape:guide-points="false"
+ showguides="true" />
+ <metadata
+ id="metadata7">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title>Top Corner</dc:title>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Olivier Fourdan</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:groupmode="layer"
+ id="layer2"
+ inkscape:label="Grad"
+ style="display:inline">
+ <path
+ style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 0,1 L 5,1 C 5,1 7,1 7,4 C 7,27 7,27 5,19 L 0,19 L 0,19 L 0,1 z "
+ id="path6057" />
+ </g>
+ <g
+ inkscape:groupmode="layer"
+ id="layer3"
+ inkscape:label="hilight">
+ <path
+ style="fill:url(#linearGradient6962);fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 0,1 L 2.25,1 C 2.25,1 6,1 6,4 C 6,4 5.25,4 5.25,4 L 0,4 L 0,4 z "
+ id="path6061"
+ sodipodi:nodetypes="ccsc" />
+ <path
+ style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:0.75;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 0,1 L 5,1 C 5,1 7,1 7,4 C 7,8 7,8 5,10 L 0,10 L 0,10 L 0,1 z "
+ id="path1884" />
+ </g>
+ <g
+ inkscape:label="Border"
+ inkscape:groupmode="layer"
+ id="layer1"
+ style="display:inline">
+ <path
+ id="rect1319"
+ d="M 0,0 L 0,1 L 5,1 C 5,1 7,1 7,4 C 7,19 7,19 7,19 L 8,19 L 8,0 L 0,0 z "
+ style="fill:black;fill-opacity:0.50" />
+ </g>
+ <g
+ inkscape:groupmode="layer"
+ id="layer5"
+ inkscape:label="Shadow">
+ <path
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.10"
+ d="M 0.5,18.5 L 5.5,18.5"
+ id="path6989"
+ sodipodi:nodetypes="cc" />
+ </g>
+</svg>
diff --git a/themes/daloa/top-right-active.xpm b/themes/daloa/top-right-active.xpm
index 97706133f50f095ae26a9d1fb83e7cad94538da9..234c4d5b10bbf47b4d8f8e8314683971dca213de 100644
--- a/themes/daloa/top-right-active.xpm
+++ b/themes/daloa/top-right-active.xpm
@@ -1,27 +1,24 @@
/* XPM */
static char * top_right_active_xpm[] = {
-"7 19 5 1",
+"8 19 2 1",
" c None",
-". c #A0A0FF s active_shadow_1",
-"+ c #D0D0FF s active_hilight_1",
-"@ c #C0C0FF s active_color_1",
-"# c #B0B0FF s active_mid_1",
-"..... ",
-"+++++. ",
-"@@@@@+.",
-"@@@@@+.",
-"@@@@@+.",
-"@@@@@+.",
-"@@@@@+.",
-"@@@@@+.",
-"@@@@@+.",
-"@@@@@+.",
-"@@@@@+.",
-"@@@@@+.",
-"@@@@@+.",
-"@@@@@+.",
-"@@@@@+.",
-"@@@@@+.",
-"@@@@@+.",
-"@@@@@+.",
-"@@@@@+."};
+". c #C0C0FF s active_color_1",
+"...... ",
+"....... ",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
diff --git a/themes/daloa/top-right-inactive.png b/themes/daloa/top-right-inactive.png
index 910d998d5433881c041024fb36c15c32317b0ce8..2806dafd7d96a2d890d1a2949df68475943fdccb 100644
Binary files a/themes/daloa/top-right-inactive.png and b/themes/daloa/top-right-inactive.png differ
diff --git a/themes/daloa/top-right-inactive.svg b/themes/daloa/top-right-inactive.svg
new file mode 100644
index 0000000000000000000000000000000000000000..57f83a269242a313befecfe2c0c61a4f6dfce1a9
--- /dev/null
+++ b/themes/daloa/top-right-inactive.svg
@@ -0,0 +1,182 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://web.resource.org/cc/"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="8"
+ height="19"
+ id="svg2"
+ sodipodi:version="0.32"
+ inkscape:version="0.44"
+ version="1.0"
+ sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/default"
+ sodipodi:docname="top-right-inactive.svg"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
+ <defs
+ id="defs4">
+ <linearGradient
+ id="linearGradient1886">
+ <stop
+ style="stop-color:white;stop-opacity:1;"
+ offset="0"
+ id="stop1888" />
+ <stop
+ style="stop-color:white;stop-opacity:0.05;"
+ offset="1"
+ id="stop1890" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient5873">
+ <stop
+ id="stop5875"
+ offset="0"
+ style="stop-color:white;stop-opacity:1;" />
+ <stop
+ id="stop5877"
+ offset="1"
+ style="stop-color:white;stop-opacity:0;" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient5847">
+ <stop
+ id="stop5849"
+ offset="0"
+ style="stop-color:white;stop-opacity:0.33;" />
+ <stop
+ id="stop5851"
+ offset="1"
+ style="stop-color:white;stop-opacity:0;" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5847"
+ id="linearGradient6945"
+ gradientUnits="userSpaceOnUse"
+ x1="0"
+ y1="0.5"
+ x2="0"
+ y2="18.5"
+ gradientTransform="matrix(1,0,0,1,0,0)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5873"
+ id="linearGradient6962"
+ x1="0"
+ y1="1"
+ x2="0"
+ y2="8"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1,0,0,0.2,0,1)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient1886"
+ id="linearGradient1892"
+ x1="0"
+ y1="1"
+ x2="0"
+ y2="9"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient1886"
+ id="linearGradient2791"
+ x1="0"
+ y1="1"
+ x2="0"
+ y2="19"
+ gradientUnits="userSpaceOnUse" />
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="white"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="10"
+ inkscape:cx="0"
+ inkscape:cy="0"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ inkscape:grid-bbox="true"
+ inkscape:grid-points="true"
+ gridoriginx="0px"
+ gridtolerance="0.5px"
+ guidetolerance="1px"
+ inkscape:window-width="640"
+ inkscape:window-height="733"
+ inkscape:window-x="187"
+ inkscape:window-y="728"
+ inkscape:guide-bbox="true"
+ inkscape:guide-points="false"
+ showguides="true" />
+ <metadata
+ id="metadata7">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title>Top Corner</dc:title>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Olivier Fourdan</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:groupmode="layer"
+ id="layer2"
+ inkscape:label="Grad"
+ style="display:inline">
+ <path
+ style="fill:url(#linearGradient6945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 0,1 L 5,1 C 5,1 7,1 7,4 C 7,27 7,27 5,19 L 0,19 L 0,19 L 0,1 z "
+ id="path6057" />
+ </g>
+ <g
+ inkscape:groupmode="layer"
+ id="layer3"
+ inkscape:label="hilight">
+ <path
+ style="fill:url(#linearGradient6962);fill-opacity:0.60;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 0,1 L 2.25,1 C 2.25,1 6,1 6,4 C 6,4 5.25,4 5.25,4 L 0,4 L 0,3 z "
+ id="path6061"
+ sodipodi:nodetypes="ccsc" />
+ <path
+ style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:0.75;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 0,1 L 5,1 C 5,1 7,1 7,4 C 7,8 7,8 5,10 L 0,10 L 0,10 L 0,1 z "
+ id="path1884" />
+ </g>
+ <g
+ inkscape:label="Border"
+ inkscape:groupmode="layer"
+ id="layer1"
+ style="display:inline">
+ <path
+ id="rect1319"
+ d="M 0,0 L 0,1 L 5,1 C 5,1 7,1 7,4 C 7,19 7,19 7,19 L 8,19 L 8,0 L 0,0 z "
+ style="fill:black;fill-opacity:0.50" />
+ </g>
+ <g
+ inkscape:groupmode="layer"
+ id="layer5"
+ inkscape:label="Shadow">
+ <path
+ style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.10"
+ d="M 0.5,18.5 L 5.5,18.5"
+ id="path6989"
+ sodipodi:nodetypes="cc" />
+ </g>
+</svg>
diff --git a/themes/daloa/top-right-inactive.xpm b/themes/daloa/top-right-inactive.xpm
index 3fd9019f91d6f1420eca03d291cf166504ae0743..dda792a42f7b007e13c96a228b990d32cacdabcd 100644
--- a/themes/daloa/top-right-inactive.xpm
+++ b/themes/daloa/top-right-inactive.xpm
@@ -1,27 +1,24 @@
/* XPM */
static char * top_right_inactive_xpm[] = {
-"7 19 5 1",
+"8 19 2 1",
" c None",
-". c #A0A0FF s inactive_shadow_1",
-"+ c #D0D0FF s inactive_hilight_1",
-"@ c #C0C0FF s inactive_color_1",
-"# c #B0B0FF s inactive_mid_1",
-"..... ",
-"+++++. ",
-"@@@@@+.",
-"@@@@@+.",
-"@@@@@+.",
-"@@@@@+.",
-"@@@@@+.",
-"@@@@@+.",
-"@@@@@+.",
-"@@@@@+.",
-"@@@@@+.",
-"@@@@@+.",
-"@@@@@+.",
-"@@@@@+.",
-"@@@@@+.",
-"@@@@@+.",
-"@@@@@+.",
-"@@@@@+.",
-"@@@@@+."};
+". c #C0C0FF s inactive_color_1",
+"...... ",
+"....... ",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",
+"........",