Theme cleanup

(Old svn revision: 25882)

623 files changed, 2441 insertions, 23985 deletions

diff --git a/themes/Makefile.am b/themes/Makefile.am
index e80304558..1f0d408dc 100644
--- a/themes/Makefile.am
+++ b/themes/Makefile.am
@@ -8,9 +8,6 @@ SUBDIRS =								\
 	default-4.0							\
 	default-4.2							\
 	default-4.4							\
-	katiola								\
-	kokodi								\
-	largeprint							\
 	moheli								\
 	sassandra							\
 	stoneage							\
diff --git a/themes/daloa/themerc b/themes/daloa/themerc
index a7d73acac..eef70cbf2 100644
--- a/themes/daloa/themerc
+++ b/themes/daloa/themerc
@@ -1,5 +1,5 @@
 active_text_color=#ffffff
-button_offset=0
+button_offset=1
 button_spacing=-1
 maximized_offset=0
 shadow_delta_height=0
diff --git a/themes/default/Makefile.am b/themes/default/Makefile.am
deleted file mode 100644
index 5643b9786..000000000
--- a/themes/default/Makefile.am
+++ /dev/null
@@ -1,212 +0,0 @@
-themedir = $(datadir)/themes/Default/xfwm4
-
-PNG_FILES = 								\
-	bottom-active.png						\
-	bottom-inactive.png						\
-	bottom-left-active.png						\
-	bottom-left-inactive.png					\
-	bottom-right-active.png						\
-	bottom-right-inactive.png					\
-	close-active.png						\
-	close-inactive.png						\
-	close-pressed.png						\
-	close-prelight.png						\
-	hide-active.png							\
-	hide-inactive.png						\
-	hide-pressed.png						\
-	hide-pressed.png						\
-	hide-prelight.png						\
-	left-active.png							\
-	left-inactive.png						\
-	maximize-active.png						\
-	maximize-inactive.png						\
-	maximize-pressed.png						\
-	maximize-prelight.png						\
-	maximize-toggled-active.png					\
-	maximize-toggled-inactive.png					\
-	maximize-toggled-pressed.png					\
-	maximize-toggled-prelight.png					\
-	menu-active.png							\
-	menu-inactive.png						\
-	menu-pressed.png						\
-	menu-prelight.png						\
-	right-active.png						\
-	right-inactive.png						\
-	shade-active.png						\
-	shade-inactive.png						\
-	shade-pressed.png						\
-	shade-prelight.png						\
-	shade-toggled-active.png					\
-	shade-toggled-inactive.png					\
-	shade-toggled-pressed.png					\
-	shade-toggled-prelight.png					\
-	stick-active.png						\
-	stick-inactive.png						\
-	stick-pressed.png						\
-	stick-prelight.png						\
-	stick-toggled-active.png					\
-	stick-toggled-inactive.png					\
-	stick-toggled-pressed.png					\
-	stick-toggled-prelight.png					\
-	title-1-active.png						\
-	title-1-inactive.png						\
-	title-2-active.png						\
-	title-2-inactive.png						\
-	title-3-active.png						\
-	title-3-inactive.png						\
-	title-4-active.png						\
-	title-4-inactive.png						\
-	title-5-active.png						\
-	title-5-inactive.png						\
-	top-left-active.png						\
-	top-left-inactive.png						\
-	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						\
-	close-prelight.svg						\
-	hide-active.svg							\
-	hide-inactive.svg						\
-	hide-pressed.svg						\
-	hide-prelight.svg						\
-	left-active.svg							\
-	left-inactive.svg						\
-	maximize-active.svg						\
-	maximize-inactive.svg						\
-	maximize-pressed.svg						\
-	maximize-prelight.svg						\
-	maximize-toggled-active.svg					\
-	maximize-toggled-inactive.svg					\
-	maximize-toggled-pressed.svg					\
-	maximize-toggled-prelight.svg					\
-	menu-active.svg							\
-	menu-inactive.svg						\
-	menu-pressed.svg						\
-	menu-prelight.svg						\
-	right-active.svg						\
-	right-inactive.svg						\
-	shade-active.svg						\
-	shade-inactive.svg						\
-	shade-pressed.svg						\
-	shade-prelight.svg						\
-	shade-toggled-active.svg					\
-	shade-toggled-inactive.svg					\
-	shade-toggled-pressed.svg					\
-	shade-toggled-prelight.svg					\
-	stick-active.svg						\
-	stick-inactive.svg						\
-	stick-pressed.svg						\
-	stick-prelight.svg						\
-	stick-toggled-active.svg					\
-	stick-toggled-inactive.svg					\
-	stick-toggled-pressed.svg					\
-	stick-toggled-prelight.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						\
-	close-prelight.xpm						\
-	hide-active.xpm							\
-	hide-inactive.xpm						\
-	hide-pressed.xpm						\
-	hide-prelight.xpm						\
-	left-active.xpm							\
-	left-inactive.xpm						\
-	maximize-active.xpm						\
-	maximize-inactive.xpm						\
-	maximize-pressed.xpm						\
-	maximize-prelight.xpm						\
-	maximize-toggled-active.xpm					\
-	maximize-toggled-inactive.xpm					\
-	maximize-toggled-pressed.xpm					\
-	maximize-toggled-prelight.xpm					\
-	menu-active.xpm							\
-	menu-inactive.xpm						\
-	menu-pressed.xpm						\
-	menu-prelight.xpm						\
-	right-active.xpm						\
-	right-inactive.xpm						\
-	shade-active.xpm						\
-	shade-inactive.xpm						\
-	shade-pressed.xpm						\
-	shade-prelight.xpm						\
-	shade-toggled-active.xpm					\
-	shade-toggled-inactive.xpm					\
-	shade-toggled-pressed.xpm					\
-	shade-toggled-prelight.xpm					\
-	stick-active.xpm						\
-	stick-inactive.xpm						\
-	stick-pressed.xpm						\
-	stick-prelight.xpm						\
-	stick-toggled-active.xpm					\
-	stick-toggled-inactive.xpm					\
-	stick-toggled-pressed.xpm					\
-	stick-toggled-prelight.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.xpm
-
-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/default/README b/themes/default/README
deleted file mode 100644
index 37701257f..000000000
--- a/themes/default/README
+++ /dev/null
@@ -1,7 +0,0 @@
-README
-------
-
-SVG based theme for xfwm4.
-Created Sept. 2006 by Olivier Fourdan <fourdan@xfce.org>
-Modified Dec. 2006 by Olivier Fourdan <fourdan@xfce.org>
-Theme released under GNU GPL license.
diff --git a/themes/default/bottom-active.png b/themes/default/bottom-active.png
deleted file mode 100644
index 5c4d8e48c..000000000
--- a/themes/default/bottom-active.png
+++ /dev/null
diff --git a/themes/default/bottom-active.svg b/themes/default/bottom-active.svg
deleted file mode 100644
index 8f81982ab..000000000
--- a/themes/default/bottom-active.svg
+++ /dev/null
@@ -1,84 +0,0 @@
-<?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="6"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.45.1"
-   version="1.0"
-   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,5.5 L 24,5.5"
-       id="path1340" />
-  </g>
-</svg>
diff --git a/themes/default/bottom-active.xpm b/themes/default/bottom-active.xpm
deleted file mode 100644
index 9783ace70..000000000
--- a/themes/default/bottom-active.xpm
+++ /dev/null
@@ -1,13 +0,0 @@
-/* XPM */
-static char * bottom_active_xpm[] = {
-"24 6 4 1",
-" 	c None",
-"+	c #D0D0FF s active_hilight_1",
-"#	c #C0C0C0 s active_color_2",
-"@	c #C0C0FF s active_color_1",
-"########################",
-"########################",
-"########################",
-"@@@@@@@@@@@@@@@@@@@@@@@@",
-"++++++++++++++++++++++++",
-"@@@@@@@@@@@@@@@@@@@@@@@@"};
diff --git a/themes/default/bottom-inactive.png b/themes/default/bottom-inactive.png
deleted file mode 100644
index 5c4d8e48c..000000000
--- a/themes/default/bottom-inactive.png
+++ /dev/null
diff --git a/themes/default/bottom-inactive.svg b/themes/default/bottom-inactive.svg
deleted file mode 100644
index 2dce48399..000000000
--- a/themes/default/bottom-inactive.svg
+++ /dev/null
@@ -1,84 +0,0 @@
-<?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="6"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.45.1"
-   version="1.0"
-   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,5.5 L 24,5.5"
-       id="path1340" />
-  </g>
-</svg>
diff --git a/themes/default/bottom-inactive.xpm b/themes/default/bottom-inactive.xpm
deleted file mode 100644
index d0f95c37f..000000000
--- a/themes/default/bottom-inactive.xpm
+++ /dev/null
@@ -1,13 +0,0 @@
-/* XPM */
-static char * bottom_inactive_xpm[] = {
-"24 6 4 1",
-" 	c None",
-"+	c #D0D0FF s inactive_hilight_1",
-"#	c #C0C0C0 s inactive_color_2",
-"@	c #C0C0FF s inactive_color_1",
-"########################",
-"########################",
-"########################",
-"@@@@@@@@@@@@@@@@@@@@@@@@",
-"++++++++++++++++++++++++",
-"@@@@@@@@@@@@@@@@@@@@@@@@"};
diff --git a/themes/default/bottom-left-active.png b/themes/default/bottom-left-active.png
deleted file mode 100644
index b993ebda6..000000000
--- a/themes/default/bottom-left-active.png
+++ /dev/null
diff --git a/themes/default/bottom-left-active.svg b/themes/default/bottom-left-active.svg
deleted file mode 100644
index 9c87020f4..000000000
--- a/themes/default/bottom-left-active.svg
+++ /dev/null
@@ -1,83 +0,0 @@
-<?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.45.1"
-   version="1.0"
-   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,15 1,15 L 1,0 L 0,0 z "
-       id="rect1870" />
-  </g>
-</svg>
diff --git a/themes/default/bottom-left-active.xpm b/themes/default/bottom-left-active.xpm
deleted file mode 100644
index 05884cfc7..000000000
--- a/themes/default/bottom-left-active.xpm
+++ /dev/null
@@ -1,23 +0,0 @@
-/* XPM */
-static char * bottom_left_active_xpm[] = {
-"16 16 4 1",
-" 	c None",
-"+	c #D0D0FF s active_hilight_1",
-"#	c #C0C0C0 s active_color_2",
-"@	c #C0C0FF s active_color_1",
-"@+@###          ",
-"@+@###          ",
-"@+@###          ",
-"@+@###          ",
-"@+@###          ",
-"@+@###          ",
-"@+@###          ",
-"@+@###          ",
-"@+@###          ",
-"@+@###          ",
-"@+@#############",
-"@+@#############",
-"@+@#############",
-"@+@@@@@@@@@@@@@@",
-"@+++++++++++++++",
-" @@@@@@@@@@@@@@@"};
diff --git a/themes/default/bottom-left-inactive.png b/themes/default/bottom-left-inactive.png
deleted file mode 100644
index b993ebda6..000000000
--- a/themes/default/bottom-left-inactive.png
+++ /dev/null
diff --git a/themes/default/bottom-left-inactive.svg b/themes/default/bottom-left-inactive.svg
deleted file mode 100644
index ead279f7c..000000000
--- a/themes/default/bottom-left-inactive.svg
+++ /dev/null
@@ -1,83 +0,0 @@
-<?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.45.1"
-   version="1.0"
-   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,15 1,15 L 1,0 L 0,0 z "
-       id="rect1870" />
-  </g>
-</svg>
diff --git a/themes/default/bottom-left-inactive.xpm b/themes/default/bottom-left-inactive.xpm
deleted file mode 100644
index 5e974a228..000000000
--- a/themes/default/bottom-left-inactive.xpm
+++ /dev/null
@@ -1,23 +0,0 @@
-/* XPM */
-static char * bottom_left_inactive_xpm[] = {
-"16 16 4 1",
-" 	c None",
-"+	c #D0D0FF s inactive_hilight_1",
-"#	c #C0C0C0 s inactive_color_2",
-"@	c #C0C0FF s inactive_color_1",
-"@+@###          ",
-"@+@###          ",
-"@+@###          ",
-"@+@###          ",
-"@+@###          ",
-"@+@###          ",
-"@+@###          ",
-"@+@###          ",
-"@+@###          ",
-"@+@###          ",
-"@+@#############",
-"@+@#############",
-"@+@#############",
-"@+@@@@@@@@@@@@@@",
-"@+++++++++++++++",
-" @@@@@@@@@@@@@@@"};
diff --git a/themes/default/bottom-right-active.png b/themes/default/bottom-right-active.png
deleted file mode 100644
index 1551af588..000000000
--- a/themes/default/bottom-right-active.png
+++ /dev/null
diff --git a/themes/default/bottom-right-active.svg b/themes/default/bottom-right-active.svg
deleted file mode 100644
index 8bc1ddb70..000000000
--- a/themes/default/bottom-right-active.svg
+++ /dev/null
@@ -1,83 +0,0 @@
-<?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.45.1"
-   version="1.0"
-   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,15 15,15 L 15,0 L 16,0 z "
-       id="rect1870" />
-  </g>
-</svg>
diff --git a/themes/default/bottom-right-active.xpm b/themes/default/bottom-right-active.xpm
deleted file mode 100644
index 001d4143a..000000000
--- a/themes/default/bottom-right-active.xpm
+++ /dev/null
@@ -1,23 +0,0 @@
-/* XPM */
-static char * bottom_right_active_xpm[] = {
-"16 16 4 1",
-" 	c None",
-"+	c #D0D0FF s active_hilight_1",
-"#	c #C0C0C0 s active_color_2",
-"@	c #C0C0FF s active_color_1",
-"          ###@+@",
-"          ###@+@",
-"          ###@+@",
-"          ###@+@",
-"          ###@+@",
-"          ###@+@",
-"          ###@+@",
-"          ###@+@",
-"          ###@+@",
-"          ###@+@",
-"#############@+@",
-"#############@+@",
-"#############@+@",
-"@@@@@@@@@@@@@@+@",
-"+++++++++++++++@",
-"@@@@@@@@@@@@@@@ "};
diff --git a/themes/default/bottom-right-inactive.png b/themes/default/bottom-right-inactive.png
deleted file mode 100644
index 1551af588..000000000
--- a/themes/default/bottom-right-inactive.png
+++ /dev/null
diff --git a/themes/default/bottom-right-inactive.svg b/themes/default/bottom-right-inactive.svg
deleted file mode 100644
index b3575bdb3..000000000
--- a/themes/default/bottom-right-inactive.svg
+++ /dev/null
@@ -1,83 +0,0 @@
-<?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.45.1"
-   version="1.0"
-   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,15 15,15 L 15,0 L 16,0 z "
-       id="rect1870" />
-  </g>
-</svg>
diff --git a/themes/default/bottom-right-inactive.xpm b/themes/default/bottom-right-inactive.xpm
deleted file mode 100644
index 993919d9e..000000000
--- a/themes/default/bottom-right-inactive.xpm
+++ /dev/null
@@ -1,23 +0,0 @@
-/* XPM */
-static char * bottom_right_inactive_xpm[] = {
-"16 16 4 1",
-" 	c None",
-"+	c #D0D0FF s inactive_hilight_1",
-"#	c #C0C0C0 s inactive_color_2",
-"@	c #C0C0FF s inactive_color_1",
-"          ###@+@",
-"          ###@+@",
-"          ###@+@",
-"          ###@+@",
-"          ###@+@",
-"          ###@+@",
-"          ###@+@",
-"          ###@+@",
-"          ###@+@",
-"          ###@+@",
-"#############@+@",
-"#############@+@",
-"#############@+@",
-"@@@@@@@@@@@@@@+@",
-"+++++++++++++++@",
-"@@@@@@@@@@@@@@@ "};
diff --git a/themes/default/close-active.png b/themes/default/close-active.png
deleted file mode 100644
index 068921083..000000000
--- a/themes/default/close-active.png
+++ /dev/null
diff --git a/themes/default/close-active.svg b/themes/default/close-active.svg
deleted file mode 100644
index 1c9efcf98..000000000
--- a/themes/default/close-active.svg
+++ /dev/null
@@ -1,175 +0,0 @@
-<?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="18"
-   height="27"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.45.1"
-   version="1.0"
-   sodipodi:docname="close-active.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:white;stop-opacity:1;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.15;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:black;stop-opacity:0.05;" />
-      <stop
-         id="stop2776"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.30;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
-       x1="0"
-       y1="0.5"
-       x2="0"
-       y2="15"
-       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)" />
-  </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:0.65;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 18,0.5 C 18,0.5 18,26 18,26 L 0,26 L 0,0.5 z "
-       id="path6057" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="hilight">
-    <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.40;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
-       id="path6061" />
-  </g>
-  <g
-     inkscape:label="Border"
-     inkscape:groupmode="layer"
-     id="layer1"
-     style="display:inline">
-    <path
-       style="fill:none;fill-opacity:0.20;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 17.5,0.5"
-       id="path6059" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="g20"
-     inkscape:label="Button">
-    <g
-       id="g2328"
-       transform="translate(3,8)">
-      <g
-         transform="matrix(0.875,0,0,0.875,0.75,0.75)"
-         style="opacity:0.33;stroke:black;stroke-width:4.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         id="g2217">
-        <path
-           style="fill:none;fill-opacity:0.20;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" />
-        <path
-           style="fill:none;fill-opacity:0.20;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" />
-      </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.20;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.20;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;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0"
-       d="M 0.5,26.5 L 17.5,26.5"
-       id="path6989" />
-  </g>
-</svg>
diff --git a/themes/default/close-active.xpm b/themes/default/close-active.xpm
deleted file mode 100644
index 041dab09b..000000000
--- a/themes/default/close-active.xpm
+++ /dev/null
@@ -1,33 +0,0 @@
-/* XPM */
-static char * close_active_xpm[] = {
-"18 27 3 1",
-" 	c None",
-"+	c #D0D0FF s active_hilight_1",
-".	c #C0C0FF s active_color_1",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"                  ",
-"                  "};
diff --git a/themes/default/close-inactive.png b/themes/default/close-inactive.png
deleted file mode 100644
index 60146e3fe..000000000
--- a/themes/default/close-inactive.png
+++ /dev/null
diff --git a/themes/default/close-inactive.svg b/themes/default/close-inactive.svg
deleted file mode 100644
index 050c2bd00..000000000
--- a/themes/default/close-inactive.svg
+++ /dev/null
@@ -1,162 +0,0 @@
-<?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="18"
-   height="27"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.45.1"
-   version="1.0"
-   sodipodi:docname="close-inactive.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:white;stop-opacity:1;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.15;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:black;stop-opacity:0.05;" />
-      <stop
-         id="stop2776"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.30;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
-       x1="0"
-       y1="0.5"
-       x2="0"
-       y2="15"
-       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)" />
-  </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:0.65;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 18,0.5 C 18,0.5 18,26 18,26 L 0,26 L 0,0.5 z "
-       id="path6057" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="hilight">
-    <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.40;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
-       id="path6061" />
-  </g>
-  <g
-     inkscape:label="Border"
-     inkscape:groupmode="layer"
-     id="layer1"
-     style="display:inline">
-    <path
-       style="fill:none;fill-opacity:0.20;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 17.5,0.5"
-       id="path6059" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="g20"
-     inkscape:label="Button">
-    <g
-       id="g2328"
-       transform="translate(3,8)">
-      <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.20;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.20;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;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0"
-       d="M 0.5,26.5 L 17.5,26.5"
-       id="path6989" />
-  </g>
-</svg>
diff --git a/themes/default/close-inactive.xpm b/themes/default/close-inactive.xpm
deleted file mode 100644
index 896771411..000000000
--- a/themes/default/close-inactive.xpm
+++ /dev/null
@@ -1,33 +0,0 @@
-/* XPM */
-static char * close_inactive_xpm[] = {
-"18 27 3 1",
-" 	c None",
-"+	c #D0D0FF s inactive_hilight_1",
-".	c #C0C0FF s inactive_color_1",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"                  ",
-"                  "};
diff --git a/themes/default/close-prelight.png b/themes/default/close-prelight.png
deleted file mode 100644
index 7a67c5e7b..000000000
--- a/themes/default/close-prelight.png
+++ /dev/null
diff --git a/themes/default/close-prelight.svg b/themes/default/close-prelight.svg
deleted file mode 100644
index 0640f95f4..000000000
--- a/themes/default/close-prelight.svg
+++ /dev/null
@@ -1,202 +0,0 @@
-<?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="18"
-   height="27"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.45.1"
-   version="1.0"
-   sodipodi:docname="close-prelight.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:white;stop-opacity:1;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.15;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:black;stop-opacity:0.05;" />
-      <stop
-         id="stop2776"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.30;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
-       x1="0"
-       y1="0.5"
-       x2="0"
-       y2="15"
-       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"
-       fx="9"
-       fy="12"
-       r="12"
-       gradientTransform="matrix(1,0,0,1,0,0.5)"
-       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="layer1"
-     inkscape:label="pressed">
-    <g
-       id="g1789"
-       transform="translate(0,2)">
-      <rect
-         style="opacity:0.5;fill:url(#radialGradient3087);fill-opacity:0.75;stroke:url(#radialGradient3087);stroke-width:1;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         id="rect3079"
-         width="18"
-         height="18"
-         x="0"
-         y="4" />
-    </g>
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Grad"
-     style="display:inline">
-    <path
-       style="fill:url(#linearGradient6945);fill-opacity:0.65;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 18,0.5 C 18,0.5 18,26 18,26 L 0,26 L 0,0.5 z "
-       id="path6057" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="hilight">
-    <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.40;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
-       id="path6061" />
-  </g>
-  <g
-     inkscape:label="Border"
-     inkscape:groupmode="layer"
-     id="g31"
-     style="display:inline">
-    <path
-       style="fill:none;fill-opacity:0.20;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 17.5,0.5"
-       id="path6059" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="g3722"
-     inkscape:label="Button">
-    <g
-       id="g2328"
-       transform="translate(3,8)">
-      <g
-         transform="matrix(0.875,0,0,0.875,0.75,0.75)"
-         style="opacity:0.33;stroke:black;stroke-width:4.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         id="g2217">
-        <path
-           style="fill:none;fill-opacity:0.20;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" />
-        <path
-           style="fill:none;fill-opacity:0.20;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" />
-      </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.20;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.20;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;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0"
-       d="M 0.5,26.5 L 17.5,26.5"
-       id="path6989" />
-  </g>
-</svg>
diff --git a/themes/default/close-prelight.xpm b/themes/default/close-prelight.xpm
deleted file mode 100644
index 41211c632..000000000
--- a/themes/default/close-prelight.xpm
+++ /dev/null
@@ -1,33 +0,0 @@
-/* XPM */
-static char * close_pressed_xpm[] = {
-"18 27 3 1",
-" 	c None",
-"+	c #D0D0FF s active_hilight_1",
-".	c #C0C0FF s active_color_1",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"                  ",
-"                  "};
diff --git a/themes/default/close-pressed.png b/themes/default/close-pressed.png
deleted file mode 100644
index 81253804c..000000000
--- a/themes/default/close-pressed.png
+++ /dev/null
diff --git a/themes/default/close-pressed.xpm b/themes/default/close-pressed.xpm
deleted file mode 100644
index 41211c632..000000000
--- a/themes/default/close-pressed.xpm
+++ /dev/null
@@ -1,33 +0,0 @@
-/* XPM */
-static char * close_pressed_xpm[] = {
-"18 27 3 1",
-" 	c None",
-"+	c #D0D0FF s active_hilight_1",
-".	c #C0C0FF s active_color_1",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"                  ",
-"                  "};
diff --git a/themes/default/hide-active.png b/themes/default/hide-active.png
deleted file mode 100644
index ca3577050..000000000
--- a/themes/default/hide-active.png
+++ /dev/null
diff --git a/themes/default/hide-active.svg b/themes/default/hide-active.svg
deleted file mode 100644
index 1b4d29135..000000000
--- a/themes/default/hide-active.svg
+++ /dev/null
@@ -1,169 +0,0 @@
-<?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="18"
-   height="27"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.45.1"
-   version="1.0"
-   sodipodi:docname="hide-active.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:white;stop-opacity:1;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.15;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:black;stop-opacity:0.05;" />
-      <stop
-         id="stop2776"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.30;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
-       x1="0"
-       y1="0.5"
-       x2="0"
-       y2="15"
-       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)" />
-  </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:0.65;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 18,0.5 C 18,0.5 18,26 18,26 L 0,26 L 0,0.5 z "
-       id="path6057" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="hilight">
-    <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.40;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
-       id="path6061" />
-  </g>
-  <g
-     inkscape:label="Border"
-     inkscape:groupmode="layer"
-     id="layer1"
-     style="display:inline">
-    <path
-       style="fill:none;fill-opacity:0.20;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 17.5,0.5"
-       id="path6059" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="g20"
-     inkscape:label="Button">
-    <g
-       style="display:inline"
-       id="g1616"
-       transform="translate(3,8)">
-      <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;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0"
-       d="M 0.5,26.5 L 17.5,26.5"
-       id="path6989" />
-  </g>
-</svg>
diff --git a/themes/default/hide-active.xpm b/themes/default/hide-active.xpm
deleted file mode 100644
index c18a2ac7f..000000000
--- a/themes/default/hide-active.xpm
+++ /dev/null
@@ -1,33 +0,0 @@
-/* XPM */
-static char * hide_active_xpm[] = {
-"18 27 3 1",
-" 	c None",
-"+	c #D0D0FF s active_hilight_1",
-".	c #C0C0FF s active_color_1",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"                  ",
-"                  "};
diff --git a/themes/default/hide-inactive.png b/themes/default/hide-inactive.png
deleted file mode 100644
index 069f1cef2..000000000
--- a/themes/default/hide-inactive.png
+++ /dev/null
diff --git a/themes/default/hide-inactive.svg b/themes/default/hide-inactive.svg
deleted file mode 100644
index 89a979092..000000000
--- a/themes/default/hide-inactive.svg
+++ /dev/null
@@ -1,162 +0,0 @@
-<?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="18"
-   height="27"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.45.1"
-   version="1.0"
-   sodipodi:docname="hide-inactive.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:white;stop-opacity:1;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.15;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:black;stop-opacity:0.05;" />
-      <stop
-         id="stop2776"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.30;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
-       x1="0"
-       y1="0.5"
-       x2="0"
-       y2="15"
-       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)" />
-  </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:0.65;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 18,0.5 C 18,0.5 18,26 18,26 L 0,26 L 0,0.5 z "
-       id="path6057" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="hilight">
-    <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.40;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
-       id="path6061" />
-  </g>
-  <g
-     inkscape:label="Border"
-     inkscape:groupmode="layer"
-     id="layer1"
-     style="display:inline">
-    <path
-       style="fill:none;fill-opacity:0.20;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 17.5,0.5"
-       id="path6059" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="g20"
-     inkscape:label="Button">
-    <g
-       style="display:inline"
-       id="g1616"
-       transform="translate(3,8)">
-      <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;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0"
-       d="M 0.5,26.5 L 17.5,26.5"
-       id="path6989" />
-  </g>
-</svg>
diff --git a/themes/default/hide-inactive.xpm b/themes/default/hide-inactive.xpm
deleted file mode 100644
index 13c7e007e..000000000
--- a/themes/default/hide-inactive.xpm
+++ /dev/null
@@ -1,33 +0,0 @@
-/* XPM */
-static char * hide_inactive_xpm[] = {
-"18 27 3 1",
-" 	c None",
-"+	c #D0D0FF s inactive_hilight_1",
-".	c #C0C0FF s inactive_color_1",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"                  ",
-"                  "};
diff --git a/themes/default/hide-prelight.png b/themes/default/hide-prelight.png
deleted file mode 100644
index 040e3d520..000000000
--- a/themes/default/hide-prelight.png
+++ /dev/null
diff --git a/themes/default/hide-prelight.svg b/themes/default/hide-prelight.svg
deleted file mode 100644
index 29fb88349..000000000
--- a/themes/default/hide-prelight.svg
+++ /dev/null
@@ -1,196 +0,0 @@
-<?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="18"
-   height="27"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.45.1"
-   version="1.0"
-   sodipodi:docname="hide-prelight.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:white;stop-opacity:1;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.15;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:black;stop-opacity:0.05;" />
-      <stop
-         id="stop2776"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.30;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
-       x1="0"
-       y1="0.5"
-       x2="0"
-       y2="15"
-       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"
-       fx="9"
-       fy="12"
-       r="12"
-       gradientTransform="matrix(1,0,0,1,0,0.5)"
-       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="layer1"
-     inkscape:label="pressed">
-    <g
-       id="g1789"
-       transform="translate(0,2)">
-      <rect
-         style="opacity:0.5;fill:url(#radialGradient3087);fill-opacity:0.75;stroke:url(#radialGradient3087);stroke-width:1;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         id="rect3079"
-         width="18"
-         height="18"
-         x="0"
-         y="4" />
-    </g>
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Grad"
-     style="display:inline">
-    <path
-       style="fill:url(#linearGradient6945);fill-opacity:0.65;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 18,0.5 C 18,0.5 18,26 18,26 L 0,26 L 0,0.5 z "
-       id="path6057" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="hilight">
-    <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.40;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
-       id="path6061" />
-  </g>
-  <g
-     inkscape:label="Border"
-     inkscape:groupmode="layer"
-     id="g31"
-     style="display:inline">
-    <path
-       style="fill:none;fill-opacity:0.20;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 17.5,0.5"
-       id="path6059" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="g3722"
-     inkscape:label="Button">
-    <g
-       style="display:inline"
-       id="g1616"
-       transform="translate(3,8)">
-      <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;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0"
-       d="M 0.5,26.5 L 17.5,26.5"
-       id="path6989" />
-  </g>
-</svg>
diff --git a/themes/default/hide-prelight.xpm b/themes/default/hide-prelight.xpm
deleted file mode 100644
index 81912c289..000000000
--- a/themes/default/hide-prelight.xpm
+++ /dev/null
@@ -1,33 +0,0 @@
-/* XPM */
-static char * hide_pressed_xpm[] = {
-"18 27 3 1",
-" 	c None",
-"+	c #D0D0FF s active_hilight_1",
-".	c #C0C0FF s active_color_1",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"                  ",
-"                  "};
diff --git a/themes/default/hide-pressed.png b/themes/default/hide-pressed.png
deleted file mode 100644
index 24400da0e..000000000
--- a/themes/default/hide-pressed.png
+++ /dev/null
diff --git a/themes/default/hide-pressed.svg b/themes/default/hide-pressed.svg
deleted file mode 100644
index 37c8347ff..000000000
--- a/themes/default/hide-pressed.svg
+++ /dev/null
@@ -1,196 +0,0 @@
-<?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="18"
-   height="27"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.45.1"
-   version="1.0"
-   sodipodi:docname="hide-pressed.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:white;stop-opacity:1;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.15;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:black;stop-opacity:0.05;" />
-      <stop
-         id="stop2776"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.30;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
-       x1="0"
-       y1="0.5"
-       x2="0"
-       y2="15"
-       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"
-       fx="9"
-       fy="12"
-       r="12"
-       gradientTransform="matrix(1,0,0,1,0,0.5)"
-       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="layer1"
-     inkscape:label="pressed">
-    <g
-       id="g1789"
-       transform="translate(0,2)">
-      <rect
-         style="opacity:0.5;fill:url(#radialGradient3087);fill-opacity:1.0;stroke:url(#radialGradient3087);stroke-width:1;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         id="rect3079"
-         width="18"
-         height="18"
-         x="0"
-         y="4" />
-    </g>
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Grad"
-     style="display:inline">
-    <path
-       style="fill:url(#linearGradient6945);fill-opacity:0.65;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 18,0.5 C 18,0.5 18,26 18,26 L 0,26 L 0,0.5 z "
-       id="path6057" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="hilight">
-    <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.40;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
-       id="path6061" />
-  </g>
-  <g
-     inkscape:label="Border"
-     inkscape:groupmode="layer"
-     id="g31"
-     style="display:inline">
-    <path
-       style="fill:none;fill-opacity:0.20;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 17.5,0.5"
-       id="path6059" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="g3722"
-     inkscape:label="Button">
-    <g
-       style="display:inline"
-       id="g1616"
-       transform="translate(3,9)">
-      <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;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0"
-       d="M 0.5,26.5 L 17.5,26.5"
-       id="path6989" />
-  </g>
-</svg>
diff --git a/themes/default/hide-pressed.xpm b/themes/default/hide-pressed.xpm
deleted file mode 100644
index 81912c289..000000000
--- a/themes/default/hide-pressed.xpm
+++ /dev/null
@@ -1,33 +0,0 @@
-/* XPM */
-static char * hide_pressed_xpm[] = {
-"18 27 3 1",
-" 	c None",
-"+	c #D0D0FF s active_hilight_1",
-".	c #C0C0FF s active_color_1",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"                  ",
-"                  "};
diff --git a/themes/default/left-active.png b/themes/default/left-active.png
deleted file mode 100644
index 868b75537..000000000
--- a/themes/default/left-active.png
+++ /dev/null
diff --git a/themes/default/left-active.svg b/themes/default/left-active.svg
deleted file mode 100644
index dd3f96667..000000000
--- a/themes/default/left-active.svg
+++ /dev/null
@@ -1,82 +0,0 @@
-<?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="6"
-   height="24"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.45.1"
-   version="1.0"
-   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/default/left-active.xpm b/themes/default/left-active.xpm
deleted file mode 100644
index 1d56006a0..000000000
--- a/themes/default/left-active.xpm
+++ /dev/null
@@ -1,31 +0,0 @@
-/* XPM */
-static char * left_active_xpm[] = {
-"6 24 4 1",
-" 	c None",
-"+	c #D0D0FF s active_hilight_1",
-"#	c #C0C0C0 s active_color_2",
-"@	c #C0C0FF s active_color_1",
-"@+@###",
-"@+@###",
-"@+@###",
-"@+@###",
-"@+@###",
-"@+@###",
-"@+@###",
-"@+@###",
-"@+@###",
-"@+@###",
-"@+@###",
-"@+@###",
-"@+@###",
-"@+@###",
-"@+@###",
-"@+@###",
-"@+@###",
-"@+@###",
-"@+@###",
-"@+@###",
-"@+@###",
-"@+@###",
-"@+@###",
-"@+@###"};
diff --git a/themes/default/left-inactive.png b/themes/default/left-inactive.png
deleted file mode 100644
index 868b75537..000000000
--- a/themes/default/left-inactive.png
+++ /dev/null
diff --git a/themes/default/left-inactive.svg b/themes/default/left-inactive.svg
deleted file mode 100644
index 56ab84d6c..000000000
--- a/themes/default/left-inactive.svg
+++ /dev/null
@@ -1,82 +0,0 @@
-<?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="6"
-   height="24"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.45.1"
-   version="1.0"
-   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/default/left-inactive.xpm b/themes/default/left-inactive.xpm
deleted file mode 100644
index a133ee82f..000000000
--- a/themes/default/left-inactive.xpm
+++ /dev/null
@@ -1,31 +0,0 @@
-/* XPM */
-static char * left_inactive_xpm[] = {
-"6 24 4 1",
-" 	c None",
-"+	c #D0D0FF s inactive_hilight_1",
-"#	c #C0C0C0 s inactive_color_2",
-"@	c #C0C0FF s inactive_color_1",
-"@+@###",
-"@+@###",
-"@+@###",
-"@+@###",
-"@+@###",
-"@+@###",
-"@+@###",
-"@+@###",
-"@+@###",
-"@+@###",
-"@+@###",
-"@+@###",
-"@+@###",
-"@+@###",
-"@+@###",
-"@+@###",
-"@+@###",
-"@+@###",
-"@+@###",
-"@+@###",
-"@+@###",
-"@+@###",
-"@+@###",
-"@+@###"};
diff --git a/themes/default/maximize-active.png b/themes/default/maximize-active.png
deleted file mode 100644
index f8bdd7a4b..000000000
--- a/themes/default/maximize-active.png
+++ /dev/null
diff --git a/themes/default/maximize-active.svg b/themes/default/maximize-active.svg
deleted file mode 100644
index a1f5f8743..000000000
--- a/themes/default/maximize-active.svg
+++ /dev/null
@@ -1,163 +0,0 @@
-<?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="18"
-   height="27"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.45.1"
-   version="1.0"
-   sodipodi:docname="maximize-active.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:white;stop-opacity:1;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.15;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:black;stop-opacity:0.05;" />
-      <stop
-         id="stop2776"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.30;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
-       x1="0"
-       y1="0.5"
-       x2="0"
-       y2="15"
-       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)" />
-  </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:0.65;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 18,0.5 C 18,0.5 18,26 18,26 L 0,26 L 0,0.5 z "
-       id="path6057" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="hilight">
-    <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.40;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
-       id="path6061" />
-  </g>
-  <g
-     inkscape:label="Border"
-     inkscape:groupmode="layer"
-     id="layer1"
-     style="display:inline">
-    <path
-       style="fill:none;fill-opacity:0.20;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 17.5,0.5"
-       id="path6059" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="g20"
-     inkscape:label="Button">
-    <g
-       style="display:inline"
-       id="g1614"
-       transform="translate(3,8)">
-      <path
-         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="rect2285"
-         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;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0"
-       d="M 0.5,26.5 L 17.5,26.5"
-       id="path6989" />
-  </g>
-</svg>
diff --git a/themes/default/maximize-active.xpm b/themes/default/maximize-active.xpm
deleted file mode 100644
index c839ace59..000000000
--- a/themes/default/maximize-active.xpm
+++ /dev/null
@@ -1,33 +0,0 @@
-/* XPM */
-static char * maximize_active_xpm[] = {
-"18 27 3 1",
-" 	c None",
-"+	c #D0D0FF s active_hilight_1",
-".	c #C0C0FF s active_color_1",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"                  ",
-"                  "};
diff --git a/themes/default/maximize-inactive.png b/themes/default/maximize-inactive.png
deleted file mode 100644
index 504441423..000000000
--- a/themes/default/maximize-inactive.png
+++ /dev/null
diff --git a/themes/default/maximize-inactive.svg b/themes/default/maximize-inactive.svg
deleted file mode 100644
index 6651c9579..000000000
--- a/themes/default/maximize-inactive.svg
+++ /dev/null
@@ -1,159 +0,0 @@
-<?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="18"
-   height="27"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.45.1"
-   version="1.0"
-   sodipodi:docname="maximize-inactive.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:white;stop-opacity:1;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.15;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:black;stop-opacity:0.05;" />
-      <stop
-         id="stop2776"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.30;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
-       x1="0"
-       y1="0.5"
-       x2="0"
-       y2="15"
-       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)" />
-  </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:0.65;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 18,0.5 C 18,0.5 18,26 18,26 L 0,26 L 0,0.5 z "
-       id="path6057" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="hilight">
-    <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.40;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
-       id="path6061" />
-  </g>
-  <g
-     inkscape:label="Border"
-     inkscape:groupmode="layer"
-     id="layer1"
-     style="display:inline">
-    <path
-       style="fill:none;fill-opacity:0.20;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 17.5,0.5"
-       id="path6059" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="g20"
-     inkscape:label="Button">
-    <g
-       style="display:inline"
-       id="g1626"
-       transform="translate(3,8)">
-      <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="rect2285" />
-    </g>
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer5"
-     inkscape:label="Shadow">
-    <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0"
-       d="M 0.5,26.5 L 17.5,26.5"
-       id="path6989" />
-  </g>
-</svg>
diff --git a/themes/default/maximize-inactive.xpm b/themes/default/maximize-inactive.xpm
deleted file mode 100644
index a21640984..000000000
--- a/themes/default/maximize-inactive.xpm
+++ /dev/null
@@ -1,33 +0,0 @@
-/* XPM */
-static char * maximize_inactive_xpm[] = {
-"18 27 3 1",
-" 	c None",
-"+	c #D0D0FF s inactive_hilight_1",
-".	c #C0C0FF s inactive_color_1",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"                  ",
-"                  "};
diff --git a/themes/default/maximize-prelight.png b/themes/default/maximize-prelight.png
deleted file mode 100644
index f1b7c1109..000000000
--- a/themes/default/maximize-prelight.png
+++ /dev/null
diff --git a/themes/default/maximize-prelight.svg b/themes/default/maximize-prelight.svg
deleted file mode 100644
index 5f1c60da4..000000000
--- a/themes/default/maximize-prelight.svg
+++ /dev/null
@@ -1,190 +0,0 @@
-<?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="18"
-   height="27"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.45.1"
-   version="1.0"
-   sodipodi:docname="maximize-prelight.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:white;stop-opacity:1;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.15;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:black;stop-opacity:0.05;" />
-      <stop
-         id="stop2776"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.30;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
-       x1="0"
-       y1="0.5"
-       x2="0"
-       y2="15"
-       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"
-       fx="9"
-       fy="12"
-       r="12"
-       gradientTransform="matrix(1,0,0,1,0,0.5)"
-       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="layer1"
-     inkscape:label="pressed">
-    <g
-       id="g1789"
-       transform="translate(0,2)">
-      <rect
-         style="opacity:0.5;fill:url(#radialGradient3087);fill-opacity:0.75;stroke:url(#radialGradient3087);stroke-width:1;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         id="rect3079"
-         width="18"
-         height="18"
-         x="0"
-         y="4" />
-    </g>
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Grad"
-     style="display:inline">
-    <path
-       style="fill:url(#linearGradient6945);fill-opacity:0.65;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 18,0.5 C 18,0.5 18,26 18,26 L 0,26 L 0,0.5 z "
-       id="path6057" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="hilight">
-    <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.40;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
-       id="path6061" />
-  </g>
-  <g
-     inkscape:label="Border"
-     inkscape:groupmode="layer"
-     id="g31"
-     style="display:inline">
-    <path
-       style="fill:none;fill-opacity:0.20;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 17.5,0.5"
-       id="path6059" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="g3722"
-     inkscape:label="Button">
-    <g
-       style="display:inline"
-       id="g1614"
-       transform="translate(3,8)">
-      <path
-         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="rect2285"
-         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;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0"
-       d="M 0.5,26.5 L 17.5,26.5"
-       id="path6989" />
-  </g>
-</svg>
diff --git a/themes/default/maximize-prelight.xpm b/themes/default/maximize-prelight.xpm
deleted file mode 100644
index 3f31322ea..000000000
--- a/themes/default/maximize-prelight.xpm
+++ /dev/null
@@ -1,33 +0,0 @@
-/* XPM */
-static char * maximize_pressed_xpm[] = {
-"18 27 3 1",
-" 	c None",
-"+	c #D0D0FF s active_hilight_1",
-".	c #C0C0FF s active_color_1",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"                  ",
-"                  "};
diff --git a/themes/default/maximize-pressed.png b/themes/default/maximize-pressed.png
deleted file mode 100644
index b6f071a56..000000000
--- a/themes/default/maximize-pressed.png
+++ /dev/null
diff --git a/themes/default/maximize-pressed.xpm b/themes/default/maximize-pressed.xpm
deleted file mode 100644
index 3f31322ea..000000000
--- a/themes/default/maximize-pressed.xpm
+++ /dev/null
@@ -1,33 +0,0 @@
-/* XPM */
-static char * maximize_pressed_xpm[] = {
-"18 27 3 1",
-" 	c None",
-"+	c #D0D0FF s active_hilight_1",
-".	c #C0C0FF s active_color_1",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"                  ",
-"                  "};
diff --git a/themes/default/maximize-toggled-active.png b/themes/default/maximize-toggled-active.png
deleted file mode 100644
index 25a0d2b49..000000000
--- a/themes/default/maximize-toggled-active.png
+++ /dev/null
diff --git a/themes/default/maximize-toggled-active.svg b/themes/default/maximize-toggled-active.svg
deleted file mode 100644
index dbaacf1d2..000000000
--- a/themes/default/maximize-toggled-active.svg
+++ /dev/null
@@ -1,167 +0,0 @@
-<?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="18"
-   height="27"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.45.1"
-   version="1.0"
-   sodipodi:docname="maximize-toggled-active.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:white;stop-opacity:1;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.15;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:black;stop-opacity:0.05;" />
-      <stop
-         id="stop2776"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.30;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
-       x1="0"
-       y1="0.5"
-       x2="0"
-       y2="15"
-       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)" />
-  </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:0.65;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 18,0.5 C 18,0.5 18,26 18,26 L 0,26 L 0,0.5 z "
-       id="path6057" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="hilight">
-    <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.40;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
-       id="path6061" />
-  </g>
-  <g
-     inkscape:label="Border"
-     inkscape:groupmode="layer"
-     id="layer1"
-     style="display:inline">
-    <path
-       style="fill:none;fill-opacity:0.20;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 17.5,0.5"
-       id="path6059" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="g20"
-     inkscape:label="Button">
-    <g
-       style="display:inline"
-       id="g1626"
-       transform="translate(3,8)">
-      <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;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0"
-       d="M 0.5,26.5 L 17.5,26.5"
-       id="path6989" />
-  </g>
-</svg>
diff --git a/themes/default/maximize-toggled-active.xpm b/themes/default/maximize-toggled-active.xpm
deleted file mode 100644
index 67d04fbe4..000000000
--- a/themes/default/maximize-toggled-active.xpm
+++ /dev/null
@@ -1,33 +0,0 @@
-/* XPM */
-static char * maximize_toggled_active_xpm[] = {
-"18 27 3 1",
-" 	c None",
-"+	c #D0D0FF s active_hilight_1",
-".	c #C0C0FF s active_color_1",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"                  ",
-"                  "};
diff --git a/themes/default/maximize-toggled-inactive.png b/themes/default/maximize-toggled-inactive.png
deleted file mode 100644
index f59d167c5..000000000
--- a/themes/default/maximize-toggled-inactive.png
+++ /dev/null
diff --git a/themes/default/maximize-toggled-inactive.svg b/themes/default/maximize-toggled-inactive.svg
deleted file mode 100644
index cd64ece7d..000000000
--- a/themes/default/maximize-toggled-inactive.svg
+++ /dev/null
@@ -1,163 +0,0 @@
-<?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="18"
-   height="27"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.45.1"
-   version="1.0"
-   sodipodi:docname="maximize-toggled-inactive.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:white;stop-opacity:1;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.15;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:black;stop-opacity:0.05;" />
-      <stop
-         id="stop2776"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.30;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
-       x1="0"
-       y1="0.5"
-       x2="0"
-       y2="15"
-       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)" />
-  </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:0.65;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 18,0.5 C 18,0.5 18,26 18,26 L 0,26 L 0,0.5 z "
-       id="path6057" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="hilight">
-    <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.40;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
-       id="path6061" />
-  </g>
-  <g
-     inkscape:label="Border"
-     inkscape:groupmode="layer"
-     id="layer1"
-     style="display:inline">
-    <path
-       style="fill:none;fill-opacity:0.20;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 17.5,0.5"
-       id="path6059" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="g20"
-     inkscape:label="Button">
-    <g
-       style="display:inline"
-       id="g1639"
-       transform="translate(3,8)">
-      <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;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0"
-       d="M 0.5,26.5 L 17.5,26.5"
-       id="path6989" />
-  </g>
-</svg>
diff --git a/themes/default/maximize-toggled-inactive.xpm b/themes/default/maximize-toggled-inactive.xpm
deleted file mode 100644
index 5c8d782bb..000000000
--- a/themes/default/maximize-toggled-inactive.xpm
+++ /dev/null
@@ -1,33 +0,0 @@
-/* XPM */
-static char * maximize_toggled_inactive_xpm[] = {
-"18 27 3 1",
-" 	c None",
-"+	c #D0D0FF s inactive_hilight_1",
-".	c #C0C0FF s inactive_color_1",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"                  ",
-"                  "};
diff --git a/themes/default/maximize-toggled-prelight.png b/themes/default/maximize-toggled-prelight.png
deleted file mode 100644
index b48859a96..000000000
--- a/themes/default/maximize-toggled-prelight.png
+++ /dev/null
diff --git a/themes/default/maximize-toggled-prelight.svg b/themes/default/maximize-toggled-prelight.svg
deleted file mode 100644
index 76ef54158..000000000
--- a/themes/default/maximize-toggled-prelight.svg
+++ /dev/null
@@ -1,194 +0,0 @@
-<?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="18"
-   height="27"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.45.1"
-   version="1.0"
-   sodipodi:docname="maximize-toggled-prelight.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:white;stop-opacity:1;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.15;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:black;stop-opacity:0.05;" />
-      <stop
-         id="stop2776"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.30;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
-       x1="0"
-       y1="0.5"
-       x2="0"
-       y2="15"
-       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"
-       fx="9"
-       fy="12"
-       r="12"
-       gradientTransform="matrix(1,0,0,1,0,0.5)"
-       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="layer1"
-     inkscape:label="pressed">
-    <g
-       id="g1789"
-       transform="translate(0,2)">
-      <rect
-         style="opacity:0.5;fill:url(#radialGradient3087);fill-opacity:0.75;stroke:url(#radialGradient3087);stroke-width:1;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         id="rect3079"
-         width="18"
-         height="18"
-         x="0"
-         y="4" />
-    </g>
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Grad"
-     style="display:inline">
-    <path
-       style="fill:url(#linearGradient6945);fill-opacity:0.65;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 18,0.5 C 18,0.5 18,26 18,26 L 0,26 L 0,0.5 z "
-       id="path6057" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="hilight">
-    <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.40;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
-       id="path6061" />
-  </g>
-  <g
-     inkscape:label="Border"
-     inkscape:groupmode="layer"
-     id="g31"
-     style="display:inline">
-    <path
-       style="fill:none;fill-opacity:0.20;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 17.5,0.5"
-       id="path6059" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="g3722"
-     inkscape:label="Button">
-    <g
-       style="display:inline"
-       id="g1626"
-       transform="translate(3,8)">
-      <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;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0"
-       d="M 0.5,26.5 L 17.5,26.5"
-       id="path6989" />
-  </g>
-</svg>
diff --git a/themes/default/maximize-toggled-prelight.xpm b/themes/default/maximize-toggled-prelight.xpm
deleted file mode 100644
index 0d14d8002..000000000
--- a/themes/default/maximize-toggled-prelight.xpm
+++ /dev/null
@@ -1,33 +0,0 @@
-/* XPM */
-static char * maximize_toggled_pressed_xpm[] = {
-"18 27 3 1",
-" 	c None",
-"+	c #D0D0FF s active_hilight_1",
-".	c #C0C0FF s active_color_1",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"                  ",
-"                  "};
diff --git a/themes/default/maximize-toggled-pressed.png b/themes/default/maximize-toggled-pressed.png
deleted file mode 100644
index 5c8af9724..000000000
--- a/themes/default/maximize-toggled-pressed.png
+++ /dev/null
diff --git a/themes/default/maximize-toggled-pressed.xpm b/themes/default/maximize-toggled-pressed.xpm
deleted file mode 100644
index 0d14d8002..000000000
--- a/themes/default/maximize-toggled-pressed.xpm
+++ /dev/null
@@ -1,33 +0,0 @@
-/* XPM */
-static char * maximize_toggled_pressed_xpm[] = {
-"18 27 3 1",
-" 	c None",
-"+	c #D0D0FF s active_hilight_1",
-".	c #C0C0FF s active_color_1",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"                  ",
-"                  "};
diff --git a/themes/default/menu-active.png b/themes/default/menu-active.png
deleted file mode 100644
index 552ae6ade..000000000
--- a/themes/default/menu-active.png
+++ /dev/null
diff --git a/themes/default/menu-active.svg b/themes/default/menu-active.svg
deleted file mode 100644
index 868339bf4..000000000
--- a/themes/default/menu-active.svg
+++ /dev/null
@@ -1,145 +0,0 @@
-<?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="16"
-   height="27"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.45.1"
-   version="1.0"
-   sodipodi:docname="menu-active.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:white;stop-opacity:1;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.15;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:black;stop-opacity:0.05;" />
-      <stop
-         id="stop2776"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.30;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
-       x1="0"
-       y1="0.5"
-       x2="0"
-       y2="15"
-       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)" />
-  </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:0.65;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 16,0.5 C 16,0.5 16,26 16,26 L 0,26 L 0,0.5 z "
-       id="path6057" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="hilight">
-    <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.40;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 0,1 L 16,1 C 16,1 16,4 16,4 L 0,4 L 0,3 z "
-       id="path6061" />
-  </g>
-  <g
-     inkscape:label="Border"
-     inkscape:groupmode="layer"
-     id="layer1"
-     style="display:inline">
-    <path
-       style="fill:none;fill-opacity:0.20;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 15.5,0.5"
-       id="path6059" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer5"
-     inkscape:label="Shadow">
-    <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0"
-       d="M 0.5,26.5 L 15.5,26.5"
-       id="path6989" />
-  </g>
-</svg>
diff --git a/themes/default/menu-active.xpm b/themes/default/menu-active.xpm
deleted file mode 100644
index 76d560b64..000000000
--- a/themes/default/menu-active.xpm
+++ /dev/null
@@ -1,33 +0,0 @@
-/* XPM */
-static char * menu_active_xpm[] = {
-"16 27 3 1",
-" 	c None",
-"+	c #D0D0FF s active_hilight_1",
-".	c #C0C0FF s active_color_1",
-"                ",
-"                ",
-"                ",
-"                ",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"                ",
-"                "};
diff --git a/themes/default/menu-inactive.png b/themes/default/menu-inactive.png
deleted file mode 100644
index 552ae6ade..000000000
--- a/themes/default/menu-inactive.png
+++ /dev/null
diff --git a/themes/default/menu-inactive.svg b/themes/default/menu-inactive.svg
deleted file mode 100644
index e7ca3e248..000000000
--- a/themes/default/menu-inactive.svg
+++ /dev/null
@@ -1,145 +0,0 @@
-<?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="16"
-   height="27"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.45.1"
-   version="1.0"
-   sodipodi:docname="menu-inactive.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:white;stop-opacity:1;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.15;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:black;stop-opacity:0.05;" />
-      <stop
-         id="stop2776"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.30;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
-       x1="0"
-       y1="0.5"
-       x2="0"
-       y2="15"
-       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)" />
-  </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:0.65;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 16,0.5 C 16,0.5 16,26 16,26 L 0,26 L 0,0.5 z "
-       id="path6057" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="hilight">
-    <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.40;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 0,1 L 16,1 C 16,1 16,4 16,4 L 0,4 L 0,3 z "
-       id="path6061" />
-  </g>
-  <g
-     inkscape:label="Border"
-     inkscape:groupmode="layer"
-     id="layer1"
-     style="display:inline">
-    <path
-       style="fill:none;fill-opacity:0.20;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 15.5,0.5"
-       id="path6059" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer5"
-     inkscape:label="Shadow">
-    <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0"
-       d="M 0.5,26.5 L 15.5,26.5"
-       id="path6989" />
-  </g>
-</svg>
diff --git a/themes/default/menu-inactive.xpm b/themes/default/menu-inactive.xpm
deleted file mode 100644
index 057cd4177..000000000
--- a/themes/default/menu-inactive.xpm
+++ /dev/null
@@ -1,33 +0,0 @@
-/* XPM */
-static char * menu_inactive_xpm[] = {
-"16 27 3 1",
-" 	c None",
-"+	c #D0D0FF s inactive_hilight_1",
-".	c #C0C0FF s inactive_color_1",
-"                ",
-"                ",
-"                ",
-"                ",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"                ",
-"                "};
diff --git a/themes/default/menu-prelight.png b/themes/default/menu-prelight.png
deleted file mode 100644
index 552ae6ade..000000000
--- a/themes/default/menu-prelight.png
+++ /dev/null
diff --git a/themes/default/menu-prelight.xpm b/themes/default/menu-prelight.xpm
deleted file mode 100644
index 1df80f7a0..000000000
--- a/themes/default/menu-prelight.xpm
+++ /dev/null
@@ -1,33 +0,0 @@
-/* XPM */
-static char * menu_pressed_xpm[] = {
-"16 27 3 1",
-" 	c None",
-"+	c #D0D0FF s active_hilight_1",
-".	c #C0C0FF s active_color_1",
-"                ",
-"                ",
-"                ",
-"                ",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"                ",
-"                "};
diff --git a/themes/default/menu-pressed.png b/themes/default/menu-pressed.png
deleted file mode 100644
index 552ae6ade..000000000
--- a/themes/default/menu-pressed.png
+++ /dev/null
diff --git a/themes/default/menu-pressed.svg b/themes/default/menu-pressed.svg
deleted file mode 100644
index ac83c5f44..000000000
--- a/themes/default/menu-pressed.svg
+++ /dev/null
@@ -1,145 +0,0 @@
-<?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="16"
-   height="27"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.45.1"
-   version="1.0"
-   sodipodi:docname="menu-pressed.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:white;stop-opacity:1;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.15;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:black;stop-opacity:0.05;" />
-      <stop
-         id="stop2776"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.30;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
-       x1="0"
-       y1="0.5"
-       x2="0"
-       y2="15"
-       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)" />
-  </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:0.65;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 16,0.5 C 16,0.5 16,26 16,26 L 0,26 L 0,0.5 z "
-       id="path6057" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="hilight">
-    <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.40;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 0,1 L 16,1 C 16,1 16,4 16,4 L 0,4 L 0,3 z "
-       id="path6061" />
-  </g>
-  <g
-     inkscape:label="Border"
-     inkscape:groupmode="layer"
-     id="g31"
-     style="display:inline">
-    <path
-       style="fill:none;fill-opacity:0.20;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 15.5,0.5"
-       id="path6059" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer5"
-     inkscape:label="Shadow">
-    <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0"
-       d="M 0.5,26.5 L 15.5,26.5"
-       id="path6989" />
-  </g>
-</svg>
diff --git a/themes/default/menu-pressed.xpm b/themes/default/menu-pressed.xpm
deleted file mode 100644
index 1df80f7a0..000000000
--- a/themes/default/menu-pressed.xpm
+++ /dev/null
@@ -1,33 +0,0 @@
-/* XPM */
-static char * menu_pressed_xpm[] = {
-"16 27 3 1",
-" 	c None",
-"+	c #D0D0FF s active_hilight_1",
-".	c #C0C0FF s active_color_1",
-"                ",
-"                ",
-"                ",
-"                ",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"................",
-"                ",
-"                "};
diff --git a/themes/default/right-active.png b/themes/default/right-active.png
deleted file mode 100644
index b45a3bcf0..000000000
--- a/themes/default/right-active.png
+++ /dev/null
diff --git a/themes/default/right-active.svg b/themes/default/right-active.svg
deleted file mode 100644
index 6d5f7093b..000000000
--- a/themes/default/right-active.svg
+++ /dev/null
@@ -1,82 +0,0 @@
-<?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="6"
-   height="24"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.45.1"
-   version="1.0"
-   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 5.5,0 L 5.5,24"
-       id="path1340" />
-  </g>
-</svg>
diff --git a/themes/default/right-active.xpm b/themes/default/right-active.xpm
deleted file mode 100644
index 0fdb43c7b..000000000
--- a/themes/default/right-active.xpm
+++ /dev/null
@@ -1,31 +0,0 @@
-/* XPM */
-static char * right_active_xpm[] = {
-"6 24 4 1",
-" 	c None",
-"+	c #D0D0FF s active_hilight_1",
-"#	c #C0C0C0 s active_color_2",
-"@	c #C0C0FF s active_color_1",
-"###@+@",
-"###@+@",
-"###@+@",
-"###@+@",
-"###@+@",
-"###@+@",
-"###@+@",
-"###@+@",
-"###@+@",
-"###@+@",
-"###@+@",
-"###@+@",
-"###@+@",
-"###@+@",
-"###@+@",
-"###@+@",
-"###@+@",
-"###@+@",
-"###@+@",
-"###@+@",
-"###@+@",
-"###@+@",
-"###@+@",
-"###@+@"};
diff --git a/themes/default/right-inactive.png b/themes/default/right-inactive.png
deleted file mode 100644
index b45a3bcf0..000000000
--- a/themes/default/right-inactive.png
+++ /dev/null
diff --git a/themes/default/right-inactive.svg b/themes/default/right-inactive.svg
deleted file mode 100644
index b88798cf3..000000000
--- a/themes/default/right-inactive.svg
+++ /dev/null
@@ -1,82 +0,0 @@
-<?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="6"
-   height="24"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.45.1"
-   version="1.0"
-   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 5.5,0 L 5.5,24"
-       id="path1340" />
-  </g>
-</svg>
diff --git a/themes/default/right-inactive.xpm b/themes/default/right-inactive.xpm
deleted file mode 100644
index 128581baf..000000000
--- a/themes/default/right-inactive.xpm
+++ /dev/null
@@ -1,31 +0,0 @@
-/* XPM */
-static char * right_inactive_xpm[] = {
-"6 24 4 1",
-" 	c None",
-"+	c #D0D0FF s inactive_hilight_1",
-"#	c #C0C0C0 s inactive_color_2",
-"@	c #C0C0FF s inactive_color_1",
-"###@+@",
-"###@+@",
-"###@+@",
-"###@+@",
-"###@+@",
-"###@+@",
-"###@+@",
-"###@+@",
-"###@+@",
-"###@+@",
-"###@+@",
-"###@+@",
-"###@+@",
-"###@+@",
-"###@+@",
-"###@+@",
-"###@+@",
-"###@+@",
-"###@+@",
-"###@+@",
-"###@+@",
-"###@+@",
-"###@+@",
-"###@+@"};
diff --git a/themes/default/shade-active.png b/themes/default/shade-active.png
deleted file mode 100644
index ac011d0e9..000000000
--- a/themes/default/shade-active.png
+++ /dev/null
diff --git a/themes/default/shade-active.svg b/themes/default/shade-active.svg
deleted file mode 100644
index 375959ffd..000000000
--- a/themes/default/shade-active.svg
+++ /dev/null
@@ -1,163 +0,0 @@
-<?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="18"
-   height="27"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.45.1"
-   version="1.0"
-   sodipodi:docname="shade-active.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:white;stop-opacity:1;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.15;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:black;stop-opacity:0.05;" />
-      <stop
-         id="stop2776"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.30;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
-       x1="0"
-       y1="0.5"
-       x2="0"
-       y2="15"
-       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)" />
-  </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:0.65;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 18,0.5 C 18,0.5 18,26 18,26 L 0,26 L 0,0.5 z "
-       id="path6057" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="hilight">
-    <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.40;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
-       id="path6061" />
-  </g>
-  <g
-     inkscape:label="Border"
-     inkscape:groupmode="layer"
-     id="layer1"
-     style="display:inline">
-    <path
-       style="fill:none;fill-opacity:0.20;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 17.5,0.5"
-       id="path6059" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="g20"
-     inkscape:label="Button">
-    <g
-       style="display:inline"
-       id="g1616"
-       transform="translate(3,8)">
-      <path
-         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.20;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.20;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;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0"
-       d="M 0.5,26.5 L 17.5,26.5"
-       id="path6989" />
-  </g>
-</svg>
diff --git a/themes/default/shade-active.xpm b/themes/default/shade-active.xpm
deleted file mode 100644
index 1001686d2..000000000
--- a/themes/default/shade-active.xpm
+++ /dev/null
@@ -1,33 +0,0 @@
-/* XPM */
-static char * shade_active_xpm[] = {
-"18 27 3 1",
-" 	c None",
-"+	c #D0D0FF s active_hilight_1",
-".	c #C0C0FF s active_color_1",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"                  ",
-"                  "};
diff --git a/themes/default/shade-inactive.png b/themes/default/shade-inactive.png
deleted file mode 100644
index 27bb35087..000000000
--- a/themes/default/shade-inactive.png
+++ /dev/null
diff --git a/themes/default/shade-inactive.svg b/themes/default/shade-inactive.svg
deleted file mode 100644
index 32fc55021..000000000
--- a/themes/default/shade-inactive.svg
+++ /dev/null
@@ -1,159 +0,0 @@
-<?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="18"
-   height="27"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.45.1"
-   version="1.0"
-   sodipodi:docname="shade-inactive.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:white;stop-opacity:1;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.15;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:black;stop-opacity:0.05;" />
-      <stop
-         id="stop2776"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.30;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
-       x1="0"
-       y1="0.5"
-       x2="0"
-       y2="15"
-       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)" />
-  </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:0.65;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 18,0.5 C 18,0.5 18,26 18,26 L 0,26 L 0,0.5 z "
-       id="path6057" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="hilight">
-    <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.40;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
-       id="path6061" />
-  </g>
-  <g
-     inkscape:label="Border"
-     inkscape:groupmode="layer"
-     id="layer1"
-     style="display:inline">
-    <path
-       style="fill:none;fill-opacity:0.20;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 17.5,0.5"
-       id="path6059" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="g20"
-     inkscape:label="Button">
-    <g
-       style="display:inline"
-       id="g1616"
-       transform="translate(3,8)">
-      <path
-         id="path2620"
-         style="opacity:0.50;fill:none;fill-opacity:0.20;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;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0"
-       d="M 0.5,26.5 L 17.5,26.5"
-       id="path6989" />
-  </g>
-</svg>
diff --git a/themes/default/shade-inactive.xpm b/themes/default/shade-inactive.xpm
deleted file mode 100644
index 7c5f01e37..000000000
--- a/themes/default/shade-inactive.xpm
+++ /dev/null
@@ -1,33 +0,0 @@
-/* XPM */
-static char * shade_inactive_xpm[] = {
-"18 27 3 1",
-" 	c None",
-"+	c #D0D0FF s inactive_hilight_1",
-".	c #C0C0FF s inactive_color_1",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"                  ",
-"                  "};
diff --git a/themes/default/shade-prelight.png b/themes/default/shade-prelight.png
deleted file mode 100644
index 1daf9a5a3..000000000
--- a/themes/default/shade-prelight.png
+++ /dev/null
diff --git a/themes/default/shade-prelight.svg b/themes/default/shade-prelight.svg
deleted file mode 100644
index 6952de295..000000000
--- a/themes/default/shade-prelight.svg
+++ /dev/null
@@ -1,190 +0,0 @@
-<?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="18"
-   height="27"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.45.1"
-   version="1.0"
-   sodipodi:docname="shade-prelight.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:white;stop-opacity:1;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.15;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:black;stop-opacity:0.05;" />
-      <stop
-         id="stop2776"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.30;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
-       x1="0"
-       y1="0.5"
-       x2="0"
-       y2="15"
-       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"
-       fx="9"
-       fy="12"
-       r="12"
-       gradientTransform="matrix(1,0,0,1,0,0.5)"
-       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="layer1"
-     inkscape:label="pressed">
-    <g
-       id="g1789"
-       transform="translate(0,2)">
-      <rect
-         style="opacity:0.5;fill:url(#radialGradient3087);fill-opacity:0.75;stroke:url(#radialGradient3087);stroke-width:1;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         id="rect3079"
-         width="18"
-         height="18"
-         x="0"
-         y="4" />
-    </g>
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Grad"
-     style="display:inline">
-    <path
-       style="fill:url(#linearGradient6945);fill-opacity:0.65;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 18,0.5 C 18,0.5 18,26 18,26 L 0,26 L 0,0.5 z "
-       id="path6057" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="hilight">
-    <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.40;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
-       id="path6061" />
-  </g>
-  <g
-     inkscape:label="Border"
-     inkscape:groupmode="layer"
-     id="g31"
-     style="display:inline">
-    <path
-       style="fill:none;fill-opacity:0.20;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 17.5,0.5"
-       id="path6059" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="g3722"
-     inkscape:label="Button">
-    <g
-       style="display:inline"
-       id="g1616"
-       transform="translate(3,8)">
-      <path
-         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.20;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.20;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;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0"
-       d="M 0.5,26.5 L 17.5,26.5"
-       id="path6989" />
-  </g>
-</svg>
diff --git a/themes/default/shade-prelight.xpm b/themes/default/shade-prelight.xpm
deleted file mode 100644
index e388c8b46..000000000
--- a/themes/default/shade-prelight.xpm
+++ /dev/null
@@ -1,33 +0,0 @@
-/* XPM */
-static char * shade_pressed_xpm[] = {
-"18 27 3 1",
-" 	c None",
-"+	c #D0D0FF s active_hilight_1",
-".	c #C0C0FF s active_color_1",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"                  ",
-"                  "};
diff --git a/themes/default/shade-pressed.png b/themes/default/shade-pressed.png
deleted file mode 100644
index 1472a91ab..000000000
--- a/themes/default/shade-pressed.png
+++ /dev/null
diff --git a/themes/default/shade-pressed.xpm b/themes/default/shade-pressed.xpm
deleted file mode 100644
index e388c8b46..000000000
--- a/themes/default/shade-pressed.xpm
+++ /dev/null
@@ -1,33 +0,0 @@
-/* XPM */
-static char * shade_pressed_xpm[] = {
-"18 27 3 1",
-" 	c None",
-"+	c #D0D0FF s active_hilight_1",
-".	c #C0C0FF s active_color_1",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"                  ",
-"                  "};
diff --git a/themes/default/shade-toggled-active.png b/themes/default/shade-toggled-active.png
deleted file mode 100644
index c80c61d0e..000000000
--- a/themes/default/shade-toggled-active.png
+++ /dev/null
diff --git a/themes/default/shade-toggled-active.svg b/themes/default/shade-toggled-active.svg
deleted file mode 100644
index 1a68b2c04..000000000
--- a/themes/default/shade-toggled-active.svg
+++ /dev/null
@@ -1,163 +0,0 @@
-<?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="18"
-   height="27"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.45.1"
-   version="1.0"
-   sodipodi:docname="shade-toggled-active.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:white;stop-opacity:1;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.15;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:black;stop-opacity:0.05;" />
-      <stop
-         id="stop2776"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.30;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
-       x1="0"
-       y1="0.5"
-       x2="0"
-       y2="15"
-       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)" />
-  </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:0.65;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 18,0.5 C 18,0.5 18,26 18,26 L 0,26 L 0,0.5 z "
-       id="path6057" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="hilight">
-    <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.40;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
-       id="path6061" />
-  </g>
-  <g
-     inkscape:label="Border"
-     inkscape:groupmode="layer"
-     id="layer1"
-     style="display:inline">
-    <path
-       style="fill:none;fill-opacity:0.20;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 17.5,0.5"
-       id="path6059" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="g20"
-     inkscape:label="Button">
-    <g
-       style="display:inline"
-       id="g1628"
-       transform="translate(3,8)">
-      <path
-         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.20;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.20;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;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0"
-       d="M 0.5,26.5 L 17.5,26.5"
-       id="path6989" />
-  </g>
-</svg>
diff --git a/themes/default/shade-toggled-active.xpm b/themes/default/shade-toggled-active.xpm
deleted file mode 100644
index c99b5e6de..000000000
--- a/themes/default/shade-toggled-active.xpm
+++ /dev/null
@@ -1,33 +0,0 @@
-/* XPM */
-static char * shade_toggled_active_xpm[] = {
-"18 27 3 1",
-" 	c None",
-"+	c #D0D0FF s active_hilight_1",
-".	c #C0C0FF s active_color_1",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"                  ",
-"                  "};
diff --git a/themes/default/shade-toggled-inactive.png b/themes/default/shade-toggled-inactive.png
deleted file mode 100644
index e8a623b46..000000000
--- a/themes/default/shade-toggled-inactive.png
+++ /dev/null
diff --git a/themes/default/shade-toggled-inactive.svg b/themes/default/shade-toggled-inactive.svg
deleted file mode 100644
index 75725a3e2..000000000
--- a/themes/default/shade-toggled-inactive.svg
+++ /dev/null
@@ -1,159 +0,0 @@
-<?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="18"
-   height="27"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.45.1"
-   version="1.0"
-   sodipodi:docname="shade-toggled-inactive.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:white;stop-opacity:1;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.15;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:black;stop-opacity:0.05;" />
-      <stop
-         id="stop2776"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.30;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
-       x1="0"
-       y1="0.5"
-       x2="0"
-       y2="15"
-       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)" />
-  </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:0.65;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 18,0.5 C 18,0.5 18,26 18,26 L 0,26 L 0,0.5 z "
-       id="path6057" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="hilight">
-    <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.40;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
-       id="path6061" />
-  </g>
-  <g
-     inkscape:label="Border"
-     inkscape:groupmode="layer"
-     id="layer1"
-     style="display:inline">
-    <path
-       style="fill:none;fill-opacity:0.20;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 17.5,0.5"
-       id="path6059" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="g20"
-     inkscape:label="Button">
-    <g
-       style="display:inline"
-       id="g1628"
-       transform="translate(3,8)">
-      <path
-         id="path2620"
-         style="opacity:0.50;fill:none;fill-opacity:0.20;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;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0"
-       d="M 0.5,26.5 L 17.5,26.5"
-       id="path6989" />
-  </g>
-</svg>
diff --git a/themes/default/shade-toggled-inactive.xpm b/themes/default/shade-toggled-inactive.xpm
deleted file mode 100644
index 91fb16c3e..000000000
--- a/themes/default/shade-toggled-inactive.xpm
+++ /dev/null
@@ -1,33 +0,0 @@
-/* XPM */
-static char * shade_toggled_inactive_xpm[] = {
-"18 27 3 1",
-" 	c None",
-"+	c #D0D0FF s inactive_hilight_1",
-".	c #C0C0FF s inactive_color_1",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"                  ",
-"                  "};
diff --git a/themes/default/shade-toggled-prelight.png b/themes/default/shade-toggled-prelight.png
deleted file mode 100644
index 3096715b7..000000000
--- a/themes/default/shade-toggled-prelight.png
+++ /dev/null
diff --git a/themes/default/shade-toggled-prelight.svg b/themes/default/shade-toggled-prelight.svg
deleted file mode 100644
index 3621f1a7c..000000000
--- a/themes/default/shade-toggled-prelight.svg
+++ /dev/null
@@ -1,190 +0,0 @@
-<?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="18"
-   height="27"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.45.1"
-   version="1.0"
-   sodipodi:docname="shade-toggled-prelight.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:white;stop-opacity:1;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.15;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:black;stop-opacity:0.05;" />
-      <stop
-         id="stop2776"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.30;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
-       x1="0"
-       y1="0.5"
-       x2="0"
-       y2="15"
-       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"
-       fx="9"
-       fy="12"
-       r="12"
-       gradientTransform="matrix(1,0,0,1,0,0.5)"
-       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="layer1"
-     inkscape:label="pressed">
-    <g
-       id="g1789"
-       transform="translate(0,2)">
-      <rect
-         style="opacity:0.5;fill:url(#radialGradient3087);fill-opacity:0.75;stroke:url(#radialGradient3087);stroke-width:1;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         id="rect3079"
-         width="18"
-         height="18"
-         x="0"
-         y="4" />
-    </g>
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Grad"
-     style="display:inline">
-    <path
-       style="fill:url(#linearGradient6945);fill-opacity:0.65;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 18,0.5 C 18,0.5 18,26 18,26 L 0,26 L 0,0.5 z "
-       id="path6057" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="hilight">
-    <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.40;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
-       id="path6061" />
-  </g>
-  <g
-     inkscape:label="Border"
-     inkscape:groupmode="layer"
-     id="g31"
-     style="display:inline">
-    <path
-       style="fill:none;fill-opacity:0.20;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 17.5,0.5"
-       id="path6059" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="g3722"
-     inkscape:label="Button">
-    <g
-       style="display:inline"
-       id="g1628"
-       transform="translate(3,8)">
-      <path
-         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.20;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.20;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;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0"
-       d="M 0.5,26.5 L 17.5,26.5"
-       id="path6989" />
-  </g>
-</svg>
diff --git a/themes/default/shade-toggled-prelight.xpm b/themes/default/shade-toggled-prelight.xpm
deleted file mode 100644
index f83ac1a7c..000000000
--- a/themes/default/shade-toggled-prelight.xpm
+++ /dev/null
@@ -1,33 +0,0 @@
-/* XPM */
-static char * shade_toggled_pressed_xpm[] = {
-"18 27 3 1",
-" 	c None",
-"+	c #D0D0FF s active_hilight_1",
-".	c #C0C0FF s active_color_1",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"                  ",
-"                  "};
diff --git a/themes/default/shade-toggled-pressed.png b/themes/default/shade-toggled-pressed.png
deleted file mode 100644
index f2eea4848..000000000
--- a/themes/default/shade-toggled-pressed.png
+++ /dev/null
diff --git a/themes/default/shade-toggled-pressed.svg b/themes/default/shade-toggled-pressed.svg
deleted file mode 100644
index 3d3f37cb0..000000000
--- a/themes/default/shade-toggled-pressed.svg
+++ /dev/null
@@ -1,190 +0,0 @@
-<?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="18"
-   height="27"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.45.1"
-   version="1.0"
-   sodipodi:docname="shade-toggled-pressed.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:white;stop-opacity:1;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.15;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:black;stop-opacity:0.05;" />
-      <stop
-         id="stop2776"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.30;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
-       x1="0"
-       y1="0.5"
-       x2="0"
-       y2="15"
-       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"
-       fx="9"
-       fy="12"
-       r="12"
-       gradientTransform="matrix(1,0,0,1,0,0.5)"
-       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="layer1"
-     inkscape:label="pressed">
-    <g
-       id="g1789"
-       transform="translate(0,2)">
-      <rect
-         style="opacity:0.5;fill:url(#radialGradient3087);fill-opacity:1.0;stroke:url(#radialGradient3087);stroke-width:1;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         id="rect3079"
-         width="18"
-         height="18"
-         x="0"
-         y="4" />
-    </g>
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Grad"
-     style="display:inline">
-    <path
-       style="fill:url(#linearGradient6945);fill-opacity:0.65;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 18,0.5 C 18,0.5 18,26 18,26 L 0,26 L 0,0.5 z "
-       id="path6057" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="hilight">
-    <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.40;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
-       id="path6061" />
-  </g>
-  <g
-     inkscape:label="Border"
-     inkscape:groupmode="layer"
-     id="g31"
-     style="display:inline">
-    <path
-       style="fill:none;fill-opacity:0.20;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 17.5,0.5"
-       id="path6059" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="g3722"
-     inkscape:label="Button">
-    <g
-       style="display:inline"
-       id="g1628"
-       transform="translate(3,9)">
-      <path
-         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.20;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.20;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;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0"
-       d="M 0.5,26.5 L 17.5,26.5"
-       id="path6989" />
-  </g>
-</svg>
diff --git a/themes/default/shade-toggled-pressed.xpm b/themes/default/shade-toggled-pressed.xpm
deleted file mode 100644
index f83ac1a7c..000000000
--- a/themes/default/shade-toggled-pressed.xpm
+++ /dev/null
@@ -1,33 +0,0 @@
-/* XPM */
-static char * shade_toggled_pressed_xpm[] = {
-"18 27 3 1",
-" 	c None",
-"+	c #D0D0FF s active_hilight_1",
-".	c #C0C0FF s active_color_1",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"                  ",
-"                  "};
diff --git a/themes/default/stick-active.png b/themes/default/stick-active.png
deleted file mode 100644
index a0dec0d80..000000000
--- a/themes/default/stick-active.png
+++ /dev/null
diff --git a/themes/default/stick-active.svg b/themes/default/stick-active.svg
deleted file mode 100644
index 616ce49fc..000000000
--- a/themes/default/stick-active.svg
+++ /dev/null
@@ -1,163 +0,0 @@
-<?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="18"
-   height="27"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.45.1"
-   version="1.0"
-   sodipodi:docname="stick-active.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:white;stop-opacity:1;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.15;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:black;stop-opacity:0.05;" />
-      <stop
-         id="stop2776"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.30;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
-       x1="0"
-       y1="0.5"
-       x2="0"
-       y2="15"
-       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)" />
-  </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:0.65;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 18,0.5 C 18,0.5 18,26 18,26 L 0,26 L 0,0.5 z "
-       id="path6057" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="hilight">
-    <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.40;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
-       id="path6061" />
-  </g>
-  <g
-     inkscape:label="Border"
-     inkscape:groupmode="layer"
-     id="layer1"
-     style="display:inline">
-    <path
-       style="fill:none;fill-opacity:0.20;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 17.5,0.5"
-       id="path6059" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="g20"
-     inkscape:label="Button">
-    <g
-       style="display:inline"
-       id="g1613"
-       transform="translate(3,8)">
-      <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;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0"
-       d="M 0.5,26.5 L 17.5,26.5"
-       id="path6989" />
-  </g>
-</svg>
diff --git a/themes/default/stick-active.xpm b/themes/default/stick-active.xpm
deleted file mode 100644
index 7d46cdd8e..000000000
--- a/themes/default/stick-active.xpm
+++ /dev/null
@@ -1,33 +0,0 @@
-/* XPM */
-static char * stick_active_xpm[] = {
-"18 27 3 1",
-" 	c None",
-"+	c #D0D0FF s active_hilight_1",
-".	c #C0C0FF s active_color_1",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"                  ",
-"                  "};
diff --git a/themes/default/stick-inactive.png b/themes/default/stick-inactive.png
deleted file mode 100644
index ff47184b4..000000000
--- a/themes/default/stick-inactive.png
+++ /dev/null
diff --git a/themes/default/stick-inactive.svg b/themes/default/stick-inactive.svg
deleted file mode 100644
index 1c65bb6d7..000000000
--- a/themes/default/stick-inactive.svg
+++ /dev/null
@@ -1,159 +0,0 @@
-<?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="18"
-   height="27"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.45.1"
-   version="1.0"
-   sodipodi:docname="stick-inactive.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:white;stop-opacity:1;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.15;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:black;stop-opacity:0.05;" />
-      <stop
-         id="stop2776"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.30;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
-       x1="0"
-       y1="0.5"
-       x2="0"
-       y2="15"
-       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)" />
-  </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:0.65;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 18,0.5 C 18,0.5 18,26 18,26 L 0,26 L 0,0.5 z "
-       id="path6057" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="hilight">
-    <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.40;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
-       id="path6061" />
-  </g>
-  <g
-     inkscape:label="Border"
-     inkscape:groupmode="layer"
-     id="layer1"
-     style="display:inline">
-    <path
-       style="fill:none;fill-opacity:0.20;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 17.5,0.5"
-       id="path6059" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="g20"
-     inkscape:label="Button">
-    <g
-       style="display:inline"
-       id="g1613"
-       transform="translate(3,8)">
-      <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;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0"
-       d="M 0.5,26.5 L 17.5,26.5"
-       id="path6989" />
-  </g>
-</svg>
diff --git a/themes/default/stick-inactive.xpm b/themes/default/stick-inactive.xpm
deleted file mode 100644
index 7392b387a..000000000
--- a/themes/default/stick-inactive.xpm
+++ /dev/null
@@ -1,33 +0,0 @@
-/* XPM */
-static char * stick_inactive_xpm[] = {
-"18 27 3 1",
-" 	c None",
-"+	c #D0D0FF s inactive_hilight_1",
-".	c #C0C0FF s inactive_color_1",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"                  ",
-"                  "};
diff --git a/themes/default/stick-prelight.png b/themes/default/stick-prelight.png
deleted file mode 100644
index c2d1be76f..000000000
--- a/themes/default/stick-prelight.png
+++ /dev/null
diff --git a/themes/default/stick-prelight.svg b/themes/default/stick-prelight.svg
deleted file mode 100644
index bba572198..000000000
--- a/themes/default/stick-prelight.svg
+++ /dev/null
@@ -1,190 +0,0 @@
-<?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="18"
-   height="27"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.45.1"
-   version="1.0"
-   sodipodi:docname="stick-prelight.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:white;stop-opacity:1;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.15;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:black;stop-opacity:0.05;" />
-      <stop
-         id="stop2776"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.30;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
-       x1="0"
-       y1="0.5"
-       x2="0"
-       y2="15"
-       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"
-       fx="9"
-       fy="12"
-       r="12"
-       gradientTransform="matrix(1,0,0,1,0,0.5)"
-       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="layer1"
-     inkscape:label="pressed">
-    <g
-       id="g1789"
-       transform="translate(0,2)">
-      <rect
-         style="opacity:0.5;fill:url(#radialGradient3087);fill-opacity:0.75;stroke:url(#radialGradient3087);stroke-width:1;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         id="rect3079"
-         width="18"
-         height="18"
-         x="0"
-         y="4" />
-    </g>
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Grad"
-     style="display:inline">
-    <path
-       style="fill:url(#linearGradient6945);fill-opacity:0.65;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 18,0.5 C 18,0.5 18,26 18,26 L 0,26 L 0,0.5 z "
-       id="path6057" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="hilight">
-    <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.40;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
-       id="path6061" />
-  </g>
-  <g
-     inkscape:label="Border"
-     inkscape:groupmode="layer"
-     id="g31"
-     style="display:inline">
-    <path
-       style="fill:none;fill-opacity:0.20;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 17.5,0.5"
-       id="path6059" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="g3722"
-     inkscape:label="Button">
-    <g
-       style="display:inline"
-       id="g1613"
-       transform="translate(3,8)">
-      <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;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0"
-       d="M 0.5,26.5 L 17.5,26.5"
-       id="path6989" />
-  </g>
-</svg>
diff --git a/themes/default/stick-prelight.xpm b/themes/default/stick-prelight.xpm
deleted file mode 100644
index f805d8e3f..000000000
--- a/themes/default/stick-prelight.xpm
+++ /dev/null
@@ -1,33 +0,0 @@
-/* XPM */
-static char * stick_pressed_xpm[] = {
-"18 27 3 1",
-" 	c None",
-"+	c #D0D0FF s active_hilight_1",
-".	c #C0C0FF s active_color_1",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"                  ",
-"                  "};
diff --git a/themes/default/stick-pressed.png b/themes/default/stick-pressed.png
deleted file mode 100644
index 4210a7491..000000000
--- a/themes/default/stick-pressed.png
+++ /dev/null
diff --git a/themes/default/stick-pressed.svg b/themes/default/stick-pressed.svg
deleted file mode 100644
index 67129263d..000000000
--- a/themes/default/stick-pressed.svg
+++ /dev/null
@@ -1,190 +0,0 @@
-<?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="18"
-   height="27"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.45.1"
-   version="1.0"
-   sodipodi:docname="stick-pressed.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:white;stop-opacity:1;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.15;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:black;stop-opacity:0.05;" />
-      <stop
-         id="stop2776"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.30;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
-       x1="0"
-       y1="0.5"
-       x2="0"
-       y2="15"
-       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"
-       fx="9"
-       fy="12"
-       r="12"
-       gradientTransform="matrix(1,0,0,1,0,0.5)"
-       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="layer1"
-     inkscape:label="pressed">
-    <g
-       id="g1789"
-       transform="translate(0,2)">
-      <rect
-         style="opacity:0.5;fill:url(#radialGradient3087);fill-opacity:1.0;stroke:url(#radialGradient3087);stroke-width:1;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         id="rect3079"
-         width="18"
-         height="18"
-         x="0"
-         y="4" />
-    </g>
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Grad"
-     style="display:inline">
-    <path
-       style="fill:url(#linearGradient6945);fill-opacity:0.65;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 18,0.5 C 18,0.5 18,26 18,26 L 0,26 L 0,0.5 z "
-       id="path6057" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="hilight">
-    <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.40;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
-       id="path6061" />
-  </g>
-  <g
-     inkscape:label="Border"
-     inkscape:groupmode="layer"
-     id="g31"
-     style="display:inline">
-    <path
-       style="fill:none;fill-opacity:0.20;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 17.5,0.5"
-       id="path6059" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="g3722"
-     inkscape:label="Button">
-    <g
-       style="display:inline"
-       id="g1613"
-       transform="translate(3,9)">
-      <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;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0"
-       d="M 0.5,26.5 L 17.5,26.5"
-       id="path6989" />
-  </g>
-</svg>
diff --git a/themes/default/stick-pressed.xpm b/themes/default/stick-pressed.xpm
deleted file mode 100644
index f805d8e3f..000000000
--- a/themes/default/stick-pressed.xpm
+++ /dev/null
@@ -1,33 +0,0 @@
-/* XPM */
-static char * stick_pressed_xpm[] = {
-"18 27 3 1",
-" 	c None",
-"+	c #D0D0FF s active_hilight_1",
-".	c #C0C0FF s active_color_1",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"                  ",
-"                  "};
diff --git a/themes/default/stick-toggled-active.png b/themes/default/stick-toggled-active.png
deleted file mode 100644
index d4b8a2473..000000000
--- a/themes/default/stick-toggled-active.png
+++ /dev/null
diff --git a/themes/default/stick-toggled-active.svg b/themes/default/stick-toggled-active.svg
deleted file mode 100644
index 1c0fc6e13..000000000
--- a/themes/default/stick-toggled-active.svg
+++ /dev/null
@@ -1,172 +0,0 @@
-<?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="18"
-   height="27"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.45.1"
-   version="1.0"
-   sodipodi:docname="stick-toggled-active.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:white;stop-opacity:1;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.15;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:black;stop-opacity:0.05;" />
-      <stop
-         id="stop2776"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.30;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
-       x1="0"
-       y1="0.5"
-       x2="0"
-       y2="15"
-       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)" />
-  </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:0.65;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 18,0.5 C 18,0.5 18,26 18,26 L 0,26 L 0,0.5 z "
-       id="path6057" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="hilight">
-    <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.40;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
-       id="path6061" />
-  </g>
-  <g
-     inkscape:label="Border"
-     inkscape:groupmode="layer"
-     id="layer1"
-     style="display:inline">
-    <path
-       style="fill:none;fill-opacity:0.20;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 17.5,0.5"
-       id="path6059" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="g20"
-     inkscape:label="Button">
-    <g
-       style="display:inline"
-       id="g1625"
-       transform="translate(3,8)">
-      <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="path2282"
-         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;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0"
-       d="M 0.5,26.5 L 17.5,26.5"
-       id="path6989" />
-  </g>
-</svg>
diff --git a/themes/default/stick-toggled-active.xpm b/themes/default/stick-toggled-active.xpm
deleted file mode 100644
index 14eb6df44..000000000
--- a/themes/default/stick-toggled-active.xpm
+++ /dev/null
@@ -1,33 +0,0 @@
-/* XPM */
-static char * stick_toggled_active_xpm[] = {
-"18 27 3 1",
-" 	c None",
-"+	c #D0D0FF s active_hilight_1",
-".	c #C0C0FF s active_color_1",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"                  ",
-"                  "};
diff --git a/themes/default/stick-toggled-inactive.png b/themes/default/stick-toggled-inactive.png
deleted file mode 100644
index af73417d8..000000000
--- a/themes/default/stick-toggled-inactive.png
+++ /dev/null
diff --git a/themes/default/stick-toggled-inactive.svg b/themes/default/stick-toggled-inactive.svg
deleted file mode 100644
index 075f9e9ce..000000000
--- a/themes/default/stick-toggled-inactive.svg
+++ /dev/null
@@ -1,168 +0,0 @@
-<?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="18"
-   height="27"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.45.1"
-   version="1.0"
-   sodipodi:docname="stick-toggled-inactive.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:white;stop-opacity:1;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.15;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:black;stop-opacity:0.05;" />
-      <stop
-         id="stop2776"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.30;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
-       x1="0"
-       y1="0.5"
-       x2="0"
-       y2="15"
-       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)" />
-  </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:0.65;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 18,0.5 C 18,0.5 18,26 18,26 L 0,26 L 0,0.5 z "
-       id="path6057" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="hilight">
-    <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.40;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
-       id="path6061" />
-  </g>
-  <g
-     inkscape:label="Border"
-     inkscape:groupmode="layer"
-     id="layer1"
-     style="display:inline">
-    <path
-       style="fill:none;fill-opacity:0.20;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 17.5,0.5"
-       id="path6059" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="g20"
-     inkscape:label="Button">
-    <g
-       style="display:inline"
-       id="g1625"
-       transform="translate(3,8)">
-      <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;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0"
-       d="M 0.5,26.5 L 17.5,26.5"
-       id="path6989" />
-  </g>
-</svg>
diff --git a/themes/default/stick-toggled-inactive.xpm b/themes/default/stick-toggled-inactive.xpm
deleted file mode 100644
index 4c3eb7e46..000000000
--- a/themes/default/stick-toggled-inactive.xpm
+++ /dev/null
@@ -1,33 +0,0 @@
-/* XPM */
-static char * stick_toggled_inactive_xpm[] = {
-"18 27 3 1",
-" 	c None",
-"+	c #D0D0FF s inactive_hilight_1",
-".	c #C0C0FF s inactive_color_1",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"                  ",
-"                  "};
diff --git a/themes/default/stick-toggled-prelight.png b/themes/default/stick-toggled-prelight.png
deleted file mode 100644
index 0a6040e3c..000000000
--- a/themes/default/stick-toggled-prelight.png
+++ /dev/null
diff --git a/themes/default/stick-toggled-prelight.svg b/themes/default/stick-toggled-prelight.svg
deleted file mode 100644
index 6a93314fa..000000000
--- a/themes/default/stick-toggled-prelight.svg
+++ /dev/null
@@ -1,199 +0,0 @@
-<?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="18"
-   height="27"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.45.1"
-   version="1.0"
-   sodipodi:docname="stick-toggled-prelight.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:white;stop-opacity:1;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.15;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:black;stop-opacity:0.05;" />
-      <stop
-         id="stop2776"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.30;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
-       x1="0"
-       y1="0.5"
-       x2="0"
-       y2="15"
-       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"
-       fx="9"
-       fy="12"
-       r="12"
-       gradientTransform="matrix(1,0,0,1,0,0.5)"
-       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="layer1"
-     inkscape:label="pressed">
-    <g
-       id="g1789"
-       transform="translate(0,2)">
-      <rect
-         style="opacity:0.5;fill:url(#radialGradient3087);fill-opacity:0.75;stroke:url(#radialGradient3087);stroke-width:1;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         id="rect3079"
-         width="18"
-         height="18"
-         x="0"
-         y="4" />
-    </g>
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Grad"
-     style="display:inline">
-    <path
-       style="fill:url(#linearGradient6945);fill-opacity:0.65;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 18,0.5 C 18,0.5 18,26 18,26 L 0,26 L 0,0.5 z "
-       id="path6057" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="hilight">
-    <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.40;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
-       id="path6061" />
-  </g>
-  <g
-     inkscape:label="Border"
-     inkscape:groupmode="layer"
-     id="g31"
-     style="display:inline">
-    <path
-       style="fill:none;fill-opacity:0.20;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 17.5,0.5"
-       id="path6059" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="g3722"
-     inkscape:label="Button">
-    <g
-       style="display:inline"
-       id="g1625"
-       transform="translate(3,8)">
-      <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="path2282"
-         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;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0"
-       d="M 0.5,26.5 L 17.5,26.5"
-       id="path6989" />
-  </g>
-</svg>
diff --git a/themes/default/stick-toggled-prelight.xpm b/themes/default/stick-toggled-prelight.xpm
deleted file mode 100644
index dc6069de2..000000000
--- a/themes/default/stick-toggled-prelight.xpm
+++ /dev/null
@@ -1,33 +0,0 @@
-/* XPM */
-static char * stick_toggled_pressed_xpm[] = {
-"18 27 3 1",
-" 	c None",
-"+	c #D0D0FF s active_hilight_1",
-".	c #C0C0FF s active_color_1",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"                  ",
-"                  "};
diff --git a/themes/default/stick-toggled-pressed.png b/themes/default/stick-toggled-pressed.png
deleted file mode 100644
index 550fb8aa5..000000000
--- a/themes/default/stick-toggled-pressed.png
+++ /dev/null
diff --git a/themes/default/stick-toggled-pressed.svg b/themes/default/stick-toggled-pressed.svg
deleted file mode 100644
index 4e235f08e..000000000
--- a/themes/default/stick-toggled-pressed.svg
+++ /dev/null
@@ -1,199 +0,0 @@
-<?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="18"
-   height="27"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.45.1"
-   version="1.0"
-   sodipodi:docname="stick-toggled-pressed.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:white;stop-opacity:1;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.15;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:black;stop-opacity:0.05;" />
-      <stop
-         id="stop2776"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.30;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
-       x1="0"
-       y1="0.5"
-       x2="0"
-       y2="15"
-       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"
-       fx="9"
-       fy="12"
-       r="12"
-       gradientTransform="matrix(1,0,0,1,0,0.5)"
-       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="layer1"
-     inkscape:label="pressed">
-    <g
-       id="g1789"
-       transform="translate(0,2)">
-      <rect
-         style="opacity:0.5;fill:url(#radialGradient3087);fill-opacity:1.0;stroke:url(#radialGradient3087);stroke-width:1;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         id="rect3079"
-         width="18"
-         height="18"
-         x="0"
-         y="4" />
-    </g>
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Grad"
-     style="display:inline">
-    <path
-       style="fill:url(#linearGradient6945);fill-opacity:0.65;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 18,0.5 C 18,0.5 18,26 18,26 L 0,26 L 0,0.5 z "
-       id="path6057" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="hilight">
-    <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.40;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
-       id="path6061" />
-  </g>
-  <g
-     inkscape:label="Border"
-     inkscape:groupmode="layer"
-     id="g31"
-     style="display:inline">
-    <path
-       style="fill:none;fill-opacity:0.20;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 17.5,0.5"
-       id="path6059" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="g3722"
-     inkscape:label="Button">
-    <g
-       style="display:inline"
-       id="g1625"
-       transform="translate(3,9)">
-      <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="path2282"
-         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;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0"
-       d="M 0.5,26.5 L 17.5,26.5"
-       id="path6989" />
-  </g>
-</svg>
diff --git a/themes/default/stick-toggled-pressed.xpm b/themes/default/stick-toggled-pressed.xpm
deleted file mode 100644
index dc6069de2..000000000
--- a/themes/default/stick-toggled-pressed.xpm
+++ /dev/null
@@ -1,33 +0,0 @@
-/* XPM */
-static char * stick_toggled_pressed_xpm[] = {
-"18 27 3 1",
-" 	c None",
-"+	c #D0D0FF s active_hilight_1",
-".	c #C0C0FF s active_color_1",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"                  ",
-"                  "};
diff --git a/themes/default/themerc b/themes/default/themerc
deleted file mode 100644
index 21c06df68..000000000
--- a/themes/default/themerc
+++ /dev/null
@@ -1,15 +0,0 @@
-active_text_color=#ffffff
-button_offset=0
-button_spacing=0
-full_width_title=false
-maximized_offset=0
-shadow_delta_height=2
-shadow_delta_width=1
-shadow_delta_x=1
-shadow_delta_y=1
-show_app_icon=true
-title_horizontal_offset=1
-title_shadow_active=frame
-title_shadow_inactive=false
-title_vertical_offset_active=1
-title_vertical_offset_inactive=1
diff --git a/themes/default/title-1-active.png b/themes/default/title-1-active.png
deleted file mode 100644
index 479a78b34..000000000
--- a/themes/default/title-1-active.png
+++ /dev/null
diff --git a/themes/default/title-1-active.svg b/themes/default/title-1-active.svg
deleted file mode 100644
index 8b44f9b7b..000000000
--- a/themes/default/title-1-active.svg
+++ /dev/null
@@ -1,145 +0,0 @@
-<?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="27"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.45.1"
-   version="1.0"
-   sodipodi:docname="title-1-active.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:white;stop-opacity:1;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.15;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:black;stop-opacity:0.05;" />
-      <stop
-         id="stop2776"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.30;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
-       x1="0"
-       y1="0.5"
-       x2="0"
-       y2="15"
-       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)" />
-  </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:0.65;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,26 8,26 L 0,26 L 0,0.5 z "
-       id="path6057" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="hilight">
-    <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.40;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" />
-  </g>
-  <g
-     inkscape:label="Border"
-     inkscape:groupmode="layer"
-     id="layer1"
-     style="display:inline">
-    <path
-       style="fill:none;fill-opacity:0.20;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" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer5"
-     inkscape:label="Shadow">
-    <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0"
-       d="M 0.5,26.5 L 7.5,26.5"
-       id="path6989" />
-  </g>
-</svg>
diff --git a/themes/default/title-1-active.xpm b/themes/default/title-1-active.xpm
deleted file mode 100644
index 56588f27a..000000000
--- a/themes/default/title-1-active.xpm
+++ /dev/null
@@ -1,33 +0,0 @@
-/* XPM */
-static char * title_active_xpm[] = {
-"4 27 3 1",
-" 	c None",
-"+	c #D0D0FF s active_hilight_1",
-".	c #C0C0FF s active_color_1",
-"....",
-"++++",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"...."};
diff --git a/themes/default/title-1-inactive.png b/themes/default/title-1-inactive.png
deleted file mode 100644
index 479a78b34..000000000
--- a/themes/default/title-1-inactive.png
+++ /dev/null
diff --git a/themes/default/title-1-inactive.svg b/themes/default/title-1-inactive.svg
deleted file mode 100644
index e8e94e6ff..000000000
--- a/themes/default/title-1-inactive.svg
+++ /dev/null
@@ -1,145 +0,0 @@
-<?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="27"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.45.1"
-   version="1.0"
-   sodipodi:docname="title-1-inactive.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:white;stop-opacity:1;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.15;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:black;stop-opacity:0.05;" />
-      <stop
-         id="stop2776"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.30;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
-       x1="0"
-       y1="0.5"
-       x2="0"
-       y2="15"
-       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)" />
-  </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:0.65;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,26 8,26 L 0,26 L 0,0.5 z "
-       id="path6057" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="hilight">
-    <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.40;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" />
-  </g>
-  <g
-     inkscape:label="Border"
-     inkscape:groupmode="layer"
-     id="layer1"
-     style="display:inline">
-    <path
-       style="fill:none;fill-opacity:0.20;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" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer5"
-     inkscape:label="Shadow">
-    <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0"
-       d="M 0.5,26.5 L 7.5,26.5"
-       id="path6989" />
-  </g>
-</svg>
diff --git a/themes/default/title-1-inactive.xpm b/themes/default/title-1-inactive.xpm
deleted file mode 100644
index 16aecc7f9..000000000
--- a/themes/default/title-1-inactive.xpm
+++ /dev/null
@@ -1,33 +0,0 @@
-/* XPM */
-static char * title_inactive_xpm[] = {
-"4 27 3 1",
-" 	c None",
-"+	c #D0D0FF s inactive_hilight_1",
-".	c #C0C0FF s inactive_color_1",
-"....",
-"++++",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"...."};
diff --git a/themes/default/title-2-active.png b/themes/default/title-2-active.png
deleted file mode 100644
index 479a78b34..000000000
--- a/themes/default/title-2-active.png
+++ /dev/null
diff --git a/themes/default/title-2-active.svg b/themes/default/title-2-active.svg
deleted file mode 100644
index a2072c5d5..000000000
--- a/themes/default/title-2-active.svg
+++ /dev/null
@@ -1,145 +0,0 @@
-<?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="27"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.45.1"
-   version="1.0"
-   sodipodi:docname="title-2-active.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:white;stop-opacity:1;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.15;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:black;stop-opacity:0.05;" />
-      <stop
-         id="stop2776"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.30;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
-       x1="0"
-       y1="0.5"
-       x2="0"
-       y2="15"
-       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)" />
-  </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:0.65;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,26 8,26 L 0,26 L 0,0.5 z "
-       id="path6057" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="hilight">
-    <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.40;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" />
-  </g>
-  <g
-     inkscape:label="Border"
-     inkscape:groupmode="layer"
-     id="layer1"
-     style="display:inline">
-    <path
-       style="fill:none;fill-opacity:0.20;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" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer5"
-     inkscape:label="Shadow">
-    <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0"
-       d="M 0.5,26.5 L 7.5,26.5"
-       id="path6989" />
-  </g>
-</svg>
diff --git a/themes/default/title-2-active.xpm b/themes/default/title-2-active.xpm
deleted file mode 100644
index 56588f27a..000000000
--- a/themes/default/title-2-active.xpm
+++ /dev/null
@@ -1,33 +0,0 @@
-/* XPM */
-static char * title_active_xpm[] = {
-"4 27 3 1",
-" 	c None",
-"+	c #D0D0FF s active_hilight_1",
-".	c #C0C0FF s active_color_1",
-"....",
-"++++",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"...."};
diff --git a/themes/default/title-2-inactive.png b/themes/default/title-2-inactive.png
deleted file mode 100644
index 479a78b34..000000000
--- a/themes/default/title-2-inactive.png
+++ /dev/null
diff --git a/themes/default/title-2-inactive.svg b/themes/default/title-2-inactive.svg
deleted file mode 100644
index 704c21380..000000000
--- a/themes/default/title-2-inactive.svg
+++ /dev/null
@@ -1,145 +0,0 @@
-<?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="27"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.45.1"
-   version="1.0"
-   sodipodi:docname="title-2-inactive.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:white;stop-opacity:1;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.15;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:black;stop-opacity:0.05;" />
-      <stop
-         id="stop2776"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.30;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
-       x1="0"
-       y1="0.5"
-       x2="0"
-       y2="15"
-       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)" />
-  </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:0.65;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,26 8,26 L 0,26 L 0,0.5 z "
-       id="path6057" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="hilight">
-    <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.40;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" />
-  </g>
-  <g
-     inkscape:label="Border"
-     inkscape:groupmode="layer"
-     id="layer1"
-     style="display:inline">
-    <path
-       style="fill:none;fill-opacity:0.20;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" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer5"
-     inkscape:label="Shadow">
-    <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0"
-       d="M 0.5,26.5 L 7.5,26.5"
-       id="path6989" />
-  </g>
-</svg>
diff --git a/themes/default/title-2-inactive.xpm b/themes/default/title-2-inactive.xpm
deleted file mode 100644
index 16aecc7f9..000000000
--- a/themes/default/title-2-inactive.xpm
+++ /dev/null
@@ -1,33 +0,0 @@
-/* XPM */
-static char * title_inactive_xpm[] = {
-"4 27 3 1",
-" 	c None",
-"+	c #D0D0FF s inactive_hilight_1",
-".	c #C0C0FF s inactive_color_1",
-"....",
-"++++",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"...."};
diff --git a/themes/default/title-3-active.png b/themes/default/title-3-active.png
deleted file mode 100644
index 479a78b34..000000000
--- a/themes/default/title-3-active.png
+++ /dev/null
diff --git a/themes/default/title-3-active.svg b/themes/default/title-3-active.svg
deleted file mode 100644
index df44718f3..000000000
--- a/themes/default/title-3-active.svg
+++ /dev/null
@@ -1,145 +0,0 @@
-<?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="27"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.45.1"
-   version="1.0"
-   sodipodi:docname="title-3-active.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:white;stop-opacity:1;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.15;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:black;stop-opacity:0.05;" />
-      <stop
-         id="stop2776"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.30;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
-       x1="0"
-       y1="0.5"
-       x2="0"
-       y2="15"
-       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)" />
-  </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:0.65;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,26 8,26 L 0,26 L 0,0.5 z "
-       id="path6057" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="hilight">
-    <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.40;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" />
-  </g>
-  <g
-     inkscape:label="Border"
-     inkscape:groupmode="layer"
-     id="layer1"
-     style="display:inline">
-    <path
-       style="fill:none;fill-opacity:0.20;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" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer5"
-     inkscape:label="Shadow">
-    <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0"
-       d="M 0.5,26.5 L 7.5,26.5"
-       id="path6989" />
-  </g>
-</svg>
diff --git a/themes/default/title-3-active.xpm b/themes/default/title-3-active.xpm
deleted file mode 100644
index 56588f27a..000000000
--- a/themes/default/title-3-active.xpm
+++ /dev/null
@@ -1,33 +0,0 @@
-/* XPM */
-static char * title_active_xpm[] = {
-"4 27 3 1",
-" 	c None",
-"+	c #D0D0FF s active_hilight_1",
-".	c #C0C0FF s active_color_1",
-"....",
-"++++",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"...."};
diff --git a/themes/default/title-3-inactive.png b/themes/default/title-3-inactive.png
deleted file mode 100644
index 479a78b34..000000000
--- a/themes/default/title-3-inactive.png
+++ /dev/null
diff --git a/themes/default/title-3-inactive.svg b/themes/default/title-3-inactive.svg
deleted file mode 100644
index f6fba18d3..000000000
--- a/themes/default/title-3-inactive.svg
+++ /dev/null
@@ -1,145 +0,0 @@
-<?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="27"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.45.1"
-   version="1.0"
-   sodipodi:docname="title-3-inactive.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:white;stop-opacity:1;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.15;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:black;stop-opacity:0.05;" />
-      <stop
-         id="stop2776"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.30;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
-       x1="0"
-       y1="0.5"
-       x2="0"
-       y2="15"
-       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)" />
-  </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:0.65;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,26 8,26 L 0,26 L 0,0.5 z "
-       id="path6057" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="hilight">
-    <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.40;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" />
-  </g>
-  <g
-     inkscape:label="Border"
-     inkscape:groupmode="layer"
-     id="layer1"
-     style="display:inline">
-    <path
-       style="fill:none;fill-opacity:0.20;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" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer5"
-     inkscape:label="Shadow">
-    <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0"
-       d="M 0.5,26.5 L 7.5,26.5"
-       id="path6989" />
-  </g>
-</svg>
diff --git a/themes/default/title-3-inactive.xpm b/themes/default/title-3-inactive.xpm
deleted file mode 100644
index 16aecc7f9..000000000
--- a/themes/default/title-3-inactive.xpm
+++ /dev/null
@@ -1,33 +0,0 @@
-/* XPM */
-static char * title_inactive_xpm[] = {
-"4 27 3 1",
-" 	c None",
-"+	c #D0D0FF s inactive_hilight_1",
-".	c #C0C0FF s inactive_color_1",
-"....",
-"++++",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"...."};
diff --git a/themes/default/title-4-active.png b/themes/default/title-4-active.png
deleted file mode 100644
index 479a78b34..000000000
--- a/themes/default/title-4-active.png
+++ /dev/null
diff --git a/themes/default/title-4-active.svg b/themes/default/title-4-active.svg
deleted file mode 100644
index c7a0a227f..000000000
--- a/themes/default/title-4-active.svg
+++ /dev/null
@@ -1,145 +0,0 @@
-<?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="27"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.45.1"
-   version="1.0"
-   sodipodi:docname="title-4-active.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:white;stop-opacity:1;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.15;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:black;stop-opacity:0.05;" />
-      <stop
-         id="stop2776"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.30;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
-       x1="0"
-       y1="0.5"
-       x2="0"
-       y2="15"
-       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)" />
-  </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:0.65;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,26 8,26 L 0,26 L 0,0.5 z "
-       id="path6057" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="hilight">
-    <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.40;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" />
-  </g>
-  <g
-     inkscape:label="Border"
-     inkscape:groupmode="layer"
-     id="layer1"
-     style="display:inline">
-    <path
-       style="fill:none;fill-opacity:0.20;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" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer5"
-     inkscape:label="Shadow">
-    <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0"
-       d="M 0.5,26.5 L 7.5,26.5"
-       id="path6989" />
-  </g>
-</svg>
diff --git a/themes/default/title-4-active.xpm b/themes/default/title-4-active.xpm
deleted file mode 100644
index 56588f27a..000000000
--- a/themes/default/title-4-active.xpm
+++ /dev/null
@@ -1,33 +0,0 @@
-/* XPM */
-static char * title_active_xpm[] = {
-"4 27 3 1",
-" 	c None",
-"+	c #D0D0FF s active_hilight_1",
-".	c #C0C0FF s active_color_1",
-"....",
-"++++",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"...."};
diff --git a/themes/default/title-4-inactive.png b/themes/default/title-4-inactive.png
deleted file mode 100644
index 479a78b34..000000000
--- a/themes/default/title-4-inactive.png
+++ /dev/null
diff --git a/themes/default/title-4-inactive.svg b/themes/default/title-4-inactive.svg
deleted file mode 100644
index 433431bf7..000000000
--- a/themes/default/title-4-inactive.svg
+++ /dev/null
@@ -1,145 +0,0 @@
-<?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="27"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.45.1"
-   version="1.0"
-   sodipodi:docname="title-4-inactive.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:white;stop-opacity:1;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.15;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:black;stop-opacity:0.05;" />
-      <stop
-         id="stop2776"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.30;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
-       x1="0"
-       y1="0.5"
-       x2="0"
-       y2="15"
-       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)" />
-  </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:0.65;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,26 8,26 L 0,26 L 0,0.5 z "
-       id="path6057" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="hilight">
-    <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.40;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" />
-  </g>
-  <g
-     inkscape:label="Border"
-     inkscape:groupmode="layer"
-     id="layer1"
-     style="display:inline">
-    <path
-       style="fill:none;fill-opacity:0.20;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" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer5"
-     inkscape:label="Shadow">
-    <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0"
-       d="M 0.5,26.5 L 7.5,26.5"
-       id="path6989" />
-  </g>
-</svg>
diff --git a/themes/default/title-4-inactive.xpm b/themes/default/title-4-inactive.xpm
deleted file mode 100644
index 16aecc7f9..000000000
--- a/themes/default/title-4-inactive.xpm
+++ /dev/null
@@ -1,33 +0,0 @@
-/* XPM */
-static char * title_inactive_xpm[] = {
-"4 27 3 1",
-" 	c None",
-"+	c #D0D0FF s inactive_hilight_1",
-".	c #C0C0FF s inactive_color_1",
-"....",
-"++++",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"...."};
diff --git a/themes/default/title-5-active.png b/themes/default/title-5-active.png
deleted file mode 100644
index 479a78b34..000000000
--- a/themes/default/title-5-active.png
+++ /dev/null
diff --git a/themes/default/title-5-active.svg b/themes/default/title-5-active.svg
deleted file mode 100644
index 8f6a0ac0d..000000000
--- a/themes/default/title-5-active.svg
+++ /dev/null
@@ -1,145 +0,0 @@
-<?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="27"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.45.1"
-   version="1.0"
-   sodipodi:docname="title-5-active.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:white;stop-opacity:1;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.15;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:black;stop-opacity:0.05;" />
-      <stop
-         id="stop2776"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.30;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
-       x1="0"
-       y1="0.5"
-       x2="0"
-       y2="15"
-       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)" />
-  </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:0.65;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,26 8,26 L 0,26 L 0,0.5 z "
-       id="path6057" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="hilight">
-    <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.40;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" />
-  </g>
-  <g
-     inkscape:label="Border"
-     inkscape:groupmode="layer"
-     id="layer1"
-     style="display:inline">
-    <path
-       style="fill:none;fill-opacity:0.20;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" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer5"
-     inkscape:label="Shadow">
-    <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0"
-       d="M 0.5,26.5 L 7.5,26.5"
-       id="path6989" />
-  </g>
-</svg>
diff --git a/themes/default/title-5-active.xpm b/themes/default/title-5-active.xpm
deleted file mode 100644
index 56588f27a..000000000
--- a/themes/default/title-5-active.xpm
+++ /dev/null
@@ -1,33 +0,0 @@
-/* XPM */
-static char * title_active_xpm[] = {
-"4 27 3 1",
-" 	c None",
-"+	c #D0D0FF s active_hilight_1",
-".	c #C0C0FF s active_color_1",
-"....",
-"++++",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"...."};
diff --git a/themes/default/title-5-inactive.png b/themes/default/title-5-inactive.png
deleted file mode 100644
index 479a78b34..000000000
--- a/themes/default/title-5-inactive.png
+++ /dev/null
diff --git a/themes/default/title-5-inactive.svg b/themes/default/title-5-inactive.svg
deleted file mode 100644
index da2578cc4..000000000
--- a/themes/default/title-5-inactive.svg
+++ /dev/null
@@ -1,145 +0,0 @@
-<?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="27"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.45.1"
-   version="1.0"
-   sodipodi:docname="title-5-inactive.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:white;stop-opacity:1;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.15;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:black;stop-opacity:0.05;" />
-      <stop
-         id="stop2776"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.30;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
-       x1="0"
-       y1="0.5"
-       x2="0"
-       y2="15"
-       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)" />
-  </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:0.65;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,26 8,26 L 0,26 L 0,0.5 z "
-       id="path6057" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="hilight">
-    <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.40;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" />
-  </g>
-  <g
-     inkscape:label="Border"
-     inkscape:groupmode="layer"
-     id="layer1"
-     style="display:inline">
-    <path
-       style="fill:none;fill-opacity:0.20;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" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer5"
-     inkscape:label="Shadow">
-    <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0"
-       d="M 0.5,26.5 L 7.5,26.5"
-       id="path6989" />
-  </g>
-</svg>
diff --git a/themes/default/title-5-inactive.xpm b/themes/default/title-5-inactive.xpm
deleted file mode 100644
index 16aecc7f9..000000000
--- a/themes/default/title-5-inactive.xpm
+++ /dev/null
@@ -1,33 +0,0 @@
-/* XPM */
-static char * title_inactive_xpm[] = {
-"4 27 3 1",
-" 	c None",
-"+	c #D0D0FF s inactive_hilight_1",
-".	c #C0C0FF s inactive_color_1",
-"....",
-"++++",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"...."};
diff --git a/themes/default/top-left-active.png b/themes/default/top-left-active.png
deleted file mode 100644
index 6f0b7099f..000000000
--- a/themes/default/top-left-active.png
+++ /dev/null
diff --git a/themes/default/top-left-active.svg b/themes/default/top-left-active.svg
deleted file mode 100644
index a556ac36d..000000000
--- a/themes/default/top-left-active.svg
+++ /dev/null
@@ -1,145 +0,0 @@
-<?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"
-   version="1.0"
-   inkscape:version="0.45.1"
-   sodipodi:version="0.32"
-   id="svg2"
-   height="27"
-   width="8"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:white;stop-opacity:1;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.15;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:black;stop-opacity:0.05;" />
-      <stop
-         id="stop2776"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.30;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
-       x1="0"
-       y1="0.5"
-       x2="0"
-       y2="15"
-       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)" />
-  </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
-       style="fill:url(#linearGradient6945);fill-opacity:0.65;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 8,1 L 4,1 C 4,1 2,1 2,4 L 2,21 C 2,21 2,26 7,26 L 8,26 L 8,26 L 8,1 z "
-       id="path6057" />
-  </g>
-  <g
-     inkscape:label="hilight"
-     id="layer3"
-     inkscape:groupmode="layer">
-    <path
-       id="path6061"
-       d="M 8,1 L 5.75,1 C 5.75,1 2,1 2,4 C 2,4 2.75,4 2.75,4 L 8,4 L 8,4 z "
-       style="fill:url(#linearGradient6962);fill-opacity:0.40;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" />
-  </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,27 1,27 1,27 L 0,27 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;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0"
-       d="M 2.5,26.5 L 7.5,26.5"
-       id="path6989" />
-  </g>
-</svg>
diff --git a/themes/default/top-left-active.xpm b/themes/default/top-left-active.xpm
deleted file mode 100644
index 6b5a69919..000000000
--- a/themes/default/top-left-active.xpm
+++ /dev/null
@@ -1,33 +0,0 @@
-/* XPM */
-static char * top_left_active_xpm[] = {
-"8 27 3 1",
-" 	c None",
-"+	c #D0D0FF s active_hilight_1",
-".	c #C0C0FF s active_color_1",
-"  ......",
-" .++++++",
-".+......",
-".+......",
-".+......",
-".+......",
-".+......",
-".+......",
-".+......",
-".+......",
-".+......",
-".+......",
-".+......",
-".+......",
-".+......",
-".+......",
-".+......",
-".+......",
-".+......",
-".+......",
-".+......",
-".+......",
-".+......",
-".+......",
-".+......",
-".+......",
-".+......"};
diff --git a/themes/default/top-left-inactive.png b/themes/default/top-left-inactive.png
deleted file mode 100644
index 6f0b7099f..000000000
--- a/themes/default/top-left-inactive.png
+++ /dev/null
diff --git a/themes/default/top-left-inactive.svg b/themes/default/top-left-inactive.svg
deleted file mode 100644
index f5c9a1d93..000000000
--- a/themes/default/top-left-inactive.svg
+++ /dev/null
@@ -1,145 +0,0 @@
-<?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"
-   version="1.0"
-   inkscape:version="0.45.1"
-   sodipodi:version="0.32"
-   id="svg2"
-   height="27"
-   width="8"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:white;stop-opacity:1;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.15;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:black;stop-opacity:0.05;" />
-      <stop
-         id="stop2776"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.30;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
-       x1="0"
-       y1="0.5"
-       x2="0"
-       y2="15"
-       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)" />
-  </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
-       style="fill:url(#linearGradient6945);fill-opacity:0.65;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 8,1 L 4,1 C 4,1 2,1 2,4 L 2,21 C 2,21 2,26 7,26 L 8,26 L 8,26 L 8,1 z "
-       id="path6057" />
-  </g>
-  <g
-     inkscape:label="hilight"
-     id="layer3"
-     inkscape:groupmode="layer">
-    <path
-       id="path6061"
-       d="M 8,1 L 5.75,1 C 5.75,1 2,1 2,4 C 2,4 2.75,4 2.75,4 L 8,4 L 8,4 z "
-       style="fill:url(#linearGradient6962);fill-opacity:0.40;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" />
-  </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,27 1,27 1,27 L 0,27 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;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0"
-       d="M 2.5,26.5 L 7.5,26.5"
-       id="path6989" />
-  </g>
-</svg>
diff --git a/themes/default/top-left-inactive.xpm b/themes/default/top-left-inactive.xpm
deleted file mode 100644
index 2f927e233..000000000
--- a/themes/default/top-left-inactive.xpm
+++ /dev/null
@@ -1,33 +0,0 @@
-/* XPM */
-static char * top_left_inactive_xpm[] = {
-"8 27 3 1",
-" 	c None",
-"+	c #D0D0FF s inactive_hilight_1",
-".	c #C0C0FF s inactive_color_1",
-"  ......",
-" .++++++",
-".+......",
-".+......",
-".+......",
-".+......",
-".+......",
-".+......",
-".+......",
-".+......",
-".+......",
-".+......",
-".+......",
-".+......",
-".+......",
-".+......",
-".+......",
-".+......",
-".+......",
-".+......",
-".+......",
-".+......",
-".+......",
-".+......",
-".+......",
-".+......",
-".+......"};
diff --git a/themes/default/top-right-active.png b/themes/default/top-right-active.png
deleted file mode 100644
index 872ea06f6..000000000
--- a/themes/default/top-right-active.png
+++ /dev/null
diff --git a/themes/default/top-right-active.svg b/themes/default/top-right-active.svg
deleted file mode 100644
index a44b34553..000000000
--- a/themes/default/top-right-active.svg
+++ /dev/null
@@ -1,145 +0,0 @@
-<?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="27"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.45.1"
-   version="1.0"
-   sodipodi:docname="top-right-active.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:white;stop-opacity:1;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.15;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:black;stop-opacity:0.05;" />
-      <stop
-         id="stop2776"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.30;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
-       x1="0"
-       y1="0.5"
-       x2="0"
-       y2="15"
-       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)" />
-  </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:0.65;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 4,1 C 4,1 6,1 6,4 L 6,21 C 6,21 6,26 1,26 L 0,26 L 0,26 L 0,1 z "
-       id="path6057" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="hilight">
-    <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.40;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" />
-  </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,27 7,27 7,27 L 8,27 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;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0"
-       d="M 0.5,26.5 L 5.5,26.5"
-       id="path6989" />
-  </g>
-</svg>
diff --git a/themes/default/top-right-active.xpm b/themes/default/top-right-active.xpm
deleted file mode 100644
index 8c67ce893..000000000
--- a/themes/default/top-right-active.xpm
+++ /dev/null
@@ -1,33 +0,0 @@
-/* XPM */
-static char * top_right_active_xpm[] = {
-"8 27 3 1",
-" 	c None",
-"+	c #D0D0FF s active_hilight_1",
-".	c #C0C0FF s active_color_1",
-"......  ",
-"++++++. ",
-"......+.",
-"......+.",
-"......+.",
-"......+.",
-"......+.",
-"......+.",
-"......+.",
-"......+.",
-"......+.",
-"......+.",
-"......+.",
-"......+.",
-"......+.",
-"......+.",
-"......+.",
-"......+.",
-"......+.",
-"......+.",
-"......+.",
-"......+.",
-"......+.",
-"......+.",
-"......+.",
-"......+.",
-"......+."};
diff --git a/themes/default/top-right-inactive.png b/themes/default/top-right-inactive.png
deleted file mode 100644
index 872ea06f6..000000000
--- a/themes/default/top-right-inactive.png
+++ /dev/null
diff --git a/themes/default/top-right-inactive.svg b/themes/default/top-right-inactive.svg
deleted file mode 100644
index 82a7b6f73..000000000
--- a/themes/default/top-right-inactive.svg
+++ /dev/null
@@ -1,145 +0,0 @@
-<?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="27"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.45.1"
-   version="1.0"
-   sodipodi:docname="top-right-inactive.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:white;stop-opacity:1;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.15;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:black;stop-opacity:0.05;" />
-      <stop
-         id="stop2776"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.30;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
-       x1="0"
-       y1="0.5"
-       x2="0"
-       y2="15"
-       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)" />
-  </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:0.65;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 4,1 C 4,1 6,1 6,4 L 6,21 C 6,21 6,26 1,26 L 0,26 L 0,26 L 0,1 z "
-       id="path6057" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="hilight">
-    <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.40;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" />
-  </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,27 7,27 7,27 L 8,27 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;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0"
-       d="M 0.5,26.5 L 5.5,26.5"
-       id="path6989" />
-  </g>
-</svg>
diff --git a/themes/default/top-right-inactive.xpm b/themes/default/top-right-inactive.xpm
deleted file mode 100644
index 302e22830..000000000
--- a/themes/default/top-right-inactive.xpm
+++ /dev/null
@@ -1,33 +0,0 @@
-/* XPM */
-static char * top_right_inactive_xpm[] = {
-"8 27 3 1",
-" 	c None",
-"+	c #D0D0FF s inactive_hilight_1",
-".	c #C0C0FF s inactive_color_1",
-"......  ",
-"++++++. ",
-"......+.",
-"......+.",
-"......+.",
-"......+.",
-"......+.",
-"......+.",
-"......+.",
-"......+.",
-"......+.",
-"......+.",
-"......+.",
-"......+.",
-"......+.",
-"......+.",
-"......+.",
-"......+.",
-"......+.",
-"......+.",
-"......+.",
-"......+.",
-"......+.",
-"......+.",
-"......+.",
-"......+.",
-"......+."};
diff --git a/themes/katiola/Makefile.am b/themes/katiola/Makefile.am
deleted file mode 100644
index 39517d35b..000000000
--- a/themes/katiola/Makefile.am
+++ /dev/null
@@ -1,107 +0,0 @@
-themedir = $(datadir)/themes/Katiola/xfwm4
-theme_DATA = 								\
-	README								\
-	themerc								\
-	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-active.xpm						\
-	top-right-inactive.png						\
-	top-right-inactive.xpm
-EXTRA_DIST = $(theme_DATA)
diff --git a/themes/katiola/README b/themes/katiola/README
deleted file mode 100644
index 3249a926f..000000000
--- a/themes/katiola/README
+++ /dev/null
@@ -1,6 +0,0 @@
-Katiola
--------
-
-Theme for xfwm4.
-Created Apr. 2006 by Olivier Fourdan <fourdan@xfce.org>
-Theme released under GNU GPL license.
diff --git a/themes/katiola/bottom-active.png b/themes/katiola/bottom-active.png
deleted file mode 100644
index 72b252fc6..000000000
--- a/themes/katiola/bottom-active.png
+++ /dev/null
diff --git a/themes/katiola/bottom-active.xpm b/themes/katiola/bottom-active.xpm
deleted file mode 100644
index 1650e2e42..000000000
--- a/themes/katiola/bottom-active.xpm
+++ /dev/null
@@ -1,13 +0,0 @@
-/* XPM */
-static char * bottom_active_xpm[] = {
-"32 5 5 1",
-" 	c None",
-"+	c #E0E0E0 s active_hilight_2",
-"@	c #A0A0A0 s active_shadow_2",
-"$	c #B0B0B0 s active_mid_2",
-"#	c #C0C0C0 s active_color_2",
-"################################",
-"################################",
-"################################",
-"$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$",
-"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"};
diff --git a/themes/katiola/bottom-inactive.png b/themes/katiola/bottom-inactive.png
deleted file mode 100644
index 72b252fc6..000000000
--- a/themes/katiola/bottom-inactive.png
+++ /dev/null
diff --git a/themes/katiola/bottom-inactive.xpm b/themes/katiola/bottom-inactive.xpm
deleted file mode 100644
index 645037f60..000000000
--- a/themes/katiola/bottom-inactive.xpm
+++ /dev/null
@@ -1,13 +0,0 @@
-/* XPM */
-static char * bottom_inactive_xpm[] = {
-"32 5 5 1",
-" 	c None",
-"+	c #E0E0E0 s inactive_hilight_2",
-"@	c #A0A0A0 s inactive_shadow_2",
-"$	c #B0B0B0 s inactive_mid_2",
-"#	c #C0C0C0 s inactive_color_2",
-"################################",
-"################################",
-"################################",
-"$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$",
-"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"};
diff --git a/themes/katiola/bottom-left-active.png b/themes/katiola/bottom-left-active.png
deleted file mode 100644
index 6043364fb..000000000
--- a/themes/katiola/bottom-left-active.png
+++ /dev/null
diff --git a/themes/katiola/bottom-left-active.xpm b/themes/katiola/bottom-left-active.xpm
deleted file mode 100644
index aa5c939e8..000000000
--- a/themes/katiola/bottom-left-active.xpm
+++ /dev/null
@@ -1,24 +0,0 @@
-/* XPM */
-static char * bottom_left_active_xpm[] = {
-"16 16 5 1",
-" 	c None",
-"+	c #E0E0E0 s active_hilight_2",
-"@	c #A0A0A0 s active_shadow_2",
-"$	c #B0B0B0 s active_mid_2",
-"#	c #C0C0C0 s active_color_2",
-"@+###           ",
-"@+###           ",
-"@+###           ",
-"@+###           ",
-"@+###           ",
-"@+###           ",
-"@+###           ",
-"@+###           ",
-"@+###           ",
-"@+###           ",
-"@+###           ",
-"@+##############",
-"@+##############",
-"@+##############",
-"@+$$$$$$$$$$$$$$",
-" @@@@@@@@@@@@@@@"};
diff --git a/themes/katiola/bottom-left-inactive.png b/themes/katiola/bottom-left-inactive.png
deleted file mode 100644
index 6043364fb..000000000
--- a/themes/katiola/bottom-left-inactive.png
+++ /dev/null
diff --git a/themes/katiola/bottom-left-inactive.xpm b/themes/katiola/bottom-left-inactive.xpm
deleted file mode 100644
index add3053db..000000000
--- a/themes/katiola/bottom-left-inactive.xpm
+++ /dev/null
@@ -1,24 +0,0 @@
-/* XPM */
-static char * bottom_left_inactive_xpm[] = {
-"16 16 5 1",
-" 	c None",
-"+	c #E0E0E0 s inactive_hilight_2",
-"@	c #A0A0A0 s inactive_shadow_2",
-"$	c #B0B0B0 s inactive_mid_2",
-"#	c #C0C0C0 s inactive_color_2",
-"@+###           ",
-"@+###           ",
-"@+###           ",
-"@+###           ",
-"@+###           ",
-"@+###           ",
-"@+###           ",
-"@+###           ",
-"@+###           ",
-"@+###           ",
-"@+###           ",
-"@+##############",
-"@+##############",
-"@+##############",
-"@+$$$$$$$$$$$$$$",
-" @@@@@@@@@@@@@@@"};
diff --git a/themes/katiola/bottom-right-active.png b/themes/katiola/bottom-right-active.png
deleted file mode 100644
index 2e8b3eb9e..000000000
--- a/themes/katiola/bottom-right-active.png
+++ /dev/null
diff --git a/themes/katiola/bottom-right-active.xpm b/themes/katiola/bottom-right-active.xpm
deleted file mode 100644
index 6dcdd9e80..000000000
--- a/themes/katiola/bottom-right-active.xpm
+++ /dev/null
@@ -1,25 +0,0 @@
-/* XPM */
-static char * bottom_right_active_xpm[] = {
-"16 16 5 1",
-" 	c None",
-"+	c #E0E0E0 s active_hilight_2",
-"@	c #A0A0A0 s active_shadow_2",
-"$	c #B0B0B0 s active_mid_2",
-"#	c #C0C0C0 s active_color_2",
-"           ###$@",
-"           ###$@",
-"           ###$@",
-"           ###$@",
-"           ###$@",
-"           ###$@",
-"           ###$@",
-"           ###$@",
-"           ###$@",
-"           ###$@",
-"           ###$@",
-"##############$@",
-"##############$@",
-"##############$@",
-"$$$$$$$$$$$$$$$@",
-"@@@@@@@@@@@@@@@ "};
-
diff --git a/themes/katiola/bottom-right-inactive.png b/themes/katiola/bottom-right-inactive.png
deleted file mode 100644
index 2e8b3eb9e..000000000
--- a/themes/katiola/bottom-right-inactive.png
+++ /dev/null
diff --git a/themes/katiola/bottom-right-inactive.xpm b/themes/katiola/bottom-right-inactive.xpm
deleted file mode 100644
index ce0747460..000000000
--- a/themes/katiola/bottom-right-inactive.xpm
+++ /dev/null
@@ -1,24 +0,0 @@
-/* XPM */
-static char * bottom_right_inactive_xpm[] = {
-"16 16 5 1",
-" 	c None",
-"+	c #E0E0E0 s inactive_hilight_2",
-"@	c #A0A0A0 s inactive_shadow_2",
-"$	c #B0B0B0 s inactive_mid_2",
-"#	c #C0C0C0 s inactive_color_2",
-"           ###$@",
-"           ###$@",
-"           ###$@",
-"           ###$@",
-"           ###$@",
-"           ###$@",
-"           ###$@",
-"           ###$@",
-"           ###$@",
-"           ###$@",
-"           ###$@",
-"##############$@",
-"##############$@",
-"##############$@",
-"$$$$$$$$$$$$$$$@",
-"@@@@@@@@@@@@@@@ "};
diff --git a/themes/katiola/close-active.png b/themes/katiola/close-active.png
deleted file mode 100644
index 50adbf6c1..000000000
--- a/themes/katiola/close-active.png
+++ /dev/null
diff --git a/themes/katiola/close-active.xpm b/themes/katiola/close-active.xpm
deleted file mode 100644
index 39f1e9e58..000000000
--- a/themes/katiola/close-active.xpm
+++ /dev/null
@@ -1,22 +0,0 @@
-/* XPM */
-static char * close_active_xpm[] = {
-"24 14 5 1",
-" 	c None",
-".	c #C0C0C0 s active_color_2",
-"+	c #D0D0D0 s active_hilight_2",
-"@	c #A0A0D0 s active_shadow_2",
-"#	c #000000 s active_border_color",
-" ...................... ",
-"........................",
-"........................",
-"........##....##........",
-"........###..###........",
-".........######.........",
-"..........####..........",
-"..........####..........",
-".........######.........",
-"........###..###........",
-"........##....##........",
-"........................",
-"........................",
-" ...................... "};
diff --git a/themes/katiola/close-inactive.png b/themes/katiola/close-inactive.png
deleted file mode 100644
index 50adbf6c1..000000000
--- a/themes/katiola/close-inactive.png
+++ /dev/null
diff --git a/themes/katiola/close-inactive.xpm b/themes/katiola/close-inactive.xpm
deleted file mode 100644
index 4bc773610..000000000
--- a/themes/katiola/close-inactive.xpm
+++ /dev/null
@@ -1,22 +0,0 @@
-/* XPM */
-static char * close_inactive_xpm[] = {
-"24 14 5 1",
-" 	c None",
-".	c #C0C0C0 s inactive_color_2",
-"+	c #D0D0D0 s inactive_hilight_2",
-"@	c #A0A0D0 s inactive_shadow_2",
-"#	c #000000 s inactive_border_color",
-" ...................... ",
-"........................",
-"........................",
-"........@@....@@........",
-"........@@@..@@@........",
-".........@@@@@@.........",
-"..........@@@@..........",
-"..........@@@@..........",
-".........@@@@@@.........",
-"........@@@..@@@........",
-"........@@....@@........",
-"........................",
-"........................",
-" ...................... "};
diff --git a/themes/katiola/close-pressed.png b/themes/katiola/close-pressed.png
deleted file mode 100644
index 649e6d930..000000000
--- a/themes/katiola/close-pressed.png
+++ /dev/null
diff --git a/themes/katiola/close-pressed.xpm b/themes/katiola/close-pressed.xpm
deleted file mode 100644
index dfecfb74b..000000000
--- a/themes/katiola/close-pressed.xpm
+++ /dev/null
@@ -1,22 +0,0 @@
-/* XPM */
-static char * close_pressed_xpm[] = {
-"24 14 5 1",
-" 	c None",
-".	c #C0C0C0 s active_color_2",
-"+	c #D0D0D0 s active_hilight_2",
-"@	c #A0A0D0 s active_shadow_2",
-"#	c #000000 s active_border_color",
-" ...................... ",
-"........................",
-"........................",
-"........................",
-"........##....##........",
-"........###..###........",
-".........######.........",
-"..........####..........",
-"..........####..........",
-".........######.........",
-"........###..###........",
-"........##....##........",
-"........................",
-" ...................... "};
diff --git a/themes/katiola/hide-active.png b/themes/katiola/hide-active.png
deleted file mode 100644
index 50adbf6c1..000000000
--- a/themes/katiola/hide-active.png
+++ /dev/null
diff --git a/themes/katiola/hide-active.xpm b/themes/katiola/hide-active.xpm
deleted file mode 100644
index 835c7f17c..000000000
--- a/themes/katiola/hide-active.xpm
+++ /dev/null
@@ -1,22 +0,0 @@
-/* XPM */
-static char * hide_active_xpm[] = {
-"24 14 5 1",
-" 	c None",
-".	c #C0C0C0 s active_color_2",
-"+	c #D0D0D0 s active_hilight_2",
-"@	c #A0A0D0 s active_shadow_2",
-"#	c #000000 s active_border_color",
-" ...................... ",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-".........######.........",
-".........######.........",
-"........................",
-"........................",
-" ...................... "};
diff --git a/themes/katiola/hide-inactive.png b/themes/katiola/hide-inactive.png
deleted file mode 100644
index 50adbf6c1..000000000
--- a/themes/katiola/hide-inactive.png
+++ /dev/null
diff --git a/themes/katiola/hide-inactive.xpm b/themes/katiola/hide-inactive.xpm
deleted file mode 100644
index 994ac7c3c..000000000
--- a/themes/katiola/hide-inactive.xpm
+++ /dev/null
@@ -1,22 +0,0 @@
-/* XPM */
-static char * hide_inactive_xpm[] = {
-"24 14 5 1",
-" 	c None",
-".	c #C0C0C0 s inactive_color_2",
-"+	c #D0D0D0 s inactive_hilight_2",
-"@	c #A0A0D0 s inactive_shadow_2",
-"#	c #000000 s inactive_border_color",
-" ...................... ",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-".........@@@@@@.........",
-".........@@@@@@.........",
-"........................",
-"........................",
-" ...................... "};
diff --git a/themes/katiola/hide-pressed.png b/themes/katiola/hide-pressed.png
deleted file mode 100644
index 649e6d930..000000000
--- a/themes/katiola/hide-pressed.png
+++ /dev/null
diff --git a/themes/katiola/hide-pressed.xpm b/themes/katiola/hide-pressed.xpm
deleted file mode 100644
index bbaa1d512..000000000
--- a/themes/katiola/hide-pressed.xpm
+++ /dev/null
@@ -1,22 +0,0 @@
-/* XPM */
-static char * hide_pressed_xpm[] = {
-"24 14 5 1",
-" 	c None",
-".	c #C0C0C0 s active_color_2",
-"+	c #D0D0D0 s active_hilight_2",
-"@	c #A0A0D0 s active_shadow_2",
-"#	c #000000 s active_border_color",
-" ...................... ",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-".........######.........",
-".........######.........",
-"........................",
-" ...................... "};
diff --git a/themes/katiola/left-active.png b/themes/katiola/left-active.png
deleted file mode 100644
index 0555061dc..000000000
--- a/themes/katiola/left-active.png
+++ /dev/null
diff --git a/themes/katiola/left-active.xpm b/themes/katiola/left-active.xpm
deleted file mode 100644
index aa723e97d..000000000
--- a/themes/katiola/left-active.xpm
+++ /dev/null
@@ -1,40 +0,0 @@
-/* XPM */
-static char * left_active_xpm[] = {
-"5 32 5 1",
-" 	c None",
-"+	c #E0E0E0 s active_hilight_2",
-"@	c #A0A0A0 s active_shadow_2",
-"$	c #B0B0B0 s active_mid_2",
-"#	c #C0C0C0 s active_color_2",
-"@+###",
-"@+###",
-"@+###",
-"@+###",
-"@+###",
-"@+###",
-"@+###",
-"@+###",
-"@+###",
-"@+###",
-"@+###",
-"@+###",
-"@+###",
-"@+###",
-"@+###",
-"@+###",
-"@+###",
-"@+###",
-"@+###",
-"@+###",
-"@+###",
-"@+###",
-"@+###",
-"@+###",
-"@+###",
-"@+###",
-"@+###",
-"@+###",
-"@+###",
-"@+###",
-"@+###",
-"@+###"};
diff --git a/themes/katiola/left-inactive.png b/themes/katiola/left-inactive.png
deleted file mode 100644
index 0555061dc..000000000
--- a/themes/katiola/left-inactive.png
+++ /dev/null
diff --git a/themes/katiola/left-inactive.xpm b/themes/katiola/left-inactive.xpm
deleted file mode 100644
index 4f4e0fed8..000000000
--- a/themes/katiola/left-inactive.xpm
+++ /dev/null
@@ -1,40 +0,0 @@
-/* XPM */
-static char * left_inactive_xpm[] = {
-"5 32 5 1",
-" 	c None",
-"+	c #E0E0E0 s inactive_hilight_2",
-"@	c #A0A0A0 s inactive_shadow_2",
-"$	c #B0B0B0 s inactive_mid_2",
-"#	c #C0C0C0 s inactive_color_2",
-"@+###",
-"@+###",
-"@+###",
-"@+###",
-"@+###",
-"@+###",
-"@+###",
-"@+###",
-"@+###",
-"@+###",
-"@+###",
-"@+###",
-"@+###",
-"@+###",
-"@+###",
-"@+###",
-"@+###",
-"@+###",
-"@+###",
-"@+###",
-"@+###",
-"@+###",
-"@+###",
-"@+###",
-"@+###",
-"@+###",
-"@+###",
-"@+###",
-"@+###",
-"@+###",
-"@+###",
-"@+###"};
diff --git a/themes/katiola/maximize-active.png b/themes/katiola/maximize-active.png
deleted file mode 100644
index 50adbf6c1..000000000
--- a/themes/katiola/maximize-active.png
+++ /dev/null
diff --git a/themes/katiola/maximize-active.xpm b/themes/katiola/maximize-active.xpm
deleted file mode 100644
index 958d83fdf..000000000
--- a/themes/katiola/maximize-active.xpm
+++ /dev/null
@@ -1,22 +0,0 @@
-/* XPM */
-static char * maximize_active_xpm[] = {
-"24 14 5 1",
-" 	c None",
-".	c #C0C0C0 s active_color_2",
-"+	c #D0D0D0 s active_hilight_2",
-"@	c #A0A0D0 s active_shadow_2",
-"#	c #000000 s active_border_color",
-" ...................... ",
-"........................",
-"........................",
-"........########........",
-"........########........",
-"........#......#........",
-"........#......#........",
-"........#......#........",
-"........#......#........",
-"........#......#........",
-"........########........",
-"........................",
-"........................",
-" ...................... "};
diff --git a/themes/katiola/maximize-inactive.png b/themes/katiola/maximize-inactive.png
deleted file mode 100644
index 50adbf6c1..000000000
--- a/themes/katiola/maximize-inactive.png
+++ /dev/null
diff --git a/themes/katiola/maximize-inactive.xpm b/themes/katiola/maximize-inactive.xpm
deleted file mode 100644
index e9e2f414d..000000000
--- a/themes/katiola/maximize-inactive.xpm
+++ /dev/null
@@ -1,22 +0,0 @@
-/* XPM */
-static char * maximize_inactive_xpm[] = {
-"24 14 5 1",
-" 	c None",
-".	c #C0C0C0 s inactive_color_2",
-"+	c #D0D0D0 s inactive_hilight_2",
-"@	c #A0A0D0 s inactive_shadow_2",
-"#	c #000000 s inactive_border_color",
-" ...................... ",
-"........................",
-"........................",
-"........@@@@@@@@........",
-"........@@@@@@@@........",
-"........@......@........",
-"........@......@........",
-"........@......@........",
-"........@......@........",
-"........@......@........",
-"........@@@@@@@@........",
-"........................",
-"........................",
-" ...................... "};
diff --git a/themes/katiola/maximize-pressed.png b/themes/katiola/maximize-pressed.png
deleted file mode 100644
index 649e6d930..000000000
--- a/themes/katiola/maximize-pressed.png
+++ /dev/null
diff --git a/themes/katiola/maximize-pressed.xpm b/themes/katiola/maximize-pressed.xpm
deleted file mode 100644
index f05cee7ef..000000000
--- a/themes/katiola/maximize-pressed.xpm
+++ /dev/null
@@ -1,22 +0,0 @@
-/* XPM */
-static char * maximize_pressed_xpm[] = {
-"24 14 5 1",
-" 	c None",
-".	c #C0C0C0 s active_color_2",
-"+	c #D0D0D0 s active_hilight_2",
-"@	c #A0A0D0 s active_shadow_2",
-"#	c #000000 s active_border_color",
-" ...................... ",
-"........................",
-"........................",
-"........................",
-"........########........",
-"........########........",
-"........#......#........",
-"........#......#........",
-"........#......#........",
-"........#......#........",
-"........#......#........",
-"........########........",
-"........................",
-" ...................... "};
diff --git a/themes/katiola/maximize-toggled-active.png b/themes/katiola/maximize-toggled-active.png
deleted file mode 100644
index 50adbf6c1..000000000
--- a/themes/katiola/maximize-toggled-active.png
+++ /dev/null
diff --git a/themes/katiola/maximize-toggled-active.xpm b/themes/katiola/maximize-toggled-active.xpm
deleted file mode 100644
index cb3034bb2..000000000
--- a/themes/katiola/maximize-toggled-active.xpm
+++ /dev/null
@@ -1,22 +0,0 @@
-/* XPM */
-static char * maximize_toggled_active_xpm[] = {
-"24 14 5 1",
-" 	c None",
-".	c #C0C0C0 s active_color_2",
-"+	c #D0D0D0 s active_hilight_2",
-"@	c #A0A0D0 s active_shadow_2",
-"#	c #000000 s active_border_color",
-" ...................... ",
-"........................",
-"..........#######.......",
-"..........#######.......",
-"................#.......",
-".......#######..#.......",
-".......#######..#.......",
-".......#.....#..#.......",
-".......#.....#.##.......",
-".......#.....#..........",
-".......#.....#..........",
-".......#######..........",
-"........................",
-" ...................... "};
diff --git a/themes/katiola/maximize-toggled-inactive.png b/themes/katiola/maximize-toggled-inactive.png
deleted file mode 100644
index 50adbf6c1..000000000
--- a/themes/katiola/maximize-toggled-inactive.png
+++ /dev/null
diff --git a/themes/katiola/maximize-toggled-inactive.xpm b/themes/katiola/maximize-toggled-inactive.xpm
deleted file mode 100644
index 503dbb980..000000000
--- a/themes/katiola/maximize-toggled-inactive.xpm
+++ /dev/null
@@ -1,22 +0,0 @@
-/* XPM */
-static char * maximize_toggled_inactive_xpm[] = {
-"24 14 5 1",
-" 	c None",
-".	c #C0C0C0 s inactive_color_2",
-"+	c #D0D0D0 s inactive_hilight_2",
-"@	c #A0A0D0 s inactive_shadow_2",
-"#	c #000000 s inactive_border_color",
-" ...................... ",
-"........................",
-"..........@@@@@@@.......",
-"..........@@@@@@@.......",
-"................@.......",
-".......@@@@@@@..@.......",
-".......@@@@@@@..@.......",
-".......@.....@..@.......",
-".......@.....@.@@.......",
-".......@.....@..........",
-".......@.....@..........",
-".......@@@@@@@..........",
-"........................",
-" ...................... "};
diff --git a/themes/katiola/maximize-toggled-pressed.png b/themes/katiola/maximize-toggled-pressed.png
deleted file mode 100644
index 649e6d930..000000000
--- a/themes/katiola/maximize-toggled-pressed.png
+++ /dev/null
diff --git a/themes/katiola/maximize-toggled-pressed.xpm b/themes/katiola/maximize-toggled-pressed.xpm
deleted file mode 100644
index 51275b611..000000000
--- a/themes/katiola/maximize-toggled-pressed.xpm
+++ /dev/null
@@ -1,22 +0,0 @@
-/* XPM */
-static char * maximize_toggled_pressed_xpm[] = {
-"24 14 5 1",
-" 	c None",
-".	c #C0C0C0 s active_color_2",
-"+	c #D0D0D0 s active_hilight_2",
-"@	c #A0A0D0 s active_shadow_2",
-"#	c #000000 s active_border_color",
-" ...................... ",
-"........................",
-"........................",
-"..........#######.......",
-"..........#######.......",
-"................#.......",
-".......#######..#.......",
-".......#######..#.......",
-".......#.....#..#.......",
-".......#.....#.##.......",
-".......#.....#..........",
-".......#.....#..........",
-".......#######..........",
-" ...................... "};
diff --git a/themes/katiola/menu-active.png b/themes/katiola/menu-active.png
deleted file mode 100644
index 98a24d18f..000000000
--- a/themes/katiola/menu-active.png
+++ /dev/null
diff --git a/themes/katiola/menu-active.xpm b/themes/katiola/menu-active.xpm
deleted file mode 100644
index 6704819f7..000000000
--- a/themes/katiola/menu-active.xpm
+++ /dev/null
@@ -1,21 +0,0 @@
-/* XPM */
-static char * menu_active_xpm[] = {
-"16 16 2 1",
-" 	c None",
-"@	c #C0C0C0 s active_color_2",
-"@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@"};
diff --git a/themes/katiola/menu-inactive.png b/themes/katiola/menu-inactive.png
deleted file mode 100644
index 98a24d18f..000000000
--- a/themes/katiola/menu-inactive.png
+++ /dev/null
diff --git a/themes/katiola/menu-inactive.xpm b/themes/katiola/menu-inactive.xpm
deleted file mode 100644
index 1e44787a4..000000000
--- a/themes/katiola/menu-inactive.xpm
+++ /dev/null
@@ -1,21 +0,0 @@
-/* XPM */
-static char * menu_inactive_xpm[] = {
-"16 16 2 1",
-" 	c None",
-"@	c #C0C0C0 s inactive_color_2",
-"@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@"};
diff --git a/themes/katiola/menu-pressed.png b/themes/katiola/menu-pressed.png
deleted file mode 100644
index 98a24d18f..000000000
--- a/themes/katiola/menu-pressed.png
+++ /dev/null
diff --git a/themes/katiola/menu-pressed.xpm b/themes/katiola/menu-pressed.xpm
deleted file mode 100644
index f6a8d6023..000000000
--- a/themes/katiola/menu-pressed.xpm
+++ /dev/null
@@ -1,21 +0,0 @@
-/* XPM */
-static char * menu_pressed_xpm[] = {
-"16 16 2 1",
-" 	c None",
-"@	c #C0C0C0 s active_color_2",
-"@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@"};
diff --git a/themes/katiola/right-active.png b/themes/katiola/right-active.png
deleted file mode 100644
index 2eb8e03f7..000000000
--- a/themes/katiola/right-active.png
+++ /dev/null
diff --git a/themes/katiola/right-active.xpm b/themes/katiola/right-active.xpm
deleted file mode 100644
index 0660a1838..000000000
--- a/themes/katiola/right-active.xpm
+++ /dev/null
@@ -1,40 +0,0 @@
-/* XPM */
-static char * right_active_xpm[] = {
-"5 32 5 1",
-" 	c None",
-"+	c #E0E0E0 s active_hilight_2",
-"@	c #A0A0A0 s active_shadow_2",
-"$	c #B0B0B0 s active_mid_2",
-"#	c #C0C0C0 s active_color_2",
-"###$@",
-"###$@",
-"###$@",
-"###$@",
-"###$@",
-"###$@",
-"###$@",
-"###$@",
-"###$@",
-"###$@",
-"###$@",
-"###$@",
-"###$@",
-"###$@",
-"###$@",
-"###$@",
-"###$@",
-"###$@",
-"###$@",
-"###$@",
-"###$@",
-"###$@",
-"###$@",
-"###$@",
-"###$@",
-"###$@",
-"###$@",
-"###$@",
-"###$@",
-"###$@",
-"###$@",
-"###$@"};
diff --git a/themes/katiola/right-inactive.png b/themes/katiola/right-inactive.png
deleted file mode 100644
index 2eb8e03f7..000000000
--- a/themes/katiola/right-inactive.png
+++ /dev/null
diff --git a/themes/katiola/right-inactive.xpm b/themes/katiola/right-inactive.xpm
deleted file mode 100644
index 52af6b5de..000000000
--- a/themes/katiola/right-inactive.xpm
+++ /dev/null
@@ -1,40 +0,0 @@
-/* XPM */
-static char * right_inactive_xpm[] = {
-"5 32 5 1",
-" 	c None",
-"+	c #E0E0E0 s inactive_hilight_2",
-"@	c #A0A0A0 s inactive_shadow_2",
-"$	c #B0B0B0 s inactive_mid_2",
-"#	c #C0C0C0 s inactive_color_2",
-"###$@",
-"###$@",
-"###$@",
-"###$@",
-"###$@",
-"###$@",
-"###$@",
-"###$@",
-"###$@",
-"###$@",
-"###$@",
-"###$@",
-"###$@",
-"###$@",
-"###$@",
-"###$@",
-"###$@",
-"###$@",
-"###$@",
-"###$@",
-"###$@",
-"###$@",
-"###$@",
-"###$@",
-"###$@",
-"###$@",
-"###$@",
-"###$@",
-"###$@",
-"###$@",
-"###$@",
-"###$@"};
diff --git a/themes/katiola/shade-active.png b/themes/katiola/shade-active.png
deleted file mode 100644
index 50adbf6c1..000000000
--- a/themes/katiola/shade-active.png
+++ /dev/null
diff --git a/themes/katiola/shade-active.xpm b/themes/katiola/shade-active.xpm
deleted file mode 100644
index 18a9ad59b..000000000
--- a/themes/katiola/shade-active.xpm
+++ /dev/null
@@ -1,22 +0,0 @@
-/* XPM */
-static char * shade_active_xpm[] = {
-"24 14 5 1",
-" 	c None",
-".	c #C0C0C0 s active_color_2",
-"+	c #D0D0D0 s active_hilight_2",
-"@	c #A0A0D0 s active_shadow_2",
-"#	c #000000 s active_border_color",
-" ...................... ",
-"........................",
-"........................",
-"...........##...........",
-"..........####..........",
-".........######.........",
-"........########........",
-"........##.##.##........",
-"...........##...........",
-"...........##...........",
-"...........##...........",
-"........................",
-"........................",
-" ...................... "};
diff --git a/themes/katiola/shade-inactive.png b/themes/katiola/shade-inactive.png
deleted file mode 100644
index 50adbf6c1..000000000
--- a/themes/katiola/shade-inactive.png
+++ /dev/null
diff --git a/themes/katiola/shade-inactive.xpm b/themes/katiola/shade-inactive.xpm
deleted file mode 100644
index 21e12b237..000000000
--- a/themes/katiola/shade-inactive.xpm
+++ /dev/null
@@ -1,22 +0,0 @@
-/* XPM */
-static char * shade_inactive_xpm[] = {
-"24 14 5 1",
-" 	c None",
-".	c #C0C0C0 s inactive_color_2",
-"+	c #D0D0D0 s inactive_hilight_2",
-"@	c #A0A0D0 s inactive_shadow_2",
-"#	c #000000 s inactive_border_color",
-" ...................... ",
-"........................",
-"........................",
-"...........@@...........",
-"..........@@@@..........",
-".........@@@@@@.........",
-"........@@@@@@@@........",
-"........@@.@@.@@........",
-"...........@@...........",
-"...........@@...........",
-"...........@@...........",
-"........................",
-"........................",
-" ...................... "};
diff --git a/themes/katiola/shade-pressed.png b/themes/katiola/shade-pressed.png
deleted file mode 100644
index 649e6d930..000000000
--- a/themes/katiola/shade-pressed.png
+++ /dev/null
diff --git a/themes/katiola/shade-pressed.xpm b/themes/katiola/shade-pressed.xpm
deleted file mode 100644
index d72ec7040..000000000
--- a/themes/katiola/shade-pressed.xpm
+++ /dev/null
@@ -1,22 +0,0 @@
-/* XPM */
-static char * shade_pressed_xpm[] = {
-"24 14 5 1",
-" 	c None",
-".	c #C0C0C0 s active_color_2",
-"+	c #D0D0D0 s active_hilight_2",
-"@	c #A0A0D0 s active_shadow_2",
-"#	c #000000 s active_border_color",
-" ...................... ",
-"........................",
-"........................",
-"........................",
-"...........##...........",
-"..........####..........",
-".........######.........",
-"........########........",
-"........##.##.##........",
-"...........##...........",
-"...........##...........",
-"...........##...........",
-"........................",
-" ...................... "};
diff --git a/themes/katiola/shade-toggled-active.png b/themes/katiola/shade-toggled-active.png
deleted file mode 100644
index 50adbf6c1..000000000
--- a/themes/katiola/shade-toggled-active.png
+++ /dev/null
diff --git a/themes/katiola/shade-toggled-active.xpm b/themes/katiola/shade-toggled-active.xpm
deleted file mode 100644
index 7c5897ccf..000000000
--- a/themes/katiola/shade-toggled-active.xpm
+++ /dev/null
@@ -1,22 +0,0 @@
-/* XPM */
-static char * shade_toggled_active_xpm[] = {
-"24 14 5 1",
-" 	c None",
-".	c #C0C0C0 s active_color_2",
-"+	c #D0D0D0 s active_hilight_2",
-"@	c #A0A0D0 s active_shadow_2",
-"#	c #000000 s active_border_color",
-" ...................... ",
-"........................",
-"........................",
-"...........##...........",
-"...........##...........",
-"...........##...........",
-"........##.##.##........",
-"........########........",
-".........######.........",
-"..........####..........",
-"...........##...........",
-"........................",
-"........................",
-" ...................... "};
diff --git a/themes/katiola/shade-toggled-inactive.png b/themes/katiola/shade-toggled-inactive.png
deleted file mode 100644
index 50adbf6c1..000000000
--- a/themes/katiola/shade-toggled-inactive.png
+++ /dev/null
diff --git a/themes/katiola/shade-toggled-inactive.xpm b/themes/katiola/shade-toggled-inactive.xpm
deleted file mode 100644
index 22c75381d..000000000
--- a/themes/katiola/shade-toggled-inactive.xpm
+++ /dev/null
@@ -1,22 +0,0 @@
-/* XPM */
-static char * shade_toggled_inactive_xpm[] = {
-"24 14 5 1",
-" 	c None",
-".	c #C0C0C0 s inactive_color_2",
-"+	c #D0D0D0 s inactive_hilight_2",
-"@	c #A0A0D0 s inactive_shadow_2",
-"#	c #000000 s inactive_border_color",
-" ...................... ",
-"........................",
-"........................",
-"...........@@...........",
-"...........@@...........",
-"...........@@...........",
-"........@@.@@.@@........",
-"........@@@@@@@@........",
-".........@@@@@@.........",
-"..........@@@@..........",
-"...........@@...........",
-"........................",
-"........................",
-" ...................... "};
diff --git a/themes/katiola/shade-toggled-pressed.png b/themes/katiola/shade-toggled-pressed.png
deleted file mode 100644
index 649e6d930..000000000
--- a/themes/katiola/shade-toggled-pressed.png
+++ /dev/null
diff --git a/themes/katiola/shade-toggled-pressed.xpm b/themes/katiola/shade-toggled-pressed.xpm
deleted file mode 100644
index d1cbef20f..000000000
--- a/themes/katiola/shade-toggled-pressed.xpm
+++ /dev/null
@@ -1,22 +0,0 @@
-/* XPM */
-static char * shade_toggled_pressed_xpm[] = {
-"24 14 5 1",
-" 	c None",
-".	c #C0C0C0 s active_color_2",
-"+	c #D0D0D0 s active_hilight_2",
-"@	c #A0A0D0 s active_shadow_2",
-"#	c #000000 s active_border_color",
-" ...................... ",
-"........................",
-"........................",
-"........................",
-"...........##...........",
-"...........##...........",
-"...........##...........",
-"........##.##.##........",
-"........########........",
-".........######.........",
-"..........####..........",
-"...........##...........",
-"........................",
-" ...................... "};
diff --git a/themes/katiola/stick-active.png b/themes/katiola/stick-active.png
deleted file mode 100644
index 50adbf6c1..000000000
--- a/themes/katiola/stick-active.png
+++ /dev/null
diff --git a/themes/katiola/stick-active.xpm b/themes/katiola/stick-active.xpm
deleted file mode 100644
index c72efcf78..000000000
--- a/themes/katiola/stick-active.xpm
+++ /dev/null
@@ -1,22 +0,0 @@
-/* XPM */
-static char * stick_active_xpm[] = {
-"24 14 5 1",
-" 	c None",
-".	c #C0C0C0 s active_color_2",
-"+	c #D0D0D0 s active_hilight_2",
-"@	c #A0A0D0 s active_shadow_2",
-"$	c #000000 s active_border_color",
-" ...................... ",
-"........................",
-"........................",
-"..........$$$$..........",
-".........$$$$$$.........",
-"........$$....$$........",
-"........$$....$$........",
-"........$$....$$........",
-"........$$....$$........",
-".........$$$$$$.........",
-"..........$$$$..........",
-"........................",
-"........................",
-" ...................... "};
diff --git a/themes/katiola/stick-inactive.png b/themes/katiola/stick-inactive.png
deleted file mode 100644
index 50adbf6c1..000000000
--- a/themes/katiola/stick-inactive.png
+++ /dev/null
diff --git a/themes/katiola/stick-inactive.xpm b/themes/katiola/stick-inactive.xpm
deleted file mode 100644
index dbeaf753a..000000000
--- a/themes/katiola/stick-inactive.xpm
+++ /dev/null
@@ -1,22 +0,0 @@
-/* XPM */
-static char * stick_inactive_xpm[] = {
-"24 14 5 1",
-" 	c None",
-".	c #C0C0C0 s inactive_color_2",
-"+	c #D0D0D0 s inactive_hilight_2",
-"@	c #A0A0D0 s inactive_shadow_2",
-"$	c #000000 s inactive_border_color",
-" ...................... ",
-"........................",
-"........................",
-"..........@@@@..........",
-".........@@@@@@.........",
-"........@@....@@........",
-"........@@....@@........",
-"........@@....@@........",
-"........@@....@@........",
-".........@@@@@@.........",
-"..........@@@@..........",
-"........................",
-"........................",
-" ...................... "};
diff --git a/themes/katiola/stick-pressed.png b/themes/katiola/stick-pressed.png
deleted file mode 100644
index 649e6d930..000000000
--- a/themes/katiola/stick-pressed.png
+++ /dev/null
diff --git a/themes/katiola/stick-pressed.xpm b/themes/katiola/stick-pressed.xpm
deleted file mode 100644
index 04c592712..000000000
--- a/themes/katiola/stick-pressed.xpm
+++ /dev/null
@@ -1,22 +0,0 @@
-/* XPM */
-static char * stick_pressed_xpm[] = {
-"24 14 5 1",
-" 	c None",
-".	c #C0C0C0 s active_color_2",
-"+	c #D0D0D0 s active_hilight_2",
-"@	c #A0A0D0 s active_shadow_2",
-"$	c #000000 s active_border_color",
-" ...................... ",
-"........................",
-"........................",
-"........................",
-"..........$$$$..........",
-".........$$$$$$.........",
-"........$$....$$........",
-"........$$....$$........",
-"........$$....$$........",
-"........$$....$$........",
-".........$$$$$$.........",
-"..........$$$$..........",
-"........................",
-" ...................... "};
diff --git a/themes/katiola/stick-toggled-active.png b/themes/katiola/stick-toggled-active.png
deleted file mode 100644
index 50adbf6c1..000000000
--- a/themes/katiola/stick-toggled-active.png
+++ /dev/null
diff --git a/themes/katiola/stick-toggled-active.xpm b/themes/katiola/stick-toggled-active.xpm
deleted file mode 100644
index 89485c945..000000000
--- a/themes/katiola/stick-toggled-active.xpm
+++ /dev/null
@@ -1,22 +0,0 @@
-/* XPM */
-static char * stick_toggled_active_xpm[] = {
-"24 14 5 1",
-" 	c None",
-".	c #C0C0C0 s active_color_2",
-"+	c #D0D0D0 s active_hilight_2",
-"@	c #A0A0D0 s active_shadow_2",
-"$	c #000000 s active_border_color",
-" ...................... ",
-"........................",
-"........................",
-"..........$$$$..........",
-".........$$$$$$.........",
-"........$$....$$........",
-"........$$.$$.$$........",
-"........$$.$$.$$........",
-"........$$....$$........",
-".........$$$$$$.........",
-"..........$$$$..........",
-"........................",
-"........................",
-" ...................... "};
diff --git a/themes/katiola/stick-toggled-inactive.png b/themes/katiola/stick-toggled-inactive.png
deleted file mode 100644
index 50adbf6c1..000000000
--- a/themes/katiola/stick-toggled-inactive.png
+++ /dev/null
diff --git a/themes/katiola/stick-toggled-inactive.xpm b/themes/katiola/stick-toggled-inactive.xpm
deleted file mode 100644
index 99dc7f05b..000000000
--- a/themes/katiola/stick-toggled-inactive.xpm
+++ /dev/null
@@ -1,22 +0,0 @@
-/* XPM */
-static char * stick_toggled_inactive_xpm[] = {
-"24 14 5 1",
-" 	c None",
-".	c #C0C0C0 s inactive_color_2",
-"+	c #D0D0D0 s inactive_hilight_2",
-"@	c #A0A0D0 s inactive_shadow_2",
-"$	c #000000 s inactive_border_color",
-" ...................... ",
-"........................",
-"........................",
-"..........@@@@..........",
-".........@@@@@@.........",
-"........@@....@@........",
-"........@@.@@.@@........",
-"........@@.@@.@@........",
-"........@@....@@........",
-".........@@@@@@.........",
-"..........@@@@..........",
-"........................",
-"........................",
-" ...................... "};
diff --git a/themes/katiola/stick-toggled-pressed.png b/themes/katiola/stick-toggled-pressed.png
deleted file mode 100644
index 649e6d930..000000000
--- a/themes/katiola/stick-toggled-pressed.png
+++ /dev/null
diff --git a/themes/katiola/stick-toggled-pressed.xpm b/themes/katiola/stick-toggled-pressed.xpm
deleted file mode 100644
index 7cb24de96..000000000
--- a/themes/katiola/stick-toggled-pressed.xpm
+++ /dev/null
@@ -1,22 +0,0 @@
-/* XPM */
-static char * stick_toggled_pressed_xpm[] = {
-"24 14 5 1",
-" 	c None",
-".	c #C0C0C0 s active_color_2",
-"+	c #D0D0D0 s active_hilight_2",
-"@	c #A0A0D0 s active_shadow_2",
-"$	c #000000 s active_border_color",
-" ...................... ",
-"........................",
-"........................",
-"........................",
-"..........$$$$..........",
-".........$$$$$$.........",
-"........$$....$$........",
-"........$$.$$.$$........",
-"........$$.$$.$$........",
-"........$$....$$........",
-".........$$$$$$.........",
-"..........$$$$..........",
-"........................",
-" ...................... "};
diff --git a/themes/katiola/themerc b/themes/katiola/themerc
deleted file mode 100644
index fa54d89cd..000000000
--- a/themes/katiola/themerc
+++ /dev/null
@@ -1,14 +0,0 @@
-active_text_color=#000000
-active_text_shadow_color=#fbfbfb
-button_offset=0
-button_spacing=1
-full_width_title=true
-inactive_text_color=#808080
-inactive_text_shadow_color=#f2f2f2
-maximized_offset=3
-show_app_icon=true
-title_horizontal_offset=0
-title_shadow_active=frame
-title_shadow_inactive=frame
-title_vertical_offset_active=1
-title_vertical_offset_inactive=1
diff --git a/themes/katiola/title-1-active.png b/themes/katiola/title-1-active.png
deleted file mode 100644
index c25ec05c7..000000000
--- a/themes/katiola/title-1-active.png
+++ /dev/null
diff --git a/themes/katiola/title-1-active.xpm b/themes/katiola/title-1-active.xpm
deleted file mode 100644
index 70eb006d3..000000000
--- a/themes/katiola/title-1-active.xpm
+++ /dev/null
@@ -1,31 +0,0 @@
-/* XPM */
-static char * title_3_active_xpm[] = {
-"4 23 5 1",
-" 	c None",
-"+	c #E0E0E0 s active_hilight_2",
-"@	c #A0A0A0 s active_shadow_2",
-"$	c #B0B0B0 s active_mid_2",
-"#	c #C0C0C0 s active_color_2",
-"@@@@",
-"++++",
-"####",
-"####",
-"####",
-"####",
-"####",
-"####",
-"####",
-"####",
-"####",
-"####",
-"####",
-"####",
-"####",
-"####",
-"####",
-"####",
-"####",
-"####",
-"####",
-"####",
-"####"};
diff --git a/themes/katiola/title-1-inactive.png b/themes/katiola/title-1-inactive.png
deleted file mode 100644
index c25ec05c7..000000000
--- a/themes/katiola/title-1-inactive.png
+++ /dev/null
diff --git a/themes/katiola/title-1-inactive.xpm b/themes/katiola/title-1-inactive.xpm
deleted file mode 100644
index c4116143a..000000000
--- a/themes/katiola/title-1-inactive.xpm
+++ /dev/null
@@ -1,31 +0,0 @@
-/* XPM */
-static char * title_3_inactive_xpm[] = {
-"4 23 5 1",
-" 	c None",
-"+	c #E0E0E0 s inactive_hilight_2",
-"@	c #A0A0A0 s inactive_shadow_2",
-"$	c #B0B0B0 s inactive_mid_2",
-"#	c #C0C0C0 s inactive_color_2",
-"@@@@",
-"++++",
-"####",
-"####",
-"####",
-"####",
-"####",
-"####",
-"####",
-"####",
-"####",
-"####",
-"####",
-"####",
-"####",
-"####",
-"####",
-"####",
-"####",
-"####",
-"####",
-"####",
-"####"};
diff --git a/themes/katiola/title-2-active.png b/themes/katiola/title-2-active.png
deleted file mode 100644
index 2f1458854..000000000
--- a/themes/katiola/title-2-active.png
+++ /dev/null
diff --git a/themes/katiola/title-2-active.xpm b/themes/katiola/title-2-active.xpm
deleted file mode 100644
index e76900741..000000000
--- a/themes/katiola/title-2-active.xpm
+++ /dev/null
@@ -1,31 +0,0 @@
-/* XPM */
-static char * title_3_active_xpm[] = {
-"8 23 5 1",
-" 	c None",
-"+	c #E0E0E0 s active_hilight_2",
-"@	c #A0A0A0 s active_shadow_2",
-"$	c #B0B0B0 s active_mid_2",
-"#	c #C0C0C0 s active_color_2",
-"@@@@@@@@",
-"++++++++",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########"};
diff --git a/themes/katiola/title-2-inactive.png b/themes/katiola/title-2-inactive.png
deleted file mode 100644
index 2f1458854..000000000
--- a/themes/katiola/title-2-inactive.png
+++ /dev/null
diff --git a/themes/katiola/title-2-inactive.xpm b/themes/katiola/title-2-inactive.xpm
deleted file mode 100644
index 72eb5e11e..000000000
--- a/themes/katiola/title-2-inactive.xpm
+++ /dev/null
@@ -1,31 +0,0 @@
-/* XPM */
-static char * title_3_inactive_xpm[] = {
-"8 23 5 1",
-" 	c None",
-"+	c #E0E0E0 s inactive_hilight_2",
-"@	c #A0A0A0 s inactive_shadow_2",
-"$	c #B0B0B0 s inactive_mid_2",
-"#	c #C0C0C0 s inactive_color_2",
-"@@@@@@@@",
-"++++++++",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########"};
diff --git a/themes/katiola/title-3-active.png b/themes/katiola/title-3-active.png
deleted file mode 100644
index 44fea844f..000000000
--- a/themes/katiola/title-3-active.png
+++ /dev/null
diff --git a/themes/katiola/title-3-active.xpm b/themes/katiola/title-3-active.xpm
deleted file mode 100644
index e76900741..000000000
--- a/themes/katiola/title-3-active.xpm
+++ /dev/null
@@ -1,31 +0,0 @@
-/* XPM */
-static char * title_3_active_xpm[] = {
-"8 23 5 1",
-" 	c None",
-"+	c #E0E0E0 s active_hilight_2",
-"@	c #A0A0A0 s active_shadow_2",
-"$	c #B0B0B0 s active_mid_2",
-"#	c #C0C0C0 s active_color_2",
-"@@@@@@@@",
-"++++++++",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########"};
diff --git a/themes/katiola/title-3-inactive.png b/themes/katiola/title-3-inactive.png
deleted file mode 100644
index 44fea844f..000000000
--- a/themes/katiola/title-3-inactive.png
+++ /dev/null
diff --git a/themes/katiola/title-3-inactive.xpm b/themes/katiola/title-3-inactive.xpm
deleted file mode 100644
index 72eb5e11e..000000000
--- a/themes/katiola/title-3-inactive.xpm
+++ /dev/null
@@ -1,31 +0,0 @@
-/* XPM */
-static char * title_3_inactive_xpm[] = {
-"8 23 5 1",
-" 	c None",
-"+	c #E0E0E0 s inactive_hilight_2",
-"@	c #A0A0A0 s inactive_shadow_2",
-"$	c #B0B0B0 s inactive_mid_2",
-"#	c #C0C0C0 s inactive_color_2",
-"@@@@@@@@",
-"++++++++",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########"};
diff --git a/themes/katiola/title-4-active.png b/themes/katiola/title-4-active.png
deleted file mode 100644
index 6b1289551..000000000
--- a/themes/katiola/title-4-active.png
+++ /dev/null
diff --git a/themes/katiola/title-4-active.xpm b/themes/katiola/title-4-active.xpm
deleted file mode 100644
index e76900741..000000000
--- a/themes/katiola/title-4-active.xpm
+++ /dev/null
@@ -1,31 +0,0 @@
-/* XPM */
-static char * title_3_active_xpm[] = {
-"8 23 5 1",
-" 	c None",
-"+	c #E0E0E0 s active_hilight_2",
-"@	c #A0A0A0 s active_shadow_2",
-"$	c #B0B0B0 s active_mid_2",
-"#	c #C0C0C0 s active_color_2",
-"@@@@@@@@",
-"++++++++",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########"};
diff --git a/themes/katiola/title-4-inactive.png b/themes/katiola/title-4-inactive.png
deleted file mode 100644
index 6b1289551..000000000
--- a/themes/katiola/title-4-inactive.png
+++ /dev/null
diff --git a/themes/katiola/title-4-inactive.xpm b/themes/katiola/title-4-inactive.xpm
deleted file mode 100644
index 72eb5e11e..000000000
--- a/themes/katiola/title-4-inactive.xpm
+++ /dev/null
@@ -1,31 +0,0 @@
-/* XPM */
-static char * title_3_inactive_xpm[] = {
-"8 23 5 1",
-" 	c None",
-"+	c #E0E0E0 s inactive_hilight_2",
-"@	c #A0A0A0 s inactive_shadow_2",
-"$	c #B0B0B0 s inactive_mid_2",
-"#	c #C0C0C0 s inactive_color_2",
-"@@@@@@@@",
-"++++++++",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########"};
diff --git a/themes/katiola/title-5-active.png b/themes/katiola/title-5-active.png
deleted file mode 100644
index c25ec05c7..000000000
--- a/themes/katiola/title-5-active.png
+++ /dev/null
diff --git a/themes/katiola/title-5-active.xpm b/themes/katiola/title-5-active.xpm
deleted file mode 100644
index 70eb006d3..000000000
--- a/themes/katiola/title-5-active.xpm
+++ /dev/null
@@ -1,31 +0,0 @@
-/* XPM */
-static char * title_3_active_xpm[] = {
-"4 23 5 1",
-" 	c None",
-"+	c #E0E0E0 s active_hilight_2",
-"@	c #A0A0A0 s active_shadow_2",
-"$	c #B0B0B0 s active_mid_2",
-"#	c #C0C0C0 s active_color_2",
-"@@@@",
-"++++",
-"####",
-"####",
-"####",
-"####",
-"####",
-"####",
-"####",
-"####",
-"####",
-"####",
-"####",
-"####",
-"####",
-"####",
-"####",
-"####",
-"####",
-"####",
-"####",
-"####",
-"####"};
diff --git a/themes/katiola/title-5-inactive.png b/themes/katiola/title-5-inactive.png
deleted file mode 100644
index c25ec05c7..000000000
--- a/themes/katiola/title-5-inactive.png
+++ /dev/null
diff --git a/themes/katiola/title-5-inactive.xpm b/themes/katiola/title-5-inactive.xpm
deleted file mode 100644
index c4116143a..000000000
--- a/themes/katiola/title-5-inactive.xpm
+++ /dev/null
@@ -1,31 +0,0 @@
-/* XPM */
-static char * title_3_inactive_xpm[] = {
-"4 23 5 1",
-" 	c None",
-"+	c #E0E0E0 s inactive_hilight_2",
-"@	c #A0A0A0 s inactive_shadow_2",
-"$	c #B0B0B0 s inactive_mid_2",
-"#	c #C0C0C0 s inactive_color_2",
-"@@@@",
-"++++",
-"####",
-"####",
-"####",
-"####",
-"####",
-"####",
-"####",
-"####",
-"####",
-"####",
-"####",
-"####",
-"####",
-"####",
-"####",
-"####",
-"####",
-"####",
-"####",
-"####",
-"####"};
diff --git a/themes/katiola/top-left-active.png b/themes/katiola/top-left-active.png
deleted file mode 100644
index 2bd5bd621..000000000
--- a/themes/katiola/top-left-active.png
+++ /dev/null
diff --git a/themes/katiola/top-left-active.xpm b/themes/katiola/top-left-active.xpm
deleted file mode 100644
index 7d91bae33..000000000
--- a/themes/katiola/top-left-active.xpm
+++ /dev/null
@@ -1,32 +0,0 @@
-/* XPM */
-static char * top_left_active_xpm[] = {
-"7 23 6 1",
-" 	c None",
-".	c #A0A0A0 s active_shadow_2",
-"+	c #D0D0D0 s active_hilight_2",
-"@	c #B0B0B0 s active_mid_2",
-"#	c #C0C0C0 s active_color_2",
-"$	c #000000",
-"  .....",
-" .#++++",
-".#+####",
-".+#####",
-".+#####",
-".+#####",
-".+#####",
-".+#####",
-".+#####",
-".+#####",
-".+#####",
-".+#####",
-".+#####",
-".+#####",
-".+#####",
-".+#####",
-".+#####",
-".+#####",
-".+#####",
-".+#####",
-".+#####",
-".+#####",
-".+#####"};
diff --git a/themes/katiola/top-left-inactive.png b/themes/katiola/top-left-inactive.png
deleted file mode 100644
index 2bd5bd621..000000000
--- a/themes/katiola/top-left-inactive.png
+++ /dev/null
diff --git a/themes/katiola/top-left-inactive.xpm b/themes/katiola/top-left-inactive.xpm
deleted file mode 100644
index d216c3d22..000000000
--- a/themes/katiola/top-left-inactive.xpm
+++ /dev/null
@@ -1,32 +0,0 @@
-/* XPM */
-static char * top_left_inactive_xpm[] = {
-"7 23 6 1",
-" 	c None",
-".	c #A0A0A0 s inactive_shadow_2",
-"+	c #D0D0D0 s inactive_hilight_2",
-"@	c #B0B0B0 s inactive_mid_2",
-"#	c #C0C0C0 s inactive_color_2",
-"$	c #000000",
-"  .....",
-" .#++++",
-".#+####",
-".+#####",
-".+#####",
-".+#####",
-".+#####",
-".+#####",
-".+#####",
-".+#####",
-".+#####",
-".+#####",
-".+#####",
-".+#####",
-".+#####",
-".+#####",
-".+#####",
-".+#####",
-".+#####",
-".+#####",
-".+#####",
-".+#####",
-".+#####"};
diff --git a/themes/katiola/top-right-active.png b/themes/katiola/top-right-active.png
deleted file mode 100644
index 4e1fb987a..000000000
--- a/themes/katiola/top-right-active.png
+++ /dev/null
diff --git a/themes/katiola/top-right-active.xpm b/themes/katiola/top-right-active.xpm
deleted file mode 100644
index 42302db11..000000000
--- a/themes/katiola/top-right-active.xpm
+++ /dev/null
@@ -1,32 +0,0 @@
-/* XPM */
-static char * top_right_active_xpm[] = {
-"7 23 6 1",
-" 	c None",
-".	c #A0A0A0 s active_shadow_2",
-"+	c #D0D0D0 s active_hilight_2",
-"@	c #B0B0B0 s active_mid_2",
-"#	c #C0C0C0 s active_color_2",
-"$	c #000000",
-".....  ",
-"++++#. ",
-"####+#.",
-"#####@.",
-"#####@.",
-"#####@.",
-"#####@.",
-"#####@.",
-"#####@.",
-"#####@.",
-"#####@.",
-"#####@.",
-"#####@.",
-"#####@.",
-"#####@.",
-"#####@.",
-"#####@.",
-"#####@.",
-"#####@.",
-"#####@.",
-"#####@.",
-"#####@.",
-"#####@."};
diff --git a/themes/katiola/top-right-inactive.png b/themes/katiola/top-right-inactive.png
deleted file mode 100644
index 4e1fb987a..000000000
--- a/themes/katiola/top-right-inactive.png
+++ /dev/null
diff --git a/themes/katiola/top-right-inactive.xpm b/themes/katiola/top-right-inactive.xpm
deleted file mode 100644
index 080bb82a1..000000000
--- a/themes/katiola/top-right-inactive.xpm
+++ /dev/null
@@ -1,32 +0,0 @@
-/* XPM */
-static char * top_right_inactive_xpm[] = {
-"7 23 6 1",
-" 	c None",
-".	c #A0A0A0 s inactive_shadow_2",
-"+	c #D0D0D0 s inactive_hilight_2",
-"@	c #B0B0B0 s inactive_mid_2",
-"#	c #C0C0C0 s inactive_color_2",
-"$	c #000000",
-".....  ",
-"++++#. ",
-"####+#.",
-"#####@.",
-"#####@.",
-"#####@.",
-"#####@.",
-"#####@.",
-"#####@.",
-"#####@.",
-"#####@.",
-"#####@.",
-"#####@.",
-"#####@.",
-"#####@.",
-"#####@.",
-"#####@.",
-"#####@.",
-"#####@.",
-"#####@.",
-"#####@.",
-"#####@.",
-"#####@."};
diff --git a/themes/kokodi/Makefile.am b/themes/kokodi/Makefile.am
index adfb5858f..8833c268e 100644
--- a/themes/kokodi/Makefile.am
+++ b/themes/kokodi/Makefile.am
@@ -1,4 +1,4 @@
-themedir = $(datadir)/themes/Kokodi/xfwm4
+themedir = $(datadir)/themes/Deault/xfwm4
 
 PNG_FILES = 								\
 	bottom-active.png						\
@@ -10,34 +10,44 @@ PNG_FILES = 								\
 	close-active.png						\
 	close-inactive.png						\
 	close-pressed.png						\
+	close-prelight.png						\
 	hide-active.png							\
 	hide-inactive.png						\
 	hide-pressed.png						\
+	hide-pressed.png						\
+	hide-prelight.png						\
 	left-active.png							\
 	left-inactive.png						\
 	maximize-active.png						\
 	maximize-inactive.png						\
 	maximize-pressed.png						\
+	maximize-prelight.png						\
 	maximize-toggled-active.png					\
 	maximize-toggled-inactive.png					\
 	maximize-toggled-pressed.png					\
+	maximize-toggled-prelight.png					\
 	menu-active.png							\
 	menu-inactive.png						\
 	menu-pressed.png						\
+	menu-prelight.png						\
 	right-active.png						\
 	right-inactive.png						\
 	shade-active.png						\
 	shade-inactive.png						\
 	shade-pressed.png						\
+	shade-prelight.png						\
 	shade-toggled-active.png					\
 	shade-toggled-inactive.png					\
 	shade-toggled-pressed.png					\
+	shade-toggled-prelight.png					\
 	stick-active.png						\
 	stick-inactive.png						\
 	stick-pressed.png						\
+	stick-prelight.png						\
 	stick-toggled-active.png					\
 	stick-toggled-inactive.png					\
 	stick-toggled-pressed.png					\
+	stick-toggled-prelight.png					\
 	title-1-active.png						\
 	title-1-inactive.png						\
 	title-2-active.png						\
@@ -63,34 +73,43 @@ SVG_FILES = 								\
 	close-active.svg						\
 	close-inactive.svg						\
 	close-pressed.svg						\
+	close-prelight.svg						\
 	hide-active.svg							\
 	hide-inactive.svg						\
 	hide-pressed.svg						\
+	hide-prelight.svg						\
 	left-active.svg							\
 	left-inactive.svg						\
 	maximize-active.svg						\
 	maximize-inactive.svg						\
 	maximize-pressed.svg						\
+	maximize-prelight.svg						\
 	maximize-toggled-active.svg					\
 	maximize-toggled-inactive.svg					\
 	maximize-toggled-pressed.svg					\
+	maximize-toggled-prelight.svg					\
 	menu-active.svg							\
 	menu-inactive.svg						\
 	menu-pressed.svg						\
+	menu-prelight.svg						\
 	right-active.svg						\
 	right-inactive.svg						\
 	shade-active.svg						\
 	shade-inactive.svg						\
 	shade-pressed.svg						\
+	shade-prelight.svg						\
 	shade-toggled-active.svg					\
 	shade-toggled-inactive.svg					\
 	shade-toggled-pressed.svg					\
+	shade-toggled-prelight.svg					\
 	stick-active.svg						\
 	stick-inactive.svg						\
 	stick-pressed.svg						\
+	stick-prelight.svg						\
 	stick-toggled-active.svg					\
 	stick-toggled-inactive.svg					\
 	stick-toggled-pressed.svg					\
+	stick-toggled-prelight.svg					\
 	title-1-active.svg						\
 	title-1-inactive.svg						\
 	title-2-active.svg						\
@@ -116,34 +135,43 @@ XPM_FILES = 								\
 	close-active.xpm						\
 	close-inactive.xpm						\
 	close-pressed.xpm						\
+	close-prelight.xpm						\
 	hide-active.xpm							\
 	hide-inactive.xpm						\
 	hide-pressed.xpm						\
+	hide-prelight.xpm						\
 	left-active.xpm							\
 	left-inactive.xpm						\
 	maximize-active.xpm						\
 	maximize-inactive.xpm						\
 	maximize-pressed.xpm						\
+	maximize-prelight.xpm						\
 	maximize-toggled-active.xpm					\
 	maximize-toggled-inactive.xpm					\
 	maximize-toggled-pressed.xpm					\
+	maximize-toggled-prelight.xpm					\
 	menu-active.xpm							\
 	menu-inactive.xpm						\
 	menu-pressed.xpm						\
+	menu-prelight.xpm						\
 	right-active.xpm						\
 	right-inactive.xpm						\
 	shade-active.xpm						\
 	shade-inactive.xpm						\
 	shade-pressed.xpm						\
+	shade-prelight.xpm						\
 	shade-toggled-active.xpm					\
 	shade-toggled-inactive.xpm					\
 	shade-toggled-pressed.xpm					\
+	shade-toggled-prelight.xpm					\
 	stick-active.xpm						\
 	stick-inactive.xpm						\
 	stick-pressed.xpm						\
+	stick-prelight.xpm						\
 	stick-toggled-active.xpm					\
 	stick-toggled-inactive.xpm					\
 	stick-toggled-pressed.xpm					\
+	stick-toggled-prelight.xpm					\
 	title-1-active.xpm						\
 	title-1-inactive.xpm						\
 	title-2-active.xpm						\
diff --git a/themes/kokodi/README b/themes/kokodi/README
index 5d53c4586..d01786097 100644
--- a/themes/kokodi/README
+++ b/themes/kokodi/README
@@ -1,7 +1,5 @@
-Kokodi^2
---------
-
 SVG based theme for xfwm4.
 Created Sept. 2006 by Olivier Fourdan <fourdan@xfce.org>
 Modified Oct. 2006 by Olivier Fourdan <fourdan@xfce.org>
+Modified Jul. 2007 by Olivier Fourdan <fourdan@xfce.org>
 Theme released under GNU GPL license.
diff --git a/themes/kokodi/bottom-active.png b/themes/kokodi/bottom-active.png
index 2739543a2..8eb40a1d2 100644
--- a/themes/kokodi/bottom-active.png
+++ b/themes/kokodi/bottom-active.png
diff --git a/themes/kokodi/bottom-active.svg b/themes/kokodi/bottom-active.svg
index 24b4923ad..891f7c910 100644
--- a/themes/kokodi/bottom-active.svg
+++ b/themes/kokodi/bottom-active.svg
@@ -12,9 +12,9 @@
    height="6"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.44.1"
+   inkscape:version="0.45.1"
    version="1.0"
-   sodipodi:docbase="default"
+   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/kokodi"
    sodipodi:docname="bottom-active.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
diff --git a/themes/kokodi/bottom-inactive.png b/themes/kokodi/bottom-inactive.png
index 2739543a2..8eb40a1d2 100644
--- a/themes/kokodi/bottom-inactive.png
+++ b/themes/kokodi/bottom-inactive.png
diff --git a/themes/kokodi/bottom-inactive.svg b/themes/kokodi/bottom-inactive.svg
index 5f09478cf..5467dba7d 100644
--- a/themes/kokodi/bottom-inactive.svg
+++ b/themes/kokodi/bottom-inactive.svg
@@ -12,9 +12,9 @@
    height="6"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.44.1"
+   inkscape:version="0.45.1"
    version="1.0"
-   sodipodi:docbase="default"
+   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/kokodi"
    sodipodi:docname="bottom-inactive.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
diff --git a/themes/kokodi/bottom-left-active.png b/themes/kokodi/bottom-left-active.png
index a32258657..308f43843 100644
--- a/themes/kokodi/bottom-left-active.png
+++ b/themes/kokodi/bottom-left-active.png
diff --git a/themes/kokodi/bottom-left-active.svg b/themes/kokodi/bottom-left-active.svg
index 96e0fcb8a..4e62fadbc 100644
--- a/themes/kokodi/bottom-left-active.svg
+++ b/themes/kokodi/bottom-left-active.svg
@@ -12,9 +12,9 @@
    height="16"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.44.1"
+   inkscape:version="0.45.1"
    version="1.0"
-   sodipodi:docbase="default"
+   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/kokodi"
    sodipodi:docname="bottom-left-active.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
diff --git a/themes/kokodi/bottom-left-inactive.png b/themes/kokodi/bottom-left-inactive.png
index a32258657..308f43843 100644
--- a/themes/kokodi/bottom-left-inactive.png
+++ b/themes/kokodi/bottom-left-inactive.png
diff --git a/themes/kokodi/bottom-left-inactive.svg b/themes/kokodi/bottom-left-inactive.svg
index 777eb76d2..ff2fae9d0 100644
--- a/themes/kokodi/bottom-left-inactive.svg
+++ b/themes/kokodi/bottom-left-inactive.svg
@@ -12,9 +12,9 @@
    height="16"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.44.1"
+   inkscape:version="0.45.1"
    version="1.0"
-   sodipodi:docbase="default"
+   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/kokodi"
    sodipodi:docname="bottom-left-inactive.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
diff --git a/themes/kokodi/bottom-right-active.png b/themes/kokodi/bottom-right-active.png
index 6abb47957..4c90a55b8 100644
--- a/themes/kokodi/bottom-right-active.png
+++ b/themes/kokodi/bottom-right-active.png
diff --git a/themes/kokodi/bottom-right-active.svg b/themes/kokodi/bottom-right-active.svg
index 433c631ba..6fd91673e 100644
--- a/themes/kokodi/bottom-right-active.svg
+++ b/themes/kokodi/bottom-right-active.svg
@@ -12,9 +12,9 @@
    height="16"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.44.1"
+   inkscape:version="0.45.1"
    version="1.0"
-   sodipodi:docbase="default"
+   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/kokodi"
    sodipodi:docname="bottom-right-active.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
diff --git a/themes/kokodi/bottom-right-inactive.png b/themes/kokodi/bottom-right-inactive.png
index 6abb47957..4c90a55b8 100644
--- a/themes/kokodi/bottom-right-inactive.png
+++ b/themes/kokodi/bottom-right-inactive.png
diff --git a/themes/kokodi/bottom-right-inactive.svg b/themes/kokodi/bottom-right-inactive.svg
index 46205a72b..f81aa974e 100644
--- a/themes/kokodi/bottom-right-inactive.svg
+++ b/themes/kokodi/bottom-right-inactive.svg
@@ -12,9 +12,9 @@
    height="16"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.44.1"
+   inkscape:version="0.45.1"
    version="1.0"
-   sodipodi:docbase="default"
+   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/kokodi"
    sodipodi:docname="bottom-right-inactive.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
diff --git a/themes/kokodi/close-active.png b/themes/kokodi/close-active.png
index a23d4a19c..4d118f6c2 100644
--- a/themes/kokodi/close-active.png
+++ b/themes/kokodi/close-active.png
diff --git a/themes/kokodi/close-active.svg b/themes/kokodi/close-active.svg
index ef31edc70..b25c43c4a 100644
--- a/themes/kokodi/close-active.svg
+++ b/themes/kokodi/close-active.svg
@@ -9,13 +9,13 @@
    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="18"
+   width="24"
    height="29"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.44.1"
+   inkscape:version="0.45.1"
    version="1.0"
-   sodipodi:docbase="default"
+   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/kokodi"
    sodipodi:docname="close-active.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
@@ -95,6 +95,15 @@
        y2="14"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient1886"
+       id="linearGradient2791"
+       x1="0"
+       y1="1"
+       x2="0"
+       y2="25"
+       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -145,7 +154,7 @@
      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 18,0.5 C 18,0.5 18,28 18,28 L 0,28 L 0,0.5 z "
+       d="M 0,0.5 L 24,0.5 C 24,0.5 24,28 24,28 L 0,28 L 0,0.5 z "
        id="path6057" />
   </g>
   <g
@@ -154,15 +163,19 @@
      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 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
+       d="M 0,1 L 24,1 C 24,1 24,4 24,4 L 0,4 L 0,3 z "
        id="path6061" />
     <rect
        style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect1884"
-       width="18"
+       width="24"
        height="14"
        x="0"
        y="1" />
+    <path
+       style="fill:none;stroke:url(#linearGradient2791);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.60"
+       d="M 0.5,1 L 0.5,16.5 C 0.5,16.5 0.5,18.5 2.5,18.5 C 4,18.5 21.5,18.5 21.5,18.5 C 21.5,18.5 23.5,18.5 23.5,16.5 C 23.5,14.5 23.5,1 23.5,1 L 23.5,1 L 23.5,1"
+       id="path2187" />
   </g>
   <g
      inkscape:label="Border"
@@ -171,7 +184,7 @@
      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 17.5,0.5"
+       d="M 0.5,0.5 L 23.5,0.5"
        id="path6059" />
   </g>
   <g
@@ -180,7 +193,7 @@
      inkscape:label="Button">
     <g
        id="g2327"
-       transform="translate(3,9)">
+       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"
@@ -210,7 +223,7 @@
      inkscape:label="Shadow">
     <path
        style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.05"
-       d="M 0.5,28.5 L 17.5,28.5"
+       d="M 0.5,28.5 L 23.5,28.5"
        id="path6989" />
   </g>
 </svg>
diff --git a/themes/kokodi/close-active.xpm b/themes/kokodi/close-active.xpm
index 3c1a7ae56..98936c509 100644
--- a/themes/kokodi/close-active.xpm
+++ b/themes/kokodi/close-active.xpm
@@ -1,34 +1,34 @@
 /* XPM */
 static char * close_active_xpm[] = {
-"18 29 2 1",
+"24 29 2 1",
 " 	c None",
 ".	c #C0C0FF s active_color_1",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-".................."};
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................"};
diff --git a/themes/kokodi/close-inactive.png b/themes/kokodi/close-inactive.png
index 407ca0c98..5fa496a95 100644
--- a/themes/kokodi/close-inactive.png
+++ b/themes/kokodi/close-inactive.png
diff --git a/themes/kokodi/close-inactive.svg b/themes/kokodi/close-inactive.svg
index 67bf2ce63..ed5dfa509 100644
--- a/themes/kokodi/close-inactive.svg
+++ b/themes/kokodi/close-inactive.svg
@@ -9,13 +9,13 @@
    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="18"
+   width="24"
    height="29"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.44.1"
+   inkscape:version="0.45.1"
    version="1.0"
-   sodipodi:docbase="default"
+   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/kokodi"
    sodipodi:docname="close-inactive.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
@@ -145,7 +145,7 @@
      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 18,0.5 C 18,0.5 18,28 18,28 L 0,28 L 0,0.5 z "
+       d="M 0,0.5 L 24,0.5 C 24,0.5 24,28 24,28 L 0,28 L 0,0.5 z "
        id="path6057" />
   </g>
   <g
@@ -154,15 +154,19 @@
      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 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
+       d="M 0,1 L 24,1 C 24,1 24,4 24,4 L 0,4 L 0,3 z "
        id="path6061" />
     <rect
        style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect1884"
-       width="18"
+       width="24"
        height="14"
        x="0"
        y="1" />
+    <path
+       style="fill:none;stroke:#7f7f7f;stroke-width:1px;stroke-opacity:0.25"
+       d="M 0.5,1 L 0.5,16.5 C 0.5,16.5 0.5,18.5 2.5,18.5 C 4,18.5 21.5,18.5 21.5,18.5 C 21.5,18.5 23.5,18.5 23.5,16.5 C 23.5,14.5 23.5,1 23.5,1 L 23.5,1 L 23.5,1"
+       id="path2187" />
   </g>
   <g
      inkscape:label="Border"
@@ -171,7 +175,7 @@
      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 17.5,0.5"
+       d="M 0.5,0.5 L 23.5,0.5"
        id="path6059" />
   </g>
   <g
@@ -180,7 +184,7 @@
      inkscape:label="Button">
     <g
        id="g2327"
-       transform="translate(3,9)">
+       transform="translate(6,4)">
       <path
          id="path2221"
          d="M 2.5,2.5 L 9.5,9.5 L 9.5,9.5"
@@ -197,7 +201,7 @@
      inkscape:label="Shadow">
     <path
        style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.05"
-       d="M 0.5,28.5 L 17.5,28.5"
+       d="M 0.5,28.5 L 23.5,28.5"
        id="path6989" />
   </g>
 </svg>
diff --git a/themes/kokodi/close-inactive.xpm b/themes/kokodi/close-inactive.xpm
index 1cf0710b3..5f56fba84 100644
--- a/themes/kokodi/close-inactive.xpm
+++ b/themes/kokodi/close-inactive.xpm
@@ -1,34 +1,34 @@
 /* XPM */
 static char * close_inactive_xpm[] = {
-"18 29 2 1",
+"24 29 2 1",
 " 	c None",
 ".	c #C0C0FF s inactive_color_1",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-".................."};
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................"};
diff --git a/themes/kokodi/close-prelight.png b/themes/kokodi/close-prelight.png
new file mode 100644
index 000000000..fc915c87a
--- /dev/null
+++ b/themes/kokodi/close-prelight.png
diff --git a/themes/default/close-pressed.svg b/themes/kokodi/close-prelight.svg
index dc2c08045..de2711015 100644
--- a/themes/default/close-pressed.svg
+++ b/themes/kokodi/close-prelight.svg
@@ -9,37 +9,61 @@
    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="18"
-   height="27"
+   width="24"
+   height="29"
    id="svg2"
    sodipodi:version="0.32"
    inkscape:version="0.45.1"
    version="1.0"
-   sodipodi:docname="close-pressed.svg"
+   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/kokodi"
+   sodipodi:docname="close-prelight.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.25;"
+         offset="1"
+         id="stop1890" />
+    </linearGradient>
+    <linearGradient
        id="linearGradient5873">
       <stop
          id="stop5875"
          offset="0"
          style="stop-color:white;stop-opacity:1;" />
       <stop
+         id="stop5877"
+         offset="0.5"
+         style="stop-color:white;stop-opacity:0.90;" />
+      <stop
          id="stop5879"
          offset="1"
-         style="stop-color:white;stop-opacity:0.15;" />
+         style="stop-color:white;stop-opacity:0;" />
     </linearGradient>
     <linearGradient
        id="linearGradient5847">
       <stop
          id="stop5849"
          offset="0"
-         style="stop-color:black;stop-opacity:0.05;" />
+         style="stop-color:black;stop-opacity:0;" />
       <stop
          id="stop2776"
+         offset="0.4"
+         style="stop-color:black;stop-opacity:0;" />
+      <stop
+         id="stop2779"
+         offset="0.6"
+         style="stop-color:black;stop-opacity:0.05;" />
+      <stop
+         id="stop5851"
          offset="1"
-         style="stop-color:white;stop-opacity:0.30;" />
+         style="stop-color:white;stop-opacity:0.20;" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
@@ -49,7 +73,7 @@
        x1="0"
        y1="0.5"
        x2="0"
-       y2="15"
+       y2="28.5"
        gradientTransform="matrix(1,0,0,1,0,0)" />
     <linearGradient
        inkscape:collect="always"
@@ -65,13 +89,32 @@
        inkscape:collect="always"
        xlink:href="#linearGradient5873"
        id="radialGradient3087"
-       cx="9"
-       cy="12"
-       fx="9"
-       fy="12"
-       r="12"
+       cx="12"
+       cy="0"
+       fx="12"
+       fy="3"
+       r="22"
        gradientTransform="matrix(1,0,0,1,0,0.5)"
        gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient1886"
+       id="linearGradient1892"
+       x1="0"
+       y1="1"
+       x2="0"
+       y2="12"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient1886"
+       id="linearGradient2791"
+       x1="0"
+       y1="1"
+       x2="0"
+       y2="25"
+       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -121,14 +164,14 @@
      inkscape:label="pressed">
     <g
        id="g1789"
-       transform="translate(0,2)">
+       transform="translate(0,1)">
       <rect
          style="opacity:0.5;fill:url(#radialGradient3087);fill-opacity:1.0;stroke:url(#radialGradient3087);stroke-width:1;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
          id="rect3079"
-         width="18"
-         height="18"
+         width="24"
+         height="25"
          x="0"
-         y="4" />
+         y="0" />
     </g>
   </g>
   <g
@@ -137,8 +180,8 @@
      inkscape:label="Grad"
      style="display:inline">
     <path
-       style="fill:url(#linearGradient6945);fill-opacity:0.65;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 18,0.5 C 18,0.5 18,26 18,26 L 0,26 L 0,0.5 z "
+       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,28 24,28 L 0,28 L 0,0.5 z "
        id="path6057" />
   </g>
   <g
@@ -146,9 +189,20 @@
      id="layer3"
      inkscape:label="hilight">
     <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.40;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 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"
+       d="M 0,1 L 24,1 C 24,1 24,4 24,4 L 0,4 L 0,3 z "
        id="path6061" />
+    <rect
+       style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect1884"
+       width="24"
+       height="14"
+       x="0"
+       y="1" />
+    <path
+       style="fill:none;stroke:url(#linearGradient2791);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.60"
+       d="M 0.5,1 L 0.5,16.5 C 0.5,16.5 0.5,18.5 2.5,18.5 C 4,18.5 21.5,18.5 21.5,18.5 C 21.5,18.5 23.5,18.5 23.5,16.5 C 23.5,14.5 23.5,1 23.5,1 L 23.5,1 L 23.5,1"
+       id="path2187" />
   </g>
   <g
      inkscape:label="Border"
@@ -156,8 +210,8 @@
      id="g31"
      style="display:inline">
     <path
-       style="fill:none;fill-opacity:0.20;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 17.5,0.5"
+       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+       d="M 0.5,0.5 L 23.5,0.5"
        id="path6059" />
   </g>
   <g
@@ -165,29 +219,29 @@
      id="g3722"
      inkscape:label="Button">
     <g
-       id="g2328"
-       transform="translate(3,9)">
+       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.20;fill-rule:evenodd;stroke:black;stroke-width:4.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke: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" />
         <path
-           style="fill:none;fill-opacity:0.20;fill-rule:evenodd;stroke:black;stroke-width:4.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke: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" />
       </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.20;fill-rule:evenodd;stroke:white;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+         style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke: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.20;fill-rule:evenodd;stroke:white;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+         style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:white;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
     </g>
   </g>
   <g
@@ -195,8 +249,8 @@
      id="layer5"
      inkscape:label="Shadow">
     <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0"
-       d="M 0.5,26.5 L 17.5,26.5"
+       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.05"
+       d="M 0.5,28.5 L 23.5,28.5"
        id="path6989" />
   </g>
 </svg>
diff --git a/themes/kokodi/close-prelight.xpm b/themes/kokodi/close-prelight.xpm
new file mode 100644
index 000000000..c57839b10
--- /dev/null
+++ b/themes/kokodi/close-prelight.xpm
@@ -0,0 +1,34 @@
+/* XPM */
+static char * close_pressed_xpm[] = {
+"24 29 2 1",
+" 	c None",
+".	c #C0C0FF s active_color_1",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................"};
diff --git a/themes/kokodi/close-pressed.png b/themes/kokodi/close-pressed.png
index 06d2455e6..a394a6b85 100644
--- a/themes/kokodi/close-pressed.png
+++ b/themes/kokodi/close-pressed.png
diff --git a/themes/kokodi/close-pressed.svg b/themes/kokodi/close-pressed.svg
index 7363f86b3..468138390 100644
--- a/themes/kokodi/close-pressed.svg
+++ b/themes/kokodi/close-pressed.svg
@@ -9,13 +9,13 @@
    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="18"
+   width="24"
    height="29"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.44.1"
+   inkscape:version="0.45.1"
    version="1.0"
-   sodipodi:docbase="default"
+   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/kokodi"
    sodipodi:docname="close-pressed.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
@@ -89,11 +89,11 @@
        inkscape:collect="always"
        xlink:href="#linearGradient5873"
        id="radialGradient3087"
-       cx="9"
-       cy="9"
-       fx="9"
-       fy="9"
-       r="9"
+       cx="12"
+       cy="0"
+       fx="12"
+       fy="3"
+       r="22"
        gradientTransform="matrix(1,0,0,1,0,0.5)"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
@@ -103,9 +103,18 @@
        x1="0"
        y1="1"
        x2="0"
-       y2="14"
+       y2="12"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient1886"
+       id="linearGradient2791"
+       x1="0"
+       y1="1"
+       x2="0"
+       y2="25"
+       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -155,12 +164,12 @@
      inkscape:label="pressed">
     <g
        id="g1789"
-       transform="translate(0,6)">
+       transform="translate(0,1)">
       <rect
          style="opacity:0.5;fill:url(#radialGradient3087);fill-opacity:1.0;stroke:url(#radialGradient3087);stroke-width:1;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
          id="rect3079"
-         width="18"
-         height="29"
+         width="24"
+         height="25"
          x="0"
          y="0" />
     </g>
@@ -172,7 +181,7 @@
      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 18,0.5 C 18,0.5 18,28 18,28 L 0,28 L 0,0.5 z "
+       d="M 0,0.5 L 24,0.5 C 24,0.5 24,28 24,28 L 0,28 L 0,0.5 z "
        id="path6057" />
   </g>
   <g
@@ -181,15 +190,19 @@
      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 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
+       d="M 0,1 L 24,1 C 24,1 24,4 24,4 L 0,4 L 0,3 z "
        id="path6061" />
     <rect
-       style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       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="18"
-       height="14"
+       width="24"
+       height="12"
        x="0"
        y="1" />
+    <path
+       style="fill:none;stroke:url(#linearGradient2791);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.60"
+       d="M 0.5,1 L 0.5,16.5 C 0.5,16.5 0.5,18.5 2.5,18.5 C 4,18.5 21.5,18.5 21.5,18.5 C 21.5,18.5 23.5,18.5 23.5,16.5 C 23.5,14.5 23.5,1 23.5,1 L 23.5,1 L 23.5,1"
+       id="path2187" />
   </g>
   <g
      inkscape:label="Border"
@@ -198,7 +211,7 @@
      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 17.5,0.5"
+       d="M 0.5,0.5 L 23.5,0.5"
        id="path6059" />
   </g>
   <g
@@ -207,7 +220,7 @@
      inkscape:label="Button">
     <g
        id="g2327"
-       transform="translate(3,10)">
+       transform="translate(6,5)">
       <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"
@@ -237,7 +250,7 @@
      inkscape:label="Shadow">
     <path
        style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.05"
-       d="M 0.5,28.5 L 17.5,28.5"
+       d="M 0.5,28.5 L 23.5,28.5"
        id="path6989" />
   </g>
 </svg>
diff --git a/themes/kokodi/close-pressed.xpm b/themes/kokodi/close-pressed.xpm
index 6c53e6c05..c57839b10 100644
--- a/themes/kokodi/close-pressed.xpm
+++ b/themes/kokodi/close-pressed.xpm
@@ -1,34 +1,34 @@
 /* XPM */
 static char * close_pressed_xpm[] = {
-"18 29 2 1",
+"24 29 2 1",
 " 	c None",
 ".	c #C0C0FF s active_color_1",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-".................."};
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................"};
diff --git a/themes/kokodi/hide-active.png b/themes/kokodi/hide-active.png
index 3366e49fa..53d7bd70b 100644
--- a/themes/kokodi/hide-active.png
+++ b/themes/kokodi/hide-active.png
diff --git a/themes/kokodi/hide-active.svg b/themes/kokodi/hide-active.svg
index bc784f800..249e32d13 100644
--- a/themes/kokodi/hide-active.svg
+++ b/themes/kokodi/hide-active.svg
@@ -9,13 +9,13 @@
    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="18"
+   width="24"
    height="29"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.44.1"
+   inkscape:version="0.45.1"
    version="1.0"
-   sodipodi:docbase="default"
+   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/kokodi"
    sodipodi:docname="hide-active.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
@@ -95,6 +95,15 @@
        y2="14"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient1886"
+       id="linearGradient2791"
+       x1="0"
+       y1="1"
+       x2="0"
+       y2="25"
+       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -145,7 +154,7 @@
      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 18,0.5 C 18,0.5 18,28 18,28 L 0,28 L 0,0.5 z "
+       d="M 0,0.5 L 24,0.5 C 24,0.5 24,28 24,28 L 0,28 L 0,0.5 z "
        id="path6057" />
   </g>
   <g
@@ -154,15 +163,19 @@
      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 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
+       d="M 0,1 L 24,1 C 24,1 24,4 24,4 L 0,4 L 0,3 z "
        id="path6061" />
     <rect
        style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect1884"
-       width="18"
+       width="24"
        height="14"
        x="0"
        y="1" />
+    <path
+       style="fill:none;stroke:url(#linearGradient2791);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.60"
+       d="M 0.5,1 L 0.5,16.5 C 0.5,16.5 0.5,18.5 2.5,18.5 C 4,18.5 21.5,18.5 21.5,18.5 C 21.5,18.5 23.5,18.5 23.5,16.5 C 23.5,14.5 23.5,1 23.5,1 L 23.5,1 L 23.5,1"
+       id="path2187" />
   </g>
   <g
      inkscape:label="Border"
@@ -171,7 +184,7 @@
      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 17.5,0.5"
+       d="M 0.5,0.5 L 23.5,0.5"
        id="path6059" />
   </g>
   <g
@@ -181,7 +194,7 @@
     <g
        style="display:inline"
        id="g1616"
-       transform="translate(3,9)">
+       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"
@@ -204,7 +217,7 @@
      inkscape:label="Shadow">
     <path
        style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.05"
-       d="M 0.5,28.5 L 17.5,28.5"
+       d="M 0.5,28.5 L 23.5,28.5"
        id="path6989" />
   </g>
 </svg>
diff --git a/themes/kokodi/hide-active.xpm b/themes/kokodi/hide-active.xpm
index e0b53aa5d..9b6f8993c 100644
--- a/themes/kokodi/hide-active.xpm
+++ b/themes/kokodi/hide-active.xpm
@@ -1,34 +1,34 @@
 /* XPM */
 static char * hide_active_xpm[] = {
-"18 29 2 1",
+"24 29 2 1",
 " 	c None",
 ".	c #C0C0FF s active_color_1",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-".................."};
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................"};
diff --git a/themes/kokodi/hide-inactive.png b/themes/kokodi/hide-inactive.png
index 7cf712886..dbceb93af 100644
--- a/themes/kokodi/hide-inactive.png
+++ b/themes/kokodi/hide-inactive.png
diff --git a/themes/kokodi/hide-inactive.svg b/themes/kokodi/hide-inactive.svg
index 1fd07979f..ae251000a 100644
--- a/themes/kokodi/hide-inactive.svg
+++ b/themes/kokodi/hide-inactive.svg
@@ -9,13 +9,13 @@
    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="18"
+   width="24"
    height="29"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.44.1"
+   inkscape:version="0.45.1"
    version="1.0"
-   sodipodi:docbase="default"
+   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/kokodi"
    sodipodi:docname="hide-inactive.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
@@ -145,7 +145,7 @@
      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 18,0.5 C 18,0.5 18,28 18,28 L 0,28 L 0,0.5 z "
+       d="M 0,0.5 L 24,0.5 C 24,0.5 24,28 24,28 L 0,28 L 0,0.5 z "
        id="path6057" />
   </g>
   <g
@@ -154,15 +154,19 @@
      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 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
+       d="M 0,1 L 24,1 C 24,1 24,4 24,4 L 0,4 L 0,3 z "
        id="path6061" />
     <rect
        style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect1884"
-       width="18"
+       width="24"
        height="14"
        x="0"
        y="1" />
+    <path
+       style="fill:none;stroke:#7f7f7f;stroke-width:1px;stroke-opacity:0.25"
+       d="M 0.5,1 L 0.5,16.5 C 0.5,16.5 0.5,18.5 2.5,18.5 C 4,18.5 21.5,18.5 21.5,18.5 C 21.5,18.5 23.5,18.5 23.5,16.5 C 23.5,14.5 23.5,1 23.5,1 L 23.5,1 L 23.5,1"
+       id="path2187" />
   </g>
   <g
      inkscape:label="Border"
@@ -171,7 +175,7 @@
      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 17.5,0.5"
+       d="M 0.5,0.5 L 23.5,0.5"
        id="path6059" />
   </g>
   <g
@@ -181,7 +185,7 @@
     <g
        style="display:inline"
        id="g1616"
-       transform="translate(3,9)">
+       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"
@@ -197,7 +201,7 @@
      inkscape:label="Shadow">
     <path
        style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.05"
-       d="M 0.5,28.5 L 17.5,28.5"
+       d="M 0.5,28.5 L 23.5,28.5"
        id="path6989" />
   </g>
 </svg>
diff --git a/themes/kokodi/hide-inactive.xpm b/themes/kokodi/hide-inactive.xpm
index 31a48440e..41331730f 100644
--- a/themes/kokodi/hide-inactive.xpm
+++ b/themes/kokodi/hide-inactive.xpm
@@ -1,34 +1,34 @@
 /* XPM */
 static char * hide_inactive_xpm[] = {
-"18 29 2 1",
+"24 29 2 1",
 " 	c None",
 ".	c #C0C0FF s inactive_color_1",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-".................."};
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................"};
diff --git a/themes/kokodi/hide-prelight.png b/themes/kokodi/hide-prelight.png
new file mode 100644
index 000000000..62e5db884
--- /dev/null
+++ b/themes/kokodi/hide-prelight.png
diff --git a/themes/largeprint/hide-pressed.svg b/themes/kokodi/hide-prelight.svg
index 181577ea7..c80df8cfa 100644
--- a/themes/largeprint/hide-pressed.svg
+++ b/themes/kokodi/hide-prelight.svg
@@ -9,37 +9,61 @@
    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="18"
-   height="31"
+   width="24"
+   height="29"
    id="svg2"
    sodipodi:version="0.32"
    inkscape:version="0.45.1"
    version="1.0"
-   sodipodi:docname="hide-pressed.svg"
+   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/kokodi"
+   sodipodi:docname="hide-prelight.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.25;"
+         offset="1"
+         id="stop1890" />
+    </linearGradient>
+    <linearGradient
        id="linearGradient5873">
       <stop
          id="stop5875"
          offset="0"
          style="stop-color:white;stop-opacity:1;" />
       <stop
+         id="stop5877"
+         offset="0.5"
+         style="stop-color:white;stop-opacity:0.90;" />
+      <stop
          id="stop5879"
          offset="1"
-         style="stop-color:white;stop-opacity:0.15;" />
+         style="stop-color:white;stop-opacity:0;" />
     </linearGradient>
     <linearGradient
        id="linearGradient5847">
       <stop
          id="stop5849"
          offset="0"
-         style="stop-color:black;stop-opacity:0.05;" />
+         style="stop-color:black;stop-opacity:0;" />
       <stop
          id="stop2776"
+         offset="0.4"
+         style="stop-color:black;stop-opacity:0;" />
+      <stop
+         id="stop2779"
+         offset="0.6"
+         style="stop-color:black;stop-opacity:0.05;" />
+      <stop
+         id="stop5851"
          offset="1"
-         style="stop-color:white;stop-opacity:0.30;" />
+         style="stop-color:white;stop-opacity:0.20;" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
@@ -49,7 +73,7 @@
        x1="0"
        y1="0.5"
        x2="0"
-       y2="17"
+       y2="28.5"
        gradientTransform="matrix(1,0,0,1,0,0)" />
     <linearGradient
        inkscape:collect="always"
@@ -65,13 +89,32 @@
        inkscape:collect="always"
        xlink:href="#linearGradient5873"
        id="radialGradient3087"
-       cx="9"
-       cy="14"
-       fx="9"
-       fy="14"
-       r="12"
+       cx="12"
+       cy="0"
+       fx="12"
+       fy="3"
+       r="22"
        gradientTransform="matrix(1,0,0,1,0,0.5)"
        gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient1886"
+       id="linearGradient1892"
+       x1="0"
+       y1="1"
+       x2="0"
+       y2="12"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient1886"
+       id="linearGradient2791"
+       x1="0"
+       y1="1"
+       x2="0"
+       y2="25"
+       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -121,14 +164,14 @@
      inkscape:label="pressed">
     <g
        id="g1789"
-       transform="translate(0,2)">
+       transform="translate(0,1)">
       <rect
          style="opacity:0.5;fill:url(#radialGradient3087);fill-opacity:1.0;stroke:url(#radialGradient3087);stroke-width:1;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
          id="rect3079"
-         width="18"
-         height="18"
+         width="24"
+         height="25"
          x="0"
-         y="6" />
+         y="0" />
     </g>
   </g>
   <g
@@ -137,8 +180,8 @@
      inkscape:label="Grad"
      style="display:inline">
     <path
-       style="fill:url(#linearGradient6945);fill-opacity:0.75;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 18,0.5 C 18,0.5 18,30 18,30 L 0,30 L 0,0.5 z "
+       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,28 24,28 L 0,28 L 0,0.5 z "
        id="path6057" />
   </g>
   <g
@@ -146,9 +189,20 @@
      id="layer3"
      inkscape:label="hilight">
     <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.40;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 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"
+       d="M 0,1 L 24,1 C 24,1 24,4 24,4 L 0,4 L 0,3 z "
        id="path6061" />
+    <rect
+       style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect1884"
+       width="24"
+       height="14"
+       x="0"
+       y="1" />
+    <path
+       style="fill:none;stroke:url(#linearGradient2791);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.60"
+       d="M 0.5,1 L 0.5,16.5 C 0.5,16.5 0.5,18.5 2.5,18.5 C 4,18.5 21.5,18.5 21.5,18.5 C 21.5,18.5 23.5,18.5 23.5,16.5 C 23.5,14.5 23.5,1 23.5,1 L 23.5,1 L 23.5,1"
+       id="path2187" />
   </g>
   <g
      inkscape:label="Border"
@@ -156,8 +210,8 @@
      id="g31"
      style="display:inline">
     <path
-       style="fill:none;fill-opacity:0.20;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 17.5,0.5"
+       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+       d="M 0.5,0.5 L 23.5,0.5"
        id="path6059" />
   </g>
   <g
@@ -167,7 +221,7 @@
     <g
        style="display:inline"
        id="g1616"
-       transform="translate(3,11)">
+       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"
@@ -189,8 +243,8 @@
      id="layer5"
      inkscape:label="Shadow">
     <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0"
-       d="M 0.5,30.5 L 17.5,30.5"
+       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.05"
+       d="M 0.5,28.5 L 23.5,28.5"
        id="path6989" />
   </g>
 </svg>
diff --git a/themes/kokodi/hide-prelight.xpm b/themes/kokodi/hide-prelight.xpm
new file mode 100644
index 000000000..b49e6ee85
--- /dev/null
+++ b/themes/kokodi/hide-prelight.xpm
@@ -0,0 +1,34 @@
+/* XPM */
+static char * hide_pressed_xpm[] = {
+"24 29 2 1",
+" 	c None",
+".	c #C0C0FF s active_color_1",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................"};
diff --git a/themes/kokodi/hide-pressed.png b/themes/kokodi/hide-pressed.png
index 478d957ce..c77a5240e 100644
--- a/themes/kokodi/hide-pressed.png
+++ b/themes/kokodi/hide-pressed.png
diff --git a/themes/kokodi/hide-pressed.svg b/themes/kokodi/hide-pressed.svg
index a19d822c2..c907e56f2 100644
--- a/themes/kokodi/hide-pressed.svg
+++ b/themes/kokodi/hide-pressed.svg
@@ -9,13 +9,13 @@
    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="18"
+   width="24"
    height="29"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.44.1"
+   inkscape:version="0.45.1"
    version="1.0"
-   sodipodi:docbase="default"
+   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/kokodi"
    sodipodi:docname="hide-pressed.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
@@ -89,11 +89,11 @@
        inkscape:collect="always"
        xlink:href="#linearGradient5873"
        id="radialGradient3087"
-       cx="9"
-       cy="9"
-       fx="9"
-       fy="9"
-       r="9"
+       cx="12"
+       cy="0"
+       fx="12"
+       fy="3"
+       r="22"
        gradientTransform="matrix(1,0,0,1,0,0.5)"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
@@ -103,9 +103,18 @@
        x1="0"
        y1="1"
        x2="0"
-       y2="14"
+       y2="12"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient1886"
+       id="linearGradient2791"
+       x1="0"
+       y1="1"
+       x2="0"
+       y2="25"
+       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -155,12 +164,12 @@
      inkscape:label="pressed">
     <g
        id="g1789"
-       transform="translate(0,6)">
+       transform="translate(0,1)">
       <rect
          style="opacity:0.5;fill:url(#radialGradient3087);fill-opacity:1.0;stroke:url(#radialGradient3087);stroke-width:1;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
          id="rect3079"
-         width="18"
-         height="29"
+         width="24"
+         height="25"
          x="0"
          y="0" />
     </g>
@@ -172,7 +181,7 @@
      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 18,0.5 C 18,0.5 18,28 18,28 L 0,28 L 0,0.5 z "
+       d="M 0,0.5 L 24,0.5 C 24,0.5 24,28 24,28 L 0,28 L 0,0.5 z "
        id="path6057" />
   </g>
   <g
@@ -181,15 +190,19 @@
      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 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
+       d="M 0,1 L 24,1 C 24,1 24,4 24,4 L 0,4 L 0,3 z "
        id="path6061" />
     <rect
-       style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       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="18"
-       height="14"
+       width="24"
+       height="12"
        x="0"
        y="1" />
+    <path
+       style="fill:none;stroke:url(#linearGradient2791);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.60"
+       d="M 0.5,1 L 0.5,16.5 C 0.5,16.5 0.5,18.5 2.5,18.5 C 4,18.5 21.5,18.5 21.5,18.5 C 21.5,18.5 23.5,18.5 23.5,16.5 C 23.5,14.5 23.5,1 23.5,1 L 23.5,1 L 23.5,1"
+       id="path2187" />
   </g>
   <g
      inkscape:label="Border"
@@ -198,7 +211,7 @@
      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 17.5,0.5"
+       d="M 0.5,0.5 L 23.5,0.5"
        id="path6059" />
   </g>
   <g
@@ -208,7 +221,7 @@
     <g
        style="display:inline"
        id="g1616"
-       transform="translate(3,10)">
+       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"
@@ -231,7 +244,7 @@
      inkscape:label="Shadow">
     <path
        style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.05"
-       d="M 0.5,28.5 L 17.5,28.5"
+       d="M 0.5,28.5 L 23.5,28.5"
        id="path6989" />
   </g>
 </svg>
diff --git a/themes/kokodi/hide-pressed.xpm b/themes/kokodi/hide-pressed.xpm
index c7f8dda9c..b49e6ee85 100644
--- a/themes/kokodi/hide-pressed.xpm
+++ b/themes/kokodi/hide-pressed.xpm
@@ -1,34 +1,34 @@
 /* XPM */
 static char * hide_pressed_xpm[] = {
-"18 29 2 1",
+"24 29 2 1",
 " 	c None",
 ".	c #C0C0FF s active_color_1",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-".................."};
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................"};
diff --git a/themes/kokodi/left-active.png b/themes/kokodi/left-active.png
index 6928a8d2e..ab4de17c2 100644
--- a/themes/kokodi/left-active.png
+++ b/themes/kokodi/left-active.png
diff --git a/themes/kokodi/left-active.svg b/themes/kokodi/left-active.svg
index 5fb146fb8..9b199fd03 100644
--- a/themes/kokodi/left-active.svg
+++ b/themes/kokodi/left-active.svg
@@ -12,9 +12,9 @@
    height="24"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.44.1"
+   inkscape:version="0.45.1"
    version="1.0"
-   sodipodi:docbase="default"
+   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/kokodi"
    sodipodi:docname="left-active.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
diff --git a/themes/kokodi/left-inactive.png b/themes/kokodi/left-inactive.png
index 6928a8d2e..ab4de17c2 100644
--- a/themes/kokodi/left-inactive.png
+++ b/themes/kokodi/left-inactive.png
diff --git a/themes/kokodi/left-inactive.svg b/themes/kokodi/left-inactive.svg
index 9746a7bb2..9bf1503a5 100644
--- a/themes/kokodi/left-inactive.svg
+++ b/themes/kokodi/left-inactive.svg
@@ -12,9 +12,9 @@
    height="24"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.44.1"
+   inkscape:version="0.45.1"
    version="1.0"
-   sodipodi:docbase="default"
+   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/kokodi"
    sodipodi:docname="left-inactive.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
diff --git a/themes/kokodi/maximize-active.png b/themes/kokodi/maximize-active.png
index 263891226..b7a9ebf90 100644
--- a/themes/kokodi/maximize-active.png
+++ b/themes/kokodi/maximize-active.png
diff --git a/themes/kokodi/maximize-active.svg b/themes/kokodi/maximize-active.svg
index d9f41aada..66dc5e9a7 100644
--- a/themes/kokodi/maximize-active.svg
+++ b/themes/kokodi/maximize-active.svg
@@ -9,13 +9,13 @@
    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="18"
+   width="24"
    height="29"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.44.1"
+   inkscape:version="0.45.1"
    version="1.0"
-   sodipodi:docbase="default"
+   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/kokodi"
    sodipodi:docname="maximize-active.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
@@ -95,6 +95,15 @@
        y2="14"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient1886"
+       id="linearGradient2791"
+       x1="0"
+       y1="1"
+       x2="0"
+       y2="25"
+       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -145,7 +154,7 @@
      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 18,0.5 C 18,0.5 18,28 18,28 L 0,28 L 0,0.5 z "
+       d="M 0,0.5 L 24,0.5 C 24,0.5 24,28 24,28 L 0,28 L 0,0.5 z "
        id="path6057" />
   </g>
   <g
@@ -154,15 +163,19 @@
      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 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
+       d="M 0,1 L 24,1 C 24,1 24,4 24,4 L 0,4 L 0,3 z "
        id="path6061" />
     <rect
        style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect1884"
-       width="18"
+       width="24"
        height="14"
        x="0"
        y="1" />
+    <path
+       style="fill:none;stroke:url(#linearGradient2791);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.60"
+       d="M 0.5,1 L 0.5,16.5 C 0.5,16.5 0.5,18.5 2.5,18.5 C 4,18.5 21.5,18.5 21.5,18.5 C 21.5,18.5 23.5,18.5 23.5,16.5 C 23.5,14.5 23.5,1 23.5,1 L 23.5,1 L 23.5,1"
+       id="path2187" />
   </g>
   <g
      inkscape:label="Border"
@@ -171,7 +184,7 @@
      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 17.5,0.5"
+       d="M 0.5,0.5 L 23.5,0.5"
        id="path6059" />
   </g>
   <g
@@ -181,7 +194,7 @@
     <g
        style="display:inline"
        id="g1614"
-       transform="translate(3,9)">
+       transform="translate(6,4)">
       <path
          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 "
@@ -198,7 +211,7 @@
      inkscape:label="Shadow">
     <path
        style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.05"
-       d="M 0.5,28.5 L 17.5,28.5"
+       d="M 0.5,28.5 L 23.5,28.5"
        id="path6989" />
   </g>
 </svg>
diff --git a/themes/kokodi/maximize-active.xpm b/themes/kokodi/maximize-active.xpm
index cad593dfd..c37ffcfd3 100644
--- a/themes/kokodi/maximize-active.xpm
+++ b/themes/kokodi/maximize-active.xpm
@@ -1,34 +1,34 @@
 /* XPM */
 static char * maximize_active_xpm[] = {
-"18 29 2 1",
+"24 29 2 1",
 " 	c None",
 ".	c #C0C0FF s active_color_1",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-".................."};
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................"};
diff --git a/themes/kokodi/maximize-inactive.png b/themes/kokodi/maximize-inactive.png
index dd0ad0f9f..227617b06 100644
--- a/themes/kokodi/maximize-inactive.png
+++ b/themes/kokodi/maximize-inactive.png
diff --git a/themes/kokodi/maximize-inactive.svg b/themes/kokodi/maximize-inactive.svg
index 31ec41be5..25f8d847b 100644
--- a/themes/kokodi/maximize-inactive.svg
+++ b/themes/kokodi/maximize-inactive.svg
@@ -9,13 +9,13 @@
    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="18"
+   width="24"
    height="29"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.44.1"
+   inkscape:version="0.45.1"
    version="1.0"
-   sodipodi:docbase="default"
+   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/kokodi"
    sodipodi:docname="maximize-inactive.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
@@ -145,7 +145,7 @@
      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 18,0.5 C 18,0.5 18,28 18,28 L 0,28 L 0,0.5 z "
+       d="M 0,0.5 L 24,0.5 C 24,0.5 24,28 24,28 L 0,28 L 0,0.5 z "
        id="path6057" />
   </g>
   <g
@@ -154,15 +154,19 @@
      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 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
+       d="M 0,1 L 24,1 C 24,1 24,4 24,4 L 0,4 L 0,3 z "
        id="path6061" />
     <rect
        style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect1884"
-       width="18"
+       width="24"
        height="14"
        x="0"
        y="1" />
+    <path
+       style="fill:none;stroke:#7f7f7f;stroke-width:1px;stroke-opacity:0.25"
+       d="M 0.5,1 L 0.5,16.5 C 0.5,16.5 0.5,18.5 2.5,18.5 C 4,18.5 21.5,18.5 21.5,18.5 C 21.5,18.5 23.5,18.5 23.5,16.5 C 23.5,14.5 23.5,1 23.5,1 L 23.5,1 L 23.5,1"
+       id="path2187" />
   </g>
   <g
      inkscape:label="Border"
@@ -171,7 +175,7 @@
      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 17.5,0.5"
+       d="M 0.5,0.5 L 23.5,0.5"
        id="path6059" />
   </g>
   <g
@@ -181,7 +185,7 @@
     <g
        style="display:inline"
        id="g1626"
-       transform="translate(3,9)">
+       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 "
@@ -194,7 +198,7 @@
      inkscape:label="Shadow">
     <path
        style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.05"
-       d="M 0.5,28.5 L 17.5,28.5"
+       d="M 0.5,28.5 L 23.5,28.5"
        id="path6989" />
   </g>
 </svg>
diff --git a/themes/kokodi/maximize-inactive.xpm b/themes/kokodi/maximize-inactive.xpm
index cca5139d2..bac4813be 100644
--- a/themes/kokodi/maximize-inactive.xpm
+++ b/themes/kokodi/maximize-inactive.xpm
@@ -1,34 +1,34 @@
 /* XPM */
 static char * maximize_inactive_xpm[] = {
-"18 29 2 1",
+"24 29 2 1",
 " 	c None",
 ".	c #C0C0FF s inactive_color_1",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-".................."};
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................"};
diff --git a/themes/kokodi/maximize-prelight.png b/themes/kokodi/maximize-prelight.png
new file mode 100644
index 000000000..e92e187dd
--- /dev/null
+++ b/themes/kokodi/maximize-prelight.png
diff --git a/themes/default/maximize-pressed.svg b/themes/kokodi/maximize-prelight.svg
index b512ee33f..5ca019792 100644
--- a/themes/default/maximize-pressed.svg
+++ b/themes/kokodi/maximize-prelight.svg
@@ -9,37 +9,61 @@
    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="18"
-   height="27"
+   width="24"
+   height="29"
    id="svg2"
    sodipodi:version="0.32"
    inkscape:version="0.45.1"
    version="1.0"
-   sodipodi:docname="maximize-pressed.svg"
+   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/kokodi"
+   sodipodi:docname="maximize-prelight.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.25;"
+         offset="1"
+         id="stop1890" />
+    </linearGradient>
+    <linearGradient
        id="linearGradient5873">
       <stop
          id="stop5875"
          offset="0"
          style="stop-color:white;stop-opacity:1;" />
       <stop
+         id="stop5877"
+         offset="0.5"
+         style="stop-color:white;stop-opacity:0.90;" />
+      <stop
          id="stop5879"
          offset="1"
-         style="stop-color:white;stop-opacity:0.15;" />
+         style="stop-color:white;stop-opacity:0;" />
     </linearGradient>
     <linearGradient
        id="linearGradient5847">
       <stop
          id="stop5849"
          offset="0"
-         style="stop-color:black;stop-opacity:0.05;" />
+         style="stop-color:black;stop-opacity:0;" />
       <stop
          id="stop2776"
+         offset="0.4"
+         style="stop-color:black;stop-opacity:0;" />
+      <stop
+         id="stop2779"
+         offset="0.6"
+         style="stop-color:black;stop-opacity:0.05;" />
+      <stop
+         id="stop5851"
          offset="1"
-         style="stop-color:white;stop-opacity:0.30;" />
+         style="stop-color:white;stop-opacity:0.20;" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
@@ -49,7 +73,7 @@
        x1="0"
        y1="0.5"
        x2="0"
-       y2="15"
+       y2="28.5"
        gradientTransform="matrix(1,0,0,1,0,0)" />
     <linearGradient
        inkscape:collect="always"
@@ -65,13 +89,32 @@
        inkscape:collect="always"
        xlink:href="#linearGradient5873"
        id="radialGradient3087"
-       cx="9"
-       cy="12"
-       fx="9"
-       fy="12"
-       r="12"
+       cx="12"
+       cy="0"
+       fx="12"
+       fy="3"
+       r="22"
        gradientTransform="matrix(1,0,0,1,0,0.5)"
        gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient1886"
+       id="linearGradient1892"
+       x1="0"
+       y1="1"
+       x2="0"
+       y2="12"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient1886"
+       id="linearGradient2791"
+       x1="0"
+       y1="1"
+       x2="0"
+       y2="25"
+       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -121,14 +164,14 @@
      inkscape:label="pressed">
     <g
        id="g1789"
-       transform="translate(0,2)">
+       transform="translate(0,1)">
       <rect
          style="opacity:0.5;fill:url(#radialGradient3087);fill-opacity:1.0;stroke:url(#radialGradient3087);stroke-width:1;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
          id="rect3079"
-         width="18"
-         height="18"
+         width="24"
+         height="25"
          x="0"
-         y="4" />
+         y="0" />
     </g>
   </g>
   <g
@@ -137,8 +180,8 @@
      inkscape:label="Grad"
      style="display:inline">
     <path
-       style="fill:url(#linearGradient6945);fill-opacity:0.65;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 18,0.5 C 18,0.5 18,26 18,26 L 0,26 L 0,0.5 z "
+       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,28 24,28 L 0,28 L 0,0.5 z "
        id="path6057" />
   </g>
   <g
@@ -146,9 +189,20 @@
      id="layer3"
      inkscape:label="hilight">
     <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.40;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 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"
+       d="M 0,1 L 24,1 C 24,1 24,4 24,4 L 0,4 L 0,3 z "
        id="path6061" />
+    <rect
+       style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect1884"
+       width="24"
+       height="14"
+       x="0"
+       y="1" />
+    <path
+       style="fill:none;stroke:url(#linearGradient2791);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.60"
+       d="M 0.5,1 L 0.5,16.5 C 0.5,16.5 0.5,18.5 2.5,18.5 C 4,18.5 21.5,18.5 21.5,18.5 C 21.5,18.5 23.5,18.5 23.5,16.5 C 23.5,14.5 23.5,1 23.5,1 L 23.5,1 L 23.5,1"
+       id="path2187" />
   </g>
   <g
      inkscape:label="Border"
@@ -156,8 +210,8 @@
      id="g31"
      style="display:inline">
     <path
-       style="fill:none;fill-opacity:0.20;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 17.5,0.5"
+       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+       d="M 0.5,0.5 L 23.5,0.5"
        id="path6059" />
   </g>
   <g
@@ -167,13 +221,13 @@
     <g
        style="display:inline"
        id="g1614"
-       transform="translate(3,9)">
+       transform="translate(6,4)">
       <path
          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="rect2285"
+         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>
@@ -183,8 +237,8 @@
      id="layer5"
      inkscape:label="Shadow">
     <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0"
-       d="M 0.5,26.5 L 17.5,26.5"
+       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.05"
+       d="M 0.5,28.5 L 23.5,28.5"
        id="path6989" />
   </g>
 </svg>
diff --git a/themes/kokodi/maximize-prelight.xpm b/themes/kokodi/maximize-prelight.xpm
new file mode 100644
index 000000000..60f4a88d0
--- /dev/null
+++ b/themes/kokodi/maximize-prelight.xpm
@@ -0,0 +1,34 @@
+/* XPM */
+static char * maximize_pressed_xpm[] = {
+"24 29 2 1",
+" 	c None",
+".	c #C0C0FF s active_color_1",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................"};
diff --git a/themes/kokodi/maximize-pressed.png b/themes/kokodi/maximize-pressed.png
index 3c351ff43..44e9a4cda 100644
--- a/themes/kokodi/maximize-pressed.png
+++ b/themes/kokodi/maximize-pressed.png
diff --git a/themes/kokodi/maximize-pressed.svg b/themes/kokodi/maximize-pressed.svg
index 8e14d7448..cbf0a6814 100644
--- a/themes/kokodi/maximize-pressed.svg
+++ b/themes/kokodi/maximize-pressed.svg
@@ -9,13 +9,13 @@
    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="18"
+   width="24"
    height="29"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.44.1"
+   inkscape:version="0.45.1"
    version="1.0"
-   sodipodi:docbase="default"
+   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/kokodi"
    sodipodi:docname="maximize-pressed.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
@@ -89,11 +89,11 @@
        inkscape:collect="always"
        xlink:href="#linearGradient5873"
        id="radialGradient3087"
-       cx="9"
-       cy="9"
-       fx="9"
-       fy="9"
-       r="9"
+       cx="12"
+       cy="0"
+       fx="12"
+       fy="3"
+       r="22"
        gradientTransform="matrix(1,0,0,1,0,0.5)"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
@@ -103,9 +103,18 @@
        x1="0"
        y1="1"
        x2="0"
-       y2="14"
+       y2="12"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient1886"
+       id="linearGradient2791"
+       x1="0"
+       y1="1"
+       x2="0"
+       y2="25"
+       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -155,12 +164,12 @@
      inkscape:label="pressed">
     <g
        id="g1789"
-       transform="translate(0,6)">
+       transform="translate(0,1)">
       <rect
          style="opacity:0.5;fill:url(#radialGradient3087);fill-opacity:1.0;stroke:url(#radialGradient3087);stroke-width:1;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
          id="rect3079"
-         width="18"
-         height="29"
+         width="24"
+         height="25"
          x="0"
          y="0" />
     </g>
@@ -172,7 +181,7 @@
      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 18,0.5 C 18,0.5 18,28 18,28 L 0,28 L 0,0.5 z "
+       d="M 0,0.5 L 24,0.5 C 24,0.5 24,28 24,28 L 0,28 L 0,0.5 z "
        id="path6057" />
   </g>
   <g
@@ -181,15 +190,19 @@
      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 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
+       d="M 0,1 L 24,1 C 24,1 24,4 24,4 L 0,4 L 0,3 z "
        id="path6061" />
     <rect
-       style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       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="18"
-       height="14"
+       width="24"
+       height="12"
        x="0"
        y="1" />
+    <path
+       style="fill:none;stroke:url(#linearGradient2791);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.60"
+       d="M 0.5,1 L 0.5,16.5 C 0.5,16.5 0.5,18.5 2.5,18.5 C 4,18.5 21.5,18.5 21.5,18.5 C 21.5,18.5 23.5,18.5 23.5,16.5 C 23.5,14.5 23.5,1 23.5,1 L 23.5,1 L 23.5,1"
+       id="path2187" />
   </g>
   <g
      inkscape:label="Border"
@@ -198,7 +211,7 @@
      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 17.5,0.5"
+       d="M 0.5,0.5 L 23.5,0.5"
        id="path6059" />
   </g>
   <g
@@ -208,7 +221,7 @@
     <g
        style="display:inline"
        id="g1614"
-       transform="translate(3,10)">
+       transform="translate(6,5)">
       <path
          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 "
@@ -225,7 +238,7 @@
      inkscape:label="Shadow">
     <path
        style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.05"
-       d="M 0.5,28.5 L 17.5,28.5"
+       d="M 0.5,28.5 L 23.5,28.5"
        id="path6989" />
   </g>
 </svg>
diff --git a/themes/kokodi/maximize-pressed.xpm b/themes/kokodi/maximize-pressed.xpm
index eea4bc835..60f4a88d0 100644
--- a/themes/kokodi/maximize-pressed.xpm
+++ b/themes/kokodi/maximize-pressed.xpm
@@ -1,34 +1,34 @@
 /* XPM */
 static char * maximize_pressed_xpm[] = {
-"18 29 2 1",
+"24 29 2 1",
 " 	c None",
 ".	c #C0C0FF s active_color_1",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-".................."};
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................"};
diff --git a/themes/kokodi/maximize-toggled-active.png b/themes/kokodi/maximize-toggled-active.png
index b58f7a822..e3db4f6a1 100644
--- a/themes/kokodi/maximize-toggled-active.png
+++ b/themes/kokodi/maximize-toggled-active.png
diff --git a/themes/kokodi/maximize-toggled-active.svg b/themes/kokodi/maximize-toggled-active.svg
index ad73437a0..4e2c823cc 100644
--- a/themes/kokodi/maximize-toggled-active.svg
+++ b/themes/kokodi/maximize-toggled-active.svg
@@ -9,13 +9,13 @@
    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="18"
+   width="24"
    height="29"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.44.1"
+   inkscape:version="0.45.1"
    version="1.0"
-   sodipodi:docbase="default"
+   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/kokodi"
    sodipodi:docname="maximize-toggled-active.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
@@ -95,6 +95,15 @@
        y2="14"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient1886"
+       id="linearGradient2791"
+       x1="0"
+       y1="1"
+       x2="0"
+       y2="25"
+       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -145,7 +154,7 @@
      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 18,0.5 C 18,0.5 18,28 18,28 L 0,28 L 0,0.5 z "
+       d="M 0,0.5 L 24,0.5 C 24,0.5 24,28 24,28 L 0,28 L 0,0.5 z "
        id="path6057" />
   </g>
   <g
@@ -154,15 +163,19 @@
      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 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
+       d="M 0,1 L 24,1 C 24,1 24,4 24,4 L 0,4 L 0,3 z "
        id="path6061" />
     <rect
        style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect1884"
-       width="18"
+       width="24"
        height="14"
        x="0"
        y="1" />
+    <path
+       style="fill:none;stroke:url(#linearGradient2791);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.60"
+       d="M 0.5,1 L 0.5,16.5 C 0.5,16.5 0.5,18.5 2.5,18.5 C 4,18.5 21.5,18.5 21.5,18.5 C 21.5,18.5 23.5,18.5 23.5,16.5 C 23.5,14.5 23.5,1 23.5,1 L 23.5,1 L 23.5,1"
+       id="path2187" />
   </g>
   <g
      inkscape:label="Border"
@@ -171,7 +184,7 @@
      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 17.5,0.5"
+       d="M 0.5,0.5 L 23.5,0.5"
        id="path6059" />
   </g>
   <g
@@ -181,7 +194,7 @@
     <g
        style="display:inline"
        id="g1626"
-       transform="translate(3,9)">
+       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 "
@@ -202,7 +215,7 @@
      inkscape:label="Shadow">
     <path
        style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.05"
-       d="M 0.5,28.5 L 17.5,28.5"
+       d="M 0.5,28.5 L 23.5,28.5"
        id="path6989" />
   </g>
 </svg>
diff --git a/themes/kokodi/maximize-toggled-active.xpm b/themes/kokodi/maximize-toggled-active.xpm
index b4c5c594c..4065de3c8 100644
--- a/themes/kokodi/maximize-toggled-active.xpm
+++ b/themes/kokodi/maximize-toggled-active.xpm
@@ -1,34 +1,34 @@
 /* XPM */
 static char * maximize_toggled_active_xpm[] = {
-"18 29 2 1",
+"24 29 2 1",
 " 	c None",
 ".	c #C0C0FF s active_color_1",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-".................."};
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................"};
diff --git a/themes/kokodi/maximize-toggled-inactive.png b/themes/kokodi/maximize-toggled-inactive.png
index d1b54061f..5221e73db 100644
--- a/themes/kokodi/maximize-toggled-inactive.png
+++ b/themes/kokodi/maximize-toggled-inactive.png
diff --git a/themes/kokodi/maximize-toggled-inactive.svg b/themes/kokodi/maximize-toggled-inactive.svg
index 84f0adc21..96d2e3c8d 100644
--- a/themes/kokodi/maximize-toggled-inactive.svg
+++ b/themes/kokodi/maximize-toggled-inactive.svg
@@ -9,13 +9,13 @@
    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="18"
+   width="24"
    height="29"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.44.1"
+   inkscape:version="0.45.1"
    version="1.0"
-   sodipodi:docbase="default"
+   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/kokodi"
    sodipodi:docname="maximize-toggled-inactive.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
@@ -145,7 +145,7 @@
      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 18,0.5 C 18,0.5 18,28 18,28 L 0,28 L 0,0.5 z "
+       d="M 0,0.5 L 24,0.5 C 24,0.5 24,28 24,28 L 0,28 L 0,0.5 z "
        id="path6057" />
   </g>
   <g
@@ -154,15 +154,19 @@
      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 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
+       d="M 0,1 L 24,1 C 24,1 24,4 24,4 L 0,4 L 0,3 z "
        id="path6061" />
     <rect
        style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect1884"
-       width="18"
+       width="24"
        height="14"
        x="0"
        y="1" />
+    <path
+       style="fill:none;stroke:#7f7f7f;stroke-width:1px;stroke-opacity:0.25"
+       d="M 0.5,1 L 0.5,16.5 C 0.5,16.5 0.5,18.5 2.5,18.5 C 4,18.5 21.5,18.5 21.5,18.5 C 21.5,18.5 23.5,18.5 23.5,16.5 C 23.5,14.5 23.5,1 23.5,1 L 23.5,1 L 23.5,1"
+       id="path2187" />
   </g>
   <g
      inkscape:label="Border"
@@ -171,7 +175,7 @@
      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 17.5,0.5"
+       d="M 0.5,0.5 L 23.5,0.5"
        id="path6059" />
   </g>
   <g
@@ -181,7 +185,7 @@
     <g
        style="display:inline"
        id="g1639"
-       transform="translate(3,9)">
+       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 "
@@ -198,7 +202,7 @@
      inkscape:label="Shadow">
     <path
        style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.05"
-       d="M 0.5,28.5 L 17.5,28.5"
+       d="M 0.5,28.5 L 23.5,28.5"
        id="path6989" />
   </g>
 </svg>
diff --git a/themes/kokodi/maximize-toggled-inactive.xpm b/themes/kokodi/maximize-toggled-inactive.xpm
index 18c9c3ddc..70da67796 100644
--- a/themes/kokodi/maximize-toggled-inactive.xpm
+++ b/themes/kokodi/maximize-toggled-inactive.xpm
@@ -1,34 +1,34 @@
 /* XPM */
 static char * maximize_toggled_inactive_xpm[] = {
-"18 29 2 1",
+"24 29 2 1",
 " 	c None",
 ".	c #C0C0FF s inactive_color_1",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-".................."};
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................"};
diff --git a/themes/kokodi/maximize-toggled-prelight.png b/themes/kokodi/maximize-toggled-prelight.png
new file mode 100644
index 000000000..d39a110e9
--- /dev/null
+++ b/themes/kokodi/maximize-toggled-prelight.png
diff --git a/themes/default/maximize-toggled-pressed.svg b/themes/kokodi/maximize-toggled-prelight.svg
index 47f9dd854..9c4fc27d3 100644
--- a/themes/default/maximize-toggled-pressed.svg
+++ b/themes/kokodi/maximize-toggled-prelight.svg
@@ -9,37 +9,61 @@
    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="18"
-   height="27"
+   width="24"
+   height="29"
    id="svg2"
    sodipodi:version="0.32"
    inkscape:version="0.45.1"
    version="1.0"
-   sodipodi:docname="maximize-toggled-pressed.svg"
+   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/kokodi"
+   sodipodi:docname="maximize-toggled-prelight.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.25;"
+         offset="1"
+         id="stop1890" />
+    </linearGradient>
+    <linearGradient
        id="linearGradient5873">
       <stop
          id="stop5875"
          offset="0"
          style="stop-color:white;stop-opacity:1;" />
       <stop
+         id="stop5877"
+         offset="0.5"
+         style="stop-color:white;stop-opacity:0.90;" />
+      <stop
          id="stop5879"
          offset="1"
-         style="stop-color:white;stop-opacity:0.15;" />
+         style="stop-color:white;stop-opacity:0;" />
     </linearGradient>
     <linearGradient
        id="linearGradient5847">
       <stop
          id="stop5849"
          offset="0"
-         style="stop-color:black;stop-opacity:0.05;" />
+         style="stop-color:black;stop-opacity:0;" />
       <stop
          id="stop2776"
+         offset="0.4"
+         style="stop-color:black;stop-opacity:0;" />
+      <stop
+         id="stop2779"
+         offset="0.6"
+         style="stop-color:black;stop-opacity:0.05;" />
+      <stop
+         id="stop5851"
          offset="1"
-         style="stop-color:white;stop-opacity:0.30;" />
+         style="stop-color:white;stop-opacity:0.20;" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
@@ -49,7 +73,7 @@
        x1="0"
        y1="0.5"
        x2="0"
-       y2="15"
+       y2="28.5"
        gradientTransform="matrix(1,0,0,1,0,0)" />
     <linearGradient
        inkscape:collect="always"
@@ -65,13 +89,32 @@
        inkscape:collect="always"
        xlink:href="#linearGradient5873"
        id="radialGradient3087"
-       cx="9"
-       cy="12"
-       fx="9"
-       fy="12"
-       r="12"
+       cx="12"
+       cy="0"
+       fx="12"
+       fy="3"
+       r="22"
        gradientTransform="matrix(1,0,0,1,0,0.5)"
        gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient1886"
+       id="linearGradient1892"
+       x1="0"
+       y1="1"
+       x2="0"
+       y2="12"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient1886"
+       id="linearGradient2791"
+       x1="0"
+       y1="1"
+       x2="0"
+       y2="25"
+       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -121,14 +164,14 @@
      inkscape:label="pressed">
     <g
        id="g1789"
-       transform="translate(0,2)">
+       transform="translate(0,1)">
       <rect
          style="opacity:0.5;fill:url(#radialGradient3087);fill-opacity:1.0;stroke:url(#radialGradient3087);stroke-width:1;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
          id="rect3079"
-         width="18"
-         height="18"
+         width="24"
+         height="25"
          x="0"
-         y="4" />
+         y="0" />
     </g>
   </g>
   <g
@@ -137,8 +180,8 @@
      inkscape:label="Grad"
      style="display:inline">
     <path
-       style="fill:url(#linearGradient6945);fill-opacity:0.65;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 18,0.5 C 18,0.5 18,26 18,26 L 0,26 L 0,0.5 z "
+       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,28 24,28 L 0,28 L 0,0.5 z "
        id="path6057" />
   </g>
   <g
@@ -146,9 +189,20 @@
      id="layer3"
      inkscape:label="hilight">
     <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.40;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 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"
+       d="M 0,1 L 24,1 C 24,1 24,4 24,4 L 0,4 L 0,3 z "
        id="path6061" />
+    <rect
+       style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect1884"
+       width="24"
+       height="14"
+       x="0"
+       y="1" />
+    <path
+       style="fill:none;stroke:url(#linearGradient2791);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.60"
+       d="M 0.5,1 L 0.5,16.5 C 0.5,16.5 0.5,18.5 2.5,18.5 C 4,18.5 21.5,18.5 21.5,18.5 C 21.5,18.5 23.5,18.5 23.5,16.5 C 23.5,14.5 23.5,1 23.5,1 L 23.5,1 L 23.5,1"
+       id="path2187" />
   </g>
   <g
      inkscape:label="Border"
@@ -156,8 +210,8 @@
      id="g31"
      style="display:inline">
     <path
-       style="fill:none;fill-opacity:0.20;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 17.5,0.5"
+       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+       d="M 0.5,0.5 L 23.5,0.5"
        id="path6059" />
   </g>
   <g
@@ -167,7 +221,7 @@
     <g
        style="display:inline"
        id="g1626"
-       transform="translate(3,9)">
+       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 "
@@ -187,8 +241,8 @@
      id="layer5"
      inkscape:label="Shadow">
     <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0"
-       d="M 0.5,26.5 L 17.5,26.5"
+       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.05"
+       d="M 0.5,28.5 L 23.5,28.5"
        id="path6989" />
   </g>
 </svg>
diff --git a/themes/kokodi/maximize-toggled-prelight.xpm b/themes/kokodi/maximize-toggled-prelight.xpm
new file mode 100644
index 000000000..f618ab88e
--- /dev/null
+++ b/themes/kokodi/maximize-toggled-prelight.xpm
@@ -0,0 +1,34 @@
+/* XPM */
+static char * maximize_toggled_pressed_xpm[] = {
+"24 29 2 1",
+" 	c None",
+".	c #C0C0FF s active_color_1",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................"};
diff --git a/themes/kokodi/maximize-toggled-pressed.png b/themes/kokodi/maximize-toggled-pressed.png
index 647916e3c..9e60be9de 100644
--- a/themes/kokodi/maximize-toggled-pressed.png
+++ b/themes/kokodi/maximize-toggled-pressed.png
diff --git a/themes/kokodi/maximize-toggled-pressed.svg b/themes/kokodi/maximize-toggled-pressed.svg
index 663df941b..4d418e4d2 100644
--- a/themes/kokodi/maximize-toggled-pressed.svg
+++ b/themes/kokodi/maximize-toggled-pressed.svg
@@ -9,13 +9,13 @@
    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="18"
+   width="24"
    height="29"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.44.1"
+   inkscape:version="0.45.1"
    version="1.0"
-   sodipodi:docbase="default"
+   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/kokodi"
    sodipodi:docname="maximize-toggled-pressed.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
@@ -89,11 +89,11 @@
        inkscape:collect="always"
        xlink:href="#linearGradient5873"
        id="radialGradient3087"
-       cx="9"
-       cy="9"
-       fx="9"
-       fy="9"
-       r="9"
+       cx="12"
+       cy="0"
+       fx="12"
+       fy="3"
+       r="22"
        gradientTransform="matrix(1,0,0,1,0,0.5)"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
@@ -103,9 +103,18 @@
        x1="0"
        y1="1"
        x2="0"
-       y2="14"
+       y2="12"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient1886"
+       id="linearGradient2791"
+       x1="0"
+       y1="1"
+       x2="0"
+       y2="25"
+       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -155,12 +164,12 @@
      inkscape:label="pressed">
     <g
        id="g1789"
-       transform="translate(0,6)">
+       transform="translate(0,1)">
       <rect
          style="opacity:0.5;fill:url(#radialGradient3087);fill-opacity:1.0;stroke:url(#radialGradient3087);stroke-width:1;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
          id="rect3079"
-         width="18"
-         height="29"
+         width="24"
+         height="25"
          x="0"
          y="0" />
     </g>
@@ -172,7 +181,7 @@
      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 18,0.5 C 18,0.5 18,28 18,28 L 0,28 L 0,0.5 z "
+       d="M 0,0.5 L 24,0.5 C 24,0.5 24,28 24,28 L 0,28 L 0,0.5 z "
        id="path6057" />
   </g>
   <g
@@ -181,15 +190,19 @@
      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 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
+       d="M 0,1 L 24,1 C 24,1 24,4 24,4 L 0,4 L 0,3 z "
        id="path6061" />
     <rect
-       style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       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="18"
-       height="14"
+       width="24"
+       height="12"
        x="0"
        y="1" />
+    <path
+       style="fill:none;stroke:url(#linearGradient2791);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.60"
+       d="M 0.5,1 L 0.5,16.5 C 0.5,16.5 0.5,18.5 2.5,18.5 C 4,18.5 21.5,18.5 21.5,18.5 C 21.5,18.5 23.5,18.5 23.5,16.5 C 23.5,14.5 23.5,1 23.5,1 L 23.5,1 L 23.5,1"
+       id="path2187" />
   </g>
   <g
      inkscape:label="Border"
@@ -198,7 +211,7 @@
      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 17.5,0.5"
+       d="M 0.5,0.5 L 23.5,0.5"
        id="path6059" />
   </g>
   <g
@@ -208,7 +221,7 @@
     <g
        style="display:inline"
        id="g1626"
-       transform="translate(3,10)">
+       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 "
@@ -229,7 +242,7 @@
      inkscape:label="Shadow">
     <path
        style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.05"
-       d="M 0.5,28.5 L 17.5,28.5"
+       d="M 0.5,28.5 L 23.5,28.5"
        id="path6989" />
   </g>
 </svg>
diff --git a/themes/kokodi/maximize-toggled-pressed.xpm b/themes/kokodi/maximize-toggled-pressed.xpm
index 760dc0c4b..f618ab88e 100644
--- a/themes/kokodi/maximize-toggled-pressed.xpm
+++ b/themes/kokodi/maximize-toggled-pressed.xpm
@@ -1,34 +1,34 @@
 /* XPM */
 static char * maximize_toggled_pressed_xpm[] = {
-"18 29 2 1",
+"24 29 2 1",
 " 	c None",
 ".	c #C0C0FF s active_color_1",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-".................."};
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................"};
diff --git a/themes/kokodi/menu-active.png b/themes/kokodi/menu-active.png
index aae008985..86c273a68 100644
--- a/themes/kokodi/menu-active.png
+++ b/themes/kokodi/menu-active.png
diff --git a/themes/kokodi/menu-active.svg b/themes/kokodi/menu-active.svg
index 7b9da2df7..bed66dac8 100644
--- a/themes/kokodi/menu-active.svg
+++ b/themes/kokodi/menu-active.svg
@@ -9,13 +9,13 @@
    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="18"
-   height="29"
+   width="24"
+   height="18"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.44.1"
+   inkscape:version="0.45.1"
    version="1.0"
-   sodipodi:docbase="default"
+   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/kokodi"
    sodipodi:docname="menu-active.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
@@ -142,24 +142,26 @@
      inkscape:groupmode="layer"
      id="layer2"
      inkscape:label="Grad"
+     transform="translate(0,-6)"
      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 18,0.5 C 18,0.5 18,28 18,28 L 0,28 L 0,0.5 z "
+       d="M 0,0.5 L 24,0.5 C 24,0.5 24,28 24,28 L 0,28 L 0,0.5 z "
        id="path6057" />
   </g>
   <g
      inkscape:groupmode="layer"
      id="layer3"
+     transform="translate(0,-6)"
      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 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
+       d="M 0,1 L 24,1 C 24,1 24,4 24,4 L 0,4 L 0,3 z "
        id="path6061" />
     <rect
        style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect1884"
-       width="18"
+       width="24"
        height="14"
        x="0"
        y="1" />
@@ -168,19 +170,21 @@
      inkscape:label="Border"
      inkscape:groupmode="layer"
      id="layer1"
+     transform="translate(0,-6)"
      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 17.5,0.5"
+       d="M 0.5,0.5 L 23.5,0.5"
        id="path6059" />
   </g>
   <g
      inkscape:groupmode="layer"
      id="layer5"
+     transform="translate(0,-6)"
      inkscape:label="Shadow">
     <path
        style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.05"
-       d="M 0.5,28.5 L 17.5,28.5"
+       d="M 0.5,28.5 L 23.5,28.5"
        id="path6989" />
   </g>
 </svg>
diff --git a/themes/kokodi/menu-active.xpm b/themes/kokodi/menu-active.xpm
index 785a85906..a11c4ffd2 100644
--- a/themes/kokodi/menu-active.xpm
+++ b/themes/kokodi/menu-active.xpm
@@ -1,34 +1,23 @@
 /* XPM */
 static char * menu_active_xpm[] = {
-"18 29 2 1",
+"24 18 2 1",
 " 	c None",
 ".	c #C0C0FF s active_color_1",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-".................."};
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................"};
diff --git a/themes/kokodi/menu-inactive.png b/themes/kokodi/menu-inactive.png
index aae008985..86c273a68 100644
--- a/themes/kokodi/menu-inactive.png
+++ b/themes/kokodi/menu-inactive.png
diff --git a/themes/kokodi/menu-inactive.svg b/themes/kokodi/menu-inactive.svg
index c6812927b..1230a8dc8 100644
--- a/themes/kokodi/menu-inactive.svg
+++ b/themes/kokodi/menu-inactive.svg
@@ -9,13 +9,13 @@
    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="18"
-   height="29"
+   width="24"
+   height="18"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.44.1"
+   inkscape:version="0.45.1"
    version="1.0"
-   sodipodi:docbase="default"
+   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/kokodi"
    sodipodi:docname="menu-inactive.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
@@ -142,24 +142,26 @@
      inkscape:groupmode="layer"
      id="layer2"
      inkscape:label="Grad"
+     transform="translate(0,-6)"
      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 18,0.5 C 18,0.5 18,28 18,28 L 0,28 L 0,0.5 z "
+       d="M 0,0.5 L 24,0.5 C 24,0.5 24,28 24,28 L 0,28 L 0,0.5 z "
        id="path6057" />
   </g>
   <g
      inkscape:groupmode="layer"
      id="layer3"
+     transform="translate(0,-6)"
      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 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
+       d="M 0,1 L 24,1 C 24,1 24,4 24,4 L 0,4 L 0,3 z "
        id="path6061" />
     <rect
        style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect1884"
-       width="18"
+       width="24"
        height="14"
        x="0"
        y="1" />
@@ -168,19 +170,21 @@
      inkscape:label="Border"
      inkscape:groupmode="layer"
      id="layer1"
+     transform="translate(0,-6)"
      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 17.5,0.5"
+       d="M 0.5,0.5 L 23.5,0.5"
        id="path6059" />
   </g>
   <g
      inkscape:groupmode="layer"
      id="layer5"
+     transform="translate(0,-6)"
      inkscape:label="Shadow">
     <path
        style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.05"
-       d="M 0.5,28.5 L 17.5,28.5"
+       d="M 0.5,28.5 L 23.5,28.5"
        id="path6989" />
   </g>
 </svg>
diff --git a/themes/kokodi/menu-inactive.xpm b/themes/kokodi/menu-inactive.xpm
index b00d5d9dc..76b867878 100644
--- a/themes/kokodi/menu-inactive.xpm
+++ b/themes/kokodi/menu-inactive.xpm
@@ -1,34 +1,23 @@
 /* XPM */
 static char * menu_inactive_xpm[] = {
-"18 29 2 1",
+"24 18 2 1",
 " 	c None",
 ".	c #C0C0FF s inactive_color_1",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-".................."};
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................"};
diff --git a/themes/kokodi/menu-prelight.png b/themes/kokodi/menu-prelight.png
new file mode 100644
index 000000000..86c273a68
--- /dev/null
+++ b/themes/kokodi/menu-prelight.png
diff --git a/themes/default/menu-prelight.svg b/themes/kokodi/menu-prelight.svg
index 42c5c4727..f5635e818 100644
--- a/themes/default/menu-prelight.svg
+++ b/themes/kokodi/menu-prelight.svg
@@ -9,37 +9,61 @@
    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="16"
-   height="27"
+   width="24"
+   height="18"
    id="svg2"
    sodipodi:version="0.32"
    inkscape:version="0.45.1"
    version="1.0"
+   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/kokodi"
    sodipodi:docname="menu-prelight.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.25;"
+         offset="1"
+         id="stop1890" />
+    </linearGradient>
+    <linearGradient
        id="linearGradient5873">
       <stop
          id="stop5875"
          offset="0"
          style="stop-color:white;stop-opacity:1;" />
       <stop
+         id="stop5877"
+         offset="0.5"
+         style="stop-color:white;stop-opacity:0.90;" />
+      <stop
          id="stop5879"
          offset="1"
-         style="stop-color:white;stop-opacity:0.15;" />
+         style="stop-color:white;stop-opacity:0;" />
     </linearGradient>
     <linearGradient
        id="linearGradient5847">
       <stop
          id="stop5849"
          offset="0"
-         style="stop-color:black;stop-opacity:0.05;" />
+         style="stop-color:black;stop-opacity:0;" />
       <stop
          id="stop2776"
+         offset="0.4"
+         style="stop-color:black;stop-opacity:0;" />
+      <stop
+         id="stop2779"
+         offset="0.6"
+         style="stop-color:black;stop-opacity:0.05;" />
+      <stop
+         id="stop5851"
          offset="1"
-         style="stop-color:white;stop-opacity:0.30;" />
+         style="stop-color:white;stop-opacity:0.20;" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
@@ -49,7 +73,7 @@
        x1="0"
        y1="0.5"
        x2="0"
-       y2="15"
+       y2="28.5"
        gradientTransform="matrix(1,0,0,1,0,0)" />
     <linearGradient
        inkscape:collect="always"
@@ -61,6 +85,16 @@
        y2="8"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1,0,0,0.2,0,1)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient1886"
+       id="linearGradient1892"
+       x1="0"
+       y1="1"
+       x2="0"
+       y2="14"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -108,38 +142,49 @@
      inkscape:groupmode="layer"
      id="layer2"
      inkscape:label="Grad"
+     transform="translate(0,-6)"
      style="display:inline">
     <path
-       style="fill:url(#linearGradient6945);fill-opacity:0.65;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 16,0.5 C 16,0.5 16,26 16,26 L 0,26 L 0,0.5 z "
+       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,28 24,28 L 0,28 L 0,0.5 z "
        id="path6057" />
   </g>
   <g
      inkscape:groupmode="layer"
      id="layer3"
+     transform="translate(0,-6)"
      inkscape:label="hilight">
     <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.40;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 0,1 L 16,1 C 16,1 16,4 16,4 L 0,4 L 0,3 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"
+       d="M 0,1 L 24,1 C 24,1 24,4 24,4 L 0,4 L 0,3 z "
        id="path6061" />
+    <rect
+       style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect1884"
+       width="24"
+       height="14"
+       x="0"
+       y="1" />
   </g>
   <g
      inkscape:label="Border"
      inkscape:groupmode="layer"
-     id="g31"
+     id="layer1"
+     transform="translate(0,-6)"
      style="display:inline">
     <path
-       style="fill:none;fill-opacity:0.20;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 15.5,0.5"
+       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+       d="M 0.5,0.5 L 23.5,0.5"
        id="path6059" />
   </g>
   <g
      inkscape:groupmode="layer"
      id="layer5"
+     transform="translate(0,-6)"
      inkscape:label="Shadow">
     <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0"
-       d="M 0.5,26.5 L 15.5,26.5"
+       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.05"
+       d="M 0.5,28.5 L 23.5,28.5"
        id="path6989" />
   </g>
 </svg>
diff --git a/themes/kokodi/menu-prelight.xpm b/themes/kokodi/menu-prelight.xpm
new file mode 100644
index 000000000..a11c4ffd2
--- /dev/null
+++ b/themes/kokodi/menu-prelight.xpm
@@ -0,0 +1,23 @@
+/* XPM */
+static char * menu_active_xpm[] = {
+"24 18 2 1",
+" 	c None",
+".	c #C0C0FF s active_color_1",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................"};
diff --git a/themes/kokodi/menu-pressed.png b/themes/kokodi/menu-pressed.png
index a0c300778..86c273a68 100644
--- a/themes/kokodi/menu-pressed.png
+++ b/themes/kokodi/menu-pressed.png
diff --git a/themes/kokodi/menu-pressed.svg b/themes/kokodi/menu-pressed.svg
index 08a655998..e3b1159cc 100644
--- a/themes/kokodi/menu-pressed.svg
+++ b/themes/kokodi/menu-pressed.svg
@@ -9,13 +9,13 @@
    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="18"
-   height="29"
+   width="24"
+   height="18"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.44.1"
+   inkscape:version="0.45.1"
    version="1.0"
-   sodipodi:docbase="default"
+   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/kokodi"
    sodipodi:docname="menu-pressed.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
@@ -85,17 +85,6 @@
        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="9"
-       fx="9"
-       fy="9"
-       r="9"
-       gradientTransform="matrix(1,0,0,1,0,0.5)"
-       gradientUnits="userSpaceOnUse" />
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient1886"
@@ -151,42 +140,28 @@
   </metadata>
   <g
      inkscape:groupmode="layer"
-     id="layer1"
-     inkscape:label="pressed">
-    <g
-       id="g1789"
-       transform="translate(0,6)">
-      <rect
-         style="opacity:0.5;fill:url(#radialGradient3087);fill-opacity:1.0;stroke:url(#radialGradient3087);stroke-width:1;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         id="rect3079"
-         width="18"
-         height="29"
-         x="0"
-         y="0" />
-    </g>
-  </g>
-  <g
-     inkscape:groupmode="layer"
      id="layer2"
      inkscape:label="Grad"
+     transform="translate(0,-6)"
      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 18,0.5 C 18,0.5 18,28 18,28 L 0,28 L 0,0.5 z "
+       d="M 0,0.5 L 24,0.5 C 24,0.5 24,28 24,28 L 0,28 L 0,0.5 z "
        id="path6057" />
   </g>
   <g
      inkscape:groupmode="layer"
      id="layer3"
+     transform="translate(0,-6)"
      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 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
+       d="M 0,1 L 24,1 C 24,1 24,4 24,4 L 0,4 L 0,3 z "
        id="path6061" />
     <rect
        style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect1884"
-       width="18"
+       width="24"
        height="14"
        x="0"
        y="1" />
@@ -194,20 +169,22 @@
   <g
      inkscape:label="Border"
      inkscape:groupmode="layer"
-     id="g31"
+     id="layer1"
+     transform="translate(0,-6)"
      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 17.5,0.5"
+       d="M 0.5,0.5 L 23.5,0.5"
        id="path6059" />
   </g>
   <g
      inkscape:groupmode="layer"
      id="layer5"
+     transform="translate(0,-6)"
      inkscape:label="Shadow">
     <path
        style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.05"
-       d="M 0.5,28.5 L 17.5,28.5"
+       d="M 0.5,28.5 L 23.5,28.5"
        id="path6989" />
   </g>
 </svg>
diff --git a/themes/kokodi/menu-pressed.xpm b/themes/kokodi/menu-pressed.xpm
index 44c3d4a4c..a11c4ffd2 100644
--- a/themes/kokodi/menu-pressed.xpm
+++ b/themes/kokodi/menu-pressed.xpm
@@ -1,34 +1,23 @@
 /* XPM */
-static char * menu_pressed_xpm[] = {
-"18 29 2 1",
+static char * menu_active_xpm[] = {
+"24 18 2 1",
 " 	c None",
 ".	c #C0C0FF s active_color_1",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-".................."};
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................"};
diff --git a/themes/kokodi/right-active.png b/themes/kokodi/right-active.png
index f06962db1..4422c9ee5 100644
--- a/themes/kokodi/right-active.png
+++ b/themes/kokodi/right-active.png
diff --git a/themes/kokodi/right-active.svg b/themes/kokodi/right-active.svg
index e1605f9c3..2c31f6ede 100644
--- a/themes/kokodi/right-active.svg
+++ b/themes/kokodi/right-active.svg
@@ -12,9 +12,9 @@
    height="24"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.44.1"
+   inkscape:version="0.45.1"
    version="1.0"
-   sodipodi:docbase="default"
+   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/kokodi"
    sodipodi:docname="right-active.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
diff --git a/themes/kokodi/right-inactive.png b/themes/kokodi/right-inactive.png
index f06962db1..4422c9ee5 100644
--- a/themes/kokodi/right-inactive.png
+++ b/themes/kokodi/right-inactive.png
diff --git a/themes/kokodi/right-inactive.svg b/themes/kokodi/right-inactive.svg
index 23d4acf99..5c6050219 100644
--- a/themes/kokodi/right-inactive.svg
+++ b/themes/kokodi/right-inactive.svg
@@ -12,9 +12,9 @@
    height="24"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.44.1"
+   inkscape:version="0.45.1"
    version="1.0"
-   sodipodi:docbase="default"
+   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/kokodi"
    sodipodi:docname="right-inactive.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
diff --git a/themes/kokodi/shade-active.png b/themes/kokodi/shade-active.png
index 221e28bfa..32a1f4c7e 100644
--- a/themes/kokodi/shade-active.png
+++ b/themes/kokodi/shade-active.png
diff --git a/themes/kokodi/shade-active.svg b/themes/kokodi/shade-active.svg
index bba27174c..4be10205f 100644
--- a/themes/kokodi/shade-active.svg
+++ b/themes/kokodi/shade-active.svg
@@ -9,13 +9,13 @@
    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="18"
+   width="24"
    height="29"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.44.1"
+   inkscape:version="0.45.1"
    version="1.0"
-   sodipodi:docbase="default"
+   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/kokodi"
    sodipodi:docname="shade-active.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
@@ -95,6 +95,15 @@
        y2="14"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient1886"
+       id="linearGradient2791"
+       x1="0"
+       y1="1"
+       x2="0"
+       y2="25"
+       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -145,7 +154,7 @@
      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 18,0.5 C 18,0.5 18,28 18,28 L 0,28 L 0,0.5 z "
+       d="M 0,0.5 L 24,0.5 C 24,0.5 24,28 24,28 L 0,28 L 0,0.5 z "
        id="path6057" />
   </g>
   <g
@@ -154,15 +163,19 @@
      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 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
+       d="M 0,1 L 24,1 C 24,1 24,4 24,4 L 0,4 L 0,3 z "
        id="path6061" />
     <rect
        style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect1884"
-       width="18"
+       width="24"
        height="14"
        x="0"
        y="1" />
+    <path
+       style="fill:none;stroke:url(#linearGradient2791);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.60"
+       d="M 0.5,1 L 0.5,16.5 C 0.5,16.5 0.5,18.5 2.5,18.5 C 4,18.5 21.5,18.5 21.5,18.5 C 21.5,18.5 23.5,18.5 23.5,16.5 C 23.5,14.5 23.5,1 23.5,1 L 23.5,1 L 23.5,1"
+       id="path2187" />
   </g>
   <g
      inkscape:label="Border"
@@ -171,7 +184,7 @@
      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 17.5,0.5"
+       d="M 0.5,0.5 L 23.5,0.5"
        id="path6059" />
   </g>
   <g
@@ -181,7 +194,7 @@
     <g
        style="display:inline"
        id="g1616"
-       transform="translate(3,9)">
+       transform="translate(6,4)">
       <path
          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"
@@ -198,7 +211,7 @@
      inkscape:label="Shadow">
     <path
        style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.05"
-       d="M 0.5,28.5 L 17.5,28.5"
+       d="M 0.5,28.5 L 23.5,28.5"
        id="path6989" />
   </g>
 </svg>
diff --git a/themes/kokodi/shade-active.xpm b/themes/kokodi/shade-active.xpm
index e931f598a..bdf249bc8 100644
--- a/themes/kokodi/shade-active.xpm
+++ b/themes/kokodi/shade-active.xpm
@@ -1,34 +1,34 @@
 /* XPM */
 static char * shade_active_xpm[] = {
-"18 29 2 1",
+"24 29 2 1",
 " 	c None",
 ".	c #C0C0FF s active_color_1",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-".................."};
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................"};
diff --git a/themes/kokodi/shade-inactive.png b/themes/kokodi/shade-inactive.png
index e4b56c8fc..e066fcd4c 100644
--- a/themes/kokodi/shade-inactive.png
+++ b/themes/kokodi/shade-inactive.png
diff --git a/themes/kokodi/shade-inactive.svg b/themes/kokodi/shade-inactive.svg
index 825623156..d42aa077f 100644
--- a/themes/kokodi/shade-inactive.svg
+++ b/themes/kokodi/shade-inactive.svg
@@ -9,13 +9,13 @@
    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="18"
+   width="24"
    height="29"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.44.1"
+   inkscape:version="0.45.1"
    version="1.0"
-   sodipodi:docbase="default"
+   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/kokodi"
    sodipodi:docname="shade-inactive.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
@@ -145,7 +145,7 @@
      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 18,0.5 C 18,0.5 18,28 18,28 L 0,28 L 0,0.5 z "
+       d="M 0,0.5 L 24,0.5 C 24,0.5 24,28 24,28 L 0,28 L 0,0.5 z "
        id="path6057" />
   </g>
   <g
@@ -154,15 +154,19 @@
      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 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
+       d="M 0,1 L 24,1 C 24,1 24,4 24,4 L 0,4 L 0,3 z "
        id="path6061" />
     <rect
        style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect1884"
-       width="18"
+       width="24"
        height="14"
        x="0"
        y="1" />
+    <path
+       style="fill:none;stroke:#7f7f7f;stroke-width:1px;stroke-opacity:0.25"
+       d="M 0.5,1 L 0.5,16.5 C 0.5,16.5 0.5,18.5 2.5,18.5 C 4,18.5 21.5,18.5 21.5,18.5 C 21.5,18.5 23.5,18.5 23.5,16.5 C 23.5,14.5 23.5,1 23.5,1 L 23.5,1 L 23.5,1"
+       id="path2187" />
   </g>
   <g
      inkscape:label="Border"
@@ -171,7 +175,7 @@
      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 17.5,0.5"
+       d="M 0.5,0.5 L 23.5,0.5"
        id="path6059" />
   </g>
   <g
@@ -181,7 +185,7 @@
     <g
        style="display:inline"
        id="g1616"
-       transform="translate(3,9)">
+       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"
@@ -194,7 +198,7 @@
      inkscape:label="Shadow">
     <path
        style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.05"
-       d="M 0.5,28.5 L 17.5,28.5"
+       d="M 0.5,28.5 L 23.5,28.5"
        id="path6989" />
   </g>
 </svg>
diff --git a/themes/kokodi/shade-inactive.xpm b/themes/kokodi/shade-inactive.xpm
index 5a2f3224c..cd0a08f58 100644
--- a/themes/kokodi/shade-inactive.xpm
+++ b/themes/kokodi/shade-inactive.xpm
@@ -1,34 +1,34 @@
 /* XPM */
 static char * shade_inactive_xpm[] = {
-"18 29 2 1",
+"24 29 2 1",
 " 	c None",
 ".	c #C0C0FF s inactive_color_1",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-".................."};
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................"};
diff --git a/themes/kokodi/shade-prelight.png b/themes/kokodi/shade-prelight.png
new file mode 100644
index 000000000..f6de33e9b
--- /dev/null
+++ b/themes/kokodi/shade-prelight.png
diff --git a/themes/default/shade-pressed.svg b/themes/kokodi/shade-prelight.svg
index 13df02bb9..a653fbf15 100644
--- a/themes/default/shade-pressed.svg
+++ b/themes/kokodi/shade-prelight.svg
@@ -9,37 +9,61 @@
    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="18"
-   height="27"
+   width="24"
+   height="29"
    id="svg2"
    sodipodi:version="0.32"
    inkscape:version="0.45.1"
    version="1.0"
-   sodipodi:docname="shade-pressed.svg"
+   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/kokodi"
+   sodipodi:docname="shade-prelight.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.25;"
+         offset="1"
+         id="stop1890" />
+    </linearGradient>
+    <linearGradient
        id="linearGradient5873">
       <stop
          id="stop5875"
          offset="0"
          style="stop-color:white;stop-opacity:1;" />
       <stop
+         id="stop5877"
+         offset="0.5"
+         style="stop-color:white;stop-opacity:0.90;" />
+      <stop
          id="stop5879"
          offset="1"
-         style="stop-color:white;stop-opacity:0.15;" />
+         style="stop-color:white;stop-opacity:0;" />
     </linearGradient>
     <linearGradient
        id="linearGradient5847">
       <stop
          id="stop5849"
          offset="0"
-         style="stop-color:black;stop-opacity:0.05;" />
+         style="stop-color:black;stop-opacity:0;" />
       <stop
          id="stop2776"
+         offset="0.4"
+         style="stop-color:black;stop-opacity:0;" />
+      <stop
+         id="stop2779"
+         offset="0.6"
+         style="stop-color:black;stop-opacity:0.05;" />
+      <stop
+         id="stop5851"
          offset="1"
-         style="stop-color:white;stop-opacity:0.30;" />
+         style="stop-color:white;stop-opacity:0.20;" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
@@ -49,7 +73,7 @@
        x1="0"
        y1="0.5"
        x2="0"
-       y2="15"
+       y2="28.5"
        gradientTransform="matrix(1,0,0,1,0,0)" />
     <linearGradient
        inkscape:collect="always"
@@ -65,13 +89,32 @@
        inkscape:collect="always"
        xlink:href="#linearGradient5873"
        id="radialGradient3087"
-       cx="9"
-       cy="12"
-       fx="9"
-       fy="12"
-       r="12"
+       cx="12"
+       cy="0"
+       fx="12"
+       fy="3"
+       r="22"
        gradientTransform="matrix(1,0,0,1,0,0.5)"
        gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient1886"
+       id="linearGradient1892"
+       x1="0"
+       y1="1"
+       x2="0"
+       y2="12"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient1886"
+       id="linearGradient2791"
+       x1="0"
+       y1="1"
+       x2="0"
+       y2="25"
+       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -121,14 +164,14 @@
      inkscape:label="pressed">
     <g
        id="g1789"
-       transform="translate(0,2)">
+       transform="translate(0,1)">
       <rect
          style="opacity:0.5;fill:url(#radialGradient3087);fill-opacity:1.0;stroke:url(#radialGradient3087);stroke-width:1;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
          id="rect3079"
-         width="18"
-         height="18"
+         width="24"
+         height="25"
          x="0"
-         y="4" />
+         y="0" />
     </g>
   </g>
   <g
@@ -137,8 +180,8 @@
      inkscape:label="Grad"
      style="display:inline">
     <path
-       style="fill:url(#linearGradient6945);fill-opacity:0.65;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 18,0.5 C 18,0.5 18,26 18,26 L 0,26 L 0,0.5 z "
+       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,28 24,28 L 0,28 L 0,0.5 z "
        id="path6057" />
   </g>
   <g
@@ -146,9 +189,20 @@
      id="layer3"
      inkscape:label="hilight">
     <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.40;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 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"
+       d="M 0,1 L 24,1 C 24,1 24,4 24,4 L 0,4 L 0,3 z "
        id="path6061" />
+    <rect
+       style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect1884"
+       width="24"
+       height="14"
+       x="0"
+       y="1" />
+    <path
+       style="fill:none;stroke:url(#linearGradient2791);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.60"
+       d="M 0.5,1 L 0.5,16.5 C 0.5,16.5 0.5,18.5 2.5,18.5 C 4,18.5 21.5,18.5 21.5,18.5 C 21.5,18.5 23.5,18.5 23.5,16.5 C 23.5,14.5 23.5,1 23.5,1 L 23.5,1 L 23.5,1"
+       id="path2187" />
   </g>
   <g
      inkscape:label="Border"
@@ -156,8 +210,8 @@
      id="g31"
      style="display:inline">
     <path
-       style="fill:none;fill-opacity:0.20;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 17.5,0.5"
+       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+       d="M 0.5,0.5 L 23.5,0.5"
        id="path6059" />
   </g>
   <g
@@ -167,14 +221,14 @@
     <g
        style="display:inline"
        id="g1616"
-       transform="translate(3,9)">
+       transform="translate(6,4)">
       <path
          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.20;fill-rule:evenodd;stroke:black;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
+         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.20;fill-rule:evenodd;stroke:white;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
+         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>
@@ -183,8 +237,8 @@
      id="layer5"
      inkscape:label="Shadow">
     <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0"
-       d="M 0.5,26.5 L 17.5,26.5"
+       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.05"
+       d="M 0.5,28.5 L 23.5,28.5"
        id="path6989" />
   </g>
 </svg>
diff --git a/themes/kokodi/shade-prelight.xpm b/themes/kokodi/shade-prelight.xpm
new file mode 100644
index 000000000..07dfa424c
--- /dev/null
+++ b/themes/kokodi/shade-prelight.xpm
@@ -0,0 +1,34 @@
+/* XPM */
+static char * shade_pressed_xpm[] = {
+"24 29 2 1",
+" 	c None",
+".	c #C0C0FF s active_color_1",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................"};
diff --git a/themes/kokodi/shade-pressed.png b/themes/kokodi/shade-pressed.png
index bae4e5ac9..aaf65c558 100644
--- a/themes/kokodi/shade-pressed.png
+++ b/themes/kokodi/shade-pressed.png
diff --git a/themes/kokodi/shade-pressed.svg b/themes/kokodi/shade-pressed.svg
index 8dd294b28..4595a5a16 100644
--- a/themes/kokodi/shade-pressed.svg
+++ b/themes/kokodi/shade-pressed.svg
@@ -9,13 +9,13 @@
    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="18"
+   width="24"
    height="29"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.44.1"
+   inkscape:version="0.45.1"
    version="1.0"
-   sodipodi:docbase="default"
+   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/kokodi"
    sodipodi:docname="shade-pressed.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
@@ -89,11 +89,11 @@
        inkscape:collect="always"
        xlink:href="#linearGradient5873"
        id="radialGradient3087"
-       cx="9"
-       cy="9"
-       fx="9"
-       fy="9"
-       r="9"
+       cx="12"
+       cy="0"
+       fx="12"
+       fy="3"
+       r="22"
        gradientTransform="matrix(1,0,0,1,0,0.5)"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
@@ -103,9 +103,18 @@
        x1="0"
        y1="1"
        x2="0"
-       y2="14"
+       y2="12"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient1886"
+       id="linearGradient2791"
+       x1="0"
+       y1="1"
+       x2="0"
+       y2="25"
+       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -155,12 +164,12 @@
      inkscape:label="pressed">
     <g
        id="g1789"
-       transform="translate(0,6)">
+       transform="translate(0,1)">
       <rect
          style="opacity:0.5;fill:url(#radialGradient3087);fill-opacity:1.0;stroke:url(#radialGradient3087);stroke-width:1;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
          id="rect3079"
-         width="18"
-         height="29"
+         width="24"
+         height="25"
          x="0"
          y="0" />
     </g>
@@ -172,7 +181,7 @@
      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 18,0.5 C 18,0.5 18,28 18,28 L 0,28 L 0,0.5 z "
+       d="M 0,0.5 L 24,0.5 C 24,0.5 24,28 24,28 L 0,28 L 0,0.5 z "
        id="path6057" />
   </g>
   <g
@@ -181,15 +190,19 @@
      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 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
+       d="M 0,1 L 24,1 C 24,1 24,4 24,4 L 0,4 L 0,3 z "
        id="path6061" />
     <rect
-       style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       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="18"
-       height="14"
+       width="24"
+       height="12"
        x="0"
        y="1" />
+    <path
+       style="fill:none;stroke:url(#linearGradient2791);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.60"
+       d="M 0.5,1 L 0.5,16.5 C 0.5,16.5 0.5,18.5 2.5,18.5 C 4,18.5 21.5,18.5 21.5,18.5 C 21.5,18.5 23.5,18.5 23.5,16.5 C 23.5,14.5 23.5,1 23.5,1 L 23.5,1 L 23.5,1"
+       id="path2187" />
   </g>
   <g
      inkscape:label="Border"
@@ -198,7 +211,7 @@
      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 17.5,0.5"
+       d="M 0.5,0.5 L 23.5,0.5"
        id="path6059" />
   </g>
   <g
@@ -208,7 +221,7 @@
     <g
        style="display:inline"
        id="g1616"
-       transform="translate(3,10)">
+       transform="translate(6,5)">
       <path
          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"
@@ -225,7 +238,7 @@
      inkscape:label="Shadow">
     <path
        style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.05"
-       d="M 0.5,28.5 L 17.5,28.5"
+       d="M 0.5,28.5 L 23.5,28.5"
        id="path6989" />
   </g>
 </svg>
diff --git a/themes/kokodi/shade-pressed.xpm b/themes/kokodi/shade-pressed.xpm
index e3155abd2..07dfa424c 100644
--- a/themes/kokodi/shade-pressed.xpm
+++ b/themes/kokodi/shade-pressed.xpm
@@ -1,34 +1,34 @@
 /* XPM */
 static char * shade_pressed_xpm[] = {
-"18 29 2 1",
+"24 29 2 1",
 " 	c None",
 ".	c #C0C0FF s active_color_1",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-".................."};
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................"};
diff --git a/themes/kokodi/shade-toggled-active.png b/themes/kokodi/shade-toggled-active.png
index 28618a5ad..470b9b127 100644
--- a/themes/kokodi/shade-toggled-active.png
+++ b/themes/kokodi/shade-toggled-active.png
diff --git a/themes/kokodi/shade-toggled-active.svg b/themes/kokodi/shade-toggled-active.svg
index 574aa2b4e..c3fd77bff 100644
--- a/themes/kokodi/shade-toggled-active.svg
+++ b/themes/kokodi/shade-toggled-active.svg
@@ -9,13 +9,13 @@
    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="18"
+   width="24"
    height="29"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.44.1"
+   inkscape:version="0.45.1"
    version="1.0"
-   sodipodi:docbase="default"
+   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/kokodi"
    sodipodi:docname="shade-toggled-active.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
@@ -95,6 +95,15 @@
        y2="14"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient1886"
+       id="linearGradient2791"
+       x1="0"
+       y1="1"
+       x2="0"
+       y2="25"
+       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -145,7 +154,7 @@
      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 18,0.5 C 18,0.5 18,28 18,28 L 0,28 L 0,0.5 z "
+       d="M 0,0.5 L 24,0.5 C 24,0.5 24,28 24,28 L 0,28 L 0,0.5 z "
        id="path6057" />
   </g>
   <g
@@ -154,15 +163,19 @@
      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 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
+       d="M 0,1 L 24,1 C 24,1 24,4 24,4 L 0,4 L 0,3 z "
        id="path6061" />
     <rect
        style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect1884"
-       width="18"
+       width="24"
        height="14"
        x="0"
        y="1" />
+    <path
+       style="fill:none;stroke:url(#linearGradient2791);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.60"
+       d="M 0.5,1 L 0.5,16.5 C 0.5,16.5 0.5,18.5 2.5,18.5 C 4,18.5 21.5,18.5 21.5,18.5 C 21.5,18.5 23.5,18.5 23.5,16.5 C 23.5,14.5 23.5,1 23.5,1 L 23.5,1 L 23.5,1"
+       id="path2187" />
   </g>
   <g
      inkscape:label="Border"
@@ -171,7 +184,7 @@
      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 17.5,0.5"
+       d="M 0.5,0.5 L 23.5,0.5"
        id="path6059" />
   </g>
   <g
@@ -181,7 +194,7 @@
     <g
        style="display:inline"
        id="g1628"
-       transform="translate(3,9)">
+       transform="translate(6,4)">
       <path
          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"
@@ -198,7 +211,7 @@
      inkscape:label="Shadow">
     <path
        style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.05"
-       d="M 0.5,28.5 L 17.5,28.5"
+       d="M 0.5,28.5 L 23.5,28.5"
        id="path6989" />
   </g>
 </svg>
diff --git a/themes/kokodi/shade-toggled-active.xpm b/themes/kokodi/shade-toggled-active.xpm
index 0793c86ab..4e8e1ca7b 100644
--- a/themes/kokodi/shade-toggled-active.xpm
+++ b/themes/kokodi/shade-toggled-active.xpm
@@ -1,34 +1,34 @@
 /* XPM */
 static char * shade_toggled_active_xpm[] = {
-"18 29 2 1",
+"24 29 2 1",
 " 	c None",
 ".	c #C0C0FF s active_color_1",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-".................."};
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................"};
diff --git a/themes/kokodi/shade-toggled-inactive.png b/themes/kokodi/shade-toggled-inactive.png
index 32705e238..add3e3c0f 100644
--- a/themes/kokodi/shade-toggled-inactive.png
+++ b/themes/kokodi/shade-toggled-inactive.png
diff --git a/themes/kokodi/shade-toggled-inactive.svg b/themes/kokodi/shade-toggled-inactive.svg
index ecd928a3b..7d9341f99 100644
--- a/themes/kokodi/shade-toggled-inactive.svg
+++ b/themes/kokodi/shade-toggled-inactive.svg
@@ -9,13 +9,13 @@
    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="18"
+   width="24"
    height="29"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.44.1"
+   inkscape:version="0.45.1"
    version="1.0"
-   sodipodi:docbase="default"
+   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/kokodi"
    sodipodi:docname="shade-toggled-inactive.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
@@ -145,7 +145,7 @@
      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 18,0.5 C 18,0.5 18,28 18,28 L 0,28 L 0,0.5 z "
+       d="M 0,0.5 L 24,0.5 C 24,0.5 24,28 24,28 L 0,28 L 0,0.5 z "
        id="path6057" />
   </g>
   <g
@@ -154,15 +154,19 @@
      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 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
+       d="M 0,1 L 24,1 C 24,1 24,4 24,4 L 0,4 L 0,3 z "
        id="path6061" />
     <rect
        style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect1884"
-       width="18"
+       width="24"
        height="14"
        x="0"
        y="1" />
+    <path
+       style="fill:none;stroke:#7f7f7f;stroke-width:1px;stroke-opacity:0.25"
+       d="M 0.5,1 L 0.5,16.5 C 0.5,16.5 0.5,18.5 2.5,18.5 C 4,18.5 21.5,18.5 21.5,18.5 C 21.5,18.5 23.5,18.5 23.5,16.5 C 23.5,14.5 23.5,1 23.5,1 L 23.5,1 L 23.5,1"
+       id="path2187" />
   </g>
   <g
      inkscape:label="Border"
@@ -171,7 +175,7 @@
      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 17.5,0.5"
+       d="M 0.5,0.5 L 23.5,0.5"
        id="path6059" />
   </g>
   <g
@@ -181,7 +185,7 @@
     <g
        style="display:inline"
        id="g1628"
-       transform="translate(3,9)">
+       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"
@@ -194,7 +198,7 @@
      inkscape:label="Shadow">
     <path
        style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.05"
-       d="M 0.5,28.5 L 17.5,28.5"
+       d="M 0.5,28.5 L 23.5,28.5"
        id="path6989" />
   </g>
 </svg>
diff --git a/themes/kokodi/shade-toggled-inactive.xpm b/themes/kokodi/shade-toggled-inactive.xpm
index 7d7a1fe86..b2aba2341 100644
--- a/themes/kokodi/shade-toggled-inactive.xpm
+++ b/themes/kokodi/shade-toggled-inactive.xpm
@@ -1,34 +1,34 @@
 /* XPM */
 static char * shade_toggled_inactive_xpm[] = {
-"18 29 2 1",
+"24 29 2 1",
 " 	c None",
 ".	c #C0C0FF s inactive_color_1",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-".................."};
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................"};
diff --git a/themes/kokodi/shade-toggled-prelight.png b/themes/kokodi/shade-toggled-prelight.png
new file mode 100644
index 000000000..ba0e8ce52
--- /dev/null
+++ b/themes/kokodi/shade-toggled-prelight.png
diff --git a/themes/largeprint/shade-toggled-pressed.svg b/themes/kokodi/shade-toggled-prelight.svg
index 349809a5c..6cac12a3a 100644
--- a/themes/largeprint/shade-toggled-pressed.svg
+++ b/themes/kokodi/shade-toggled-prelight.svg
@@ -9,37 +9,61 @@
    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="18"
-   height="31"
+   width="24"
+   height="29"
    id="svg2"
    sodipodi:version="0.32"
    inkscape:version="0.45.1"
    version="1.0"
-   sodipodi:docname="shade-toggled-pressed.svg"
+   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/kokodi"
+   sodipodi:docname="shade-toggled-prelight.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.25;"
+         offset="1"
+         id="stop1890" />
+    </linearGradient>
+    <linearGradient
        id="linearGradient5873">
       <stop
          id="stop5875"
          offset="0"
          style="stop-color:white;stop-opacity:1;" />
       <stop
+         id="stop5877"
+         offset="0.5"
+         style="stop-color:white;stop-opacity:0.90;" />
+      <stop
          id="stop5879"
          offset="1"
-         style="stop-color:white;stop-opacity:0.15;" />
+         style="stop-color:white;stop-opacity:0;" />
     </linearGradient>
     <linearGradient
        id="linearGradient5847">
       <stop
          id="stop5849"
          offset="0"
-         style="stop-color:black;stop-opacity:0.05;" />
+         style="stop-color:black;stop-opacity:0;" />
       <stop
          id="stop2776"
+         offset="0.4"
+         style="stop-color:black;stop-opacity:0;" />
+      <stop
+         id="stop2779"
+         offset="0.6"
+         style="stop-color:black;stop-opacity:0.05;" />
+      <stop
+         id="stop5851"
          offset="1"
-         style="stop-color:white;stop-opacity:0.30;" />
+         style="stop-color:white;stop-opacity:0.20;" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
@@ -49,7 +73,7 @@
        x1="0"
        y1="0.5"
        x2="0"
-       y2="17"
+       y2="28.5"
        gradientTransform="matrix(1,0,0,1,0,0)" />
     <linearGradient
        inkscape:collect="always"
@@ -65,13 +89,32 @@
        inkscape:collect="always"
        xlink:href="#linearGradient5873"
        id="radialGradient3087"
-       cx="9"
-       cy="14"
-       fx="9"
-       fy="14"
-       r="12"
+       cx="12"
+       cy="0"
+       fx="12"
+       fy="3"
+       r="22"
        gradientTransform="matrix(1,0,0,1,0,0.5)"
        gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient1886"
+       id="linearGradient1892"
+       x1="0"
+       y1="1"
+       x2="0"
+       y2="12"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient1886"
+       id="linearGradient2791"
+       x1="0"
+       y1="1"
+       x2="0"
+       y2="25"
+       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -121,14 +164,14 @@
      inkscape:label="pressed">
     <g
        id="g1789"
-       transform="translate(0,2)">
+       transform="translate(0,1)">
       <rect
          style="opacity:0.5;fill:url(#radialGradient3087);fill-opacity:1.0;stroke:url(#radialGradient3087);stroke-width:1;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
          id="rect3079"
-         width="18"
-         height="18"
+         width="24"
+         height="25"
          x="0"
-         y="6" />
+         y="0" />
     </g>
   </g>
   <g
@@ -137,8 +180,8 @@
      inkscape:label="Grad"
      style="display:inline">
     <path
-       style="fill:url(#linearGradient6945);fill-opacity:0.75;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 18,0.5 C 18,0.5 18,30 18,30 L 0,30 L 0,0.5 z "
+       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,28 24,28 L 0,28 L 0,0.5 z "
        id="path6057" />
   </g>
   <g
@@ -146,9 +189,20 @@
      id="layer3"
      inkscape:label="hilight">
     <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.40;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 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"
+       d="M 0,1 L 24,1 C 24,1 24,4 24,4 L 0,4 L 0,3 z "
        id="path6061" />
+    <rect
+       style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect1884"
+       width="24"
+       height="14"
+       x="0"
+       y="1" />
+    <path
+       style="fill:none;stroke:url(#linearGradient2791);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.60"
+       d="M 0.5,1 L 0.5,16.5 C 0.5,16.5 0.5,18.5 2.5,18.5 C 4,18.5 21.5,18.5 21.5,18.5 C 21.5,18.5 23.5,18.5 23.5,16.5 C 23.5,14.5 23.5,1 23.5,1 L 23.5,1 L 23.5,1"
+       id="path2187" />
   </g>
   <g
      inkscape:label="Border"
@@ -156,8 +210,8 @@
      id="g31"
      style="display:inline">
     <path
-       style="fill:none;fill-opacity:0.20;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 17.5,0.5"
+       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+       d="M 0.5,0.5 L 23.5,0.5"
        id="path6059" />
   </g>
   <g
@@ -167,14 +221,14 @@
     <g
        style="display:inline"
        id="g1628"
-       transform="translate(3,11)">
+       transform="translate(6,4)">
       <path
          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.20;fill-rule:evenodd;stroke:black;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
+         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.20;fill-rule:evenodd;stroke:white;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
+         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>
@@ -183,8 +237,8 @@
      id="layer5"
      inkscape:label="Shadow">
     <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0"
-       d="M 0.5,30.5 L 17.5,30.5"
+       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.05"
+       d="M 0.5,28.5 L 23.5,28.5"
        id="path6989" />
   </g>
 </svg>
diff --git a/themes/kokodi/shade-toggled-prelight.xpm b/themes/kokodi/shade-toggled-prelight.xpm
new file mode 100644
index 000000000..edcb1dad0
--- /dev/null
+++ b/themes/kokodi/shade-toggled-prelight.xpm
@@ -0,0 +1,34 @@
+/* XPM */
+static char * shade_toggled_pressed_xpm[] = {
+"24 29 2 1",
+" 	c None",
+".	c #C0C0FF s active_color_1",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................"};
diff --git a/themes/kokodi/shade-toggled-pressed.png b/themes/kokodi/shade-toggled-pressed.png
index daf5c5b2e..de1f90560 100644
--- a/themes/kokodi/shade-toggled-pressed.png
+++ b/themes/kokodi/shade-toggled-pressed.png
diff --git a/themes/kokodi/shade-toggled-pressed.svg b/themes/kokodi/shade-toggled-pressed.svg
index a2110ae93..f7ff8268e 100644
--- a/themes/kokodi/shade-toggled-pressed.svg
+++ b/themes/kokodi/shade-toggled-pressed.svg
@@ -9,13 +9,13 @@
    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="18"
+   width="24"
    height="29"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.44.1"
+   inkscape:version="0.45.1"
    version="1.0"
-   sodipodi:docbase="default"
+   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/kokodi"
    sodipodi:docname="shade-toggled-pressed.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
@@ -89,11 +89,11 @@
        inkscape:collect="always"
        xlink:href="#linearGradient5873"
        id="radialGradient3087"
-       cx="9"
-       cy="9"
-       fx="9"
-       fy="9"
-       r="9"
+       cx="12"
+       cy="0"
+       fx="12"
+       fy="3"
+       r="22"
        gradientTransform="matrix(1,0,0,1,0,0.5)"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
@@ -103,9 +103,18 @@
        x1="0"
        y1="1"
        x2="0"
-       y2="14"
+       y2="12"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient1886"
+       id="linearGradient2791"
+       x1="0"
+       y1="1"
+       x2="0"
+       y2="25"
+       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -155,12 +164,12 @@
      inkscape:label="pressed">
     <g
        id="g1789"
-       transform="translate(0,6)">
+       transform="translate(0,1)">
       <rect
          style="opacity:0.5;fill:url(#radialGradient3087);fill-opacity:1.0;stroke:url(#radialGradient3087);stroke-width:1;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
          id="rect3079"
-         width="18"
-         height="29"
+         width="24"
+         height="25"
          x="0"
          y="0" />
     </g>
@@ -172,7 +181,7 @@
      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 18,0.5 C 18,0.5 18,28 18,28 L 0,28 L 0,0.5 z "
+       d="M 0,0.5 L 24,0.5 C 24,0.5 24,28 24,28 L 0,28 L 0,0.5 z "
        id="path6057" />
   </g>
   <g
@@ -181,15 +190,19 @@
      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 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
+       d="M 0,1 L 24,1 C 24,1 24,4 24,4 L 0,4 L 0,3 z "
        id="path6061" />
     <rect
-       style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       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="18"
-       height="14"
+       width="24"
+       height="12"
        x="0"
        y="1" />
+    <path
+       style="fill:none;stroke:url(#linearGradient2791);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.60"
+       d="M 0.5,1 L 0.5,16.5 C 0.5,16.5 0.5,18.5 2.5,18.5 C 4,18.5 21.5,18.5 21.5,18.5 C 21.5,18.5 23.5,18.5 23.5,16.5 C 23.5,14.5 23.5,1 23.5,1 L 23.5,1 L 23.5,1"
+       id="path2187" />
   </g>
   <g
      inkscape:label="Border"
@@ -198,7 +211,7 @@
      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 17.5,0.5"
+       d="M 0.5,0.5 L 23.5,0.5"
        id="path6059" />
   </g>
   <g
@@ -208,7 +221,7 @@
     <g
        style="display:inline"
        id="g1628"
-       transform="translate(3,10)">
+       transform="translate(6,5)">
       <path
          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"
@@ -225,7 +238,7 @@
      inkscape:label="Shadow">
     <path
        style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.05"
-       d="M 0.5,28.5 L 17.5,28.5"
+       d="M 0.5,28.5 L 23.5,28.5"
        id="path6989" />
   </g>
 </svg>
diff --git a/themes/kokodi/shade-toggled-pressed.xpm b/themes/kokodi/shade-toggled-pressed.xpm
index e360feb5b..edcb1dad0 100644
--- a/themes/kokodi/shade-toggled-pressed.xpm
+++ b/themes/kokodi/shade-toggled-pressed.xpm
@@ -1,34 +1,34 @@
 /* XPM */
 static char * shade_toggled_pressed_xpm[] = {
-"18 29 2 1",
+"24 29 2 1",
 " 	c None",
 ".	c #C0C0FF s active_color_1",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-".................."};
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................"};
diff --git a/themes/kokodi/stick-active.png b/themes/kokodi/stick-active.png
index ebe7238c1..1dbb198f0 100644
--- a/themes/kokodi/stick-active.png
+++ b/themes/kokodi/stick-active.png
diff --git a/themes/kokodi/stick-active.svg b/themes/kokodi/stick-active.svg
index 02ad9d32a..85a64582a 100644
--- a/themes/kokodi/stick-active.svg
+++ b/themes/kokodi/stick-active.svg
@@ -9,13 +9,13 @@
    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="18"
+   width="24"
    height="29"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.44.1"
+   inkscape:version="0.45.1"
    version="1.0"
-   sodipodi:docbase="default"
+   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/kokodi"
    sodipodi:docname="stick-active.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
@@ -95,6 +95,15 @@
        y2="14"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient1886"
+       id="linearGradient2791"
+       x1="0"
+       y1="1"
+       x2="0"
+       y2="25"
+       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -145,7 +154,7 @@
      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 18,0.5 C 18,0.5 18,28 18,28 L 0,28 L 0,0.5 z "
+       d="M 0,0.5 L 24,0.5 C 24,0.5 24,28 24,28 L 0,28 L 0,0.5 z "
        id="path6057" />
   </g>
   <g
@@ -154,15 +163,19 @@
      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 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
+       d="M 0,1 L 24,1 C 24,1 24,4 24,4 L 0,4 L 0,3 z "
        id="path6061" />
     <rect
        style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect1884"
-       width="18"
+       width="24"
        height="14"
        x="0"
        y="1" />
+    <path
+       style="fill:none;stroke:url(#linearGradient2791);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.60"
+       d="M 0.5,1 L 0.5,16.5 C 0.5,16.5 0.5,18.5 2.5,18.5 C 4,18.5 21.5,18.5 21.5,18.5 C 21.5,18.5 23.5,18.5 23.5,16.5 C 23.5,14.5 23.5,1 23.5,1 L 23.5,1 L 23.5,1"
+       id="path2187" />
   </g>
   <g
      inkscape:label="Border"
@@ -171,7 +184,7 @@
      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 17.5,0.5"
+       d="M 0.5,0.5 L 23.5,0.5"
        id="path6059" />
   </g>
   <g
@@ -181,7 +194,7 @@
     <g
        style="display:inline"
        id="g1613"
-       transform="translate(3,9)">
+       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 "
@@ -198,7 +211,7 @@
      inkscape:label="Shadow">
     <path
        style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.05"
-       d="M 0.5,28.5 L 17.5,28.5"
+       d="M 0.5,28.5 L 23.5,28.5"
        id="path6989" />
   </g>
 </svg>
diff --git a/themes/kokodi/stick-active.xpm b/themes/kokodi/stick-active.xpm
index 5209082a8..9ac49f53b 100644
--- a/themes/kokodi/stick-active.xpm
+++ b/themes/kokodi/stick-active.xpm
@@ -1,34 +1,34 @@
 /* XPM */
 static char * stick_active_xpm[] = {
-"18 29 2 1",
+"24 29 2 1",
 " 	c None",
 ".	c #C0C0FF s active_color_1",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-".................."};
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................"};
diff --git a/themes/kokodi/stick-inactive.png b/themes/kokodi/stick-inactive.png
index 84151c253..ecc3a35af 100644
--- a/themes/kokodi/stick-inactive.png
+++ b/themes/kokodi/stick-inactive.png
diff --git a/themes/kokodi/stick-inactive.svg b/themes/kokodi/stick-inactive.svg
index 8549ffd6b..0c650991a 100644
--- a/themes/kokodi/stick-inactive.svg
+++ b/themes/kokodi/stick-inactive.svg
@@ -9,13 +9,13 @@
    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="18"
+   width="24"
    height="29"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.44.1"
+   inkscape:version="0.45.1"
    version="1.0"
-   sodipodi:docbase="default"
+   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/kokodi"
    sodipodi:docname="stick-inactive.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
@@ -145,7 +145,7 @@
      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 18,0.5 C 18,0.5 18,28 18,28 L 0,28 L 0,0.5 z "
+       d="M 0,0.5 L 24,0.5 C 24,0.5 24,28 24,28 L 0,28 L 0,0.5 z "
        id="path6057" />
   </g>
   <g
@@ -154,15 +154,19 @@
      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 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
+       d="M 0,1 L 24,1 C 24,1 24,4 24,4 L 0,4 L 0,3 z "
        id="path6061" />
     <rect
        style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect1884"
-       width="18"
+       width="24"
        height="14"
        x="0"
        y="1" />
+    <path
+       style="fill:none;stroke:#7f7f7f;stroke-width:1px;stroke-opacity:0.25"
+       d="M 0.5,1 L 0.5,16.5 C 0.5,16.5 0.5,18.5 2.5,18.5 C 4,18.5 21.5,18.5 21.5,18.5 C 21.5,18.5 23.5,18.5 23.5,16.5 C 23.5,14.5 23.5,1 23.5,1 L 23.5,1 L 23.5,1"
+       id="path2187" />
   </g>
   <g
      inkscape:label="Border"
@@ -171,7 +175,7 @@
      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 17.5,0.5"
+       d="M 0.5,0.5 L 23.5,0.5"
        id="path6059" />
   </g>
   <g
@@ -181,7 +185,7 @@
     <g
        style="display:inline"
        id="g1613"
-       transform="translate(3,9)">
+       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 "
@@ -194,7 +198,7 @@
      inkscape:label="Shadow">
     <path
        style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.05"
-       d="M 0.5,28.5 L 17.5,28.5"
+       d="M 0.5,28.5 L 23.5,28.5"
        id="path6989" />
   </g>
 </svg>
diff --git a/themes/kokodi/stick-inactive.xpm b/themes/kokodi/stick-inactive.xpm
index 82bc95e96..309527f53 100644
--- a/themes/kokodi/stick-inactive.xpm
+++ b/themes/kokodi/stick-inactive.xpm
@@ -1,34 +1,34 @@
 /* XPM */
 static char * stick_inactive_xpm[] = {
-"18 29 2 1",
+"24 29 2 1",
 " 	c None",
 ".	c #C0C0FF s inactive_color_1",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-".................."};
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................"};
diff --git a/themes/kokodi/stick-prelight.png b/themes/kokodi/stick-prelight.png
new file mode 100644
index 000000000..5b10590f6
--- /dev/null
+++ b/themes/kokodi/stick-prelight.png
diff --git a/themes/largeprint/stick-pressed.svg b/themes/kokodi/stick-prelight.svg
index 8a39f5da4..f3e9fadf0 100644
--- a/themes/largeprint/stick-pressed.svg
+++ b/themes/kokodi/stick-prelight.svg
@@ -9,37 +9,61 @@
    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="18"
-   height="31"
+   width="24"
+   height="29"
    id="svg2"
    sodipodi:version="0.32"
    inkscape:version="0.45.1"
    version="1.0"
-   sodipodi:docname="stick-pressed.svg"
+   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/kokodi"
+   sodipodi:docname="stick-prelight.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.25;"
+         offset="1"
+         id="stop1890" />
+    </linearGradient>
+    <linearGradient
        id="linearGradient5873">
       <stop
          id="stop5875"
          offset="0"
          style="stop-color:white;stop-opacity:1;" />
       <stop
+         id="stop5877"
+         offset="0.5"
+         style="stop-color:white;stop-opacity:0.90;" />
+      <stop
          id="stop5879"
          offset="1"
-         style="stop-color:white;stop-opacity:0.15;" />
+         style="stop-color:white;stop-opacity:0;" />
     </linearGradient>
     <linearGradient
        id="linearGradient5847">
       <stop
          id="stop5849"
          offset="0"
-         style="stop-color:black;stop-opacity:0.05;" />
+         style="stop-color:black;stop-opacity:0;" />
       <stop
          id="stop2776"
+         offset="0.4"
+         style="stop-color:black;stop-opacity:0;" />
+      <stop
+         id="stop2779"
+         offset="0.6"
+         style="stop-color:black;stop-opacity:0.05;" />
+      <stop
+         id="stop5851"
          offset="1"
-         style="stop-color:white;stop-opacity:0.30;" />
+         style="stop-color:white;stop-opacity:0.20;" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
@@ -49,7 +73,7 @@
        x1="0"
        y1="0.5"
        x2="0"
-       y2="17"
+       y2="28.5"
        gradientTransform="matrix(1,0,0,1,0,0)" />
     <linearGradient
        inkscape:collect="always"
@@ -65,13 +89,32 @@
        inkscape:collect="always"
        xlink:href="#linearGradient5873"
        id="radialGradient3087"
-       cx="9"
-       cy="14"
-       fx="9"
-       fy="14"
-       r="12"
+       cx="12"
+       cy="0"
+       fx="12"
+       fy="3"
+       r="22"
        gradientTransform="matrix(1,0,0,1,0,0.5)"
        gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient1886"
+       id="linearGradient1892"
+       x1="0"
+       y1="1"
+       x2="0"
+       y2="12"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient1886"
+       id="linearGradient2791"
+       x1="0"
+       y1="1"
+       x2="0"
+       y2="25"
+       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -121,14 +164,14 @@
      inkscape:label="pressed">
     <g
        id="g1789"
-       transform="translate(0,2)">
+       transform="translate(0,1)">
       <rect
          style="opacity:0.5;fill:url(#radialGradient3087);fill-opacity:1.0;stroke:url(#radialGradient3087);stroke-width:1;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
          id="rect3079"
-         width="18"
-         height="18"
+         width="24"
+         height="25"
          x="0"
-         y="6" />
+         y="0" />
     </g>
   </g>
   <g
@@ -137,8 +180,8 @@
      inkscape:label="Grad"
      style="display:inline">
     <path
-       style="fill:url(#linearGradient6945);fill-opacity:0.75;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 18,0.5 C 18,0.5 18,30 18,30 L 0,30 L 0,0.5 z "
+       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,28 24,28 L 0,28 L 0,0.5 z "
        id="path6057" />
   </g>
   <g
@@ -146,9 +189,20 @@
      id="layer3"
      inkscape:label="hilight">
     <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.40;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 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"
+       d="M 0,1 L 24,1 C 24,1 24,4 24,4 L 0,4 L 0,3 z "
        id="path6061" />
+    <rect
+       style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect1884"
+       width="24"
+       height="14"
+       x="0"
+       y="1" />
+    <path
+       style="fill:none;stroke:url(#linearGradient2791);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.60"
+       d="M 0.5,1 L 0.5,16.5 C 0.5,16.5 0.5,18.5 2.5,18.5 C 4,18.5 21.5,18.5 21.5,18.5 C 21.5,18.5 23.5,18.5 23.5,16.5 C 23.5,14.5 23.5,1 23.5,1 L 23.5,1 L 23.5,1"
+       id="path2187" />
   </g>
   <g
      inkscape:label="Border"
@@ -156,8 +210,8 @@
      id="g31"
      style="display:inline">
     <path
-       style="fill:none;fill-opacity:0.20;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 17.5,0.5"
+       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+       d="M 0.5,0.5 L 23.5,0.5"
        id="path6059" />
   </g>
   <g
@@ -167,7 +221,7 @@
     <g
        style="display:inline"
        id="g1613"
-       transform="translate(3,11)">
+       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 "
@@ -183,8 +237,8 @@
      id="layer5"
      inkscape:label="Shadow">
     <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0"
-       d="M 0.5,30.5 L 17.5,30.5"
+       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.05"
+       d="M 0.5,28.5 L 23.5,28.5"
        id="path6989" />
   </g>
 </svg>
diff --git a/themes/kokodi/stick-prelight.xpm b/themes/kokodi/stick-prelight.xpm
new file mode 100644
index 000000000..ed5cabcd3
--- /dev/null
+++ b/themes/kokodi/stick-prelight.xpm
@@ -0,0 +1,34 @@
+/* XPM */
+static char * stick_pressed_xpm[] = {
+"24 29 2 1",
+" 	c None",
+".	c #C0C0FF s active_color_1",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................"};
diff --git a/themes/kokodi/stick-pressed.png b/themes/kokodi/stick-pressed.png
index 326f45645..e777be123 100644
--- a/themes/kokodi/stick-pressed.png
+++ b/themes/kokodi/stick-pressed.png
diff --git a/themes/kokodi/stick-pressed.svg b/themes/kokodi/stick-pressed.svg
index b53d373bc..70c965dc5 100644
--- a/themes/kokodi/stick-pressed.svg
+++ b/themes/kokodi/stick-pressed.svg
@@ -9,13 +9,13 @@
    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="18"
+   width="24"
    height="29"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.44.1"
+   inkscape:version="0.45.1"
    version="1.0"
-   sodipodi:docbase="default"
+   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/kokodi"
    sodipodi:docname="stick-pressed.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
@@ -89,11 +89,11 @@
        inkscape:collect="always"
        xlink:href="#linearGradient5873"
        id="radialGradient3087"
-       cx="9"
-       cy="9"
-       fx="9"
-       fy="9"
-       r="9"
+       cx="12"
+       cy="0"
+       fx="12"
+       fy="3"
+       r="22"
        gradientTransform="matrix(1,0,0,1,0,0.5)"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
@@ -103,9 +103,18 @@
        x1="0"
        y1="1"
        x2="0"
-       y2="14"
+       y2="12"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient1886"
+       id="linearGradient2791"
+       x1="0"
+       y1="1"
+       x2="0"
+       y2="25"
+       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -155,12 +164,12 @@
      inkscape:label="pressed">
     <g
        id="g1789"
-       transform="translate(0,6)">
+       transform="translate(0,1)">
       <rect
          style="opacity:0.5;fill:url(#radialGradient3087);fill-opacity:1.0;stroke:url(#radialGradient3087);stroke-width:1;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
          id="rect3079"
-         width="18"
-         height="29"
+         width="24"
+         height="25"
          x="0"
          y="0" />
     </g>
@@ -172,7 +181,7 @@
      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 18,0.5 C 18,0.5 18,28 18,28 L 0,28 L 0,0.5 z "
+       d="M 0,0.5 L 24,0.5 C 24,0.5 24,28 24,28 L 0,28 L 0,0.5 z "
        id="path6057" />
   </g>
   <g
@@ -181,15 +190,19 @@
      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 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
+       d="M 0,1 L 24,1 C 24,1 24,4 24,4 L 0,4 L 0,3 z "
        id="path6061" />
     <rect
-       style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       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="18"
-       height="14"
+       width="24"
+       height="12"
        x="0"
        y="1" />
+    <path
+       style="fill:none;stroke:url(#linearGradient2791);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.60"
+       d="M 0.5,1 L 0.5,16.5 C 0.5,16.5 0.5,18.5 2.5,18.5 C 4,18.5 21.5,18.5 21.5,18.5 C 21.5,18.5 23.5,18.5 23.5,16.5 C 23.5,14.5 23.5,1 23.5,1 L 23.5,1 L 23.5,1"
+       id="path2187" />
   </g>
   <g
      inkscape:label="Border"
@@ -198,7 +211,7 @@
      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 17.5,0.5"
+       d="M 0.5,0.5 L 23.5,0.5"
        id="path6059" />
   </g>
   <g
@@ -208,7 +221,7 @@
     <g
        style="display:inline"
        id="g1613"
-       transform="translate(3,10)">
+       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 "
@@ -225,7 +238,7 @@
      inkscape:label="Shadow">
     <path
        style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.05"
-       d="M 0.5,28.5 L 17.5,28.5"
+       d="M 0.5,28.5 L 23.5,28.5"
        id="path6989" />
   </g>
 </svg>
diff --git a/themes/kokodi/stick-pressed.xpm b/themes/kokodi/stick-pressed.xpm
index a399043fd..ed5cabcd3 100644
--- a/themes/kokodi/stick-pressed.xpm
+++ b/themes/kokodi/stick-pressed.xpm
@@ -1,34 +1,34 @@
 /* XPM */
 static char * stick_pressed_xpm[] = {
-"18 29 2 1",
+"24 29 2 1",
 " 	c None",
 ".	c #C0C0FF s active_color_1",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-".................."};
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................"};
diff --git a/themes/kokodi/stick-toggled-active.png b/themes/kokodi/stick-toggled-active.png
index 09d49d2e6..47bd88773 100644
--- a/themes/kokodi/stick-toggled-active.png
+++ b/themes/kokodi/stick-toggled-active.png
diff --git a/themes/kokodi/stick-toggled-active.svg b/themes/kokodi/stick-toggled-active.svg
index 05a1e66c8..c0fe8ba29 100644
--- a/themes/kokodi/stick-toggled-active.svg
+++ b/themes/kokodi/stick-toggled-active.svg
@@ -9,13 +9,13 @@
    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="18"
+   width="24"
    height="29"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.44.1"
+   inkscape:version="0.45.1"
    version="1.0"
-   sodipodi:docbase="default"
+   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/kokodi"
    sodipodi:docname="stick-toggled-active.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
@@ -95,6 +95,15 @@
        y2="14"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient1886"
+       id="linearGradient2791"
+       x1="0"
+       y1="1"
+       x2="0"
+       y2="25"
+       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -145,7 +154,7 @@
      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 18,0.5 C 18,0.5 18,28 18,28 L 0,28 L 0,0.5 z "
+       d="M 0,0.5 L 24,0.5 C 24,0.5 24,28 24,28 L 0,28 L 0,0.5 z "
        id="path6057" />
   </g>
   <g
@@ -154,15 +163,19 @@
      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 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
+       d="M 0,1 L 24,1 C 24,1 24,4 24,4 L 0,4 L 0,3 z "
        id="path6061" />
     <rect
        style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect1884"
-       width="18"
+       width="24"
        height="14"
        x="0"
        y="1" />
+    <path
+       style="fill:none;stroke:url(#linearGradient2791);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.60"
+       d="M 0.5,1 L 0.5,16.5 C 0.5,16.5 0.5,18.5 2.5,18.5 C 4,18.5 21.5,18.5 21.5,18.5 C 21.5,18.5 23.5,18.5 23.5,16.5 C 23.5,14.5 23.5,1 23.5,1 L 23.5,1 L 23.5,1"
+       id="path2187" />
   </g>
   <g
      inkscape:label="Border"
@@ -171,7 +184,7 @@
      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 17.5,0.5"
+       d="M 0.5,0.5 L 23.5,0.5"
        id="path6059" />
   </g>
   <g
@@ -181,7 +194,7 @@
     <g
        style="display:inline"
        id="g1625"
-       transform="translate(3,9)">
+       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 "
@@ -207,7 +220,7 @@
      inkscape:label="Shadow">
     <path
        style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.05"
-       d="M 0.5,28.5 L 17.5,28.5"
+       d="M 0.5,28.5 L 23.5,28.5"
        id="path6989" />
   </g>
 </svg>
diff --git a/themes/kokodi/stick-toggled-active.xpm b/themes/kokodi/stick-toggled-active.xpm
index 8af322457..bd2ca51eb 100644
--- a/themes/kokodi/stick-toggled-active.xpm
+++ b/themes/kokodi/stick-toggled-active.xpm
@@ -1,34 +1,34 @@
 /* XPM */
 static char * stick_toggled_active_xpm[] = {
-"18 29 2 1",
+"24 29 2 1",
 " 	c None",
 ".	c #C0C0FF s active_color_1",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-".................."};
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................"};
diff --git a/themes/kokodi/stick-toggled-inactive.png b/themes/kokodi/stick-toggled-inactive.png
index d27d2e007..b2424573a 100644
--- a/themes/kokodi/stick-toggled-inactive.png
+++ b/themes/kokodi/stick-toggled-inactive.png
diff --git a/themes/kokodi/stick-toggled-inactive.svg b/themes/kokodi/stick-toggled-inactive.svg
index 182cdba97..56103d6cd 100644
--- a/themes/kokodi/stick-toggled-inactive.svg
+++ b/themes/kokodi/stick-toggled-inactive.svg
@@ -9,13 +9,13 @@
    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="18"
+   width="24"
    height="29"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.44.1"
+   inkscape:version="0.45.1"
    version="1.0"
-   sodipodi:docbase="default"
+   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/kokodi"
    sodipodi:docname="stick-toggled-inactive.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
@@ -145,7 +145,7 @@
      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 18,0.5 C 18,0.5 18,28 18,28 L 0,28 L 0,0.5 z "
+       d="M 0,0.5 L 24,0.5 C 24,0.5 24,28 24,28 L 0,28 L 0,0.5 z "
        id="path6057" />
   </g>
   <g
@@ -154,15 +154,19 @@
      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 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
+       d="M 0,1 L 24,1 C 24,1 24,4 24,4 L 0,4 L 0,3 z "
        id="path6061" />
     <rect
        style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect1884"
-       width="18"
+       width="24"
        height="14"
        x="0"
        y="1" />
+    <path
+       style="fill:none;stroke:#7f7f7f;stroke-width:1px;stroke-opacity:0.25"
+       d="M 0.5,1 L 0.5,16.5 C 0.5,16.5 0.5,18.5 2.5,18.5 C 4,18.5 21.5,18.5 21.5,18.5 C 21.5,18.5 23.5,18.5 23.5,16.5 C 23.5,14.5 23.5,1 23.5,1 L 23.5,1 L 23.5,1"
+       id="path2187" />
   </g>
   <g
      inkscape:label="Border"
@@ -171,7 +175,7 @@
      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 17.5,0.5"
+       d="M 0.5,0.5 L 23.5,0.5"
        id="path6059" />
   </g>
   <g
@@ -181,7 +185,7 @@
     <g
        style="display:inline"
        id="g1625"
-       transform="translate(3,9)">
+       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 "
@@ -203,7 +207,7 @@
      inkscape:label="Shadow">
     <path
        style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.05"
-       d="M 0.5,28.5 L 17.5,28.5"
+       d="M 0.5,28.5 L 23.5,28.5"
        id="path6989" />
   </g>
 </svg>
diff --git a/themes/kokodi/stick-toggled-inactive.xpm b/themes/kokodi/stick-toggled-inactive.xpm
index b9a1af361..ae842ef7a 100644
--- a/themes/kokodi/stick-toggled-inactive.xpm
+++ b/themes/kokodi/stick-toggled-inactive.xpm
@@ -1,34 +1,34 @@
 /* XPM */
 static char * stick_toggled_inactive_xpm[] = {
-"18 29 2 1",
+"24 29 2 1",
 " 	c None",
 ".	c #C0C0FF s inactive_color_1",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-".................."};
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................"};
diff --git a/themes/kokodi/stick-toggled-prelight.png b/themes/kokodi/stick-toggled-prelight.png
new file mode 100644
index 000000000..64640a42c
--- /dev/null
+++ b/themes/kokodi/stick-toggled-prelight.png
diff --git a/themes/largeprint/stick-toggled-pressed.svg b/themes/kokodi/stick-toggled-prelight.svg
index 9f6005695..12e50db76 100644
--- a/themes/largeprint/stick-toggled-pressed.svg
+++ b/themes/kokodi/stick-toggled-prelight.svg
@@ -9,37 +9,61 @@
    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="18"
-   height="31"
+   width="24"
+   height="29"
    id="svg2"
    sodipodi:version="0.32"
    inkscape:version="0.45.1"
    version="1.0"
-   sodipodi:docname="stick-toggled-pressed.svg"
+   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/kokodi"
+   sodipodi:docname="stick-toggled-prelight.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.25;"
+         offset="1"
+         id="stop1890" />
+    </linearGradient>
+    <linearGradient
        id="linearGradient5873">
       <stop
          id="stop5875"
          offset="0"
          style="stop-color:white;stop-opacity:1;" />
       <stop
+         id="stop5877"
+         offset="0.5"
+         style="stop-color:white;stop-opacity:0.90;" />
+      <stop
          id="stop5879"
          offset="1"
-         style="stop-color:white;stop-opacity:0.15;" />
+         style="stop-color:white;stop-opacity:0;" />
     </linearGradient>
     <linearGradient
        id="linearGradient5847">
       <stop
          id="stop5849"
          offset="0"
-         style="stop-color:black;stop-opacity:0.05;" />
+         style="stop-color:black;stop-opacity:0;" />
       <stop
          id="stop2776"
+         offset="0.4"
+         style="stop-color:black;stop-opacity:0;" />
+      <stop
+         id="stop2779"
+         offset="0.6"
+         style="stop-color:black;stop-opacity:0.05;" />
+      <stop
+         id="stop5851"
          offset="1"
-         style="stop-color:white;stop-opacity:0.30;" />
+         style="stop-color:white;stop-opacity:0.20;" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
@@ -49,7 +73,7 @@
        x1="0"
        y1="0.5"
        x2="0"
-       y2="17"
+       y2="28.5"
        gradientTransform="matrix(1,0,0,1,0,0)" />
     <linearGradient
        inkscape:collect="always"
@@ -65,13 +89,32 @@
        inkscape:collect="always"
        xlink:href="#linearGradient5873"
        id="radialGradient3087"
-       cx="9"
-       cy="14"
-       fx="9"
-       fy="14"
-       r="12"
+       cx="12"
+       cy="0"
+       fx="12"
+       fy="3"
+       r="22"
        gradientTransform="matrix(1,0,0,1,0,0.5)"
        gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient1886"
+       id="linearGradient1892"
+       x1="0"
+       y1="1"
+       x2="0"
+       y2="12"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient1886"
+       id="linearGradient2791"
+       x1="0"
+       y1="1"
+       x2="0"
+       y2="25"
+       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -121,14 +164,14 @@
      inkscape:label="pressed">
     <g
        id="g1789"
-       transform="translate(0,2)">
+       transform="translate(0,1)">
       <rect
          style="opacity:0.5;fill:url(#radialGradient3087);fill-opacity:1.0;stroke:url(#radialGradient3087);stroke-width:1;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
          id="rect3079"
-         width="18"
-         height="18"
+         width="24"
+         height="25"
          x="0"
-         y="6" />
+         y="0" />
     </g>
   </g>
   <g
@@ -137,8 +180,8 @@
      inkscape:label="Grad"
      style="display:inline">
     <path
-       style="fill:url(#linearGradient6945);fill-opacity:0.75;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 18,0.5 C 18,0.5 18,30 18,30 L 0,30 L 0,0.5 z "
+       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,28 24,28 L 0,28 L 0,0.5 z "
        id="path6057" />
   </g>
   <g
@@ -146,9 +189,20 @@
      id="layer3"
      inkscape:label="hilight">
     <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.40;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 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"
+       d="M 0,1 L 24,1 C 24,1 24,4 24,4 L 0,4 L 0,3 z "
        id="path6061" />
+    <rect
+       style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect1884"
+       width="24"
+       height="14"
+       x="0"
+       y="1" />
+    <path
+       style="fill:none;stroke:url(#linearGradient2791);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.60"
+       d="M 0.5,1 L 0.5,16.5 C 0.5,16.5 0.5,18.5 2.5,18.5 C 4,18.5 21.5,18.5 21.5,18.5 C 21.5,18.5 23.5,18.5 23.5,16.5 C 23.5,14.5 23.5,1 23.5,1 L 23.5,1 L 23.5,1"
+       id="path2187" />
   </g>
   <g
      inkscape:label="Border"
@@ -156,8 +210,8 @@
      id="g31"
      style="display:inline">
     <path
-       style="fill:none;fill-opacity:0.20;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 17.5,0.5"
+       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.50"
+       d="M 0.5,0.5 L 23.5,0.5"
        id="path6059" />
   </g>
   <g
@@ -167,7 +221,7 @@
     <g
        style="display:inline"
        id="g1625"
-       transform="translate(3,11)">
+       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 "
@@ -182,7 +236,7 @@
          sodipodi:rx="1"
          sodipodi:cy="0"
          sodipodi:cx="6"
-         id="path2282"
+         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>
@@ -192,8 +246,8 @@
      id="layer5"
      inkscape:label="Shadow">
     <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0"
-       d="M 0.5,30.5 L 17.5,30.5"
+       style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.05"
+       d="M 0.5,28.5 L 23.5,28.5"
        id="path6989" />
   </g>
 </svg>
diff --git a/themes/kokodi/stick-toggled-prelight.xpm b/themes/kokodi/stick-toggled-prelight.xpm
new file mode 100644
index 000000000..e65a41324
--- /dev/null
+++ b/themes/kokodi/stick-toggled-prelight.xpm
@@ -0,0 +1,34 @@
+/* XPM */
+static char * stick_toggled_pressed_xpm[] = {
+"24 29 2 1",
+" 	c None",
+".	c #C0C0FF s active_color_1",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................"};
diff --git a/themes/kokodi/stick-toggled-pressed.png b/themes/kokodi/stick-toggled-pressed.png
index e509d2e06..dc6c1a73a 100644
--- a/themes/kokodi/stick-toggled-pressed.png
+++ b/themes/kokodi/stick-toggled-pressed.png
diff --git a/themes/kokodi/stick-toggled-pressed.svg b/themes/kokodi/stick-toggled-pressed.svg
index a1a2864fc..ec9b999e4 100644
--- a/themes/kokodi/stick-toggled-pressed.svg
+++ b/themes/kokodi/stick-toggled-pressed.svg
@@ -9,13 +9,13 @@
    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="18"
+   width="24"
    height="29"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.44.1"
+   inkscape:version="0.45.1"
    version="1.0"
-   sodipodi:docbase="default"
+   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/kokodi"
    sodipodi:docname="stick-toggled-pressed.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
@@ -89,11 +89,11 @@
        inkscape:collect="always"
        xlink:href="#linearGradient5873"
        id="radialGradient3087"
-       cx="9"
-       cy="9"
-       fx="9"
-       fy="9"
-       r="9"
+       cx="12"
+       cy="0"
+       fx="12"
+       fy="3"
+       r="22"
        gradientTransform="matrix(1,0,0,1,0,0.5)"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
@@ -103,9 +103,18 @@
        x1="0"
        y1="1"
        x2="0"
-       y2="14"
+       y2="12"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(0.75,0,0,1,0.75,0)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient1886"
+       id="linearGradient2791"
+       x1="0"
+       y1="1"
+       x2="0"
+       y2="25"
+       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -155,12 +164,12 @@
      inkscape:label="pressed">
     <g
        id="g1789"
-       transform="translate(0,6)">
+       transform="translate(0,1)">
       <rect
          style="opacity:0.5;fill:url(#radialGradient3087);fill-opacity:1.0;stroke:url(#radialGradient3087);stroke-width:1;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
          id="rect3079"
-         width="18"
-         height="29"
+         width="24"
+         height="25"
          x="0"
          y="0" />
     </g>
@@ -172,7 +181,7 @@
      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 18,0.5 C 18,0.5 18,28 18,28 L 0,28 L 0,0.5 z "
+       d="M 0,0.5 L 24,0.5 C 24,0.5 24,28 24,28 L 0,28 L 0,0.5 z "
        id="path6057" />
   </g>
   <g
@@ -181,15 +190,19 @@
      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 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
+       d="M 0,1 L 24,1 C 24,1 24,4 24,4 L 0,4 L 0,3 z "
        id="path6061" />
     <rect
-       style="opacity:0.5;fill:url(#linearGradient1892);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       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="18"
-       height="14"
+       width="24"
+       height="12"
        x="0"
        y="1" />
+    <path
+       style="fill:none;stroke:url(#linearGradient2791);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.60"
+       d="M 0.5,1 L 0.5,16.5 C 0.5,16.5 0.5,18.5 2.5,18.5 C 4,18.5 21.5,18.5 21.5,18.5 C 21.5,18.5 23.5,18.5 23.5,16.5 C 23.5,14.5 23.5,1 23.5,1 L 23.5,1 L 23.5,1"
+       id="path2187" />
   </g>
   <g
      inkscape:label="Border"
@@ -198,7 +211,7 @@
      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 17.5,0.5"
+       d="M 0.5,0.5 L 23.5,0.5"
        id="path6059" />
   </g>
   <g
@@ -208,7 +221,7 @@
     <g
        style="display:inline"
        id="g1625"
-       transform="translate(3,10)">
+       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 "
@@ -234,7 +247,7 @@
      inkscape:label="Shadow">
     <path
        style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.05"
-       d="M 0.5,28.5 L 17.5,28.5"
+       d="M 0.5,28.5 L 23.5,28.5"
        id="path6989" />
   </g>
 </svg>
diff --git a/themes/kokodi/stick-toggled-pressed.xpm b/themes/kokodi/stick-toggled-pressed.xpm
index 8297ebfbb..e65a41324 100644
--- a/themes/kokodi/stick-toggled-pressed.xpm
+++ b/themes/kokodi/stick-toggled-pressed.xpm
@@ -1,34 +1,34 @@
 /* XPM */
 static char * stick_toggled_pressed_xpm[] = {
-"18 29 2 1",
+"24 29 2 1",
 " 	c None",
 ".	c #C0C0FF s active_color_1",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-".................."};
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................",
+"........................"};
diff --git a/themes/kokodi/themerc b/themes/kokodi/themerc
index 9f3070109..6a66b2f60 100644
--- a/themes/kokodi/themerc
+++ b/themes/kokodi/themerc
@@ -1,6 +1,6 @@
 active_text_color=#ffffff
-button_offset=0
-button_spacing=0
+button_offset=2
+button_spacing=-1
 full_width_title=false
 maximized_offset=0
 shadow_delta_height=-2
diff --git a/themes/kokodi/title-1-active.png b/themes/kokodi/title-1-active.png
index 46b470988..adca4d744 100644
--- a/themes/kokodi/title-1-active.png
+++ b/themes/kokodi/title-1-active.png
diff --git a/themes/kokodi/title-1-active.svg b/themes/kokodi/title-1-active.svg
index 69461d81d..a22406535 100644
--- a/themes/kokodi/title-1-active.svg
+++ b/themes/kokodi/title-1-active.svg
@@ -13,9 +13,9 @@
    height="29"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.44.1"
+   inkscape:version="0.45.1"
    version="1.0"
-   sodipodi:docbase="default"
+   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/kokodi"
    sodipodi:docname="title-1-active.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
diff --git a/themes/kokodi/title-1-inactive.png b/themes/kokodi/title-1-inactive.png
index 46b470988..adca4d744 100644
--- a/themes/kokodi/title-1-inactive.png
+++ b/themes/kokodi/title-1-inactive.png
diff --git a/themes/kokodi/title-1-inactive.svg b/themes/kokodi/title-1-inactive.svg
index dbfbbf533..7801203d0 100644
--- a/themes/kokodi/title-1-inactive.svg
+++ b/themes/kokodi/title-1-inactive.svg
@@ -13,9 +13,9 @@
    height="29"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.44.1"
+   inkscape:version="0.45.1"
    version="1.0"
-   sodipodi:docbase="default"
+   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/kokodi"
    sodipodi:docname="title-1-inactive.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
diff --git a/themes/kokodi/title-2-active.png b/themes/kokodi/title-2-active.png
index 46b470988..adca4d744 100644
--- a/themes/kokodi/title-2-active.png
+++ b/themes/kokodi/title-2-active.png
diff --git a/themes/kokodi/title-2-active.svg b/themes/kokodi/title-2-active.svg
index 26fe6d1cd..44bb42c63 100644
--- a/themes/kokodi/title-2-active.svg
+++ b/themes/kokodi/title-2-active.svg
@@ -13,9 +13,9 @@
    height="29"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.44.1"
+   inkscape:version="0.45.1"
    version="1.0"
-   sodipodi:docbase="default"
+   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/kokodi"
    sodipodi:docname="title-2-active.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
diff --git a/themes/kokodi/title-2-inactive.png b/themes/kokodi/title-2-inactive.png
index 46b470988..adca4d744 100644
--- a/themes/kokodi/title-2-inactive.png
+++ b/themes/kokodi/title-2-inactive.png
diff --git a/themes/kokodi/title-2-inactive.svg b/themes/kokodi/title-2-inactive.svg
index 82424fab8..f5082ca03 100644
--- a/themes/kokodi/title-2-inactive.svg
+++ b/themes/kokodi/title-2-inactive.svg
@@ -13,9 +13,9 @@
    height="29"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.44.1"
+   inkscape:version="0.45.1"
    version="1.0"
-   sodipodi:docbase="default"
+   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/kokodi"
    sodipodi:docname="title-2-inactive.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
diff --git a/themes/kokodi/title-3-active.png b/themes/kokodi/title-3-active.png
index 46b470988..adca4d744 100644
--- a/themes/kokodi/title-3-active.png
+++ b/themes/kokodi/title-3-active.png
diff --git a/themes/kokodi/title-3-active.svg b/themes/kokodi/title-3-active.svg
index 86ef24f0f..e521a794d 100644
--- a/themes/kokodi/title-3-active.svg
+++ b/themes/kokodi/title-3-active.svg
@@ -13,9 +13,9 @@
    height="29"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.44.1"
+   inkscape:version="0.45.1"
    version="1.0"
-   sodipodi:docbase="default"
+   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/kokodi"
    sodipodi:docname="title-3-active.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
diff --git a/themes/kokodi/title-3-inactive.png b/themes/kokodi/title-3-inactive.png
index 46b470988..adca4d744 100644
--- a/themes/kokodi/title-3-inactive.png
+++ b/themes/kokodi/title-3-inactive.png
diff --git a/themes/kokodi/title-3-inactive.svg b/themes/kokodi/title-3-inactive.svg
index 4fcf55cf5..bb755e58d 100644
--- a/themes/kokodi/title-3-inactive.svg
+++ b/themes/kokodi/title-3-inactive.svg
@@ -13,9 +13,9 @@
    height="29"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.44.1"
+   inkscape:version="0.45.1"
    version="1.0"
-   sodipodi:docbase="default"
+   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/kokodi"
    sodipodi:docname="title-3-inactive.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
diff --git a/themes/kokodi/title-4-active.png b/themes/kokodi/title-4-active.png
index 46b470988..adca4d744 100644
--- a/themes/kokodi/title-4-active.png
+++ b/themes/kokodi/title-4-active.png
diff --git a/themes/kokodi/title-4-active.svg b/themes/kokodi/title-4-active.svg
index 0d243cf3f..7e167206a 100644
--- a/themes/kokodi/title-4-active.svg
+++ b/themes/kokodi/title-4-active.svg
@@ -13,9 +13,9 @@
    height="29"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.44.1"
+   inkscape:version="0.45.1"
    version="1.0"
-   sodipodi:docbase="default"
+   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/kokodi"
    sodipodi:docname="title-4-active.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
diff --git a/themes/kokodi/title-4-inactive.png b/themes/kokodi/title-4-inactive.png
index 46b470988..adca4d744 100644
--- a/themes/kokodi/title-4-inactive.png
+++ b/themes/kokodi/title-4-inactive.png
diff --git a/themes/kokodi/title-4-inactive.svg b/themes/kokodi/title-4-inactive.svg
index 4fb492fb8..c755798fb 100644
--- a/themes/kokodi/title-4-inactive.svg
+++ b/themes/kokodi/title-4-inactive.svg
@@ -13,9 +13,9 @@
    height="29"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.44.1"
+   inkscape:version="0.45.1"
    version="1.0"
-   sodipodi:docbase="default"
+   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/kokodi"
    sodipodi:docname="title-4-inactive.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
diff --git a/themes/kokodi/title-5-active.png b/themes/kokodi/title-5-active.png
index 46b470988..adca4d744 100644
--- a/themes/kokodi/title-5-active.png
+++ b/themes/kokodi/title-5-active.png
diff --git a/themes/kokodi/title-5-active.svg b/themes/kokodi/title-5-active.svg
index bd7858925..7d583c242 100644
--- a/themes/kokodi/title-5-active.svg
+++ b/themes/kokodi/title-5-active.svg
@@ -13,9 +13,9 @@
    height="29"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.44.1"
+   inkscape:version="0.45.1"
    version="1.0"
-   sodipodi:docbase="default"
+   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/kokodi"
    sodipodi:docname="title-5-active.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
diff --git a/themes/kokodi/title-5-inactive.png b/themes/kokodi/title-5-inactive.png
index 46b470988..adca4d744 100644
--- a/themes/kokodi/title-5-inactive.png
+++ b/themes/kokodi/title-5-inactive.png
diff --git a/themes/kokodi/title-5-inactive.svg b/themes/kokodi/title-5-inactive.svg
index 881547b59..e51772ed6 100644
--- a/themes/kokodi/title-5-inactive.svg
+++ b/themes/kokodi/title-5-inactive.svg
@@ -13,9 +13,9 @@
    height="29"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.44.1"
+   inkscape:version="0.45.1"
    version="1.0"
-   sodipodi:docbase="default"
+   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/kokodi"
    sodipodi:docname="title-5-inactive.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
diff --git a/themes/kokodi/top-left-active.png b/themes/kokodi/top-left-active.png
index b95efdf4a..a2becfdf4 100644
--- a/themes/kokodi/top-left-active.png
+++ b/themes/kokodi/top-left-active.png
diff --git a/themes/kokodi/top-left-active.svg b/themes/kokodi/top-left-active.svg
index 6fe458cea..f832bef49 100644
--- a/themes/kokodi/top-left-active.svg
+++ b/themes/kokodi/top-left-active.svg
@@ -10,9 +10,9 @@
    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="default"
+   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/kokodi"
    version="1.0"
-   inkscape:version="0.44.1"
+   inkscape:version="0.45.1"
    sodipodi:version="0.32"
    id="svg2"
    height="29"
diff --git a/themes/kokodi/top-left-inactive.png b/themes/kokodi/top-left-inactive.png
index b95efdf4a..a2becfdf4 100644
--- a/themes/kokodi/top-left-inactive.png
+++ b/themes/kokodi/top-left-inactive.png
diff --git a/themes/kokodi/top-left-inactive.svg b/themes/kokodi/top-left-inactive.svg
index 6510838cc..7486fdab9 100644
--- a/themes/kokodi/top-left-inactive.svg
+++ b/themes/kokodi/top-left-inactive.svg
@@ -10,9 +10,9 @@
    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="default"
+   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/kokodi"
    version="1.0"
-   inkscape:version="0.44.1"
+   inkscape:version="0.45.1"
    sodipodi:version="0.32"
    id="svg2"
    height="29"
diff --git a/themes/kokodi/top-right-active.png b/themes/kokodi/top-right-active.png
index d6bc706ec..e7de17e98 100644
--- a/themes/kokodi/top-right-active.png
+++ b/themes/kokodi/top-right-active.png
diff --git a/themes/kokodi/top-right-active.svg b/themes/kokodi/top-right-active.svg
index 7043f078a..8e1e046ab 100644
--- a/themes/kokodi/top-right-active.svg
+++ b/themes/kokodi/top-right-active.svg
@@ -13,9 +13,9 @@
    height="29"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.44.1"
+   inkscape:version="0.45.1"
    version="1.0"
-   sodipodi:docbase="default"
+   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/kokodi"
    sodipodi:docname="top-right-active.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
diff --git a/themes/kokodi/top-right-inactive.png b/themes/kokodi/top-right-inactive.png
index d6bc706ec..e7de17e98 100644
--- a/themes/kokodi/top-right-inactive.png
+++ b/themes/kokodi/top-right-inactive.png
diff --git a/themes/kokodi/top-right-inactive.svg b/themes/kokodi/top-right-inactive.svg
index 8a65173b1..281446de0 100644
--- a/themes/kokodi/top-right-inactive.svg
+++ b/themes/kokodi/top-right-inactive.svg
@@ -13,9 +13,9 @@
    height="29"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.44.1"
+   inkscape:version="0.45.1"
    version="1.0"
-   sodipodi:docbase="default"
+   sodipodi:docbase="/home/ofourdan/src/svn/xfwm4/trunk/themes/kokodi"
    sodipodi:docname="top-right-inactive.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
diff --git a/themes/largeprint/Makefile.am b/themes/largeprint/Makefile.am
deleted file mode 100644
index 376b388fc..000000000
--- a/themes/largeprint/Makefile.am
+++ /dev/null
@@ -1,212 +0,0 @@
-themedir = $(datadir)/themes/LargePrint/xfwm4
-
-PNG_FILES = 								\
-	bottom-active.png						\
-	bottom-inactive.png						\
-	bottom-left-active.png						\
-	bottom-left-inactive.png					\
-	bottom-right-active.png						\
-	bottom-right-inactive.png					\
-	close-active.png						\
-	close-inactive.png						\
-	close-pressed.png						\
-	close-prelight.png						\
-	hide-active.png							\
-	hide-inactive.png						\
-	hide-pressed.png						\
-	hide-pressed.png						\
-	hide-prelight.png						\
-	left-active.png							\
-	left-inactive.png						\
-	maximize-active.png						\
-	maximize-inactive.png						\
-	maximize-pressed.png						\
-	maximize-prelight.png						\
-	maximize-toggled-active.png					\
-	maximize-toggled-inactive.png					\
-	maximize-toggled-pressed.png					\
-	maximize-toggled-prelight.png					\
-	menu-active.png							\
-	menu-inactive.png						\
-	menu-pressed.png						\
-	menu-prelight.png						\
-	right-active.png						\
-	right-inactive.png						\
-	shade-active.png						\
-	shade-inactive.png						\
-	shade-pressed.png						\
-	shade-prelight.png						\
-	shade-toggled-active.png					\
-	shade-toggled-inactive.png					\
-	shade-toggled-pressed.png					\
-	shade-toggled-prelight.png					\
-	stick-active.png						\
-	stick-inactive.png						\
-	stick-pressed.png						\
-	stick-prelight.png						\
-	stick-toggled-active.png					\
-	stick-toggled-inactive.png					\
-	stick-toggled-pressed.png					\
-	stick-toggled-prelight.png					\
-	title-1-active.png						\
-	title-1-inactive.png						\
-	title-2-active.png						\
-	title-2-inactive.png						\
-	title-3-active.png						\
-	title-3-inactive.png						\
-	title-4-active.png						\
-	title-4-inactive.png						\
-	title-5-active.png						\
-	title-5-inactive.png						\
-	top-left-active.png						\
-	top-left-inactive.png						\
-	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						\
-	close-prelight.svg						\
-	hide-active.svg							\
-	hide-inactive.svg						\
-	hide-pressed.svg						\
-	hide-prelight.svg						\
-	left-active.svg							\
-	left-inactive.svg						\
-	maximize-active.svg						\
-	maximize-inactive.svg						\
-	maximize-pressed.svg						\
-	maximize-prelight.svg						\
-	maximize-toggled-active.svg					\
-	maximize-toggled-inactive.svg					\
-	maximize-toggled-pressed.svg					\
-	maximize-toggled-prelight.svg					\
-	menu-active.svg							\
-	menu-inactive.svg						\
-	menu-pressed.svg						\
-	menu-prelight.svg						\
-	right-active.svg						\
-	right-inactive.svg						\
-	shade-active.svg						\
-	shade-inactive.svg						\
-	shade-pressed.svg						\
-	shade-prelight.svg						\
-	shade-toggled-active.svg					\
-	shade-toggled-inactive.svg					\
-	shade-toggled-pressed.svg					\
-	shade-toggled-prelight.svg					\
-	stick-active.svg						\
-	stick-inactive.svg						\
-	stick-pressed.svg						\
-	stick-prelight.svg						\
-	stick-toggled-active.svg					\
-	stick-toggled-inactive.svg					\
-	stick-toggled-pressed.svg					\
-	stick-toggled-prelight.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						\
-	close-prelight.xpm						\
-	hide-active.xpm							\
-	hide-inactive.xpm						\
-	hide-pressed.xpm						\
-	hide-prelight.xpm						\
-	left-active.xpm							\
-	left-inactive.xpm						\
-	maximize-active.xpm						\
-	maximize-inactive.xpm						\
-	maximize-pressed.xpm						\
-	maximize-prelight.xpm						\
-	maximize-toggled-active.xpm					\
-	maximize-toggled-inactive.xpm					\
-	maximize-toggled-pressed.xpm					\
-	maximize-toggled-prelight.xpm					\
-	menu-active.xpm							\
-	menu-inactive.xpm						\
-	menu-pressed.xpm						\
-	menu-prelight.xpm						\
-	right-active.xpm						\
-	right-inactive.xpm						\
-	shade-active.xpm						\
-	shade-inactive.xpm						\
-	shade-pressed.xpm						\
-	shade-prelight.xpm						\
-	shade-toggled-active.xpm					\
-	shade-toggled-inactive.xpm					\
-	shade-toggled-pressed.xpm					\
-	shade-toggled-prelight.xpm					\
-	stick-active.xpm						\
-	stick-inactive.xpm						\
-	stick-pressed.xpm						\
-	stick-prelight.xpm						\
-	stick-toggled-active.xpm					\
-	stick-toggled-inactive.xpm					\
-	stick-toggled-pressed.xpm					\
-	stick-toggled-prelight.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.xpm
-
-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/largeprint/README b/themes/largeprint/README
deleted file mode 100644
index 5d53c4586..000000000
--- a/themes/largeprint/README
+++ /dev/null
@@ -1,7 +0,0 @@
-Kokodi^2
---------
-
-SVG based theme for xfwm4.
-Created Sept. 2006 by Olivier Fourdan <fourdan@xfce.org>
-Modified Oct. 2006 by Olivier Fourdan <fourdan@xfce.org>
-Theme released under GNU GPL license.
diff --git a/themes/largeprint/bottom-active.png b/themes/largeprint/bottom-active.png
deleted file mode 100644
index 5b91a1ffa..000000000
--- a/themes/largeprint/bottom-active.png
+++ /dev/null
diff --git a/themes/largeprint/bottom-active.svg b/themes/largeprint/bottom-active.svg
deleted file mode 100644
index d724518b2..000000000
--- a/themes/largeprint/bottom-active.svg
+++ /dev/null
@@ -1,84 +0,0 @@
-<?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="8"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.45.1"
-   version="1.0"
-   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,7.5 L 24,7.5"
-       id="path1340" />
-  </g>
-</svg>
diff --git a/themes/largeprint/bottom-active.xpm b/themes/largeprint/bottom-active.xpm
deleted file mode 100644
index c57472314..000000000
--- a/themes/largeprint/bottom-active.xpm
+++ /dev/null
@@ -1,15 +0,0 @@
-/* XPM */
-static char * bottom_active_xpm[] = {
-"24 8 4 1",
-" 	c None",
-"+	c #D0D0FF s active_hilight_1",
-"#	c #C0C0C0 s active_color_2",
-"@	c #C0C0FF s active_color_1",
-"########################",
-"########################",
-"########################",
-"########################",
-"@@@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@@@",
-"++++++++++++++++++++++++",
-"@@@@@@@@@@@@@@@@@@@@@@@@"};
diff --git a/themes/largeprint/bottom-inactive.png b/themes/largeprint/bottom-inactive.png
deleted file mode 100644
index 5b91a1ffa..000000000
--- a/themes/largeprint/bottom-inactive.png
+++ /dev/null
diff --git a/themes/largeprint/bottom-inactive.svg b/themes/largeprint/bottom-inactive.svg
deleted file mode 100644
index 5898a8be8..000000000
--- a/themes/largeprint/bottom-inactive.svg
+++ /dev/null
@@ -1,84 +0,0 @@
-<?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="8"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.45.1"
-   version="1.0"
-   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,7.5 L 24,7.5"
-       id="path1340" />
-  </g>
-</svg>
diff --git a/themes/largeprint/bottom-inactive.xpm b/themes/largeprint/bottom-inactive.xpm
deleted file mode 100644
index 83fa9497b..000000000
--- a/themes/largeprint/bottom-inactive.xpm
+++ /dev/null
@@ -1,15 +0,0 @@
-/* XPM */
-static char * bottom_inactive_xpm[] = {
-"24 8 4 1",
-" 	c None",
-"+	c #D0D0FF s inactive_hilight_1",
-"#	c #C0C0C0 s inactive_color_2",
-"@	c #C0C0FF s inactive_color_1",
-"########################",
-"########################",
-"########################",
-"########################",
-"@@@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@@@",
-"++++++++++++++++++++++++",
-"@@@@@@@@@@@@@@@@@@@@@@@@"};
diff --git a/themes/largeprint/bottom-left-active.png b/themes/largeprint/bottom-left-active.png
deleted file mode 100644
index 555ee6ebb..000000000
--- a/themes/largeprint/bottom-left-active.png
+++ /dev/null
diff --git a/themes/largeprint/bottom-left-active.svg b/themes/largeprint/bottom-left-active.svg
deleted file mode 100644
index 9c87020f4..000000000
--- a/themes/largeprint/bottom-left-active.svg
+++ /dev/null
@@ -1,83 +0,0 @@
-<?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.45.1"
-   version="1.0"
-   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,15 1,15 L 1,0 L 0,0 z "
-       id="rect1870" />
-  </g>
-</svg>
diff --git a/themes/largeprint/bottom-left-active.xpm b/themes/largeprint/bottom-left-active.xpm
deleted file mode 100644
index 3d4c5a0d4..000000000
--- a/themes/largeprint/bottom-left-active.xpm
+++ /dev/null
@@ -1,23 +0,0 @@
-/* XPM */
-static char * bottom_left_active_xpm[] = {
-"16 16 4 1",
-" 	c None",
-"+	c #D0D0FF s active_hilight_1",
-"#	c #C0C0C0 s active_color_2",
-"@	c #C0C0FF s active_color_1",
-"@+@@####        ",
-"@+@@####        ",
-"@+@@####        ",
-"@+@@####        ",
-"@+@@####        ",
-"@+@@####        ",
-"@+@@####        ",
-"@+@@####        ",
-"@+@@############",
-"@+@@############",
-"@+@@############",
-"@+@@############",
-"@+@@@@@@@@@@@@@@",
-"@+@@@@@@@@@@@@@@",
-"@+++++++++++++++",
-" @@@@@@@@@@@@@@@"};
diff --git a/themes/largeprint/bottom-left-inactive.png b/themes/largeprint/bottom-left-inactive.png
deleted file mode 100644
index 555ee6ebb..000000000
--- a/themes/largeprint/bottom-left-inactive.png
+++ /dev/null
diff --git a/themes/largeprint/bottom-left-inactive.svg b/themes/largeprint/bottom-left-inactive.svg
deleted file mode 100644
index ead279f7c..000000000
--- a/themes/largeprint/bottom-left-inactive.svg
+++ /dev/null
@@ -1,83 +0,0 @@
-<?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.45.1"
-   version="1.0"
-   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,15 1,15 L 1,0 L 0,0 z "
-       id="rect1870" />
-  </g>
-</svg>
diff --git a/themes/largeprint/bottom-left-inactive.xpm b/themes/largeprint/bottom-left-inactive.xpm
deleted file mode 100644
index 4b130e376..000000000
--- a/themes/largeprint/bottom-left-inactive.xpm
+++ /dev/null
@@ -1,23 +0,0 @@
-/* XPM */
-static char * bottom_left_inactive_xpm[] = {
-"16 16 4 1",
-" 	c None",
-"+	c #D0D0FF s inactive_hilight_1",
-"#	c #C0C0C0 s inactive_color_2",
-"@	c #C0C0FF s inactive_color_1",
-"@+@@####        ",
-"@+@@####        ",
-"@+@@####        ",
-"@+@@####        ",
-"@+@@####        ",
-"@+@@####        ",
-"@+@@####        ",
-"@+@@####        ",
-"@+@@############",
-"@+@@############",
-"@+@@############",
-"@+@@############",
-"@+@@@@@@@@@@@@@@",
-"@+@@@@@@@@@@@@@@",
-"@+++++++++++++++",
-" @@@@@@@@@@@@@@@"};
diff --git a/themes/largeprint/bottom-right-active.png b/themes/largeprint/bottom-right-active.png
deleted file mode 100644
index 73a97dd36..000000000
--- a/themes/largeprint/bottom-right-active.png
+++ /dev/null
diff --git a/themes/largeprint/bottom-right-active.svg b/themes/largeprint/bottom-right-active.svg
deleted file mode 100644
index 8bc1ddb70..000000000
--- a/themes/largeprint/bottom-right-active.svg
+++ /dev/null
@@ -1,83 +0,0 @@
-<?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.45.1"
-   version="1.0"
-   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,15 15,15 L 15,0 L 16,0 z "
-       id="rect1870" />
-  </g>
-</svg>
diff --git a/themes/largeprint/bottom-right-active.xpm b/themes/largeprint/bottom-right-active.xpm
deleted file mode 100644
index a9898ed70..000000000
--- a/themes/largeprint/bottom-right-active.xpm
+++ /dev/null
@@ -1,23 +0,0 @@
-/* XPM */
-static char * bottom_right_active_xpm[] = {
-"16 16 4 1",
-" 	c None",
-"+	c #D0D0FF s active_hilight_1",
-"#	c #C0C0C0 s active_color_2",
-"@	c #C0C0FF s active_color_1",
-"        ####@@+@",
-"        ####@@+@",
-"        ####@@+@",
-"        ####@@+@",
-"        ####@@+@",
-"        ####@@+@",
-"        ####@@+@",
-"        ####@@+@",
-"############@@+@",
-"############@@+@",
-"############@@+@",
-"############@@+@",
-"@@@@@@@@@@@@@@+@",
-"@@@@@@@@@@@@@@+@",
-"+++++++++++++++@",
-"@@@@@@@@@@@@@@@ "};
diff --git a/themes/largeprint/bottom-right-inactive.png b/themes/largeprint/bottom-right-inactive.png
deleted file mode 100644
index 73a97dd36..000000000
--- a/themes/largeprint/bottom-right-inactive.png
+++ /dev/null
diff --git a/themes/largeprint/bottom-right-inactive.svg b/themes/largeprint/bottom-right-inactive.svg
deleted file mode 100644
index b3575bdb3..000000000
--- a/themes/largeprint/bottom-right-inactive.svg
+++ /dev/null
@@ -1,83 +0,0 @@
-<?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.45.1"
-   version="1.0"
-   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,15 15,15 L 15,0 L 16,0 z "
-       id="rect1870" />
-  </g>
-</svg>
diff --git a/themes/largeprint/bottom-right-inactive.xpm b/themes/largeprint/bottom-right-inactive.xpm
deleted file mode 100644
index 2a5d41bc1..000000000
--- a/themes/largeprint/bottom-right-inactive.xpm
+++ /dev/null
@@ -1,23 +0,0 @@
-/* XPM */
-static char * bottom_right_inactive_xpm[] = {
-"16 16 4 1",
-" 	c None",
-"+	c #D0D0FF s inactive_hilight_1",
-"#	c #C0C0C0 s inactive_color_2",
-"@	c #C0C0FF s inactive_color_1",
-"        ####@@+@",
-"        ####@@+@",
-"        ####@@+@",
-"        ####@@+@",
-"        ####@@+@",
-"        ####@@+@",
-"        ####@@+@",
-"        ####@@+@",
-"############@@+@",
-"############@@+@",
-"############@@+@",
-"############@@+@",
-"@@@@@@@@@@@@@@+@",
-"@@@@@@@@@@@@@@+@",
-"+++++++++++++++@",
-"@@@@@@@@@@@@@@@ "};
diff --git a/themes/largeprint/close-active.png b/themes/largeprint/close-active.png
deleted file mode 100644
index d159b486e..000000000
--- a/themes/largeprint/close-active.png
+++ /dev/null
diff --git a/themes/largeprint/close-active.svg b/themes/largeprint/close-active.svg
deleted file mode 100644
index 24d498434..000000000
--- a/themes/largeprint/close-active.svg
+++ /dev/null
@@ -1,175 +0,0 @@
-<?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="18"
-   height="31"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.45.1"
-   version="1.0"
-   sodipodi:docname="close-active.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:white;stop-opacity:1;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.15;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:black;stop-opacity:0.05;" />
-      <stop
-         id="stop2776"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.30;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
-       x1="0"
-       y1="0.5"
-       x2="0"
-       y2="17"
-       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)" />
-  </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:0.75;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 18,0.5 C 18,0.5 18,30 18,30 L 0,30 L 0,0.5 z "
-       id="path6057" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="hilight">
-    <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.40;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
-       id="path6061" />
-  </g>
-  <g
-     inkscape:label="Border"
-     inkscape:groupmode="layer"
-     id="layer1"
-     style="display:inline">
-    <path
-       style="fill:none;fill-opacity:0.20;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 17.5,0.5"
-       id="path6059" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="g20"
-     inkscape:label="Button">
-    <g
-       id="g2328"
-       transform="translate(3,10)">
-      <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.20;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" />
-        <path
-           style="fill:none;fill-opacity:0.20;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" />
-      </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.20;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.20;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;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0"
-       d="M 0.5,30.5 L 17.5,30.5"
-       id="path6989" />
-  </g>
-</svg>
diff --git a/themes/largeprint/close-active.xpm b/themes/largeprint/close-active.xpm
deleted file mode 100644
index 943f879bd..000000000
--- a/themes/largeprint/close-active.xpm
+++ /dev/null
@@ -1,37 +0,0 @@
-/* XPM */
-static char * close_active_xpm[] = {
-"18 31 3 1",
-" 	c None",
-"+	c #D0D0FF s active_hilight_1",
-".	c #C0C0FF s active_color_1",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"                  ",
-"                  ",
-"                  ",
-"                  "};
diff --git a/themes/largeprint/close-inactive.png b/themes/largeprint/close-inactive.png
deleted file mode 100644
index 0e6b72305..000000000
--- a/themes/largeprint/close-inactive.png
+++ /dev/null
diff --git a/themes/largeprint/close-inactive.svg b/themes/largeprint/close-inactive.svg
deleted file mode 100644
index 35e9e1507..000000000
--- a/themes/largeprint/close-inactive.svg
+++ /dev/null
@@ -1,162 +0,0 @@
-<?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="18"
-   height="31"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.45.1"
-   version="1.0"
-   sodipodi:docname="close-inactive.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:white;stop-opacity:1;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.15;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:black;stop-opacity:0.05;" />
-      <stop
-         id="stop2776"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.30;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
-       x1="0"
-       y1="0.5"
-       x2="0"
-       y2="17"
-       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)" />
-  </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:0.75;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 18,0.5 C 18,0.5 18,30 18,30 L 0,30 L 0,0.5 z "
-       id="path6057" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="hilight">
-    <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.40;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
-       id="path6061" />
-  </g>
-  <g
-     inkscape:label="Border"
-     inkscape:groupmode="layer"
-     id="layer1"
-     style="display:inline">
-    <path
-       style="fill:none;fill-opacity:0.20;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 17.5,0.5"
-       id="path6059" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="g20"
-     inkscape:label="Button">
-    <g
-       id="g2328"
-       transform="translate(3,10)">
-      <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.20;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.20;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;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0"
-       d="M 0.5,30.5 L 17.5,30.5"
-       id="path6989" />
-  </g>
-</svg>
diff --git a/themes/largeprint/close-inactive.xpm b/themes/largeprint/close-inactive.xpm
deleted file mode 100644
index 4e3fe98a9..000000000
--- a/themes/largeprint/close-inactive.xpm
+++ /dev/null
@@ -1,37 +0,0 @@
-/* XPM */
-static char * close_inactive_xpm[] = {
-"18 31 3 1",
-" 	c None",
-"+	c #D0D0FF s inactive_hilight_1",
-".	c #C0C0FF s inactive_color_1",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"                  ",
-"                  ",
-"                  ",
-"                  "};
diff --git a/themes/largeprint/close-prelight.png b/themes/largeprint/close-prelight.png
deleted file mode 100644
index 9f44d3177..000000000
--- a/themes/largeprint/close-prelight.png
+++ /dev/null
diff --git a/themes/largeprint/close-prelight.svg b/themes/largeprint/close-prelight.svg
deleted file mode 100644
index 1aa7b8565..000000000
--- a/themes/largeprint/close-prelight.svg
+++ /dev/null
@@ -1,202 +0,0 @@
-<?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="18"
-   height="31"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.45.1"
-   version="1.0"
-   sodipodi:docname="close-prelight.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:white;stop-opacity:1;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.15;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:black;stop-opacity:0.05;" />
-      <stop
-         id="stop2776"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.30;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
-       x1="0"
-       y1="0.5"
-       x2="0"
-       y2="17"
-       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="14"
-       fx="9"
-       fy="14"
-       r="12"
-       gradientTransform="matrix(1,0,0,1,0,0.5)"
-       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="layer1"
-     inkscape:label="pressed">
-    <g
-       id="g1789"
-       transform="translate(0,2)">
-      <rect
-         style="opacity:0.5;fill:url(#radialGradient3087);fill-opacity:0.75;stroke:url(#radialGradient3087);stroke-width:1;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         id="rect3079"
-         width="18"
-         height="18"
-         x="0"
-         y="6" />
-    </g>
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Grad"
-     style="display:inline">
-    <path
-       style="fill:url(#linearGradient6945);fill-opacity:0.75;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 18,0.5 C 18,0.5 18,30 18,30 L 0,30 L 0,0.5 z "
-       id="path6057" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="hilight">
-    <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.40;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
-       id="path6061" />
-  </g>
-  <g
-     inkscape:label="Border"
-     inkscape:groupmode="layer"
-     id="g31"
-     style="display:inline">
-    <path
-       style="fill:none;fill-opacity:0.20;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 17.5,0.5"
-       id="path6059" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="g3722"
-     inkscape:label="Button">
-    <g
-       id="g2328"
-       transform="translate(3,10)">
-      <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.20;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" />
-        <path
-           style="fill:none;fill-opacity:0.20;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" />
-      </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.20;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.20;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;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0"
-       d="M 0.5,30.5 L 17.5,30.5"
-       id="path6989" />
-  </g>
-</svg>
diff --git a/themes/largeprint/close-prelight.xpm b/themes/largeprint/close-prelight.xpm
deleted file mode 100644
index f3efa27bd..000000000
--- a/themes/largeprint/close-prelight.xpm
+++ /dev/null
@@ -1,37 +0,0 @@
-/* XPM */
-static char * close_pressed_xpm[] = {
-"18 31 3 1",
-" 	c None",
-"+	c #D0D0FF s active_hilight_1",
-".	c #C0C0FF s active_color_1",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"                  ",
-"                  ",
-"                  ",
-"                  "};
diff --git a/themes/largeprint/close-pressed.png b/themes/largeprint/close-pressed.png
deleted file mode 100644
index 582abce99..000000000
--- a/themes/largeprint/close-pressed.png
+++ /dev/null
diff --git a/themes/largeprint/close-pressed.svg b/themes/largeprint/close-pressed.svg
deleted file mode 100644
index 25252b24e..000000000
--- a/themes/largeprint/close-pressed.svg
+++ /dev/null
@@ -1,202 +0,0 @@
-<?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="18"
-   height="31"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.45.1"
-   version="1.0"
-   sodipodi:docname="close-pressed.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:white;stop-opacity:1;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.15;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:black;stop-opacity:0.05;" />
-      <stop
-         id="stop2776"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.30;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
-       x1="0"
-       y1="0.5"
-       x2="0"
-       y2="17"
-       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="14"
-       fx="9"
-       fy="14"
-       r="12"
-       gradientTransform="matrix(1,0,0,1,0,0.5)"
-       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="layer1"
-     inkscape:label="pressed">
-    <g
-       id="g1789"
-       transform="translate(0,2)">
-      <rect
-         style="opacity:0.5;fill:url(#radialGradient3087);fill-opacity:1.0;stroke:url(#radialGradient3087);stroke-width:1;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         id="rect3079"
-         width="18"
-         height="18"
-         x="0"
-         y="6" />
-    </g>
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Grad"
-     style="display:inline">
-    <path
-       style="fill:url(#linearGradient6945);fill-opacity:0.75;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 18,0.5 C 18,0.5 18,30 18,30 L 0,30 L 0,0.5 z "
-       id="path6057" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="hilight">
-    <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.40;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
-       id="path6061" />
-  </g>
-  <g
-     inkscape:label="Border"
-     inkscape:groupmode="layer"
-     id="g31"
-     style="display:inline">
-    <path
-       style="fill:none;fill-opacity:0.20;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 17.5,0.5"
-       id="path6059" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="g3722"
-     inkscape:label="Button">
-    <g
-       id="g2328"
-       transform="translate(3,11)">
-      <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.20;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" />
-        <path
-           style="fill:none;fill-opacity:0.20;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" />
-      </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.20;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.20;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;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0"
-       d="M 0.5,30.5 L 17.5,30.5"
-       id="path6989" />
-  </g>
-</svg>
diff --git a/themes/largeprint/close-pressed.xpm b/themes/largeprint/close-pressed.xpm
deleted file mode 100644
index f3efa27bd..000000000
--- a/themes/largeprint/close-pressed.xpm
+++ /dev/null
@@ -1,37 +0,0 @@
-/* XPM */
-static char * close_pressed_xpm[] = {
-"18 31 3 1",
-" 	c None",
-"+	c #D0D0FF s active_hilight_1",
-".	c #C0C0FF s active_color_1",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"                  ",
-"                  ",
-"                  ",
-"                  "};
diff --git a/themes/largeprint/hide-active.png b/themes/largeprint/hide-active.png
deleted file mode 100644
index 0b2e1424d..000000000
--- a/themes/largeprint/hide-active.png
+++ /dev/null
diff --git a/themes/largeprint/hide-active.svg b/themes/largeprint/hide-active.svg
deleted file mode 100644
index d1e9db222..000000000
--- a/themes/largeprint/hide-active.svg
+++ /dev/null
@@ -1,169 +0,0 @@
-<?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="18"
-   height="31"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.45.1"
-   version="1.0"
-   sodipodi:docname="hide-active.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:white;stop-opacity:1;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.15;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:black;stop-opacity:0.05;" />
-      <stop
-         id="stop2776"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.30;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
-       x1="0"
-       y1="0.5"
-       x2="0"
-       y2="17"
-       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)" />
-  </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:0.75;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 18,0.5 C 18,0.5 18,30 18,30 L 0,30 L 0,0.5 z "
-       id="path6057" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="hilight">
-    <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.40;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
-       id="path6061" />
-  </g>
-  <g
-     inkscape:label="Border"
-     inkscape:groupmode="layer"
-     id="layer1"
-     style="display:inline">
-    <path
-       style="fill:none;fill-opacity:0.20;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 17.5,0.5"
-       id="path6059" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="g20"
-     inkscape:label="Button">
-    <g
-       style="display:inline"
-       id="g1616"
-       transform="translate(3,10)">
-      <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;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0"
-       d="M 0.5,30.5 L 17.5,30.5"
-       id="path6989" />
-  </g>
-</svg>
diff --git a/themes/largeprint/hide-active.xpm b/themes/largeprint/hide-active.xpm
deleted file mode 100644
index cb606cfd9..000000000
--- a/themes/largeprint/hide-active.xpm
+++ /dev/null
@@ -1,37 +0,0 @@
-/* XPM */
-static char * hide_active_xpm[] = {
-"18 31 3 1",
-" 	c None",
-"+	c #D0D0FF s active_hilight_1",
-".	c #C0C0FF s active_color_1",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"                  ",
-"                  ",
-"                  ",
-"                  "};
diff --git a/themes/largeprint/hide-inactive.png b/themes/largeprint/hide-inactive.png
deleted file mode 100644
index 61f116548..000000000
--- a/themes/largeprint/hide-inactive.png
+++ /dev/null
diff --git a/themes/largeprint/hide-inactive.svg b/themes/largeprint/hide-inactive.svg
deleted file mode 100644
index 4874aaceb..000000000
--- a/themes/largeprint/hide-inactive.svg
+++ /dev/null
@@ -1,162 +0,0 @@
-<?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="18"
-   height="31"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.45.1"
-   version="1.0"
-   sodipodi:docname="hide-inactive.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:white;stop-opacity:1;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.15;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:black;stop-opacity:0.05;" />
-      <stop
-         id="stop2776"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.30;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
-       x1="0"
-       y1="0.5"
-       x2="0"
-       y2="17"
-       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)" />
-  </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:0.75;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 18,0.5 C 18,0.5 18,30 18,30 L 0,30 L 0,0.5 z "
-       id="path6057" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="hilight">
-    <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.40;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
-       id="path6061" />
-  </g>
-  <g
-     inkscape:label="Border"
-     inkscape:groupmode="layer"
-     id="layer1"
-     style="display:inline">
-    <path
-       style="fill:none;fill-opacity:0.20;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 17.5,0.5"
-       id="path6059" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="g20"
-     inkscape:label="Button">
-    <g
-       style="display:inline"
-       id="g1616"
-       transform="translate(3,10)">
-      <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;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0"
-       d="M 0.5,30.5 L 17.5,30.5"
-       id="path6989" />
-  </g>
-</svg>
diff --git a/themes/largeprint/hide-inactive.xpm b/themes/largeprint/hide-inactive.xpm
deleted file mode 100644
index 7c452317b..000000000
--- a/themes/largeprint/hide-inactive.xpm
+++ /dev/null
@@ -1,37 +0,0 @@
-/* XPM */
-static char * hide_inactive_xpm[] = {
-"18 31 3 1",
-" 	c None",
-"+	c #D0D0FF s inactive_hilight_1",
-".	c #C0C0FF s inactive_color_1",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"                  ",
-"                  ",
-"                  ",
-"                  "};
diff --git a/themes/largeprint/hide-prelight.png b/themes/largeprint/hide-prelight.png
deleted file mode 100644
index 7ed2a4e3a..000000000
--- a/themes/largeprint/hide-prelight.png
+++ /dev/null
diff --git a/themes/largeprint/hide-prelight.svg b/themes/largeprint/hide-prelight.svg
deleted file mode 100644
index 07792485f..000000000
--- a/themes/largeprint/hide-prelight.svg
+++ /dev/null
@@ -1,196 +0,0 @@
-<?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="18"
-   height="31"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.45.1"
-   version="1.0"
-   sodipodi:docname="hide-prelight.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:white;stop-opacity:1;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.15;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:black;stop-opacity:0.05;" />
-      <stop
-         id="stop2776"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.30;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
-       x1="0"
-       y1="0.5"
-       x2="0"
-       y2="17"
-       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="14"
-       fx="9"
-       fy="14"
-       r="12"
-       gradientTransform="matrix(1,0,0,1,0,0.5)"
-       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="layer1"
-     inkscape:label="pressed">
-    <g
-       id="g1789"
-       transform="translate(0,2)">
-      <rect
-         style="opacity:0.5;fill:url(#radialGradient3087);fill-opacity:0.75;stroke:url(#radialGradient3087);stroke-width:1;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         id="rect3079"
-         width="18"
-         height="18"
-         x="0"
-         y="6" />
-    </g>
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Grad"
-     style="display:inline">
-    <path
-       style="fill:url(#linearGradient6945);fill-opacity:0.75;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 18,0.5 C 18,0.5 18,30 18,30 L 0,30 L 0,0.5 z "
-       id="path6057" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="hilight">
-    <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.40;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
-       id="path6061" />
-  </g>
-  <g
-     inkscape:label="Border"
-     inkscape:groupmode="layer"
-     id="g31"
-     style="display:inline">
-    <path
-       style="fill:none;fill-opacity:0.20;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 17.5,0.5"
-       id="path6059" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="g3722"
-     inkscape:label="Button">
-    <g
-       style="display:inline"
-       id="g1616"
-       transform="translate(3,10)">
-      <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;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0"
-       d="M 0.5,30.5 L 17.5,30.5"
-       id="path6989" />
-  </g>
-</svg>
diff --git a/themes/largeprint/hide-prelight.xpm b/themes/largeprint/hide-prelight.xpm
deleted file mode 100644
index 56991ea6c..000000000
--- a/themes/largeprint/hide-prelight.xpm
+++ /dev/null
@@ -1,37 +0,0 @@
-/* XPM */
-static char * hide_pressed_xpm[] = {
-"18 31 3 1",
-" 	c None",
-"+	c #D0D0FF s active_hilight_1",
-".	c #C0C0FF s active_color_1",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"                  ",
-"                  ",
-"                  ",
-"                  "};
diff --git a/themes/largeprint/hide-pressed.png b/themes/largeprint/hide-pressed.png
deleted file mode 100644
index 2fc2e8297..000000000
--- a/themes/largeprint/hide-pressed.png
+++ /dev/null
diff --git a/themes/largeprint/hide-pressed.xpm b/themes/largeprint/hide-pressed.xpm
deleted file mode 100644
index 56991ea6c..000000000
--- a/themes/largeprint/hide-pressed.xpm
+++ /dev/null
@@ -1,37 +0,0 @@
-/* XPM */
-static char * hide_pressed_xpm[] = {
-"18 31 3 1",
-" 	c None",
-"+	c #D0D0FF s active_hilight_1",
-".	c #C0C0FF s active_color_1",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"                  ",
-"                  ",
-"                  ",
-"                  "};
diff --git a/themes/largeprint/left-active.png b/themes/largeprint/left-active.png
deleted file mode 100644
index b1e4517dc..000000000
--- a/themes/largeprint/left-active.png
+++ /dev/null
diff --git a/themes/largeprint/left-active.svg b/themes/largeprint/left-active.svg
deleted file mode 100644
index 377264e00..000000000
--- a/themes/largeprint/left-active.svg
+++ /dev/null
@@ -1,82 +0,0 @@
-<?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="8"
-   height="24"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.45.1"
-   version="1.0"
-   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/largeprint/left-active.xpm b/themes/largeprint/left-active.xpm
deleted file mode 100644
index 44242a30f..000000000
--- a/themes/largeprint/left-active.xpm
+++ /dev/null
@@ -1,31 +0,0 @@
-/* XPM */
-static char * left_active_xpm[] = {
-"8 24 4 1",
-" 	c None",
-"+	c #D0D0FF s active_hilight_1",
-"#	c #C0C0C0 s active_color_2",
-"@	c #C0C0FF s active_color_1",
-"@+@@####",
-"@+@@####",
-"@+@@####",
-"@+@@####",
-"@+@@####",
-"@+@@####",
-"@+@@####",
-"@+@@####",
-"@+@@####",
-"@+@@####",
-"@+@@####",
-"@+@@####",
-"@+@@####",
-"@+@@####",
-"@+@@####",
-"@+@@####",
-"@+@@####",
-"@+@@####",
-"@+@@####",
-"@+@@####",
-"@+@@####",
-"@+@@####",
-"@+@@####",
-"@+@@####"};
diff --git a/themes/largeprint/left-inactive.png b/themes/largeprint/left-inactive.png
deleted file mode 100644
index b1e4517dc..000000000
--- a/themes/largeprint/left-inactive.png
+++ /dev/null
diff --git a/themes/largeprint/left-inactive.svg b/themes/largeprint/left-inactive.svg
deleted file mode 100644
index d4578552c..000000000
--- a/themes/largeprint/left-inactive.svg
+++ /dev/null
@@ -1,82 +0,0 @@
-<?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="8"
-   height="24"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.45.1"
-   version="1.0"
-   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/largeprint/left-inactive.xpm b/themes/largeprint/left-inactive.xpm
deleted file mode 100644
index 9fb3e642f..000000000
--- a/themes/largeprint/left-inactive.xpm
+++ /dev/null
@@ -1,31 +0,0 @@
-/* XPM */
-static char * left_inactive_xpm[] = {
-"8 24 4 1",
-" 	c None",
-"+	c #D0D0FF s inactive_hilight_1",
-"#	c #C0C0C0 s inactive_color_2",
-"@	c #C0C0FF s inactive_color_1",
-"@+@@####",
-"@+@@####",
-"@+@@####",
-"@+@@####",
-"@+@@####",
-"@+@@####",
-"@+@@####",
-"@+@@####",
-"@+@@####",
-"@+@@####",
-"@+@@####",
-"@+@@####",
-"@+@@####",
-"@+@@####",
-"@+@@####",
-"@+@@####",
-"@+@@####",
-"@+@@####",
-"@+@@####",
-"@+@@####",
-"@+@@####",
-"@+@@####",
-"@+@@####",
-"@+@@####"};
diff --git a/themes/largeprint/maximize-active.png b/themes/largeprint/maximize-active.png
deleted file mode 100644
index 0a9b4d435..000000000
--- a/themes/largeprint/maximize-active.png
+++ /dev/null
diff --git a/themes/largeprint/maximize-active.svg b/themes/largeprint/maximize-active.svg
deleted file mode 100644
index 78e8bd232..000000000
--- a/themes/largeprint/maximize-active.svg
+++ /dev/null
@@ -1,163 +0,0 @@
-<?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="18"
-   height="31"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.45.1"
-   version="1.0"
-   sodipodi:docname="maximize-active.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:white;stop-opacity:1;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.15;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:black;stop-opacity:0.05;" />
-      <stop
-         id="stop2776"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.30;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
-       x1="0"
-       y1="0.5"
-       x2="0"
-       y2="17"
-       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)" />
-  </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:0.75;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 18,0.5 C 18,0.5 18,30 18,30 L 0,30 L 0,0.5 z "
-       id="path6057" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="hilight">
-    <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.40;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
-       id="path6061" />
-  </g>
-  <g
-     inkscape:label="Border"
-     inkscape:groupmode="layer"
-     id="layer1"
-     style="display:inline">
-    <path
-       style="fill:none;fill-opacity:0.20;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 17.5,0.5"
-       id="path6059" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="g20"
-     inkscape:label="Button">
-    <g
-       style="display:inline"
-       id="g1614"
-       transform="translate(3,10)">
-      <path
-         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="rect2285"
-         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;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0"
-       d="M 0.5,30.5 L 17.5,30.5"
-       id="path6989" />
-  </g>
-</svg>
diff --git a/themes/largeprint/maximize-active.xpm b/themes/largeprint/maximize-active.xpm
deleted file mode 100644
index 5e491195e..000000000
--- a/themes/largeprint/maximize-active.xpm
+++ /dev/null
@@ -1,37 +0,0 @@
-/* XPM */
-static char * maximize_active_xpm[] = {
-"18 31 3 1",
-" 	c None",
-"+	c #D0D0FF s active_hilight_1",
-".	c #C0C0FF s active_color_1",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"                  ",
-"                  ",
-"                  ",
-"                  "};
diff --git a/themes/largeprint/maximize-inactive.png b/themes/largeprint/maximize-inactive.png
deleted file mode 100644
index f1420536e..000000000
--- a/themes/largeprint/maximize-inactive.png
+++ /dev/null
diff --git a/themes/largeprint/maximize-inactive.svg b/themes/largeprint/maximize-inactive.svg
deleted file mode 100644
index 960f8f29f..000000000
--- a/themes/largeprint/maximize-inactive.svg
+++ /dev/null
@@ -1,159 +0,0 @@
-<?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="18"
-   height="31"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.45.1"
-   version="1.0"
-   sodipodi:docname="maximize-inactive.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:white;stop-opacity:1;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.15;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:black;stop-opacity:0.05;" />
-      <stop
-         id="stop2776"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.30;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
-       x1="0"
-       y1="0.5"
-       x2="0"
-       y2="17"
-       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)" />
-  </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:0.75;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 18,0.5 C 18,0.5 18,30 18,30 L 0,30 L 0,0.5 z "
-       id="path6057" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="hilight">
-    <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.40;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
-       id="path6061" />
-  </g>
-  <g
-     inkscape:label="Border"
-     inkscape:groupmode="layer"
-     id="layer1"
-     style="display:inline">
-    <path
-       style="fill:none;fill-opacity:0.20;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 17.5,0.5"
-       id="path6059" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="g20"
-     inkscape:label="Button">
-    <g
-       style="display:inline"
-       id="g1626"
-       transform="translate(3,10)">
-      <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="rect2285" />
-    </g>
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer5"
-     inkscape:label="Shadow">
-    <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0"
-       d="M 0.5,30.5 L 17.5,30.5"
-       id="path6989" />
-  </g>
-</svg>
diff --git a/themes/largeprint/maximize-inactive.xpm b/themes/largeprint/maximize-inactive.xpm
deleted file mode 100644
index 655338a9e..000000000
--- a/themes/largeprint/maximize-inactive.xpm
+++ /dev/null
@@ -1,37 +0,0 @@
-/* XPM */
-static char * maximize_inactive_xpm[] = {
-"18 31 3 1",
-" 	c None",
-"+	c #D0D0FF s inactive_hilight_1",
-".	c #C0C0FF s inactive_color_1",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"                  ",
-"                  ",
-"                  ",
-"                  "};
diff --git a/themes/largeprint/maximize-prelight.png b/themes/largeprint/maximize-prelight.png
deleted file mode 100644
index c16cc76e0..000000000
--- a/themes/largeprint/maximize-prelight.png
+++ /dev/null
diff --git a/themes/largeprint/maximize-prelight.svg b/themes/largeprint/maximize-prelight.svg
deleted file mode 100644
index 169efcf0b..000000000
--- a/themes/largeprint/maximize-prelight.svg
+++ /dev/null
@@ -1,190 +0,0 @@
-<?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="18"
-   height="31"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.45.1"
-   version="1.0"
-   sodipodi:docname="maximize-prelight.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:white;stop-opacity:1;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.15;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:black;stop-opacity:0.05;" />
-      <stop
-         id="stop2776"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.30;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
-       x1="0"
-       y1="0.5"
-       x2="0"
-       y2="17"
-       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="14"
-       fx="9"
-       fy="14"
-       r="12"
-       gradientTransform="matrix(1,0,0,1,0,0.5)"
-       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="layer1"
-     inkscape:label="pressed">
-    <g
-       id="g1789"
-       transform="translate(0,2)">
-      <rect
-         style="opacity:0.5;fill:url(#radialGradient3087);fill-opacity:0.75;stroke:url(#radialGradient3087);stroke-width:1;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         id="rect3079"
-         width="18"
-         height="18"
-         x="0"
-         y="6" />
-    </g>
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Grad"
-     style="display:inline">
-    <path
-       style="fill:url(#linearGradient6945);fill-opacity:0.75;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 18,0.5 C 18,0.5 18,30 18,30 L 0,30 L 0,0.5 z "
-       id="path6057" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="hilight">
-    <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.40;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
-       id="path6061" />
-  </g>
-  <g
-     inkscape:label="Border"
-     inkscape:groupmode="layer"
-     id="g31"
-     style="display:inline">
-    <path
-       style="fill:none;fill-opacity:0.20;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 17.5,0.5"
-       id="path6059" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="g3722"
-     inkscape:label="Button">
-    <g
-       style="display:inline"
-       id="g1614"
-       transform="translate(3,10)">
-      <path
-         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="rect2285"
-         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;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0"
-       d="M 0.5,30.5 L 17.5,30.5"
-       id="path6989" />
-  </g>
-</svg>
diff --git a/themes/largeprint/maximize-prelight.xpm b/themes/largeprint/maximize-prelight.xpm
deleted file mode 100644
index d5585e6b4..000000000
--- a/themes/largeprint/maximize-prelight.xpm
+++ /dev/null
@@ -1,37 +0,0 @@
-/* XPM */
-static char * maximize_pressed_xpm[] = {
-"18 31 3 1",
-" 	c None",
-"+	c #D0D0FF s active_hilight_1",
-".	c #C0C0FF s active_color_1",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"                  ",
-"                  ",
-"                  ",
-"                  "};
diff --git a/themes/largeprint/maximize-pressed.png b/themes/largeprint/maximize-pressed.png
deleted file mode 100644
index 71ca0a401..000000000
--- a/themes/largeprint/maximize-pressed.png
+++ /dev/null
diff --git a/themes/largeprint/maximize-pressed.svg b/themes/largeprint/maximize-pressed.svg
deleted file mode 100644
index 674e73405..000000000
--- a/themes/largeprint/maximize-pressed.svg
+++ /dev/null
@@ -1,190 +0,0 @@
-<?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="18"
-   height="31"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.45.1"
-   version="1.0"
-   sodipodi:docname="maximize-pressed.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:white;stop-opacity:1;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.15;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:black;stop-opacity:0.05;" />
-      <stop
-         id="stop2776"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.30;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
-       x1="0"
-       y1="0.5"
-       x2="0"
-       y2="17"
-       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="14"
-       fx="9"
-       fy="14"
-       r="12"
-       gradientTransform="matrix(1,0,0,1,0,0.5)"
-       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="layer1"
-     inkscape:label="pressed">
-    <g
-       id="g1789"
-       transform="translate(0,2)">
-      <rect
-         style="opacity:0.5;fill:url(#radialGradient3087);fill-opacity:1.0;stroke:url(#radialGradient3087);stroke-width:1;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         id="rect3079"
-         width="18"
-         height="18"
-         x="0"
-         y="6" />
-    </g>
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Grad"
-     style="display:inline">
-    <path
-       style="fill:url(#linearGradient6945);fill-opacity:0.75;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 18,0.5 C 18,0.5 18,30 18,30 L 0,30 L 0,0.5 z "
-       id="path6057" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="hilight">
-    <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.40;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
-       id="path6061" />
-  </g>
-  <g
-     inkscape:label="Border"
-     inkscape:groupmode="layer"
-     id="g31"
-     style="display:inline">
-    <path
-       style="fill:none;fill-opacity:0.20;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 17.5,0.5"
-       id="path6059" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="g3722"
-     inkscape:label="Button">
-    <g
-       style="display:inline"
-       id="g1614"
-       transform="translate(3,11)">
-      <path
-         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="rect2285"
-         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;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0"
-       d="M 0.5,30.5 L 17.5,30.5"
-       id="path6989" />
-  </g>
-</svg>
diff --git a/themes/largeprint/maximize-pressed.xpm b/themes/largeprint/maximize-pressed.xpm
deleted file mode 100644
index d5585e6b4..000000000
--- a/themes/largeprint/maximize-pressed.xpm
+++ /dev/null
@@ -1,37 +0,0 @@
-/* XPM */
-static char * maximize_pressed_xpm[] = {
-"18 31 3 1",
-" 	c None",
-"+	c #D0D0FF s active_hilight_1",
-".	c #C0C0FF s active_color_1",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"                  ",
-"                  ",
-"                  ",
-"                  "};
diff --git a/themes/largeprint/maximize-toggled-active.png b/themes/largeprint/maximize-toggled-active.png
deleted file mode 100644
index 2d2db7090..000000000
--- a/themes/largeprint/maximize-toggled-active.png
+++ /dev/null
diff --git a/themes/largeprint/maximize-toggled-active.svg b/themes/largeprint/maximize-toggled-active.svg
deleted file mode 100644
index ffd30b926..000000000
--- a/themes/largeprint/maximize-toggled-active.svg
+++ /dev/null
@@ -1,167 +0,0 @@
-<?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="18"
-   height="31"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.45.1"
-   version="1.0"
-   sodipodi:docname="maximize-toggled-active.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:white;stop-opacity:1;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.15;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:black;stop-opacity:0.05;" />
-      <stop
-         id="stop2776"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.30;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
-       x1="0"
-       y1="0.5"
-       x2="0"
-       y2="17"
-       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)" />
-  </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:0.75;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 18,0.5 C 18,0.5 18,30 18,30 L 0,30 L 0,0.5 z "
-       id="path6057" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="hilight">
-    <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.40;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
-       id="path6061" />
-  </g>
-  <g
-     inkscape:label="Border"
-     inkscape:groupmode="layer"
-     id="layer1"
-     style="display:inline">
-    <path
-       style="fill:none;fill-opacity:0.20;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 17.5,0.5"
-       id="path6059" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="g20"
-     inkscape:label="Button">
-    <g
-       style="display:inline"
-       id="g1626"
-       transform="translate(3,10)">
-      <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;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0"
-       d="M 0.5,30.5 L 17.5,30.5"
-       id="path6989" />
-  </g>
-</svg>
diff --git a/themes/largeprint/maximize-toggled-active.xpm b/themes/largeprint/maximize-toggled-active.xpm
deleted file mode 100644
index 3c31e6abb..000000000
--- a/themes/largeprint/maximize-toggled-active.xpm
+++ /dev/null
@@ -1,37 +0,0 @@
-/* XPM */
-static char * maximize_toggled_active_xpm[] = {
-"18 31 3 1",
-" 	c None",
-"+	c #D0D0FF s active_hilight_1",
-".	c #C0C0FF s active_color_1",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"                  ",
-"                  ",
-"                  ",
-"                  "};
diff --git a/themes/largeprint/maximize-toggled-inactive.png b/themes/largeprint/maximize-toggled-inactive.png
deleted file mode 100644
index 447536c5b..000000000
--- a/themes/largeprint/maximize-toggled-inactive.png
+++ /dev/null
diff --git a/themes/largeprint/maximize-toggled-inactive.svg b/themes/largeprint/maximize-toggled-inactive.svg
deleted file mode 100644
index ef6027980..000000000
--- a/themes/largeprint/maximize-toggled-inactive.svg
+++ /dev/null
@@ -1,163 +0,0 @@
-<?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="18"
-   height="31"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.45.1"
-   version="1.0"
-   sodipodi:docname="maximize-toggled-inactive.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:white;stop-opacity:1;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.15;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:black;stop-opacity:0.05;" />
-      <stop
-         id="stop2776"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.30;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
-       x1="0"
-       y1="0.5"
-       x2="0"
-       y2="17"
-       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)" />
-  </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:0.75;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 18,0.5 C 18,0.5 18,30 18,30 L 0,30 L 0,0.5 z "
-       id="path6057" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="hilight">
-    <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.40;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
-       id="path6061" />
-  </g>
-  <g
-     inkscape:label="Border"
-     inkscape:groupmode="layer"
-     id="layer1"
-     style="display:inline">
-    <path
-       style="fill:none;fill-opacity:0.20;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 17.5,0.5"
-       id="path6059" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="g20"
-     inkscape:label="Button">
-    <g
-       style="display:inline"
-       id="g1639"
-       transform="translate(3,10)">
-      <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;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0"
-       d="M 0.5,30.5 L 17.5,30.5"
-       id="path6989" />
-  </g>
-</svg>
diff --git a/themes/largeprint/maximize-toggled-inactive.xpm b/themes/largeprint/maximize-toggled-inactive.xpm
deleted file mode 100644
index 4ecb32a9a..000000000
--- a/themes/largeprint/maximize-toggled-inactive.xpm
+++ /dev/null
@@ -1,37 +0,0 @@
-/* XPM */
-static char * maximize_toggled_inactive_xpm[] = {
-"18 31 3 1",
-" 	c None",
-"+	c #D0D0FF s inactive_hilight_1",
-".	c #C0C0FF s inactive_color_1",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"                  ",
-"                  ",
-"                  ",
-"                  "};
diff --git a/themes/largeprint/maximize-toggled-prelight.png b/themes/largeprint/maximize-toggled-prelight.png
deleted file mode 100644
index 5a3fccefc..000000000
--- a/themes/largeprint/maximize-toggled-prelight.png
+++ /dev/null
diff --git a/themes/largeprint/maximize-toggled-prelight.svg b/themes/largeprint/maximize-toggled-prelight.svg
deleted file mode 100644
index 65e92ed31..000000000
--- a/themes/largeprint/maximize-toggled-prelight.svg
+++ /dev/null
@@ -1,194 +0,0 @@
-<?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="18"
-   height="31"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.45.1"
-   version="1.0"
-   sodipodi:docname="maximize-toggled-prelight.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:white;stop-opacity:1;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.15;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:black;stop-opacity:0.05;" />
-      <stop
-         id="stop2776"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.30;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
-       x1="0"
-       y1="0.5"
-       x2="0"
-       y2="17"
-       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="14"
-       fx="9"
-       fy="14"
-       r="12"
-       gradientTransform="matrix(1,0,0,1,0,0.5)"
-       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="layer1"
-     inkscape:label="pressed">
-    <g
-       id="g1789"
-       transform="translate(0,2)">
-      <rect
-         style="opacity:0.5;fill:url(#radialGradient3087);fill-opacity:0.75;stroke:url(#radialGradient3087);stroke-width:1;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         id="rect3079"
-         width="18"
-         height="18"
-         x="0"
-         y="6" />
-    </g>
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Grad"
-     style="display:inline">
-    <path
-       style="fill:url(#linearGradient6945);fill-opacity:0.75;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 18,0.5 C 18,0.5 18,30 18,30 L 0,30 L 0,0.5 z "
-       id="path6057" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="hilight">
-    <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.40;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
-       id="path6061" />
-  </g>
-  <g
-     inkscape:label="Border"
-     inkscape:groupmode="layer"
-     id="g31"
-     style="display:inline">
-    <path
-       style="fill:none;fill-opacity:0.20;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 17.5,0.5"
-       id="path6059" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="g3722"
-     inkscape:label="Button">
-    <g
-       style="display:inline"
-       id="g1626"
-       transform="translate(3,10)">
-      <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;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0"
-       d="M 0.5,30.5 L 17.5,30.5"
-       id="path6989" />
-  </g>
-</svg>
diff --git a/themes/largeprint/maximize-toggled-prelight.xpm b/themes/largeprint/maximize-toggled-prelight.xpm
deleted file mode 100644
index a77783f81..000000000
--- a/themes/largeprint/maximize-toggled-prelight.xpm
+++ /dev/null
@@ -1,37 +0,0 @@
-/* XPM */
-static char * maximize_toggled_pressed_xpm[] = {
-"18 31 3 1",
-" 	c None",
-"+	c #D0D0FF s active_hilight_1",
-".	c #C0C0FF s active_color_1",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"                  ",
-"                  ",
-"                  ",
-"                  "};
diff --git a/themes/largeprint/maximize-toggled-pressed.png b/themes/largeprint/maximize-toggled-pressed.png
deleted file mode 100644
index 45d666b4b..000000000
--- a/themes/largeprint/maximize-toggled-pressed.png
+++ /dev/null
diff --git a/themes/largeprint/maximize-toggled-pressed.svg b/themes/largeprint/maximize-toggled-pressed.svg
deleted file mode 100644
index b1da06566..000000000
--- a/themes/largeprint/maximize-toggled-pressed.svg
+++ /dev/null
@@ -1,194 +0,0 @@
-<?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="18"
-   height="31"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.45.1"
-   version="1.0"
-   sodipodi:docname="maximize-toggled-pressed.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:white;stop-opacity:1;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.15;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:black;stop-opacity:0.05;" />
-      <stop
-         id="stop2776"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.30;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
-       x1="0"
-       y1="0.5"
-       x2="0"
-       y2="17"
-       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="14"
-       fx="9"
-       fy="14"
-       r="12"
-       gradientTransform="matrix(1,0,0,1,0,0.5)"
-       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="layer1"
-     inkscape:label="pressed">
-    <g
-       id="g1789"
-       transform="translate(0,2)">
-      <rect
-         style="opacity:0.5;fill:url(#radialGradient3087);fill-opacity:1.0;stroke:url(#radialGradient3087);stroke-width:1;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         id="rect3079"
-         width="18"
-         height="18"
-         x="0"
-         y="6" />
-    </g>
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Grad"
-     style="display:inline">
-    <path
-       style="fill:url(#linearGradient6945);fill-opacity:0.75;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 18,0.5 C 18,0.5 18,30 18,30 L 0,30 L 0,0.5 z "
-       id="path6057" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="hilight">
-    <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.40;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
-       id="path6061" />
-  </g>
-  <g
-     inkscape:label="Border"
-     inkscape:groupmode="layer"
-     id="g31"
-     style="display:inline">
-    <path
-       style="fill:none;fill-opacity:0.20;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 17.5,0.5"
-       id="path6059" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="g3722"
-     inkscape:label="Button">
-    <g
-       style="display:inline"
-       id="g1626"
-       transform="translate(3,11)">
-      <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;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0"
-       d="M 0.5,30.5 L 17.5,30.5"
-       id="path6989" />
-  </g>
-</svg>
diff --git a/themes/largeprint/maximize-toggled-pressed.xpm b/themes/largeprint/maximize-toggled-pressed.xpm
deleted file mode 100644
index a77783f81..000000000
--- a/themes/largeprint/maximize-toggled-pressed.xpm
+++ /dev/null
@@ -1,37 +0,0 @@
-/* XPM */
-static char * maximize_toggled_pressed_xpm[] = {
-"18 31 3 1",
-" 	c None",
-"+	c #D0D0FF s active_hilight_1",
-".	c #C0C0FF s active_color_1",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"                  ",
-"                  ",
-"                  ",
-"                  "};
diff --git a/themes/largeprint/menu-active.png b/themes/largeprint/menu-active.png
deleted file mode 100644
index 9a9933efd..000000000
--- a/themes/largeprint/menu-active.png
+++ /dev/null
diff --git a/themes/largeprint/menu-active.svg b/themes/largeprint/menu-active.svg
deleted file mode 100644
index 5d86c94c8..000000000
--- a/themes/largeprint/menu-active.svg
+++ /dev/null
@@ -1,145 +0,0 @@
-<?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="18"
-   height="31"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.45.1"
-   version="1.0"
-   sodipodi:docname="menu-active.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:white;stop-opacity:1;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.15;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:black;stop-opacity:0.05;" />
-      <stop
-         id="stop2776"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.30;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
-       x1="0"
-       y1="0.5"
-       x2="0"
-       y2="17"
-       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)" />
-  </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:0.75;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 18,0.5 C 18,0.5 18,30 18,30 L 0,30 L 0,0.5 z "
-       id="path6057" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="hilight">
-    <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.40;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
-       id="path6061" />
-  </g>
-  <g
-     inkscape:label="Border"
-     inkscape:groupmode="layer"
-     id="layer1"
-     style="display:inline">
-    <path
-       style="fill:none;fill-opacity:0.20;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 17.5,0.5"
-       id="path6059" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer5"
-     inkscape:label="Shadow">
-    <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0"
-       d="M 0.5,30.5 L 17.5,30.5"
-       id="path6989" />
-  </g>
-</svg>
diff --git a/themes/largeprint/menu-active.xpm b/themes/largeprint/menu-active.xpm
deleted file mode 100644
index 0bb186156..000000000
--- a/themes/largeprint/menu-active.xpm
+++ /dev/null
@@ -1,37 +0,0 @@
-/* XPM */
-static char * menu_active_xpm[] = {
-"18 31 3 1",
-" 	c None",
-"+	c #D0D0FF s active_hilight_1",
-".	c #C0C0FF s active_color_1",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"                  ",
-"                  ",
-"                  ",
-"                  "};
diff --git a/themes/largeprint/menu-inactive.png b/themes/largeprint/menu-inactive.png
deleted file mode 100644
index 9a9933efd..000000000
--- a/themes/largeprint/menu-inactive.png
+++ /dev/null
diff --git a/themes/largeprint/menu-inactive.svg b/themes/largeprint/menu-inactive.svg
deleted file mode 100644
index 1a0b0cc94..000000000
--- a/themes/largeprint/menu-inactive.svg
+++ /dev/null
@@ -1,145 +0,0 @@
-<?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="18"
-   height="31"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.45.1"
-   version="1.0"
-   sodipodi:docname="menu-inactive.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:white;stop-opacity:1;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.15;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:black;stop-opacity:0.05;" />
-      <stop
-         id="stop2776"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.30;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
-       x1="0"
-       y1="0.5"
-       x2="0"
-       y2="17"
-       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)" />
-  </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:0.75;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 18,0.5 C 18,0.5 18,30 18,30 L 0,30 L 0,0.5 z "
-       id="path6057" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="hilight">
-    <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.40;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
-       id="path6061" />
-  </g>
-  <g
-     inkscape:label="Border"
-     inkscape:groupmode="layer"
-     id="layer1"
-     style="display:inline">
-    <path
-       style="fill:none;fill-opacity:0.20;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 17.5,0.5"
-       id="path6059" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer5"
-     inkscape:label="Shadow">
-    <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0"
-       d="M 0.5,30.5 L 17.5,30.5"
-       id="path6989" />
-  </g>
-</svg>
diff --git a/themes/largeprint/menu-inactive.xpm b/themes/largeprint/menu-inactive.xpm
deleted file mode 100644
index f7b9a59c0..000000000
--- a/themes/largeprint/menu-inactive.xpm
+++ /dev/null
@@ -1,37 +0,0 @@
-/* XPM */
-static char * menu_inactive_xpm[] = {
-"18 31 3 1",
-" 	c None",
-"+	c #D0D0FF s inactive_hilight_1",
-".	c #C0C0FF s inactive_color_1",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"                  ",
-"                  ",
-"                  ",
-"                  "};
diff --git a/themes/largeprint/menu-prelight.png b/themes/largeprint/menu-prelight.png
deleted file mode 100644
index 9a9933efd..000000000
--- a/themes/largeprint/menu-prelight.png
+++ /dev/null
diff --git a/themes/largeprint/menu-prelight.svg b/themes/largeprint/menu-prelight.svg
deleted file mode 100644
index 1c2f12e6d..000000000
--- a/themes/largeprint/menu-prelight.svg
+++ /dev/null
@@ -1,145 +0,0 @@
-<?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="18"
-   height="31"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.45.1"
-   version="1.0"
-   sodipodi:docname="menu-prelight.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:white;stop-opacity:1;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.15;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:black;stop-opacity:0.05;" />
-      <stop
-         id="stop2776"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.30;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
-       x1="0"
-       y1="0.5"
-       x2="0"
-       y2="17"
-       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)" />
-  </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:0.75;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 18,0.5 C 18,0.5 18,30 18,30 L 0,30 L 0,0.5 z "
-       id="path6057" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="hilight">
-    <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.40;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
-       id="path6061" />
-  </g>
-  <g
-     inkscape:label="Border"
-     inkscape:groupmode="layer"
-     id="g31"
-     style="display:inline">
-    <path
-       style="fill:none;fill-opacity:0.20;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 17.5,0.5"
-       id="path6059" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer5"
-     inkscape:label="Shadow">
-    <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0"
-       d="M 0.5,30.5 L 17.5,30.5"
-       id="path6989" />
-  </g>
-</svg>
diff --git a/themes/largeprint/menu-prelight.xpm b/themes/largeprint/menu-prelight.xpm
deleted file mode 100644
index 0f71cb151..000000000
--- a/themes/largeprint/menu-prelight.xpm
+++ /dev/null
@@ -1,37 +0,0 @@
-/* XPM */
-static char * menu_pressed_xpm[] = {
-"18 31 3 1",
-" 	c None",
-"+	c #D0D0FF s active_hilight_1",
-".	c #C0C0FF s active_color_1",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"                  ",
-"                  ",
-"                  ",
-"                  "};
diff --git a/themes/largeprint/menu-pressed.png b/themes/largeprint/menu-pressed.png
deleted file mode 100644
index 9a9933efd..000000000
--- a/themes/largeprint/menu-pressed.png
+++ /dev/null
diff --git a/themes/largeprint/menu-pressed.svg b/themes/largeprint/menu-pressed.svg
deleted file mode 100644
index cb16ff887..000000000
--- a/themes/largeprint/menu-pressed.svg
+++ /dev/null
@@ -1,145 +0,0 @@
-<?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="18"
-   height="31"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.45.1"
-   version="1.0"
-   sodipodi:docname="menu-pressed.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:white;stop-opacity:1;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.15;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:black;stop-opacity:0.05;" />
-      <stop
-         id="stop2776"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.30;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
-       x1="0"
-       y1="0.5"
-       x2="0"
-       y2="17"
-       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)" />
-  </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:0.75;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 18,0.5 C 18,0.5 18,30 18,30 L 0,30 L 0,0.5 z "
-       id="path6057" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="hilight">
-    <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.40;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
-       id="path6061" />
-  </g>
-  <g
-     inkscape:label="Border"
-     inkscape:groupmode="layer"
-     id="g31"
-     style="display:inline">
-    <path
-       style="fill:none;fill-opacity:0.20;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 17.5,0.5"
-       id="path6059" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer5"
-     inkscape:label="Shadow">
-    <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0"
-       d="M 0.5,30.5 L 17.5,30.5"
-       id="path6989" />
-  </g>
-</svg>
diff --git a/themes/largeprint/menu-pressed.xpm b/themes/largeprint/menu-pressed.xpm
deleted file mode 100644
index 0f71cb151..000000000
--- a/themes/largeprint/menu-pressed.xpm
+++ /dev/null
@@ -1,37 +0,0 @@
-/* XPM */
-static char * menu_pressed_xpm[] = {
-"18 31 3 1",
-" 	c None",
-"+	c #D0D0FF s active_hilight_1",
-".	c #C0C0FF s active_color_1",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"                  ",
-"                  ",
-"                  ",
-"                  "};
diff --git a/themes/largeprint/right-active.png b/themes/largeprint/right-active.png
deleted file mode 100644
index 4b01e97fe..000000000
--- a/themes/largeprint/right-active.png
+++ /dev/null
diff --git a/themes/largeprint/right-active.svg b/themes/largeprint/right-active.svg
deleted file mode 100644
index cb2a0befc..000000000
--- a/themes/largeprint/right-active.svg
+++ /dev/null
@@ -1,82 +0,0 @@
-<?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="8"
-   height="24"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.45.1"
-   version="1.0"
-   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 7.5,0 L 7.5,24"
-       id="path1340" />
-  </g>
-</svg>
diff --git a/themes/largeprint/right-active.xpm b/themes/largeprint/right-active.xpm
deleted file mode 100644
index 5e6c492f8..000000000
--- a/themes/largeprint/right-active.xpm
+++ /dev/null
@@ -1,31 +0,0 @@
-/* XPM */
-static char * right_active_xpm[] = {
-"8 24 4 1",
-" 	c None",
-"+	c #D0D0FF s active_hilight_1",
-"#	c #C0C0C0 s active_color_2",
-"@	c #C0C0FF s active_color_1",
-"####@@+@",
-"####@@+@",
-"####@@+@",
-"####@@+@",
-"####@@+@",
-"####@@+@",
-"####@@+@",
-"####@@+@",
-"####@@+@",
-"####@@+@",
-"####@@+@",
-"####@@+@",
-"####@@+@",
-"####@@+@",
-"####@@+@",
-"####@@+@",
-"####@@+@",
-"####@@+@",
-"####@@+@",
-"####@@+@",
-"####@@+@",
-"####@@+@",
-"####@@+@",
-"####@@+@"};
diff --git a/themes/largeprint/right-inactive.png b/themes/largeprint/right-inactive.png
deleted file mode 100644
index 4b01e97fe..000000000
--- a/themes/largeprint/right-inactive.png
+++ /dev/null
diff --git a/themes/largeprint/right-inactive.svg b/themes/largeprint/right-inactive.svg
deleted file mode 100644
index b799f98b8..000000000
--- a/themes/largeprint/right-inactive.svg
+++ /dev/null
@@ -1,82 +0,0 @@
-<?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="8"
-   height="24"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.45.1"
-   version="1.0"
-   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 7.5,0 L 7.5,24"
-       id="path1340" />
-  </g>
-</svg>
diff --git a/themes/largeprint/right-inactive.xpm b/themes/largeprint/right-inactive.xpm
deleted file mode 100644
index f47ebdcdf..000000000
--- a/themes/largeprint/right-inactive.xpm
+++ /dev/null
@@ -1,31 +0,0 @@
-/* XPM */
-static char * right_inactive_xpm[] = {
-"8 24 4 1",
-" 	c None",
-"+	c #D0D0FF s inactive_hilight_1",
-"#	c #C0C0C0 s inactive_color_2",
-"@	c #C0C0FF s inactive_color_1",
-"####@@+@",
-"####@@+@",
-"####@@+@",
-"####@@+@",
-"####@@+@",
-"####@@+@",
-"####@@+@",
-"####@@+@",
-"####@@+@",
-"####@@+@",
-"####@@+@",
-"####@@+@",
-"####@@+@",
-"####@@+@",
-"####@@+@",
-"####@@+@",
-"####@@+@",
-"####@@+@",
-"####@@+@",
-"####@@+@",
-"####@@+@",
-"####@@+@",
-"####@@+@",
-"####@@+@"};
diff --git a/themes/largeprint/shade-active.png b/themes/largeprint/shade-active.png
deleted file mode 100644
index 7a54170aa..000000000
--- a/themes/largeprint/shade-active.png
+++ /dev/null
diff --git a/themes/largeprint/shade-active.svg b/themes/largeprint/shade-active.svg
deleted file mode 100644
index 0740c95ac..000000000
--- a/themes/largeprint/shade-active.svg
+++ /dev/null
@@ -1,163 +0,0 @@
-<?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="18"
-   height="31"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.45.1"
-   version="1.0"
-   sodipodi:docname="shade-active.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:white;stop-opacity:1;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.15;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:black;stop-opacity:0.05;" />
-      <stop
-         id="stop2776"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.30;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
-       x1="0"
-       y1="0.5"
-       x2="0"
-       y2="17"
-       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)" />
-  </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:0.75;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 18,0.5 C 18,0.5 18,30 18,30 L 0,30 L 0,0.5 z "
-       id="path6057" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="hilight">
-    <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.40;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
-       id="path6061" />
-  </g>
-  <g
-     inkscape:label="Border"
-     inkscape:groupmode="layer"
-     id="layer1"
-     style="display:inline">
-    <path
-       style="fill:none;fill-opacity:0.20;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 17.5,0.5"
-       id="path6059" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="g20"
-     inkscape:label="Button">
-    <g
-       style="display:inline"
-       id="g1616"
-       transform="translate(3,10)">
-      <path
-         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.20;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.20;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;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0"
-       d="M 0.5,30.5 L 17.5,30.5"
-       id="path6989" />
-  </g>
-</svg>
diff --git a/themes/largeprint/shade-active.xpm b/themes/largeprint/shade-active.xpm
deleted file mode 100644
index 6f37f8872..000000000
--- a/themes/largeprint/shade-active.xpm
+++ /dev/null
@@ -1,37 +0,0 @@
-/* XPM */
-static char * shade_active_xpm[] = {
-"18 31 3 1",
-" 	c None",
-"+	c #D0D0FF s active_hilight_1",
-".	c #C0C0FF s active_color_1",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"                  ",
-"                  ",
-"                  ",
-"                  "};
diff --git a/themes/largeprint/shade-inactive.png b/themes/largeprint/shade-inactive.png
deleted file mode 100644
index eb4404586..000000000
--- a/themes/largeprint/shade-inactive.png
+++ /dev/null
diff --git a/themes/largeprint/shade-inactive.svg b/themes/largeprint/shade-inactive.svg
deleted file mode 100644
index 7dd48ee2a..000000000
--- a/themes/largeprint/shade-inactive.svg
+++ /dev/null
@@ -1,159 +0,0 @@
-<?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="18"
-   height="31"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.45.1"
-   version="1.0"
-   sodipodi:docname="shade-inactive.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:white;stop-opacity:1;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.15;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:black;stop-opacity:0.05;" />
-      <stop
-         id="stop2776"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.30;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
-       x1="0"
-       y1="0.5"
-       x2="0"
-       y2="17"
-       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)" />
-  </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:0.75;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 18,0.5 C 18,0.5 18,30 18,30 L 0,30 L 0,0.5 z "
-       id="path6057" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="hilight">
-    <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.40;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
-       id="path6061" />
-  </g>
-  <g
-     inkscape:label="Border"
-     inkscape:groupmode="layer"
-     id="layer1"
-     style="display:inline">
-    <path
-       style="fill:none;fill-opacity:0.20;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 17.5,0.5"
-       id="path6059" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="g20"
-     inkscape:label="Button">
-    <g
-       style="display:inline"
-       id="g1616"
-       transform="translate(3,10)">
-      <path
-         id="path2620"
-         style="opacity:0.50;fill:none;fill-opacity:0.20;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;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0"
-       d="M 0.5,30.5 L 17.5,30.5"
-       id="path6989" />
-  </g>
-</svg>
diff --git a/themes/largeprint/shade-inactive.xpm b/themes/largeprint/shade-inactive.xpm
deleted file mode 100644
index 63d1ec523..000000000
--- a/themes/largeprint/shade-inactive.xpm
+++ /dev/null
@@ -1,37 +0,0 @@
-/* XPM */
-static char * shade_inactive_xpm[] = {
-"18 31 3 1",
-" 	c None",
-"+	c #D0D0FF s inactive_hilight_1",
-".	c #C0C0FF s inactive_color_1",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"                  ",
-"                  ",
-"                  ",
-"                  "};
diff --git a/themes/largeprint/shade-prelight.png b/themes/largeprint/shade-prelight.png
deleted file mode 100644
index 15dbffc0e..000000000
--- a/themes/largeprint/shade-prelight.png
+++ /dev/null
diff --git a/themes/largeprint/shade-prelight.svg b/themes/largeprint/shade-prelight.svg
deleted file mode 100644
index 295453d8e..000000000
--- a/themes/largeprint/shade-prelight.svg
+++ /dev/null
@@ -1,190 +0,0 @@
-<?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="18"
-   height="31"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.45.1"
-   version="1.0"
-   sodipodi:docname="shade-prelight.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:white;stop-opacity:1;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.15;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:black;stop-opacity:0.05;" />
-      <stop
-         id="stop2776"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.30;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
-       x1="0"
-       y1="0.5"
-       x2="0"
-       y2="17"
-       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="14"
-       fx="9"
-       fy="14"
-       r="12"
-       gradientTransform="matrix(1,0,0,1,0,0.5)"
-       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="layer1"
-     inkscape:label="pressed">
-    <g
-       id="g1789"
-       transform="translate(0,2)">
-      <rect
-         style="opacity:0.5;fill:url(#radialGradient3087);fill-opacity:0.75;stroke:url(#radialGradient3087);stroke-width:1;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         id="rect3079"
-         width="18"
-         height="18"
-         x="0"
-         y="6" />
-    </g>
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Grad"
-     style="display:inline">
-    <path
-       style="fill:url(#linearGradient6945);fill-opacity:0.75;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 18,0.5 C 18,0.5 18,30 18,30 L 0,30 L 0,0.5 z "
-       id="path6057" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="hilight">
-    <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.40;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
-       id="path6061" />
-  </g>
-  <g
-     inkscape:label="Border"
-     inkscape:groupmode="layer"
-     id="g31"
-     style="display:inline">
-    <path
-       style="fill:none;fill-opacity:0.20;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 17.5,0.5"
-       id="path6059" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="g3722"
-     inkscape:label="Button">
-    <g
-       style="display:inline"
-       id="g1616"
-       transform="translate(3,10)">
-      <path
-         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.20;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.20;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;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0"
-       d="M 0.5,30.5 L 17.5,30.5"
-       id="path6989" />
-  </g>
-</svg>
diff --git a/themes/largeprint/shade-prelight.xpm b/themes/largeprint/shade-prelight.xpm
deleted file mode 100644
index eddeb640b..000000000
--- a/themes/largeprint/shade-prelight.xpm
+++ /dev/null
@@ -1,37 +0,0 @@
-/* XPM */
-static char * shade_pressed_xpm[] = {
-"18 31 3 1",
-" 	c None",
-"+	c #D0D0FF s active_hilight_1",
-".	c #C0C0FF s active_color_1",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"                  ",
-"                  ",
-"                  ",
-"                  "};
diff --git a/themes/largeprint/shade-pressed.png b/themes/largeprint/shade-pressed.png
deleted file mode 100644
index 43a8a9e5f..000000000
--- a/themes/largeprint/shade-pressed.png
+++ /dev/null
diff --git a/themes/largeprint/shade-pressed.svg b/themes/largeprint/shade-pressed.svg
deleted file mode 100644
index e7409acef..000000000
--- a/themes/largeprint/shade-pressed.svg
+++ /dev/null
@@ -1,190 +0,0 @@
-<?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="18"
-   height="31"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.45.1"
-   version="1.0"
-   sodipodi:docname="shade-pressed.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:white;stop-opacity:1;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.15;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:black;stop-opacity:0.05;" />
-      <stop
-         id="stop2776"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.30;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
-       x1="0"
-       y1="0.5"
-       x2="0"
-       y2="17"
-       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="14"
-       fx="9"
-       fy="14"
-       r="12"
-       gradientTransform="matrix(1,0,0,1,0,0.5)"
-       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="layer1"
-     inkscape:label="pressed">
-    <g
-       id="g1789"
-       transform="translate(0,2)">
-      <rect
-         style="opacity:0.5;fill:url(#radialGradient3087);fill-opacity:1.0;stroke:url(#radialGradient3087);stroke-width:1;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         id="rect3079"
-         width="18"
-         height="18"
-         x="0"
-         y="6" />
-    </g>
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Grad"
-     style="display:inline">
-    <path
-       style="fill:url(#linearGradient6945);fill-opacity:0.75;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 18,0.5 C 18,0.5 18,30 18,30 L 0,30 L 0,0.5 z "
-       id="path6057" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="hilight">
-    <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.40;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
-       id="path6061" />
-  </g>
-  <g
-     inkscape:label="Border"
-     inkscape:groupmode="layer"
-     id="g31"
-     style="display:inline">
-    <path
-       style="fill:none;fill-opacity:0.20;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 17.5,0.5"
-       id="path6059" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="g3722"
-     inkscape:label="Button">
-    <g
-       style="display:inline"
-       id="g1616"
-       transform="translate(3,11)">
-      <path
-         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.20;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.20;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;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0"
-       d="M 0.5,30.5 L 17.5,30.5"
-       id="path6989" />
-  </g>
-</svg>
diff --git a/themes/largeprint/shade-pressed.xpm b/themes/largeprint/shade-pressed.xpm
deleted file mode 100644
index eddeb640b..000000000
--- a/themes/largeprint/shade-pressed.xpm
+++ /dev/null
@@ -1,37 +0,0 @@
-/* XPM */
-static char * shade_pressed_xpm[] = {
-"18 31 3 1",
-" 	c None",
-"+	c #D0D0FF s active_hilight_1",
-".	c #C0C0FF s active_color_1",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"                  ",
-"                  ",
-"                  ",
-"                  "};
diff --git a/themes/largeprint/shade-toggled-active.png b/themes/largeprint/shade-toggled-active.png
deleted file mode 100644
index 9b7a59e91..000000000
--- a/themes/largeprint/shade-toggled-active.png
+++ /dev/null
diff --git a/themes/largeprint/shade-toggled-active.svg b/themes/largeprint/shade-toggled-active.svg
deleted file mode 100644
index 4daf72835..000000000
--- a/themes/largeprint/shade-toggled-active.svg
+++ /dev/null
@@ -1,163 +0,0 @@
-<?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="18"
-   height="31"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.45.1"
-   version="1.0"
-   sodipodi:docname="shade-toggled-active.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:white;stop-opacity:1;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.15;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:black;stop-opacity:0.05;" />
-      <stop
-         id="stop2776"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.30;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
-       x1="0"
-       y1="0.5"
-       x2="0"
-       y2="17"
-       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)" />
-  </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:0.75;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 18,0.5 C 18,0.5 18,30 18,30 L 0,30 L 0,0.5 z "
-       id="path6057" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="hilight">
-    <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.40;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
-       id="path6061" />
-  </g>
-  <g
-     inkscape:label="Border"
-     inkscape:groupmode="layer"
-     id="layer1"
-     style="display:inline">
-    <path
-       style="fill:none;fill-opacity:0.20;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 17.5,0.5"
-       id="path6059" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="g20"
-     inkscape:label="Button">
-    <g
-       style="display:inline"
-       id="g1628"
-       transform="translate(3,10)">
-      <path
-         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.20;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.20;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;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0"
-       d="M 0.5,30.5 L 17.5,30.5"
-       id="path6989" />
-  </g>
-</svg>
diff --git a/themes/largeprint/shade-toggled-active.xpm b/themes/largeprint/shade-toggled-active.xpm
deleted file mode 100644
index e4bc43080..000000000
--- a/themes/largeprint/shade-toggled-active.xpm
+++ /dev/null
@@ -1,37 +0,0 @@
-/* XPM */
-static char * shade_toggled_active_xpm[] = {
-"18 31 3 1",
-" 	c None",
-"+	c #D0D0FF s active_hilight_1",
-".	c #C0C0FF s active_color_1",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"                  ",
-"                  ",
-"                  ",
-"                  "};
diff --git a/themes/largeprint/shade-toggled-inactive.png b/themes/largeprint/shade-toggled-inactive.png
deleted file mode 100644
index f747559ea..000000000
--- a/themes/largeprint/shade-toggled-inactive.png
+++ /dev/null
diff --git a/themes/largeprint/shade-toggled-inactive.svg b/themes/largeprint/shade-toggled-inactive.svg
deleted file mode 100644
index afa6b47d2..000000000
--- a/themes/largeprint/shade-toggled-inactive.svg
+++ /dev/null
@@ -1,159 +0,0 @@
-<?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="18"
-   height="31"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.45.1"
-   version="1.0"
-   sodipodi:docname="shade-toggled-inactive.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:white;stop-opacity:1;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.15;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:black;stop-opacity:0.05;" />
-      <stop
-         id="stop2776"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.30;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
-       x1="0"
-       y1="0.5"
-       x2="0"
-       y2="17"
-       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)" />
-  </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:0.75;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 18,0.5 C 18,0.5 18,30 18,30 L 0,30 L 0,0.5 z "
-       id="path6057" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="hilight">
-    <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.40;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
-       id="path6061" />
-  </g>
-  <g
-     inkscape:label="Border"
-     inkscape:groupmode="layer"
-     id="layer1"
-     style="display:inline">
-    <path
-       style="fill:none;fill-opacity:0.20;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 17.5,0.5"
-       id="path6059" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="g20"
-     inkscape:label="Button">
-    <g
-       style="display:inline"
-       id="g1628"
-       transform="translate(3,10)">
-      <path
-         id="path2620"
-         style="opacity:0.50;fill:none;fill-opacity:0.20;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;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0"
-       d="M 0.5,30.5 L 17.5,30.5"
-       id="path6989" />
-  </g>
-</svg>
diff --git a/themes/largeprint/shade-toggled-inactive.xpm b/themes/largeprint/shade-toggled-inactive.xpm
deleted file mode 100644
index b4d805316..000000000
--- a/themes/largeprint/shade-toggled-inactive.xpm
+++ /dev/null
@@ -1,37 +0,0 @@
-/* XPM */
-static char * shade_toggled_inactive_xpm[] = {
-"18 31 3 1",
-" 	c None",
-"+	c #D0D0FF s inactive_hilight_1",
-".	c #C0C0FF s inactive_color_1",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"                  ",
-"                  ",
-"                  ",
-"                  "};
diff --git a/themes/largeprint/shade-toggled-prelight.png b/themes/largeprint/shade-toggled-prelight.png
deleted file mode 100644
index 0b0fe2746..000000000
--- a/themes/largeprint/shade-toggled-prelight.png
+++ /dev/null
diff --git a/themes/largeprint/shade-toggled-prelight.svg b/themes/largeprint/shade-toggled-prelight.svg
deleted file mode 100644
index d364d4715..000000000
--- a/themes/largeprint/shade-toggled-prelight.svg
+++ /dev/null
@@ -1,190 +0,0 @@
-<?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="18"
-   height="31"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.45.1"
-   version="1.0"
-   sodipodi:docname="shade-toggled-prelight.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:white;stop-opacity:1;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.15;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:black;stop-opacity:0.05;" />
-      <stop
-         id="stop2776"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.30;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
-       x1="0"
-       y1="0.5"
-       x2="0"
-       y2="17"
-       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="14"
-       fx="9"
-       fy="14"
-       r="12"
-       gradientTransform="matrix(1,0,0,1,0,0.5)"
-       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="layer1"
-     inkscape:label="pressed">
-    <g
-       id="g1789"
-       transform="translate(0,2)">
-      <rect
-         style="opacity:0.5;fill:url(#radialGradient3087);fill-opacity:0.75;stroke:url(#radialGradient3087);stroke-width:1;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         id="rect3079"
-         width="18"
-         height="18"
-         x="0"
-         y="6" />
-    </g>
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Grad"
-     style="display:inline">
-    <path
-       style="fill:url(#linearGradient6945);fill-opacity:0.75;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 18,0.5 C 18,0.5 18,30 18,30 L 0,30 L 0,0.5 z "
-       id="path6057" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="hilight">
-    <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.40;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
-       id="path6061" />
-  </g>
-  <g
-     inkscape:label="Border"
-     inkscape:groupmode="layer"
-     id="g31"
-     style="display:inline">
-    <path
-       style="fill:none;fill-opacity:0.20;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 17.5,0.5"
-       id="path6059" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="g3722"
-     inkscape:label="Button">
-    <g
-       style="display:inline"
-       id="g1628"
-       transform="translate(3,10)">
-      <path
-         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.20;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.20;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;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0"
-       d="M 0.5,30.5 L 17.5,30.5"
-       id="path6989" />
-  </g>
-</svg>
diff --git a/themes/largeprint/shade-toggled-prelight.xpm b/themes/largeprint/shade-toggled-prelight.xpm
deleted file mode 100644
index b6ce2bd4a..000000000
--- a/themes/largeprint/shade-toggled-prelight.xpm
+++ /dev/null
@@ -1,37 +0,0 @@
-/* XPM */
-static char * shade_toggled_pressed_xpm[] = {
-"18 31 3 1",
-" 	c None",
-"+	c #D0D0FF s active_hilight_1",
-".	c #C0C0FF s active_color_1",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"                  ",
-"                  ",
-"                  ",
-"                  "};
diff --git a/themes/largeprint/shade-toggled-pressed.png b/themes/largeprint/shade-toggled-pressed.png
deleted file mode 100644
index 3b34ac8a1..000000000
--- a/themes/largeprint/shade-toggled-pressed.png
+++ /dev/null
diff --git a/themes/largeprint/shade-toggled-pressed.xpm b/themes/largeprint/shade-toggled-pressed.xpm
deleted file mode 100644
index b6ce2bd4a..000000000
--- a/themes/largeprint/shade-toggled-pressed.xpm
+++ /dev/null
@@ -1,37 +0,0 @@
-/* XPM */
-static char * shade_toggled_pressed_xpm[] = {
-"18 31 3 1",
-" 	c None",
-"+	c #D0D0FF s active_hilight_1",
-".	c #C0C0FF s active_color_1",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"                  ",
-"                  ",
-"                  ",
-"                  "};
diff --git a/themes/largeprint/stick-active.png b/themes/largeprint/stick-active.png
deleted file mode 100644
index 534c9e6ca..000000000
--- a/themes/largeprint/stick-active.png
+++ /dev/null
diff --git a/themes/largeprint/stick-active.svg b/themes/largeprint/stick-active.svg
deleted file mode 100644
index 48b67a257..000000000
--- a/themes/largeprint/stick-active.svg
+++ /dev/null
@@ -1,163 +0,0 @@
-<?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="18"
-   height="31"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.45.1"
-   version="1.0"
-   sodipodi:docname="stick-active.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:white;stop-opacity:1;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.15;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:black;stop-opacity:0.05;" />
-      <stop
-         id="stop2776"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.30;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
-       x1="0"
-       y1="0.5"
-       x2="0"
-       y2="17"
-       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)" />
-  </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:0.75;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 18,0.5 C 18,0.5 18,30 18,30 L 0,30 L 0,0.5 z "
-       id="path6057" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="hilight">
-    <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.40;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
-       id="path6061" />
-  </g>
-  <g
-     inkscape:label="Border"
-     inkscape:groupmode="layer"
-     id="layer1"
-     style="display:inline">
-    <path
-       style="fill:none;fill-opacity:0.20;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 17.5,0.5"
-       id="path6059" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="g20"
-     inkscape:label="Button">
-    <g
-       style="display:inline"
-       id="g1613"
-       transform="translate(3,10)">
-      <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;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0"
-       d="M 0.5,30.5 L 17.5,30.5"
-       id="path6989" />
-  </g>
-</svg>
diff --git a/themes/largeprint/stick-active.xpm b/themes/largeprint/stick-active.xpm
deleted file mode 100644
index 189195d07..000000000
--- a/themes/largeprint/stick-active.xpm
+++ /dev/null
@@ -1,37 +0,0 @@
-/* XPM */
-static char * stick_active_xpm[] = {
-"18 31 3 1",
-" 	c None",
-"+	c #D0D0FF s active_hilight_1",
-".	c #C0C0FF s active_color_1",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"                  ",
-"                  ",
-"                  ",
-"                  "};
diff --git a/themes/largeprint/stick-inactive.png b/themes/largeprint/stick-inactive.png
deleted file mode 100644
index 45350335b..000000000
--- a/themes/largeprint/stick-inactive.png
+++ /dev/null
diff --git a/themes/largeprint/stick-inactive.svg b/themes/largeprint/stick-inactive.svg
deleted file mode 100644
index c8515cf5f..000000000
--- a/themes/largeprint/stick-inactive.svg
+++ /dev/null
@@ -1,159 +0,0 @@
-<?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="18"
-   height="31"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.45.1"
-   version="1.0"
-   sodipodi:docname="stick-inactive.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:white;stop-opacity:1;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.15;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:black;stop-opacity:0.05;" />
-      <stop
-         id="stop2776"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.30;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
-       x1="0"
-       y1="0.5"
-       x2="0"
-       y2="17"
-       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)" />
-  </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:0.75;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 18,0.5 C 18,0.5 18,30 18,30 L 0,30 L 0,0.5 z "
-       id="path6057" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="hilight">
-    <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.40;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
-       id="path6061" />
-  </g>
-  <g
-     inkscape:label="Border"
-     inkscape:groupmode="layer"
-     id="layer1"
-     style="display:inline">
-    <path
-       style="fill:none;fill-opacity:0.20;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 17.5,0.5"
-       id="path6059" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="g20"
-     inkscape:label="Button">
-    <g
-       style="display:inline"
-       id="g1613"
-       transform="translate(3,10)">
-      <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;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0"
-       d="M 0.5,30.5 L 17.5,30.5"
-       id="path6989" />
-  </g>
-</svg>
diff --git a/themes/largeprint/stick-inactive.xpm b/themes/largeprint/stick-inactive.xpm
deleted file mode 100644
index 8fff75ac0..000000000
--- a/themes/largeprint/stick-inactive.xpm
+++ /dev/null
@@ -1,37 +0,0 @@
-/* XPM */
-static char * stick_inactive_xpm[] = {
-"18 31 3 1",
-" 	c None",
-"+	c #D0D0FF s inactive_hilight_1",
-".	c #C0C0FF s inactive_color_1",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"                  ",
-"                  ",
-"                  ",
-"                  "};
diff --git a/themes/largeprint/stick-prelight.png b/themes/largeprint/stick-prelight.png
deleted file mode 100644
index 95ddd06e1..000000000
--- a/themes/largeprint/stick-prelight.png
+++ /dev/null
diff --git a/themes/largeprint/stick-prelight.svg b/themes/largeprint/stick-prelight.svg
deleted file mode 100644
index a292c66f1..000000000
--- a/themes/largeprint/stick-prelight.svg
+++ /dev/null
@@ -1,190 +0,0 @@
-<?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="18"
-   height="31"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.45.1"
-   version="1.0"
-   sodipodi:docname="stick-prelight.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:white;stop-opacity:1;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.15;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:black;stop-opacity:0.05;" />
-      <stop
-         id="stop2776"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.30;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
-       x1="0"
-       y1="0.5"
-       x2="0"
-       y2="17"
-       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="14"
-       fx="9"
-       fy="14"
-       r="12"
-       gradientTransform="matrix(1,0,0,1,0,0.5)"
-       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="layer1"
-     inkscape:label="pressed">
-    <g
-       id="g1789"
-       transform="translate(0,2)">
-      <rect
-         style="opacity:0.5;fill:url(#radialGradient3087);fill-opacity:0.75;stroke:url(#radialGradient3087);stroke-width:1;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         id="rect3079"
-         width="18"
-         height="18"
-         x="0"
-         y="6" />
-    </g>
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Grad"
-     style="display:inline">
-    <path
-       style="fill:url(#linearGradient6945);fill-opacity:0.75;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 18,0.5 C 18,0.5 18,30 18,30 L 0,30 L 0,0.5 z "
-       id="path6057" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="hilight">
-    <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.40;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
-       id="path6061" />
-  </g>
-  <g
-     inkscape:label="Border"
-     inkscape:groupmode="layer"
-     id="g31"
-     style="display:inline">
-    <path
-       style="fill:none;fill-opacity:0.20;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 17.5,0.5"
-       id="path6059" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="g3722"
-     inkscape:label="Button">
-    <g
-       style="display:inline"
-       id="g1613"
-       transform="translate(3,10)">
-      <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;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0"
-       d="M 0.5,30.5 L 17.5,30.5"
-       id="path6989" />
-  </g>
-</svg>
diff --git a/themes/largeprint/stick-prelight.xpm b/themes/largeprint/stick-prelight.xpm
deleted file mode 100644
index c18446c37..000000000
--- a/themes/largeprint/stick-prelight.xpm
+++ /dev/null
@@ -1,37 +0,0 @@
-/* XPM */
-static char * stick_pressed_xpm[] = {
-"18 31 3 1",
-" 	c None",
-"+	c #D0D0FF s active_hilight_1",
-".	c #C0C0FF s active_color_1",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"                  ",
-"                  ",
-"                  ",
-"                  "};
diff --git a/themes/largeprint/stick-pressed.png b/themes/largeprint/stick-pressed.png
deleted file mode 100644
index ce9bce280..000000000
--- a/themes/largeprint/stick-pressed.png
+++ /dev/null
diff --git a/themes/largeprint/stick-pressed.xpm b/themes/largeprint/stick-pressed.xpm
deleted file mode 100644
index c18446c37..000000000
--- a/themes/largeprint/stick-pressed.xpm
+++ /dev/null
@@ -1,37 +0,0 @@
-/* XPM */
-static char * stick_pressed_xpm[] = {
-"18 31 3 1",
-" 	c None",
-"+	c #D0D0FF s active_hilight_1",
-".	c #C0C0FF s active_color_1",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"                  ",
-"                  ",
-"                  ",
-"                  "};
diff --git a/themes/largeprint/stick-toggled-active.png b/themes/largeprint/stick-toggled-active.png
deleted file mode 100644
index 01f6d6ac5..000000000
--- a/themes/largeprint/stick-toggled-active.png
+++ /dev/null
diff --git a/themes/largeprint/stick-toggled-active.svg b/themes/largeprint/stick-toggled-active.svg
deleted file mode 100644
index 3bb5c4edd..000000000
--- a/themes/largeprint/stick-toggled-active.svg
+++ /dev/null
@@ -1,172 +0,0 @@
-<?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="18"
-   height="31"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.45.1"
-   version="1.0"
-   sodipodi:docname="stick-toggled-active.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:white;stop-opacity:1;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.15;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:black;stop-opacity:0.05;" />
-      <stop
-         id="stop2776"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.30;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
-       x1="0"
-       y1="0.5"
-       x2="0"
-       y2="17"
-       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)" />
-  </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:0.75;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 18,0.5 C 18,0.5 18,30 18,30 L 0,30 L 0,0.5 z "
-       id="path6057" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="hilight">
-    <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.40;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
-       id="path6061" />
-  </g>
-  <g
-     inkscape:label="Border"
-     inkscape:groupmode="layer"
-     id="layer1"
-     style="display:inline">
-    <path
-       style="fill:none;fill-opacity:0.20;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 17.5,0.5"
-       id="path6059" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="g20"
-     inkscape:label="Button">
-    <g
-       style="display:inline"
-       id="g1625"
-       transform="translate(3,10)">
-      <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="path2282"
-         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;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0"
-       d="M 0.5,30.5 L 17.5,30.5"
-       id="path6989" />
-  </g>
-</svg>
diff --git a/themes/largeprint/stick-toggled-active.xpm b/themes/largeprint/stick-toggled-active.xpm
deleted file mode 100644
index 762523b65..000000000
--- a/themes/largeprint/stick-toggled-active.xpm
+++ /dev/null
@@ -1,37 +0,0 @@
-/* XPM */
-static char * stick_toggled_active_xpm[] = {
-"18 31 3 1",
-" 	c None",
-"+	c #D0D0FF s active_hilight_1",
-".	c #C0C0FF s active_color_1",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"                  ",
-"                  ",
-"                  ",
-"                  "};
diff --git a/themes/largeprint/stick-toggled-inactive.png b/themes/largeprint/stick-toggled-inactive.png
deleted file mode 100644
index 9eaa40cf7..000000000
--- a/themes/largeprint/stick-toggled-inactive.png
+++ /dev/null
diff --git a/themes/largeprint/stick-toggled-inactive.svg b/themes/largeprint/stick-toggled-inactive.svg
deleted file mode 100644
index 5f0987b22..000000000
--- a/themes/largeprint/stick-toggled-inactive.svg
+++ /dev/null
@@ -1,168 +0,0 @@
-<?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="18"
-   height="31"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.45.1"
-   version="1.0"
-   sodipodi:docname="stick-toggled-inactive.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:white;stop-opacity:1;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.15;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:black;stop-opacity:0.05;" />
-      <stop
-         id="stop2776"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.30;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
-       x1="0"
-       y1="0.5"
-       x2="0"
-       y2="17"
-       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)" />
-  </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:0.75;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 18,0.5 C 18,0.5 18,30 18,30 L 0,30 L 0,0.5 z "
-       id="path6057" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="hilight">
-    <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.40;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
-       id="path6061" />
-  </g>
-  <g
-     inkscape:label="Border"
-     inkscape:groupmode="layer"
-     id="layer1"
-     style="display:inline">
-    <path
-       style="fill:none;fill-opacity:0.20;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 17.5,0.5"
-       id="path6059" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="g20"
-     inkscape:label="Button">
-    <g
-       style="display:inline"
-       id="g1625"
-       transform="translate(3,10)">
-      <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;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0"
-       d="M 0.5,30.5 L 17.5,30.5"
-       id="path6989" />
-  </g>
-</svg>
diff --git a/themes/largeprint/stick-toggled-inactive.xpm b/themes/largeprint/stick-toggled-inactive.xpm
deleted file mode 100644
index b542560c2..000000000
--- a/themes/largeprint/stick-toggled-inactive.xpm
+++ /dev/null
@@ -1,37 +0,0 @@
-/* XPM */
-static char * stick_toggled_inactive_xpm[] = {
-"18 31 3 1",
-" 	c None",
-"+	c #D0D0FF s inactive_hilight_1",
-".	c #C0C0FF s inactive_color_1",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"                  ",
-"                  ",
-"                  ",
-"                  "};
diff --git a/themes/largeprint/stick-toggled-prelight.png b/themes/largeprint/stick-toggled-prelight.png
deleted file mode 100644
index d87281c01..000000000
--- a/themes/largeprint/stick-toggled-prelight.png
+++ /dev/null
diff --git a/themes/largeprint/stick-toggled-prelight.svg b/themes/largeprint/stick-toggled-prelight.svg
deleted file mode 100644
index 1631f8fa5..000000000
--- a/themes/largeprint/stick-toggled-prelight.svg
+++ /dev/null
@@ -1,199 +0,0 @@
-<?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="18"
-   height="31"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.45.1"
-   version="1.0"
-   sodipodi:docname="stick-toggled-prelight.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:white;stop-opacity:1;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.15;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:black;stop-opacity:0.05;" />
-      <stop
-         id="stop2776"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.30;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
-       x1="0"
-       y1="0.5"
-       x2="0"
-       y2="17"
-       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="14"
-       fx="9"
-       fy="14"
-       r="12"
-       gradientTransform="matrix(1,0,0,1,0,0.5)"
-       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="layer1"
-     inkscape:label="pressed">
-    <g
-       id="g1789"
-       transform="translate(0,2)">
-      <rect
-         style="opacity:0.5;fill:url(#radialGradient3087);fill-opacity:0.75;stroke:url(#radialGradient3087);stroke-width:1;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         id="rect3079"
-         width="18"
-         height="18"
-         x="0"
-         y="6" />
-    </g>
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Grad"
-     style="display:inline">
-    <path
-       style="fill:url(#linearGradient6945);fill-opacity:0.75;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 18,0.5 C 18,0.5 18,30 18,30 L 0,30 L 0,0.5 z "
-       id="path6057" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="hilight">
-    <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.40;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 0,1 L 18,1 C 18,1 18,4 18,4 L 0,4 L 0,3 z "
-       id="path6061" />
-  </g>
-  <g
-     inkscape:label="Border"
-     inkscape:groupmode="layer"
-     id="g31"
-     style="display:inline">
-    <path
-       style="fill:none;fill-opacity:0.20;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 17.5,0.5"
-       id="path6059" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="g3722"
-     inkscape:label="Button">
-    <g
-       style="display:inline"
-       id="g1625"
-       transform="translate(3,10)">
-      <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="path2282"
-         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;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0"
-       d="M 0.5,30.5 L 17.5,30.5"
-       id="path6989" />
-  </g>
-</svg>
diff --git a/themes/largeprint/stick-toggled-prelight.xpm b/themes/largeprint/stick-toggled-prelight.xpm
deleted file mode 100644
index 9f00c4d63..000000000
--- a/themes/largeprint/stick-toggled-prelight.xpm
+++ /dev/null
@@ -1,37 +0,0 @@
-/* XPM */
-static char * stick_toggled_pressed_xpm[] = {
-"18 31 3 1",
-" 	c None",
-"+	c #D0D0FF s active_hilight_1",
-".	c #C0C0FF s active_color_1",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"                  ",
-"                  ",
-"                  ",
-"                  "};
diff --git a/themes/largeprint/stick-toggled-pressed.png b/themes/largeprint/stick-toggled-pressed.png
deleted file mode 100644
index 19b597ff3..000000000
--- a/themes/largeprint/stick-toggled-pressed.png
+++ /dev/null
diff --git a/themes/largeprint/stick-toggled-pressed.xpm b/themes/largeprint/stick-toggled-pressed.xpm
deleted file mode 100644
index 9f00c4d63..000000000
--- a/themes/largeprint/stick-toggled-pressed.xpm
+++ /dev/null
@@ -1,37 +0,0 @@
-/* XPM */
-static char * stick_toggled_pressed_xpm[] = {
-"18 31 3 1",
-" 	c None",
-"+	c #D0D0FF s active_hilight_1",
-".	c #C0C0FF s active_color_1",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"..................",
-"                  ",
-"                  ",
-"                  ",
-"                  "};
diff --git a/themes/largeprint/themerc b/themes/largeprint/themerc
deleted file mode 100644
index 1888a1960..000000000
--- a/themes/largeprint/themerc
+++ /dev/null
@@ -1,15 +0,0 @@
-active_text_color=#ffffff
-button_offset=0
-button_spacing=0
-full_width_title=false
-maximized_offset=0
-shadow_delta_height=4
-shadow_delta_width=1
-shadow_delta_x=1
-shadow_delta_y=1
-show_app_icon=true
-title_horizontal_offset=1
-title_shadow_active=frame
-title_shadow_inactive=false
-title_vertical_offset_active=1
-title_vertical_offset_inactive=1
diff --git a/themes/largeprint/title-1-active.png b/themes/largeprint/title-1-active.png
deleted file mode 100644
index 64c2e9edb..000000000
--- a/themes/largeprint/title-1-active.png
+++ /dev/null
diff --git a/themes/largeprint/title-1-active.svg b/themes/largeprint/title-1-active.svg
deleted file mode 100644
index 15accdd15..000000000
--- a/themes/largeprint/title-1-active.svg
+++ /dev/null
@@ -1,145 +0,0 @@
-<?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="31"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.45.1"
-   version="1.0"
-   sodipodi:docname="title-1-active.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:white;stop-opacity:1;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.15;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:black;stop-opacity:0.05;" />
-      <stop
-         id="stop2776"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.30;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
-       x1="0"
-       y1="0.5"
-       x2="0"
-       y2="17"
-       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)" />
-  </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:0.75;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,30 8,30 L 0,30 L 0,0.5 z "
-       id="path6057" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="hilight">
-    <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.40;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" />
-  </g>
-  <g
-     inkscape:label="Border"
-     inkscape:groupmode="layer"
-     id="layer1"
-     style="display:inline">
-    <path
-       style="fill:none;fill-opacity:0.20;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" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer5"
-     inkscape:label="Shadow">
-    <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0"
-       d="M 0.5,30.5 L 7.5,30.5"
-       id="path6989" />
-  </g>
-</svg>
diff --git a/themes/largeprint/title-1-active.xpm b/themes/largeprint/title-1-active.xpm
deleted file mode 100644
index 240af24e1..000000000
--- a/themes/largeprint/title-1-active.xpm
+++ /dev/null
@@ -1,37 +0,0 @@
-/* XPM */
-static char * title_active_xpm[] = {
-"4 31 3 1",
-" 	c None",
-"+	c #D0D0FF s active_hilight_1",
-".	c #C0C0FF s active_color_1",
-"....",
-"++++",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"...."};
diff --git a/themes/largeprint/title-1-inactive.png b/themes/largeprint/title-1-inactive.png
deleted file mode 100644
index 64c2e9edb..000000000
--- a/themes/largeprint/title-1-inactive.png
+++ /dev/null
diff --git a/themes/largeprint/title-1-inactive.svg b/themes/largeprint/title-1-inactive.svg
deleted file mode 100644
index 17cd3f253..000000000
--- a/themes/largeprint/title-1-inactive.svg
+++ /dev/null
@@ -1,145 +0,0 @@
-<?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="31"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.45.1"
-   version="1.0"
-   sodipodi:docname="title-1-inactive.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:white;stop-opacity:1;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.15;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:black;stop-opacity:0.05;" />
-      <stop
-         id="stop2776"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.30;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
-       x1="0"
-       y1="0.5"
-       x2="0"
-       y2="17"
-       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)" />
-  </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:0.75;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,30 8,30 L 0,30 L 0,0.5 z "
-       id="path6057" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="hilight">
-    <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.40;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" />
-  </g>
-  <g
-     inkscape:label="Border"
-     inkscape:groupmode="layer"
-     id="layer1"
-     style="display:inline">
-    <path
-       style="fill:none;fill-opacity:0.20;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" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer5"
-     inkscape:label="Shadow">
-    <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0"
-       d="M 0.5,30.5 L 7.5,30.5"
-       id="path6989" />
-  </g>
-</svg>
diff --git a/themes/largeprint/title-1-inactive.xpm b/themes/largeprint/title-1-inactive.xpm
deleted file mode 100644
index cc644871f..000000000
--- a/themes/largeprint/title-1-inactive.xpm
+++ /dev/null
@@ -1,37 +0,0 @@
-/* XPM */
-static char * title_inactive_xpm[] = {
-"4 31 3 1",
-" 	c None",
-"+	c #D0D0FF s inactive_hilight_1",
-".	c #C0C0FF s inactive_color_1",
-"....",
-"++++",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"...."};
diff --git a/themes/largeprint/title-2-active.png b/themes/largeprint/title-2-active.png
deleted file mode 100644
index 64c2e9edb..000000000
--- a/themes/largeprint/title-2-active.png
+++ /dev/null
diff --git a/themes/largeprint/title-2-active.svg b/themes/largeprint/title-2-active.svg
deleted file mode 100644
index 07cd8962e..000000000
--- a/themes/largeprint/title-2-active.svg
+++ /dev/null
@@ -1,145 +0,0 @@
-<?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="31"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.45.1"
-   version="1.0"
-   sodipodi:docname="title-2-active.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:white;stop-opacity:1;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.15;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:black;stop-opacity:0.05;" />
-      <stop
-         id="stop2776"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.30;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
-       x1="0"
-       y1="0.5"
-       x2="0"
-       y2="17"
-       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)" />
-  </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:0.75;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,30 8,30 L 0,30 L 0,0.5 z "
-       id="path6057" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="hilight">
-    <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.40;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" />
-  </g>
-  <g
-     inkscape:label="Border"
-     inkscape:groupmode="layer"
-     id="layer1"
-     style="display:inline">
-    <path
-       style="fill:none;fill-opacity:0.20;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" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer5"
-     inkscape:label="Shadow">
-    <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0"
-       d="M 0.5,30.5 L 7.5,30.5"
-       id="path6989" />
-  </g>
-</svg>
diff --git a/themes/largeprint/title-2-active.xpm b/themes/largeprint/title-2-active.xpm
deleted file mode 100644
index 240af24e1..000000000
--- a/themes/largeprint/title-2-active.xpm
+++ /dev/null
@@ -1,37 +0,0 @@
-/* XPM */
-static char * title_active_xpm[] = {
-"4 31 3 1",
-" 	c None",
-"+	c #D0D0FF s active_hilight_1",
-".	c #C0C0FF s active_color_1",
-"....",
-"++++",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"...."};
diff --git a/themes/largeprint/title-2-inactive.png b/themes/largeprint/title-2-inactive.png
deleted file mode 100644
index 64c2e9edb..000000000
--- a/themes/largeprint/title-2-inactive.png
+++ /dev/null
diff --git a/themes/largeprint/title-2-inactive.svg b/themes/largeprint/title-2-inactive.svg
deleted file mode 100644
index 2e60d6fd1..000000000
--- a/themes/largeprint/title-2-inactive.svg
+++ /dev/null
@@ -1,145 +0,0 @@
-<?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="31"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.45.1"
-   version="1.0"
-   sodipodi:docname="title-2-inactive.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:white;stop-opacity:1;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.15;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:black;stop-opacity:0.05;" />
-      <stop
-         id="stop2776"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.30;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
-       x1="0"
-       y1="0.5"
-       x2="0"
-       y2="17"
-       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)" />
-  </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:0.75;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,30 8,30 L 0,30 L 0,0.5 z "
-       id="path6057" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="hilight">
-    <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.40;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" />
-  </g>
-  <g
-     inkscape:label="Border"
-     inkscape:groupmode="layer"
-     id="layer1"
-     style="display:inline">
-    <path
-       style="fill:none;fill-opacity:0.20;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" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer5"
-     inkscape:label="Shadow">
-    <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0"
-       d="M 0.5,30.5 L 7.5,30.5"
-       id="path6989" />
-  </g>
-</svg>
diff --git a/themes/largeprint/title-2-inactive.xpm b/themes/largeprint/title-2-inactive.xpm
deleted file mode 100644
index cc644871f..000000000
--- a/themes/largeprint/title-2-inactive.xpm
+++ /dev/null
@@ -1,37 +0,0 @@
-/* XPM */
-static char * title_inactive_xpm[] = {
-"4 31 3 1",
-" 	c None",
-"+	c #D0D0FF s inactive_hilight_1",
-".	c #C0C0FF s inactive_color_1",
-"....",
-"++++",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"...."};
diff --git a/themes/largeprint/title-3-active.png b/themes/largeprint/title-3-active.png
deleted file mode 100644
index 64c2e9edb..000000000
--- a/themes/largeprint/title-3-active.png
+++ /dev/null
diff --git a/themes/largeprint/title-3-active.svg b/themes/largeprint/title-3-active.svg
deleted file mode 100644
index 3fab0840f..000000000
--- a/themes/largeprint/title-3-active.svg
+++ /dev/null
@@ -1,145 +0,0 @@
-<?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="31"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.45.1"
-   version="1.0"
-   sodipodi:docname="title-3-active.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:white;stop-opacity:1;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.15;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:black;stop-opacity:0.05;" />
-      <stop
-         id="stop2776"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.30;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
-       x1="0"
-       y1="0.5"
-       x2="0"
-       y2="17"
-       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)" />
-  </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:0.75;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,30 8,30 L 0,30 L 0,0.5 z "
-       id="path6057" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="hilight">
-    <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.40;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" />
-  </g>
-  <g
-     inkscape:label="Border"
-     inkscape:groupmode="layer"
-     id="layer1"
-     style="display:inline">
-    <path
-       style="fill:none;fill-opacity:0.20;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" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer5"
-     inkscape:label="Shadow">
-    <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0"
-       d="M 0.5,30.5 L 7.5,30.5"
-       id="path6989" />
-  </g>
-</svg>
diff --git a/themes/largeprint/title-3-active.xpm b/themes/largeprint/title-3-active.xpm
deleted file mode 100644
index 240af24e1..000000000
--- a/themes/largeprint/title-3-active.xpm
+++ /dev/null
@@ -1,37 +0,0 @@
-/* XPM */
-static char * title_active_xpm[] = {
-"4 31 3 1",
-" 	c None",
-"+	c #D0D0FF s active_hilight_1",
-".	c #C0C0FF s active_color_1",
-"....",
-"++++",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"...."};
diff --git a/themes/largeprint/title-3-inactive.png b/themes/largeprint/title-3-inactive.png
deleted file mode 100644
index 64c2e9edb..000000000
--- a/themes/largeprint/title-3-inactive.png
+++ /dev/null
diff --git a/themes/largeprint/title-3-inactive.svg b/themes/largeprint/title-3-inactive.svg
deleted file mode 100644
index efa8f5d28..000000000
--- a/themes/largeprint/title-3-inactive.svg
+++ /dev/null
@@ -1,145 +0,0 @@
-<?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="31"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.45.1"
-   version="1.0"
-   sodipodi:docname="title-3-inactive.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:white;stop-opacity:1;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.15;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:black;stop-opacity:0.05;" />
-      <stop
-         id="stop2776"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.30;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
-       x1="0"
-       y1="0.5"
-       x2="0"
-       y2="17"
-       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)" />
-  </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:0.75;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,30 8,30 L 0,30 L 0,0.5 z "
-       id="path6057" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="hilight">
-    <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.40;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" />
-  </g>
-  <g
-     inkscape:label="Border"
-     inkscape:groupmode="layer"
-     id="layer1"
-     style="display:inline">
-    <path
-       style="fill:none;fill-opacity:0.20;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" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer5"
-     inkscape:label="Shadow">
-    <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0"
-       d="M 0.5,30.5 L 7.5,30.5"
-       id="path6989" />
-  </g>
-</svg>
diff --git a/themes/largeprint/title-3-inactive.xpm b/themes/largeprint/title-3-inactive.xpm
deleted file mode 100644
index cc644871f..000000000
--- a/themes/largeprint/title-3-inactive.xpm
+++ /dev/null
@@ -1,37 +0,0 @@
-/* XPM */
-static char * title_inactive_xpm[] = {
-"4 31 3 1",
-" 	c None",
-"+	c #D0D0FF s inactive_hilight_1",
-".	c #C0C0FF s inactive_color_1",
-"....",
-"++++",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"...."};
diff --git a/themes/largeprint/title-4-active.png b/themes/largeprint/title-4-active.png
deleted file mode 100644
index 64c2e9edb..000000000
--- a/themes/largeprint/title-4-active.png
+++ /dev/null
diff --git a/themes/largeprint/title-4-active.svg b/themes/largeprint/title-4-active.svg
deleted file mode 100644
index 7bede248c..000000000
--- a/themes/largeprint/title-4-active.svg
+++ /dev/null
@@ -1,145 +0,0 @@
-<?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="31"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.45.1"
-   version="1.0"
-   sodipodi:docname="title-4-active.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:white;stop-opacity:1;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.15;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:black;stop-opacity:0.05;" />
-      <stop
-         id="stop2776"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.30;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
-       x1="0"
-       y1="0.5"
-       x2="0"
-       y2="17"
-       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)" />
-  </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:0.75;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,30 8,30 L 0,30 L 0,0.5 z "
-       id="path6057" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="hilight">
-    <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.40;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" />
-  </g>
-  <g
-     inkscape:label="Border"
-     inkscape:groupmode="layer"
-     id="layer1"
-     style="display:inline">
-    <path
-       style="fill:none;fill-opacity:0.20;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" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer5"
-     inkscape:label="Shadow">
-    <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0"
-       d="M 0.5,30.5 L 7.5,30.5"
-       id="path6989" />
-  </g>
-</svg>
diff --git a/themes/largeprint/title-4-active.xpm b/themes/largeprint/title-4-active.xpm
deleted file mode 100644
index 240af24e1..000000000
--- a/themes/largeprint/title-4-active.xpm
+++ /dev/null
@@ -1,37 +0,0 @@
-/* XPM */
-static char * title_active_xpm[] = {
-"4 31 3 1",
-" 	c None",
-"+	c #D0D0FF s active_hilight_1",
-".	c #C0C0FF s active_color_1",
-"....",
-"++++",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"...."};
diff --git a/themes/largeprint/title-4-inactive.png b/themes/largeprint/title-4-inactive.png
deleted file mode 100644
index 64c2e9edb..000000000
--- a/themes/largeprint/title-4-inactive.png
+++ /dev/null
diff --git a/themes/largeprint/title-4-inactive.svg b/themes/largeprint/title-4-inactive.svg
deleted file mode 100644
index c869a8961..000000000
--- a/themes/largeprint/title-4-inactive.svg
+++ /dev/null
@@ -1,145 +0,0 @@
-<?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="31"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.45.1"
-   version="1.0"
-   sodipodi:docname="title-4-inactive.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:white;stop-opacity:1;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.15;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:black;stop-opacity:0.05;" />
-      <stop
-         id="stop2776"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.30;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
-       x1="0"
-       y1="0.5"
-       x2="0"
-       y2="17"
-       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)" />
-  </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:0.75;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,30 8,30 L 0,30 L 0,0.5 z "
-       id="path6057" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="hilight">
-    <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.40;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" />
-  </g>
-  <g
-     inkscape:label="Border"
-     inkscape:groupmode="layer"
-     id="layer1"
-     style="display:inline">
-    <path
-       style="fill:none;fill-opacity:0.20;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" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer5"
-     inkscape:label="Shadow">
-    <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0"
-       d="M 0.5,30.5 L 7.5,30.5"
-       id="path6989" />
-  </g>
-</svg>
diff --git a/themes/largeprint/title-4-inactive.xpm b/themes/largeprint/title-4-inactive.xpm
deleted file mode 100644
index cc644871f..000000000
--- a/themes/largeprint/title-4-inactive.xpm
+++ /dev/null
@@ -1,37 +0,0 @@
-/* XPM */
-static char * title_inactive_xpm[] = {
-"4 31 3 1",
-" 	c None",
-"+	c #D0D0FF s inactive_hilight_1",
-".	c #C0C0FF s inactive_color_1",
-"....",
-"++++",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"...."};
diff --git a/themes/largeprint/title-5-active.png b/themes/largeprint/title-5-active.png
deleted file mode 100644
index 64c2e9edb..000000000
--- a/themes/largeprint/title-5-active.png
+++ /dev/null
diff --git a/themes/largeprint/title-5-active.svg b/themes/largeprint/title-5-active.svg
deleted file mode 100644
index c25b3dcad..000000000
--- a/themes/largeprint/title-5-active.svg
+++ /dev/null
@@ -1,145 +0,0 @@
-<?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="31"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.45.1"
-   version="1.0"
-   sodipodi:docname="title-5-active.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:white;stop-opacity:1;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.15;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:black;stop-opacity:0.05;" />
-      <stop
-         id="stop2776"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.30;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
-       x1="0"
-       y1="0.5"
-       x2="0"
-       y2="17"
-       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)" />
-  </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:0.75;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,30 8,30 L 0,30 L 0,0.5 z "
-       id="path6057" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="hilight">
-    <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.40;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" />
-  </g>
-  <g
-     inkscape:label="Border"
-     inkscape:groupmode="layer"
-     id="layer1"
-     style="display:inline">
-    <path
-       style="fill:none;fill-opacity:0.20;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" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer5"
-     inkscape:label="Shadow">
-    <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0"
-       d="M 0.5,30.5 L 7.5,30.5"
-       id="path6989" />
-  </g>
-</svg>
diff --git a/themes/largeprint/title-5-active.xpm b/themes/largeprint/title-5-active.xpm
deleted file mode 100644
index 240af24e1..000000000
--- a/themes/largeprint/title-5-active.xpm
+++ /dev/null
@@ -1,37 +0,0 @@
-/* XPM */
-static char * title_active_xpm[] = {
-"4 31 3 1",
-" 	c None",
-"+	c #D0D0FF s active_hilight_1",
-".	c #C0C0FF s active_color_1",
-"....",
-"++++",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"...."};
diff --git a/themes/largeprint/title-5-inactive.png b/themes/largeprint/title-5-inactive.png
deleted file mode 100644
index 64c2e9edb..000000000
--- a/themes/largeprint/title-5-inactive.png
+++ /dev/null
diff --git a/themes/largeprint/title-5-inactive.svg b/themes/largeprint/title-5-inactive.svg
deleted file mode 100644
index 65f570bd1..000000000
--- a/themes/largeprint/title-5-inactive.svg
+++ /dev/null
@@ -1,145 +0,0 @@
-<?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="31"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.45.1"
-   version="1.0"
-   sodipodi:docname="title-5-inactive.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:white;stop-opacity:1;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.15;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:black;stop-opacity:0.05;" />
-      <stop
-         id="stop2776"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.30;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
-       x1="0"
-       y1="0.5"
-       x2="0"
-       y2="17"
-       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)" />
-  </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:0.75;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,30 8,30 L 0,30 L 0,0.5 z "
-       id="path6057" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="hilight">
-    <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.40;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" />
-  </g>
-  <g
-     inkscape:label="Border"
-     inkscape:groupmode="layer"
-     id="layer1"
-     style="display:inline">
-    <path
-       style="fill:none;fill-opacity:0.20;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" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer5"
-     inkscape:label="Shadow">
-    <path
-       style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0"
-       d="M 0.5,30.5 L 7.5,30.5"
-       id="path6989" />
-  </g>
-</svg>
diff --git a/themes/largeprint/title-5-inactive.xpm b/themes/largeprint/title-5-inactive.xpm
deleted file mode 100644
index cc644871f..000000000
--- a/themes/largeprint/title-5-inactive.xpm
+++ /dev/null
@@ -1,37 +0,0 @@
-/* XPM */
-static char * title_inactive_xpm[] = {
-"4 31 3 1",
-" 	c None",
-"+	c #D0D0FF s inactive_hilight_1",
-".	c #C0C0FF s inactive_color_1",
-"....",
-"++++",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"....",
-"...."};
diff --git a/themes/largeprint/top-left-active.png b/themes/largeprint/top-left-active.png
deleted file mode 100644
index 0ad930149..000000000
--- a/themes/largeprint/top-left-active.png
+++ /dev/null
diff --git a/themes/largeprint/top-left-active.svg b/themes/largeprint/top-left-active.svg
deleted file mode 100644
index abfbe73fa..000000000
--- a/themes/largeprint/top-left-active.svg
+++ /dev/null
@@ -1,145 +0,0 @@
-<?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"
-   version="1.0"
-   inkscape:version="0.45.1"
-   sodipodi:version="0.32"
-   id="svg2"
-   height="31"
-   width="8"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:white;stop-opacity:1;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.15;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:black;stop-opacity:0.05;" />
-      <stop
-         id="stop2776"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.30;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
-       x1="0"
-       y1="0.5"
-       x2="0"
-       y2="17"
-       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)" />
-  </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
-       style="fill:url(#linearGradient6945);fill-opacity:0.75;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 8,1 L 4,1 C 4,1 2,1 2,4 L 2,25 C 2,25 2,30 7,30 L 8,30 L 8,30 L 8,1 z "
-       id="path6057" />
-  </g>
-  <g
-     inkscape:label="hilight"
-     id="layer3"
-     inkscape:groupmode="layer">
-    <path
-       id="path6061"
-       d="M 8,1 L 5.75,1 C 5.75,1 2,1 2,4 C 2,4 2.75,4 2.75,4 L 8,4 L 8,4 z "
-       style="fill:url(#linearGradient6962);fill-opacity:0.40;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" />
-  </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,31 1,31 1,31 L 0,31 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;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0"
-       d="M 2.5,30.5 L 7.5,30.5"
-       id="path6989" />
-  </g>
-</svg>
diff --git a/themes/largeprint/top-left-active.xpm b/themes/largeprint/top-left-active.xpm
deleted file mode 100644
index af8bdf79e..000000000
--- a/themes/largeprint/top-left-active.xpm
+++ /dev/null
@@ -1,37 +0,0 @@
-/* XPM */
-static char * top_left_active_xpm[] = {
-"8 31 3 1",
-" 	c None",
-"+	c #D0D0FF s active_hilight_1",
-".	c #C0C0FF s active_color_1",
-"  ......",
-" .++++++",
-".+......",
-".+......",
-".+......",
-".+......",
-".+......",
-".+......",
-".+......",
-".+......",
-".+......",
-".+......",
-".+......",
-".+......",
-".+......",
-".+......",
-".+......",
-".+......",
-".+......",
-".+......",
-".+......",
-".+......",
-".+......",
-".+......",
-".+......",
-".+......",
-".+......",
-".+......",
-".+......",
-".+......",
-".+......"};
diff --git a/themes/largeprint/top-left-inactive.png b/themes/largeprint/top-left-inactive.png
deleted file mode 100644
index 0ad930149..000000000
--- a/themes/largeprint/top-left-inactive.png
+++ /dev/null
diff --git a/themes/largeprint/top-left-inactive.svg b/themes/largeprint/top-left-inactive.svg
deleted file mode 100644
index 079a65df8..000000000
--- a/themes/largeprint/top-left-inactive.svg
+++ /dev/null
@@ -1,145 +0,0 @@
-<?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"
-   version="1.0"
-   inkscape:version="0.45.1"
-   sodipodi:version="0.32"
-   id="svg2"
-   height="31"
-   width="8"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:white;stop-opacity:1;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.15;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:black;stop-opacity:0.05;" />
-      <stop
-         id="stop2776"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.30;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
-       x1="0"
-       y1="0.5"
-       x2="0"
-       y2="17"
-       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)" />
-  </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
-       style="fill:url(#linearGradient6945);fill-opacity:0.75;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 8,1 L 4,1 C 4,1 2,1 2,4 L 2,25 C 2,25 2,30 7,30 L 8,30 L 8,30 L 8,1 z "
-       id="path6057" />
-  </g>
-  <g
-     inkscape:label="hilight"
-     id="layer3"
-     inkscape:groupmode="layer">
-    <path
-       id="path6061"
-       d="M 8,1 L 5.75,1 C 5.75,1 2,1 2,4 C 2,4 2.75,4 2.75,4 L 8,4 L 8,4 z "
-       style="fill:url(#linearGradient6962);fill-opacity:0.40;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" />
-  </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,31 1,31 1,31 L 0,31 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;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0"
-       d="M 2.5,30.5 L 7.5,30.5"
-       id="path6989" />
-  </g>
-</svg>
diff --git a/themes/largeprint/top-left-inactive.xpm b/themes/largeprint/top-left-inactive.xpm
deleted file mode 100644
index 2aa352d84..000000000
--- a/themes/largeprint/top-left-inactive.xpm
+++ /dev/null
@@ -1,37 +0,0 @@
-/* XPM */
-static char * top_left_inactive_xpm[] = {
-"8 31 3 1",
-" 	c None",
-"+	c #D0D0FF s inactive_hilight_1",
-".	c #C0C0FF s inactive_color_1",
-"  ......",
-" .++++++",
-".+......",
-".+......",
-".+......",
-".+......",
-".+......",
-".+......",
-".+......",
-".+......",
-".+......",
-".+......",
-".+......",
-".+......",
-".+......",
-".+......",
-".+......",
-".+......",
-".+......",
-".+......",
-".+......",
-".+......",
-".+......",
-".+......",
-".+......",
-".+......",
-".+......",
-".+......",
-".+......",
-".+......",
-".+......"};
diff --git a/themes/largeprint/top-right-active.png b/themes/largeprint/top-right-active.png
deleted file mode 100644
index 122325e3a..000000000
--- a/themes/largeprint/top-right-active.png
+++ /dev/null
diff --git a/themes/largeprint/top-right-active.svg b/themes/largeprint/top-right-active.svg
deleted file mode 100644
index b443116a6..000000000
--- a/themes/largeprint/top-right-active.svg
+++ /dev/null
@@ -1,145 +0,0 @@
-<?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="31"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.45.1"
-   version="1.0"
-   sodipodi:docname="top-right-active.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:white;stop-opacity:1;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.15;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:black;stop-opacity:0.05;" />
-      <stop
-         id="stop2776"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.30;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
-       x1="0"
-       y1="0.5"
-       x2="0"
-       y2="17"
-       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)" />
-  </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:0.75;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 4,1 C 4,1 6,1 6,4 L 6,25 C 6,25 6,30 1,30 L 0,30 L 0,30 L 0,1 z "
-       id="path6057" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="hilight">
-    <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.40;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" />
-  </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,31 7,31 7,31 L 8,31 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;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0"
-       d="M 0.5,30.5 L 5.5,30.5"
-       id="path6989" />
-  </g>
-</svg>
diff --git a/themes/largeprint/top-right-active.xpm b/themes/largeprint/top-right-active.xpm
deleted file mode 100644
index eeaa77746..000000000
--- a/themes/largeprint/top-right-active.xpm
+++ /dev/null
@@ -1,37 +0,0 @@
-/* XPM */
-static char * top_right_active_xpm[] = {
-"8 31 3 1",
-" 	c None",
-"+	c #D0D0FF s active_hilight_1",
-".	c #C0C0FF s active_color_1",
-"......  ",
-"++++++. ",
-"......+.",
-"......+.",
-"......+.",
-"......+.",
-"......+.",
-"......+.",
-"......+.",
-"......+.",
-"......+.",
-"......+.",
-"......+.",
-"......+.",
-"......+.",
-"......+.",
-"......+.",
-"......+.",
-"......+.",
-"......+.",
-"......+.",
-"......+.",
-"......+.",
-"......+.",
-"......+.",
-"......+.",
-"......+.",
-"......+.",
-"......+.",
-"......+.",
-"......+."};
diff --git a/themes/largeprint/top-right-inactive.png b/themes/largeprint/top-right-inactive.png
deleted file mode 100644
index 122325e3a..000000000
--- a/themes/largeprint/top-right-inactive.png
+++ /dev/null
diff --git a/themes/largeprint/top-right-inactive.svg b/themes/largeprint/top-right-inactive.svg
deleted file mode 100644
index 0d6453d8a..000000000
--- a/themes/largeprint/top-right-inactive.svg
+++ /dev/null
@@ -1,145 +0,0 @@
-<?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="31"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.45.1"
-   version="1.0"
-   sodipodi:docname="top-right-inactive.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient5873">
-      <stop
-         id="stop5875"
-         offset="0"
-         style="stop-color:white;stop-opacity:1;" />
-      <stop
-         id="stop5879"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.15;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5847">
-      <stop
-         id="stop5849"
-         offset="0"
-         style="stop-color:black;stop-opacity:0.05;" />
-      <stop
-         id="stop2776"
-         offset="1"
-         style="stop-color:white;stop-opacity:0.30;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5847"
-       id="linearGradient6945"
-       gradientUnits="userSpaceOnUse"
-       x1="0"
-       y1="0.5"
-       x2="0"
-       y2="17"
-       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)" />
-  </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:0.75;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 4,1 C 4,1 6,1 6,4 L 6,25 C 6,25 6,30 1,30 L 0,30 L 0,30 L 0,1 z "
-       id="path6057" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="hilight">
-    <path
-       style="fill:url(#linearGradient6962);fill-opacity:0.40;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" />
-  </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,31 7,31 7,31 L 8,31 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;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0"
-       d="M 0.5,30.5 L 5.5,30.5"
-       id="path6989" />
-  </g>
-</svg>
diff --git a/themes/largeprint/top-right-inactive.xpm b/themes/largeprint/top-right-inactive.xpm
deleted file mode 100644
index 739177dff..000000000
--- a/themes/largeprint/top-right-inactive.xpm
+++ /dev/null
@@ -1,37 +0,0 @@
-/* XPM */
-static char * top_right_inactive_xpm[] = {
-"8 31 3 1",
-" 	c None",
-"+	c #D0D0FF s inactive_hilight_1",
-".	c #C0C0FF s inactive_color_1",
-"......  ",
-"++++++. ",
-"......+.",
-"......+.",
-"......+.",
-"......+.",
-"......+.",
-"......+.",
-"......+.",
-"......+.",
-"......+.",
-"......+.",
-"......+.",
-"......+.",
-"......+.",
-"......+.",
-"......+.",
-"......+.",
-"......+.",
-"......+.",
-"......+.",
-"......+.",
-"......+.",
-"......+.",
-"......+.",
-"......+.",
-"......+.",
-"......+.",
-"......+.",
-"......+.",
-"......+."};