diff --git a/button-themes/svg/XPish/desk-active.svg b/button-themes/svg/XPish/desk-active.svg
new file mode 100644
index 0000000..45b0ef8
--- /dev/null
+++ b/button-themes/svg/XPish/desk-active.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" height="100" width="100">
+
+  <rect style="fill:none;stroke:#FFFFFF;stroke-width:8" width="94" height="94" x="3" y="3" rx="8" ry="8"/>
+  <rect style="fill:#FFFFFF;stroke:none" width="15" height="15" x="25" y="25"/>
+  <rect style="fill:#FFFFFF;stroke:none" width="15" height="15" x="25" y="60"/>
+  <rect style="fill:#FFFFFF;stroke:none" width="15" height="15" x="60" y="25"/>
+  <rect style="fill:#FFFFFF;stroke:none" width="15" height="15" x="60" y="60"/>
+</svg>
diff --git a/button-themes/svg/XPish/desk-inactive.svg b/button-themes/svg/XPish/desk-inactive.svg
new file mode 100644
index 0000000..8caafa7
--- /dev/null
+++ b/button-themes/svg/XPish/desk-inactive.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" height="100" width="100">
+
+  <rect style="fill:none;stroke:#AAAAAA;stroke-width:8" width="94" height="94" x="3" y="3" rx="8" ry="8"/>
+  <rect style="fill:#AAAAAA;stroke:none" width="15" height="15" x="25" y="25"/>
+  <rect style="fill:#AAAAAA;stroke:none" width="15" height="15" x="25" y="60"/>
+  <rect style="fill:#AAAAAA;stroke:none" width="15" height="15" x="60" y="25"/>
+  <rect style="fill:#AAAAAA;stroke:none" width="15" height="15" x="60" y="60"/>
+</svg>
diff --git a/button-themes/svg/XPish/desk_hover-active.svg b/button-themes/svg/XPish/desk_hover-active.svg
new file mode 100644
index 0000000..5e24f72
--- /dev/null
+++ b/button-themes/svg/XPish/desk_hover-active.svg
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" height="100" width="100">
+  <defs>
+    <linearGradient id="grad3" x1="100%" y1="0%" x2="0%" y2="0%">
+      <stop offset="0%" style="stop-color:#FF722B;stop-opacity:0.7" />
+      <stop offset="100%" style="stop-color:#FF722B;stop-opacity:1.0" />
+    </linearGradient>
+  </defs>
+  <rect style="fill:url(#grad3);stroke:#FFFFFF;stroke-width:8" width="94" height="94" x="3" y="3" rx="8" ry="8"/>
+  <rect style="fill:#FFFFFF;stroke:none" width="15" height="15" x="25" y="25"/>
+  <rect style="fill:#FFFFFF;stroke:none" width="15" height="15" x="25" y="60"/>
+  <rect style="fill:#FFFFFF;stroke:none" width="15" height="15" x="60" y="25"/>
+  <rect style="fill:#FFFFFF;stroke:none" width="15" height="15" x="60" y="60"/>
+</svg>
diff --git a/button-themes/svg/XPish/desk_hover-inactive.svg b/button-themes/svg/XPish/desk_hover-inactive.svg
new file mode 100644
index 0000000..e9f05c1
--- /dev/null
+++ b/button-themes/svg/XPish/desk_hover-inactive.svg
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" height="100" width="100">
+  <defs>
+    <linearGradient id="grad3" x1="100%" y1="0%" x2="0%" y2="0%">
+      <stop offset="0%" style="stop-color:#FF722B;stop-opacity:0.7" />
+      <stop offset="100%" style="stop-color:#FF722B;stop-opacity:1.0" />
+    </linearGradient>
+  </defs>
+  <rect style="fill:url(#grad3);stroke:#AAAAAA;stroke-width:8" width="94" height="94" x="3" y="3" rx="8" ry="8"/>
+  <rect style="fill:#AAAAAA;stroke:none" width="15" height="15" x="25" y="25"/>
+  <rect style="fill:#AAAAAA;stroke:none" width="15" height="15" x="25" y="60"/>
+  <rect style="fill:#AAAAAA;stroke:none" width="15" height="15" x="60" y="25"/>
+  <rect style="fill:#AAAAAA;stroke:none" width="15" height="15" x="60" y="60"/>
+</svg>
diff --git a/button-themes/svg/XPish/desk_toggled-active.svg b/button-themes/svg/XPish/desk_toggled-active.svg
new file mode 100644
index 0000000..8ad27f7
--- /dev/null
+++ b/button-themes/svg/XPish/desk_toggled-active.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" height="100" width="100">
+
+  <rect style="fill:none;stroke:#FFFFFF;stroke-width:8" width="94" height="94" x="3" y="3" rx="8" ry="8"/>
+  <path style="fill:#FFFFFF;stroke-width:0.1" d="m 35,7.5 -25,25 5,0 20,20 0,5 10,-10 40,40 2.5,0 0,-2.5 -40,-40 10,-10 -5,0 -20,-20 0,-5 z"/>
+</svg>
diff --git a/button-themes/svg/XPish/desk_toggled-inactive.svg b/button-themes/svg/XPish/desk_toggled-inactive.svg
new file mode 100644
index 0000000..0ad687e
--- /dev/null
+++ b/button-themes/svg/XPish/desk_toggled-inactive.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" height="100" width="100">
+
+  <rect style="fill:none;stroke:#AAAAAA;stroke-width:8" width="94" height="94" x="3" y="3" rx="8" ry="8"/>
+  <path style="fill:#AAAAAA;stroke-width:0.1" d="m 35,7.5 -25,25 5,0 20,20 0,5 10,-10 40,40 2.5,0 0,-2.5 -40,-40 10,-10 -5,0 -20,-20 0,-5 z"/>
+</svg>
diff --git a/button-themes/svg/XPish/desk_toggled_hover-active.svg b/button-themes/svg/XPish/desk_toggled_hover-active.svg
new file mode 100644
index 0000000..4833ada
--- /dev/null
+++ b/button-themes/svg/XPish/desk_toggled_hover-active.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" height="100" width="100">
+
+  <defs>
+    <linearGradient id="grad3" x1="100%" y1="0%" x2="0%" y2="0%">
+      <stop offset="0%" style="stop-color:#FF722B;stop-opacity:0.7" />
+      <stop offset="100%" style="stop-color:#FF722B;stop-opacity:1.0" />
+    </linearGradient>
+  </defs>
+  <rect style="fill:url(#grad3);stroke:#AAAAAA;stroke-width:8" width="94" height="94" x="3" y="3" rx="8" ry="8"/>
+  <path style="fill:#FFFFFF;stroke-width:0.1" d="m 35,7.5 -25,25 5,0 20,20 0,5 10,-10 40,40 2.5,0 0,-2.5 -40,-40 10,-10 -5,0 -20,-20 0,-5 z"/>
+</svg>
diff --git a/button-themes/svg/XPish/desk_toggled_hover-inactive.svg b/button-themes/svg/XPish/desk_toggled_hover-inactive.svg
new file mode 100644
index 0000000..77df629
--- /dev/null
+++ b/button-themes/svg/XPish/desk_toggled_hover-inactive.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" height="100" width="100">
+
+  <defs>
+    <linearGradient id="grad3" x1="100%" y1="0%" x2="0%" y2="0%">
+      <stop offset="0%" style="stop-color:#FF722B;stop-opacity:0.7" />
+      <stop offset="100%" style="stop-color:#FF722B;stop-opacity:1.0" />
+    </linearGradient>
+  </defs>
+  <rect style="fill:url(#grad3);stroke:#AAAAAA;stroke-width:8" width="94" height="94" x="3" y="3" rx="8" ry="8"/>
+  <path style="fill:#AAAAAA;stroke-width:0.1" d="m 35,7.5 -25,25 5,0 20,20 0,5 10,-10 40,40 2.5,0 0,-2.5 -40,-40 10,-10 -5,0 -20,-20 0,-5 z"/>
+</svg>
diff --git a/button-themes/svg/XPish/shade-active.svg b/button-themes/svg/XPish/shade-active.svg
new file mode 100644
index 0000000..0f30492
--- /dev/null
+++ b/button-themes/svg/XPish/shade-active.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" height="100" width="100">
+
+  <rect style="fill:none;stroke:#FFFFFF;stroke-width:8" width="94" height="94" x="3" y="3" rx="8" ry="8"/>
+  <path style="stroke:#FFFFFF;stroke-width:8;fill:none"  d="m 25 66 25 -25 25 25" />
+</svg>
diff --git a/button-themes/svg/XPish/shade-inactive.svg b/button-themes/svg/XPish/shade-inactive.svg
new file mode 100644
index 0000000..5f095fd
--- /dev/null
+++ b/button-themes/svg/XPish/shade-inactive.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" height="100" width="100">
+
+  <rect style="none;stroke:#AAAAAA;stroke-width:8" width="94" height="94" x="3" y="3" rx="8" ry="8"/>
+  <path style="stroke:#AAAAAA;stroke-width:8;fill:none"  d="m 25 66 25 -25 25 25" />
+</svg>
diff --git a/button-themes/svg/XPish/shade_hover-active.svg b/button-themes/svg/XPish/shade_hover-active.svg
new file mode 100644
index 0000000..646242b
--- /dev/null
+++ b/button-themes/svg/XPish/shade_hover-active.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" height="100" width="100">
+
+  <defs>
+    <linearGradient id="grad3" x1="100%" y1="0%" x2="0%" y2="0%">
+      <stop offset="0%" style="stop-color:#FF722B;stop-opacity:0.7" />
+      <stop offset="100%" style="stop-color:#FF722B;stop-opacity:1.0" />
+    </linearGradient>
+  </defs>
+  <rect style="fill:url(#grad3);stroke:#FFFFFF;stroke-width:8" width="94" height="94" x="3" y="3" rx="8" ry="8"/>
+  <path style="stroke:#FFFFFF;stroke-width:8;fill:none"  d="m 25 66 25 -25 25 25" />
+</svg>
diff --git a/button-themes/svg/XPish/shade_hover-inactive.svg b/button-themes/svg/XPish/shade_hover-inactive.svg
new file mode 100644
index 0000000..c0802b3
--- /dev/null
+++ b/button-themes/svg/XPish/shade_hover-inactive.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" height="100" width="100">
+
+  <defs>
+    <linearGradient id="grad3" x1="100%" y1="0%" x2="0%" y2="0%">
+      <stop offset="0%" style="stop-color:#FF722B;stop-opacity:0.7" />
+      <stop offset="100%" style="stop-color:#FF722B;stop-opacity:1.0" />
+    </linearGradient>
+  </defs>
+  <rect style="fill:url(#grad3);stroke:#AAAAAA;stroke-width:8" width="94" height="94" x="3" y="3" rx="8" ry="8"/>
+  <path style="stroke:#AAAAAA;stroke-width:8;fill:none"  d="m 25 66 25 -25 25 25" />
+</svg>
diff --git a/button-themes/svg/XPish/shade_toggled-active.svg b/button-themes/svg/XPish/shade_toggled-active.svg
new file mode 100644
index 0000000..9b99d79
--- /dev/null
+++ b/button-themes/svg/XPish/shade_toggled-active.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" height="100" width="100">
+
+  <rect style="fill:none;stroke:#FFFFFF;stroke-width:8" width="94" height="94" x="3" y="3" rx="8" ry="8"/>
+  <path style="stroke:#FFFFFF;stroke-width:8;fill:none;" d="m 25 33 25 25 25 -25" />
+</svg>
diff --git a/button-themes/svg/XPish/shade_toggled-inactive.svg b/button-themes/svg/XPish/shade_toggled-inactive.svg
new file mode 100644
index 0000000..e3cbfc0
--- /dev/null
+++ b/button-themes/svg/XPish/shade_toggled-inactive.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" height="100" width="100">
+
+  <rect style="fill:none;stroke:#CCCCCC;stroke-width:8" width="94" height="94" x="3" y="3" rx="8" ry="8"/>
+  <path style="stroke:#CCCCCC;stroke-width:8;fill:none;" d="m 25 33 25 25 25 -25" />
+</svg>
diff --git a/button-themes/svg/XPish/shade_toggled_hover-active.svg b/button-themes/svg/XPish/shade_toggled_hover-active.svg
new file mode 100644
index 0000000..a30f12e
--- /dev/null
+++ b/button-themes/svg/XPish/shade_toggled_hover-active.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" height="100" width="100">
+
+  <defs>
+    <linearGradient id="grad3" x1="100%" y1="0%" x2="0%" y2="0%">
+      <stop offset="0%" style="stop-color:#FF722B;stop-opacity:0.7" />
+      <stop offset="100%" style="stop-color:#FF722B;stop-opacity:1.0" />
+    </linearGradient>
+  </defs>
+  <rect style="fill:url(#grad3);stroke:#FFFFFF;stroke-width:8" width="94" height="94" x="3" y="3" rx="8" ry="8"/>
+  <path style="stroke:#FFFFFF;stroke-width:8;fill:none;" d="m 25 33 25 25 25 -25" />
+</svg>
diff --git a/button-themes/svg/XPish/shade_toggled_hover-inactive.svg b/button-themes/svg/XPish/shade_toggled_hover-inactive.svg
new file mode 100644
index 0000000..a30f12e
--- /dev/null
+++ b/button-themes/svg/XPish/shade_toggled_hover-inactive.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" height="100" width="100">
+
+  <defs>
+    <linearGradient id="grad3" x1="100%" y1="0%" x2="0%" y2="0%">
+      <stop offset="0%" style="stop-color:#FF722B;stop-opacity:0.7" />
+      <stop offset="100%" style="stop-color:#FF722B;stop-opacity:1.0" />
+    </linearGradient>
+  </defs>
+  <rect style="fill:url(#grad3);stroke:#FFFFFF;stroke-width:8" width="94" height="94" x="3" y="3" rx="8" ry="8"/>
+  <path style="stroke:#FFFFFF;stroke-width:8;fill:none;" d="m 25 33 25 25 25 -25" />
+</svg>