Migrated themes to new version

58 files changed, 288 insertions, 678 deletions

diff --git a/themes/2b.svg b/themes/2b.svg
new file mode 100644
index 0000000..dc18813
--- /dev/null
+++ b/themes/2b.svg
@@ -0,0 +1,12 @@
+
+<svg width="96px" height="64px" xmlns="http://www.w3.org/2000/svg" baseProfile="full" version="1.1">
+    <rect width='96' height='64' id='background' fill='#d4d3c0'></rect>
+    <circle cx='24' cy='24' r='8' id='f_high' fill='#534e41'></circle>
+    <circle cx='40' cy='24' r='8' id='f_med' fill='#534e41'></circle>
+    <circle cx='56' cy='24' r='8' id='f_low' fill='#ede6d4'></circle>
+    <circle cx='72' cy='24' r='8' id='f_inv' fill='#cc295c'></circle>
+    <circle cx='24' cy='40' r='8' id='b_high' fill='#ede6d4'></circle>
+    <circle cx='40' cy='40' r='8' id='b_med' fill='#534e41'></circle>
+    <circle cx='56' cy='40' r='8' id='b_low' fill='#dfddca'></circle>
+    <circle cx='72' cy='40' r='8' id='b_inv' fill='#cc295c'></circle>
+  </svg>
\ No newline at end of file
diff --git a/themes/2b.thm b/themes/2b.thm
deleted file mode 100755
index 4dfcd95..0000000
--- a/themes/2b.thm
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "meta": {
-    "author": "aeriform",
-    "version": 2,
-    "revision": 1
-  },
-  "data": {
-    "background": "#d4d3c0",
-    "f_high": "#534e41",
-    "f_med": "#534e41",
-    "f_low": "#ede6d4",
-    "f_inv": "#cc295c",
-    "b_high": "#ede6d4",
-    "b_med": "#534e41",
-    "b_low": "#dfddca",
-    "b_inv": "#cc295c"
-  }
-}
\ No newline at end of file
diff --git a/themes/apollo.svg b/themes/apollo.svg
index bb26f33..3348f82 100644
--- a/themes/apollo.svg
+++ b/themes/apollo.svg
@@ -1,34 +1,13 @@
 <svg width="96px" height="64px" xmlns="http://www.w3.org/2000/svg" baseProfile="full" version="1.1">
-    <rect width='96' height='64'  fill='#29272b'></rect>
-    <!-- Foreground -->
-    <circle cx='24' cy='24' r='8' fill='#ffffff'></circle>
-    <circle cx='40' cy='24' r='8' fill='#e47464'></circle>
-    <circle cx='56' cy='24' r='8' fill='#66606b'></circle>
-    <circle cx='72' cy='24' r='8' fill='#000000'></circle>
-    <!-- Background -->
-    <circle cx='24' cy='40' r='8' fill='#ffffff'></circle>
-    <circle cx='40' cy='40' r='8' fill='#5f5353'></circle>
-    <circle cx='56' cy='40' r='8' fill='#47424a'></circle>
-    <circle cx='72' cy='40' r='8' fill='#e47464'></circle>
-</svg>
-
-<!-- THEME
-{
-  "meta": {
-    "author": "unknown",
-    "version": 2,
-    "revision": 1
-  },
-  "data": {
-    "background": "#29272b",
-    "f_high": "#ffffff",
-    "f_med": "#e47464",
-    "f_low": "#66606b",
-    "f_inv": "#000000",
-    "b_high": "#ffffff",
-    "b_med": "#5f5353",
-    "b_low": "#47424a",
-    "b_inv": "#e47464"
-  }
-}
--->
\ No newline at end of file
+  <rect width='96' height='64'  id='background' fill='#29272b'></rect>
+  <!-- Foreground -->
+  <circle cx='24' cy='24' r='8' id='f_high' fill='#ffffff'></circle>
+  <circle cx='40' cy='24' r='8' id='f_med' fill='#e47464'></circle>
+  <circle cx='56' cy='24' r='8' id='f_low' fill='#66606b'></circle>
+  <circle cx='72' cy='24' r='8' id='f_inv' fill='#000000'></circle>
+  <!-- Background -->
+  <circle cx='24' cy='40' r='8' id='b_high' fill='#ffffff'></circle>
+  <circle cx='40' cy='40' r='8' id='b_med' fill='#5f5353'></circle>
+  <circle cx='56' cy='40' r='8' id='b_low' fill='#47424a'></circle>
+  <circle cx='72' cy='40' r='8' id='b_inv' fill='#e47464'></circle>
+</svg>
\ No newline at end of file
diff --git a/themes/apollo.thm b/themes/apollo.thm
deleted file mode 100644
index 0443dd4..0000000
--- a/themes/apollo.thm
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "meta": {
-    "author": "unknown",
-    "version": 2,
-    "revision": 1
-  },
-  "data": {
-    "background": "#d6ded9",
-    "f_high": "black",
-    "f_med": "#e47464",
-    "f_low": "#cccccc",
-    "f_inv": "#000000",
-    "b_high": "#ffffff",
-    "b_med": "#5f5353",
-    "b_low": "#afb7b2",
-    "b_inv": "#e47464"
-  }
-}
\ No newline at end of file
diff --git a/themes/apollo11.thm b/themes/apollo11.thm
deleted file mode 100644
index eb5491c..0000000
--- a/themes/apollo11.thm
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "meta": {
-    "author": "unknown",
-    "version": 2,
-    "revision": 1
-  },
-  "data": {
-    "background": "#29272b",
-    "f_high": "white",
-    "f_med": "#e47464",
-    "f_low": "#66606b",
-    "f_inv": "#000000",
-    "b_high": "#ffffff",
-    "b_med": "#5f5353",
-    "b_low": "#47424a",
-    "b_inv": "#e47464"
-  }
-}
\ No newline at end of file
diff --git a/themes/ash.thm b/themes/ash.thm
deleted file mode 100644
index 275c773..0000000
--- a/themes/ash.thm
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "meta": {
-    "author": "unknown",
-    "version": 2,
-    "revision": 1
-  },
-  "data": {
-    "background": "#111111",
-    "f_high": "#c11e1e",
-    "f_med": "#c7d4de",
-    "f_low": "#444444",
-    "f_inv": "#c7d4de",
-    "b_high": "#ffffff",
-    "b_med": "#c11e1e",
-    "b_low": "#1c1f21",
-    "b_inv": "#c11e1e"
-  }
-}
\ No newline at end of file
diff --git a/themes/battlestation.svg b/themes/battlestation.svg
new file mode 100644
index 0000000..572d1e9
--- /dev/null
+++ b/themes/battlestation.svg
@@ -0,0 +1,13 @@
+<svg width="96px" height="64px" xmlns="http://www.w3.org/2000/svg" baseProfile="full" version="1.1">
+  <rect width='96' height='64' id='background' fill='#222'></rect>
+  <!-- Foreground -->
+  <circle cx='24' cy='24' r='8' id='f_high' fill='#fff'></circle>
+  <circle cx='40' cy='24' r='8' id='f_med' fill='#777'></circle>
+  <circle cx='56' cy='24' r='8' id='f_low' fill='#444'></circle>
+  <circle cx='72' cy='24' r='8' id='f_inv' fill='#000'></circle>
+  <!-- Background -->
+  <circle cx='24' cy='40' r='8' id='b_high' fill='#000'></circle>
+  <circle cx='40' cy='40' r='8' id='b_med' fill='#affec7'></circle>
+  <circle cx='56' cy='40' r='8' id='b_low' fill='#000'></circle>
+  <circle cx='72' cy='40' r='8' id='b_inv' fill='#affec7'></circle>
+</svg>
\ No newline at end of file
diff --git a/themes/battlestation.thm b/themes/battlestation.thm
deleted file mode 100644
index abb2906..0000000
--- a/themes/battlestation.thm
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "meta": {
-    "author": "unknown",
-    "version": 2,
-    "revision": 1
-  },
-  "data": {
-    "background": "#222",
-    "f_high": "#fff",
-    "f_med": "#777",
-    "f_low": "#444",
-    "f_inv": "#000",
-    "b_high": "#000",
-    "b_med": "#affec7",
-    "b_low": "#000",
-    "b_inv": "#affec7"
-  }
-}
\ No newline at end of file
diff --git a/themes/berry.svg b/themes/berry.svg
new file mode 100644
index 0000000..4773a0b
--- /dev/null
+++ b/themes/berry.svg
@@ -0,0 +1,12 @@
+
+<svg width="96px" height="64px" xmlns="http://www.w3.org/2000/svg" baseProfile="full" version="1.1">
+    <rect width='96' height='64' id='background' fill='#9EB7FF'></rect>
+    <circle cx='24' cy='24' r='8' id='f_high' fill='#FFFFFF'></circle>
+    <circle cx='40' cy='24' r='8' id='f_med' fill='#1C0A16'></circle>
+    <circle cx='56' cy='24' r='8' id='f_low' fill='#1C0A16'></circle>
+    <circle cx='72' cy='24' r='8' id='f_inv' fill='#FFFFFF'></circle>
+    <circle cx='24' cy='40' r='8' id='b_high' fill='#6ADEDC'></circle>
+    <circle cx='40' cy='40' r='8' id='b_med' fill='#6ADEDC'></circle>
+    <circle cx='56' cy='40' r='8' id='b_low' fill='#1C0A16'></circle>
+    <circle cx='72' cy='40' r='8' id='b_inv' fill='#6ADEDC'></circle>
+  </svg>
\ No newline at end of file
diff --git a/themes/berry.thm b/themes/berry.thm
deleted file mode 100644
index cdbffb7..0000000
--- a/themes/berry.thm
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "meta": {
-    "author": "unknown",
-    "version": 2,
-    "revision": 1
-  },
-  "data": {
-    "background": "#9EB7FF",
-    "f_high": "#FFFFFF",
-    "f_med": "#1C0A16",
-    "f_low": "#1C0A16",
-    "f_inv": "#FFFFFF",
-    "b_high": "#6ADEDC",
-    "b_med": "#6ADEDC",
-    "b_low": "#1C0A16",
-    "b_inv": "#6ADEDC"
-  }
-}
\ No newline at end of file
diff --git a/themes/blanc.thm b/themes/blanc.thm
deleted file mode 100644
index 0e47310..0000000
--- a/themes/blanc.thm
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "meta": {
-    "author": "unknown",
-    "version": 2,
-    "revision": 1
-  },
-  "data": {
-    "background": "#eee",
-    "f_high": "#111",
-    "f_med": "#777",
-    "f_low": "#bbb",
-    "f_inv": "#ccc",
-    "b_high": "#000",
-    "b_med": "#999",
-    "b_low": "#ddd",
-    "b_inv": "#555"
-  }
-}
\ No newline at end of file
diff --git a/themes/cina.thm b/themes/cina.thm
deleted file mode 100644
index c32c0f1..0000000
--- a/themes/cina.thm
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "meta": {
-    "author": "unknown",
-    "version": 2,
-    "revision": 1
-  },
-  "data": {
-    "background": "#000",
-    "f_high": "white",
-    "f_med": "#6ff",
-    "f_low": "#555",
-    "f_inv": "#fff",
-    "b_high": "#89023E",
-    "b_med": "#89023E",
-    "b_low": "#222",
-    "b_inv": "#F00"
-  }
-}
\ No newline at end of file
diff --git a/themes/coal.svg b/themes/coal.svg
new file mode 100644
index 0000000..e024a2f
--- /dev/null
+++ b/themes/coal.svg
@@ -0,0 +1,11 @@
+<svg width="96px" height="64px" xmlns="http://www.w3.org/2000/svg" baseProfile="full" version="1.1">
+  <rect width='96' height='64' id='background' fill='#EDEAEA'></rect>
+  <circle cx='24' cy='24' r='8' id='f_high' fill='#A3A3A4'></circle>
+  <circle cx='40' cy='24' r='8' id='f_med' fill='#393B3F'></circle>
+  <circle cx='56' cy='24' r='8' id='f_low' fill='#808790'></circle>
+  <circle cx='72' cy='24' r='8' id='f_inv' fill='#000'></circle>
+  <circle cx='24' cy='40' r='8' id='b_high' fill='#333333'></circle>
+  <circle cx='40' cy='40' r='8' id='b_med' fill='#777777'></circle>
+  <circle cx='56' cy='40' r='8' id='b_low' fill='#DDDDDD'></circle>
+  <circle cx='72' cy='40' r='8' id='b_inv' fill='#fff'></circle>
+</svg>
\ No newline at end of file
diff --git a/themes/coal.thm b/themes/coal.thm
deleted file mode 100644
index cbbe530..0000000
--- a/themes/coal.thm
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "meta": {
-    "author": "unknown",
-    "version": 2,
-    "revision": 1
-  },
-  "data": {
-    "background": "#EDEAEA",
-    "f_high": "#393B3F",
-    "f_med": "#A3A3A4",
-    "f_low": "#808790",
-    "f_inv": "#000",
-    "b_high": "#333333",
-    "b_med": "#777777",
-    "b_low": "#DDDDDD",
-    "b_inv": "#fff"
-  }
-}
\ No newline at end of file
diff --git a/themes/commodore.svg b/themes/commodore.svg
new file mode 100644
index 0000000..1fcc292
--- /dev/null
+++ b/themes/commodore.svg
@@ -0,0 +1,12 @@
+
+  <svg width="96px" height="64px" xmlns="http://www.w3.org/2000/svg" baseProfile="full" version="1.1">
+    <rect width='96' height='64' id='background' fill='#a5a7fc'></rect>
+    <circle cx='24' cy='24' r='8' id='f_high' fill='#FFF'></circle>
+    <circle cx='40' cy='24' r='8' id='f_med' fill='#FFF'></circle>
+    <circle cx='56' cy='24' r='8' id='f_low' fill='#444ae3'></circle>
+    <circle cx='72' cy='24' r='8' id='f_inv' fill='#444ae3'></circle>
+    <circle cx='24' cy='40' r='8' id='b_high' fill='#FFF'></circle>
+    <circle cx='40' cy='40' r='8' id='b_med' fill='#444ae3'></circle>
+    <circle cx='56' cy='40' r='8' id='b_low' fill='#7479ee'></circle>
+    <circle cx='72' cy='40' r='8' id='b_inv' fill='#fff'></circle>
+  </svg>
\ No newline at end of file
diff --git a/themes/commodore.thm b/themes/commodore.thm
deleted file mode 100644
index 3f76660..0000000
--- a/themes/commodore.thm
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "meta": {
-    "author": "unknown",
-    "version": 2,
-    "revision": 1
-  },
-  "data": {
-    "background": "#a5a7fc",
-    "f_high": "#FFF",
-    "f_med": "#FFF",
-    "f_low": "#444ae3",
-    "f_inv": "#444ae3",
-    "b_high": "#FFF",
-    "b_med": "#444ae3",
-    "b_low": "#7479ee",
-    "b_inv": "#fff"
-  }
-}
\ No newline at end of file
diff --git a/themes/cpc.svg b/themes/cpc.svg
new file mode 100644
index 0000000..e6618f6
--- /dev/null
+++ b/themes/cpc.svg
@@ -0,0 +1,12 @@
+
+  <svg width="96px" height="64px" xmlns="http://www.w3.org/2000/svg" baseProfile="full" version="1.1">
+    <rect width='96' height='64' id='background' fill='#000062'></rect>
+    <circle cx='24' cy='24' r='8' id='f_high' fill='#ffff1c'></circle>
+    <circle cx='40' cy='24' r='8' id='f_med' fill='#ffff1c'></circle>
+    <circle cx='56' cy='24' r='8' id='f_low' fill='#ffff1c'></circle>
+    <circle cx='72' cy='24' r='8' id='f_inv' fill='#000062'></circle>
+    <circle cx='24' cy='40' r='8' id='b_high' fill='#ffff1c'></circle>
+    <circle cx='40' cy='40' r='8' id='b_med' fill='#000062'></circle>
+    <circle cx='56' cy='40' r='8' id='b_low' fill='#000062'></circle>
+    <circle cx='72' cy='40' r='8' id='b_inv' fill='#ff0000'></circle>
+  </svg>
\ No newline at end of file
diff --git a/themes/cpc.thm b/themes/cpc.thm
deleted file mode 100644
index fb6f43f..0000000
--- a/themes/cpc.thm
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "meta": {
-    "author": "aeriform",
-    "version": 2,
-    "revision": 1
-  },
-  "data": {
-    "background": "#000062",
-    "f_high": "#ffff1c",
-    "f_med": "#ffff1c",
-    "f_low": "#ffff1c",
-    "f_inv": "#000062",
-    "b_high": "#ffff1c",
-    "b_med": "#000062",
-    "b_low": "#000062",
-    "b_inv": "#ff0000"
-  }
-}
\ No newline at end of file
diff --git a/themes/deuveir.svg b/themes/deuveir.svg
new file mode 100644
index 0000000..6781860
--- /dev/null
+++ b/themes/deuveir.svg
@@ -0,0 +1,12 @@
+
+  <svg width="96px" height="64px" xmlns="http://www.w3.org/2000/svg" baseProfile="full" version="1.1">
+    <rect width='96' height='64' id='background' fill='#141414'></rect>
+    <circle cx='24' cy='24' r='8' id='f_high' fill='#f4f4f4'></circle>
+    <circle cx='40' cy='24' r='8' id='f_med' fill='#efefef'></circle>
+    <circle cx='56' cy='24' r='8' id='f_low' fill='#3d3d3d'></circle>
+    <circle cx='72' cy='24' r='8' id='f_inv' fill='#141414'></circle>
+    <circle cx='24' cy='40' r='8' id='b_high' fill='#efefef'></circle>
+    <circle cx='40' cy='40' r='8' id='b_med' fill='#aa0000'></circle>
+    <circle cx='56' cy='40' r='8' id='b_low' fill='#000000'></circle>
+    <circle cx='72' cy='40' r='8' id='b_inv' fill='#3d3d3d'></circle>
+  </svg>
\ No newline at end of file
diff --git a/themes/deuveir.thm b/themes/deuveir.thm
deleted file mode 100644
index 1ce34fa..0000000
--- a/themes/deuveir.thm
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "meta": {
-    "author": "deuveir",
-    "version": 2,
-    "revision": 1
-  },
-  "data": {
-    "background": "#141414",
-    "f_high": "#f4f4f4",
-    "f_med": "#efefef",
-    "f_low": "#3d3d3d",
-    "f_inv": "#141414",
-    "b_high": "#efefef",
-    "b_med": "#aa0000",
-    "b_low": "#000000",
-    "b_inv": "#3d3d3d"
-  }
-}
\ No newline at end of file
diff --git a/themes/donsol.svg b/themes/donsol.svg
new file mode 100644
index 0000000..55e3ab2
--- /dev/null
+++ b/themes/donsol.svg
@@ -0,0 +1,12 @@
+
+  <svg width="96px" height="64px" xmlns="http://www.w3.org/2000/svg" baseProfile="full" version="1.1">
+    <rect width='96' height='64' id='background' fill='#000'></rect>
+    <circle cx='24' cy='24' r='8' id='f_high' fill='white'></circle>
+    <circle cx='40' cy='24' r='8' id='f_med' fill='#FF0000'></circle>
+    <circle cx='56' cy='24' r='8' id='f_low' fill='#cccccc'></circle>
+    <circle cx='72' cy='24' r='8' id='f_inv' fill='#a93232'></circle>
+    <circle cx='24' cy='40' r='8' id='b_high' fill='#ffffff'></circle>
+    <circle cx='40' cy='40' r='8' id='b_med' fill='#000000'></circle>
+    <circle cx='56' cy='40' r='8' id='b_low' fill='#333333'></circle>
+    <circle cx='72' cy='40' r='8' id='b_inv' fill='#a93232'></circle>
+  </svg>
\ No newline at end of file
diff --git a/themes/donsol.thm b/themes/donsol.thm
deleted file mode 100644
index 1cdab5f..0000000
--- a/themes/donsol.thm
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "meta": {
-    "author": "unknown",
-    "version": 2,
-    "revision": 1
-  },
-  "data": {
-    "background": "#000",
-    "f_high": "white",
-    "f_med": "#FF0000",
-    "f_low": "#cccccc",
-    "f_inv": "#a93232",
-    "b_high": "#ffffff",
-    "b_med": "#000000",
-    "b_low": "#333333",
-    "b_inv": "#a93232"
-  }
-}
\ No newline at end of file
diff --git a/themes/frameio.svg b/themes/frameio.svg
new file mode 100644
index 0000000..82a4c0a
--- /dev/null
+++ b/themes/frameio.svg
@@ -0,0 +1,12 @@
+
+  <svg width="96px" height="64px" xmlns="http://www.w3.org/2000/svg" baseProfile="full" version="1.1">
+    <rect width='96' height='64' id='background' fill='#333848'></rect>
+    <circle cx='24' cy='24' r='8' id='f_high' fill='#edeef2'></circle>
+    <circle cx='40' cy='24' r='8' id='f_med' fill='#5b52fe'></circle>
+    <circle cx='56' cy='24' r='8' id='f_low' fill='#394153'></circle>
+    <circle cx='72' cy='24' r='8' id='f_inv' fill='#5b52fe'></circle>
+    <circle cx='24' cy='40' r='8' id='b_high' fill='#edeef2'></circle>
+    <circle cx='40' cy='40' r='8' id='b_med' fill='#394153'></circle>
+    <circle cx='56' cy='40' r='8' id='b_low' fill='#394153'></circle>
+    <circle cx='72' cy='40' r='8' id='b_inv' fill='#5b52fe'></circle>
+  </svg>
\ No newline at end of file
diff --git a/themes/frameio.thm b/themes/frameio.thm
deleted file mode 100755
index 21f8748..0000000
--- a/themes/frameio.thm
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "meta": {
-    "author": "aeriform",
-    "version": 2,
-    "revision": 1
-  },
-  "data": {
-    "background": "#333848",
-    "f_high": "#edeef2",
-    "f_med": "#5b52fe",
-    "f_low": "#394153",
-    "f_inv": "#5b52fe",
-    "b_high": "#edeef2",
-    "b_med": "#394153",
-    "b_low": "#394153",
-    "b_inv": "#5b52fe"
-  }
-}
\ No newline at end of file
diff --git a/themes/gameboy.svg b/themes/gameboy.svg
new file mode 100644
index 0000000..c13f025
--- /dev/null
+++ b/themes/gameboy.svg
@@ -0,0 +1,12 @@
+
+  <svg width="96px" height="64px" xmlns="http://www.w3.org/2000/svg" baseProfile="full" version="1.1">
+    <rect width='96' height='64' id='background' fill='#8b956d'></rect>
+    <circle cx='24' cy='24' r='8' id='f_high' fill='#c4cfa1'></circle>
+    <circle cx='40' cy='24' r='8' id='f_med' fill='#4d533c'></circle>
+    <circle cx='56' cy='24' r='8' id='f_low' fill='#4d533c'></circle>
+    <circle cx='72' cy='24' r='8' id='f_inv' fill='#1f1f1f'></circle>
+    <circle cx='24' cy='40' r='8' id='b_high' fill='#c4cfa1'></circle>
+    <circle cx='40' cy='40' r='8' id='b_med' fill='#c4cfa1'></circle>
+    <circle cx='56' cy='40' r='8' id='b_low' fill='#1f1f1f'></circle>
+    <circle cx='72' cy='40' r='8' id='b_inv' fill='#c4cfa1'></circle>
+  </svg>
\ No newline at end of file
diff --git a/themes/gameboy.thm b/themes/gameboy.thm
deleted file mode 100644
index ed462b6..0000000
--- a/themes/gameboy.thm
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "meta": {
-    "author": "unknown",
-    "version": 2,
-    "revision": 1
-  },
-  "data": {
-    "background": "#8b956d",
-    "f_high": "#c4cfa1",
-    "f_med": "#4d533c",
-    "f_low": "#4d533c",
-    "f_inv": "#1f1f1f",
-    "b_high": "#c4cfa1",
-    "b_med": "#c4cfa1",
-    "b_low": "#1f1f1f",
-    "b_inv": "#c4cfa1"
-  }
-}
\ No newline at end of file
diff --git a/themes/lotus.svg b/themes/lotus.svg
index b18f894..7ead2d5 100644
--- a/themes/lotus.svg
+++ b/themes/lotus.svg
@@ -1,34 +1,13 @@
 <svg width="96px" height="64px" xmlns="http://www.w3.org/2000/svg" baseProfile="full" version="1.1">
-    <rect width='96' height='64'  fill='#161616'></rect>
-    <!-- Foreground -->
-    <circle cx='24' cy='24' r='8' fill='#f0c098'></circle>
-    <circle cx='40' cy='24' r='8' fill='#333333'></circle>
-    <circle cx='56' cy='24' r='8' fill='#555555'></circle>
-    <circle cx='72' cy='24' r='8' fill='#222222'></circle>
-    <!-- Background -->
-    <circle cx='24' cy='40' r='8' fill='#ffffff'></circle>
-    <circle cx='40' cy='40' r='8' fill='#222222'></circle>
-    <circle cx='56' cy='40' r='8' fill='#333333'></circle>
-    <circle cx='72' cy='40' r='8' fill='#f0c098'></circle>
-</svg>
-
-<!-- THEME
-{
-  "meta": {
-    "author": "neauoire",
-    "version": 2,
-    "revision": 1
-  },
-  "data": {
-    "background": "#161616",
-    "f_high": "#f0c098",
-    "f_med": "#888888",
-    "f_low": "#555555",
-    "f_inv": "#222222",
-    "b_high": "#ffffff",
-    "b_med": "#222222",
-    "b_low": "#333333",
-    "b_inv": "#f0c098"
-  }
-}
--->
\ No newline at end of file
+  <rect width='96' height='64' id='background' fill='#161616'></rect>
+  <!-- Foreground -->
+  <circle cx='24' cy='24' r='8' id='f_high' fill='#f0c098'></circle>
+  <circle cx='40' cy='24' r='8' id='f_med' fill='#999999'></circle>
+  <circle cx='56' cy='24' r='8' id='f_low' fill='#444444'></circle>
+  <circle cx='72' cy='24' r='8' id='f_inv' fill='#222222'></circle>
+  <!-- Background -->
+  <circle cx='24' cy='40' r='8' id='b_high' fill='#ffffff'></circle>
+  <circle cx='40' cy='40' r='8' id='b_med' fill='#222222'></circle>
+  <circle cx='56' cy='40' r='8' id='b_low' fill='#333333'></circle>
+  <circle cx='72' cy='40' r='8' id='b_inv' fill='#f0c098'></circle>
+</svg>
\ No newline at end of file
diff --git a/themes/lotus.thm b/themes/lotus.thm
deleted file mode 100644
index eca2728..0000000
--- a/themes/lotus.thm
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "meta": {
-    "author": "neauoire",
-    "version": 2,
-    "revision": 1
-  },
-  "data": {
-    "background": "#161616",
-    "f_high": "#f0c098",
-    "f_med": "#333333",
-    "f_low": "#555555",
-    "f_inv": "#222222",
-    "b_high": "#ffffff",
-    "b_med": "#222222",
-    "b_low": "#333333",
-    "b_inv": "#f0c098"
-  }
-}
\ No newline at end of file
diff --git a/themes/mahou.thm b/themes/mahou.thm
deleted file mode 100644
index 3c11332..0000000
--- a/themes/mahou.thm
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "meta": {
-    "author": "unknown",
-    "version": 2,
-    "revision": 1
-  },
-  "data": {
-    "background": "#E0B1CB",
-    "f_high": "#231942",
-    "f_med": "#5E548E",
-    "f_low": "#BE95C4",
-    "f_inv": "#E0B1CB",
-    "b_high": "#FFFFFF",
-    "b_med": "#5E548E",
-    "b_low": "#BE95C4",
-    "b_inv": "#9F86C0"
-  }
-}
\ No newline at end of file
diff --git a/themes/marble.svg b/themes/marble.svg
new file mode 100644
index 0000000..9f8da87
--- /dev/null
+++ b/themes/marble.svg
@@ -0,0 +1,12 @@
+
+  <svg width="96px" height="64px" xmlns="http://www.w3.org/2000/svg" baseProfile="full" version="1.1">
+    <rect width='96' height='64' id='background' fill='#FBFBF2'></rect>
+    <circle cx='24' cy='24' r='8' id='f_high' fill='#847577'></circle>
+    <circle cx='40' cy='24' r='8' id='f_med' fill='#A6A2A2'></circle>
+    <circle cx='56' cy='24' r='8' id='f_low' fill='#A6A2A2'></circle>
+    <circle cx='72' cy='24' r='8' id='f_inv' fill='#FFFCF9'></circle>
+    <circle cx='24' cy='40' r='8' id='b_high' fill='#CFD2CD'></circle>
+    <circle cx='40' cy='40' r='8' id='b_med' fill='#676164'></circle>
+    <circle cx='56' cy='40' r='8' id='b_low' fill='#A6A2A2'></circle>
+    <circle cx='72' cy='40' r='8' id='b_inv' fill='#FFF'></circle>
+  </svg>
\ No newline at end of file
diff --git a/themes/marble.thm b/themes/marble.thm
deleted file mode 100644
index 199270d..0000000
--- a/themes/marble.thm
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "meta": {
-    "author": "unknown",
-    "version": 2,
-    "revision": 1
-  },
-  "data": {
-    "background": "#FBFBF2",
-    "f_high": "#847577",
-    "f_med": "#A6A2A2",
-    "f_low": "#A6A2A2",
-    "f_inv": "#FFFCF9",
-    "b_high": "#CFD2CD",
-    "b_med": "#676164",
-    "b_low": "#A6A2A2",
-    "b_inv": "#FFF"
-  }
-}
\ No newline at end of file
diff --git a/themes/merveilles.svg b/themes/merveilles.svg
new file mode 100644
index 0000000..027cc96
--- /dev/null
+++ b/themes/merveilles.svg
@@ -0,0 +1,12 @@
+
+  <svg width="96px" height="64px" xmlns="http://www.w3.org/2000/svg" baseProfile="full" version="1.1">
+    <rect width='96' height='64' id='background' fill='#161616'></rect>
+    <circle cx='24' cy='24' r='8' id='f_high' fill='#edeef2'></circle>
+    <circle cx='40' cy='24' r='8' id='f_med' fill='#444444'></circle>
+    <circle cx='56' cy='24' r='8' id='f_low' fill='#111110'></circle>
+    <circle cx='72' cy='24' r='8' id='f_inv' fill='#000000'></circle>
+    <circle cx='24' cy='40' r='8' id='b_high' fill='#111110'></circle>
+    <circle cx='40' cy='40' r='8' id='b_med' fill='#edeef2'></circle>
+    <circle cx='56' cy='40' r='8' id='b_low' fill='#111110'></circle>
+    <circle cx='72' cy='40' r='8' id='b_inv' fill='#3bffbe'></circle>
+  </svg>
\ No newline at end of file
diff --git a/themes/merveilles.thm b/themes/merveilles.thm
deleted file mode 100755
index 4a023b8..0000000
--- a/themes/merveilles.thm
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "meta": {
-    "author": "aeriform",
-    "version": 2,
-    "revision": 1
-  },
-  "data": {
-    "background": "#161616",
-    "f_high": "#edeef2",
-    "f_med": "#3bffbe",
-    "f_low": "#111110",
-    "f_inv": "#3bffbe",
-    "b_high": "#111110",
-    "b_med": "#edeef2",
-    "b_low": "#111110",
-    "b_inv": "#3bffbe"
-  }
-}
\ No newline at end of file
diff --git a/themes/noir.thm b/themes/noir.thm
deleted file mode 100644
index d8cf560..0000000
--- a/themes/noir.thm
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "meta": {
-    "author": "unknown",
-    "version": 2,
-    "revision": 1
-  },
-  "data": {
-    "background": "#000",
-    "f_high": "#fff",
-    "f_med": "#999",
-    "f_low": "#555",
-    "f_inv": "#000",
-    "b_high": "#000",
-    "b_med": "#555",
-    "b_low": "#222",
-    "b_inv": "#fff"
-  }
-}
\ No newline at end of file
diff --git a/themes/pale.thm b/themes/pale.thm
deleted file mode 100644
index 2162da9..0000000
--- a/themes/pale.thm
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "meta": {
-    "author": "unknown",
-    "version": 2,
-    "revision": 1
-  },
-  "data": {
-    "background": "#555",
-    "f_high": "#fff",
-    "f_med": "#999",
-    "f_low": "#bbb",
-    "f_inv": "#555",
-    "b_high": "#000",
-    "b_med": "#999",
-    "b_low": "#666",
-    "b_inv": "#ccc"
-  }
-}
\ No newline at end of file
diff --git a/themes/pico8.svg b/themes/pico8.svg
new file mode 100644
index 0000000..e9f4498
--- /dev/null
+++ b/themes/pico8.svg
@@ -0,0 +1,12 @@
+
+  <svg width="96px" height="64px" xmlns="http://www.w3.org/2000/svg" baseProfile="full" version="1.1">
+    <rect width='96' height='64'  id='background' fill='#5f564e'></rect>
+    <circle cx='24' cy='24' r='8' id='f_high' fill='#fff1e9'></circle>
+    <circle cx='40' cy='24' r='8' id='f_med' fill='#ff78a9'></circle>
+    <circle cx='56' cy='24' r='8' id='f_low' fill='#695f56'></circle>
+    <circle cx='72' cy='24' r='8' id='f_inv' fill='#00aefe'></circle>
+    <circle cx='24' cy='40' r='8' id='b_high' fill='#fff1e9'></circle>
+    <circle cx='40' cy='40' r='8' id='b_med' fill='#5f564e'></circle>
+    <circle cx='56' cy='40' r='8' id='b_low' fill='#695f56'></circle>
+    <circle cx='72' cy='40' r='8' id='b_inv' fill='#ff78a9'></circle>
+  </svg>
\ No newline at end of file
diff --git a/themes/pico8.thm b/themes/pico8.thm
deleted file mode 100755
index 82184ef..0000000
--- a/themes/pico8.thm
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "meta": {
-    "author": "aeriform",
-    "version": 2,
-    "revision": 1
-  },
-  "data": {
-    "background": "#5f564e",
-    "f_high": "#fff1e9",
-    "f_med": "#ff78a9",
-    "f_low": "#695f56",
-    "f_inv": "#00aefe",
-    "b_high": "#fff1e9",
-    "b_med": "#5f564e",
-    "b_low": "#695f56",
-    "b_inv": "#ff78a9"
-  }
-}
\ No newline at end of file
diff --git a/themes/ramma.svg b/themes/ramma.svg
new file mode 100644
index 0000000..dd593a3
--- /dev/null
+++ b/themes/ramma.svg
@@ -0,0 +1,12 @@
+
+  <svg width="96px" height="64px" xmlns="http://www.w3.org/2000/svg" baseProfile="full" version="1.1">
+    <rect width='96' height='64' id='background' fill='#252526'></rect>
+    <circle cx='24' cy='24' r='8' id='f_high' fill='#ededed'></circle>
+    <circle cx='40' cy='24' r='8' id='f_med' fill='#ededed'></circle>
+    <circle cx='56' cy='24' r='8' id='f_low' fill='#2d2d30'></circle>
+    <circle cx='72' cy='24' r='8' id='f_inv' fill='#ededed'></circle>
+    <circle cx='24' cy='40' r='8' id='b_high' fill='#ed2c3e'></circle>
+    <circle cx='40' cy='40' r='8' id='b_med' fill='#2d2d30'></circle>
+    <circle cx='56' cy='40' r='8' id='b_low' fill='#2d2d30'></circle>
+    <circle cx='72' cy='40' r='8' id='b_inv' fill='#ededed'></circle>
+  </svg>
\ No newline at end of file
diff --git a/themes/ramma.thm b/themes/ramma.thm
deleted file mode 100755
index e52facb..0000000
--- a/themes/ramma.thm
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "meta": {
-    "author": "aeriform",
-    "version": 2,
-    "revision": 1
-  },
-  "data": {
-    "background": "#252526",
-    "f_high": "#ededed",
-    "f_med": "#ededed",
-    "f_low": "#2d2d30",
-    "f_inv": "#ededed",
-    "b_high": "#ed2c3e",
-    "b_med": "#2d2d30",
-    "b_low": "#2d2d30",
-    "b_inv": "#ededed"
-  }
-}
\ No newline at end of file
diff --git a/themes/raspberry.thm b/themes/raspberry.thm
deleted file mode 100644
index 7b74fc7..0000000
--- a/themes/raspberry.thm
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "meta": {
-    "author": "unknown",
-    "version": 2,
-    "revision": 1
-  },
-  "data": {
-    "background": "#30343F",
-    "f_high": "white",
-    "f_med": "#EA638C",
-    "f_low": "#71788E",
-    "f_inv": "#89023E",
-    "b_high": "#89023E",
-    "b_med": "#89023E",
-    "b_low": "#23272F",
-    "b_inv": "#FFD9DA"
-  }
-}
\ No newline at end of file
diff --git a/themes/robo.thm b/themes/robo.thm
deleted file mode 100644
index 4d1bdda..0000000
--- a/themes/robo.thm
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "meta": {
-    "author": "unknown",
-    "version": 2,
-    "revision": 1
-  },
-  "data": {
-    "background": "#655f5f",
-    "f_high": "#ffffff",
-    "f_med": "#b5b5b5",
-    "f_low": "#191919",
-    "f_inv": "#ffffff",
-    "b_high": "#989898",
-    "b_med": "#ff8168",
-    "b_low": "#ff8168",
-    "b_inv": "#ff8168"
-  }
-}
\ No newline at end of file
diff --git a/themes/seaweed.svg b/themes/seaweed.svg
new file mode 100644
index 0000000..993cbec
--- /dev/null
+++ b/themes/seaweed.svg
@@ -0,0 +1,12 @@
+
+  <svg width="96px" height="64px" xmlns="http://www.w3.org/2000/svg" baseProfile="full" version="1.1">
+    <rect width='96' height='64' id='background' fill='#CDEDFD'></rect>
+    <circle cx='24' cy='24' r='8' id='f_high' fill='#0B132B'></circle>
+    <circle cx='40' cy='24' r='8' id='f_med' fill='#172759'></circle>
+    <circle cx='56' cy='24' r='8' id='f_low' fill='#5BC0BE'></circle>
+    <circle cx='72' cy='24' r='8' id='f_inv' fill='#3A506B'></circle>
+    <circle cx='24' cy='40' r='8' id='b_high' fill='#1C2541'></circle>
+    <circle cx='40' cy='40' r='8' id='b_med' fill='#1C2541'></circle>
+    <circle cx='56' cy='40' r='8' id='b_low' fill='#5BC0BE'></circle>
+    <circle cx='72' cy='40' r='8' id='b_inv' fill='#6FFFE9'></circle>
+  </svg>
\ No newline at end of file
diff --git a/themes/seaweed.thm b/themes/seaweed.thm
deleted file mode 100644
index 7303325..0000000
--- a/themes/seaweed.thm
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "meta": {
-    "author": "unknown",
-    "version": 2,
-    "revision": 1
-  },
-  "data": {
-    "background": "#CDEDFD",
-    "f_high": "#0B132B",
-    "f_med": "#172759",
-    "f_low": "#5BC0BE",
-    "f_inv": "#3A506B",
-    "b_high": "#1C2541",
-    "b_med": "#1C2541",
-    "b_low": "#5BC0BE",
-    "b_inv": "#6FFFE9"
-  }
-}
\ No newline at end of file
diff --git a/themes/snow.svg b/themes/snow.svg
new file mode 100644
index 0000000..46c3ba0
--- /dev/null
+++ b/themes/snow.svg
@@ -0,0 +1,12 @@
+
+  <svg width="96px" height="64px" xmlns="http://www.w3.org/2000/svg" baseProfile="full" version="1.1">
+    <rect width='96' height='64' id='background' fill='#eeefee'></rect>
+    <circle cx='24' cy='24' r='8' id='f_high' fill='#545454'></circle>
+    <circle cx='40' cy='24' r='8' id='f_med' fill='#545454'></circle>
+    <circle cx='56' cy='24' r='8' id='f_low' fill='#fbfbfb'></circle>
+    <circle cx='72' cy='24' r='8' id='f_inv' fill='#545454'></circle>
+    <circle cx='24' cy='40' r='8' id='b_high' fill='#fbfbfb'></circle>
+    <circle cx='40' cy='40' r='8' id='b_med' fill='#545454'></circle>
+    <circle cx='56' cy='40' r='8' id='b_low' fill='#f5f5f5'></circle>
+    <circle cx='72' cy='40' r='8' id='b_inv' fill='#ed2c3e'></circle>
+  </svg>
\ No newline at end of file
diff --git a/themes/snow.thm b/themes/snow.thm
deleted file mode 100644
index caaea22..0000000
--- a/themes/snow.thm
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "meta": {
-    "author": "aeriform",
-    "version": 2,
-    "revision": 1
-  },
-  "data": {
-    "background": "#eeefee",
-    "f_high": "#545454",
-    "f_med": "#545454",
-    "f_low": "#fbfbfb",
-    "f_inv": "#545454",
-    "b_high": "#fbfbfb",
-    "b_med": "#545454",
-    "b_low": "#f5f5f5",
-    "b_inv": "#ed2c3e"
-  }
-}
\ No newline at end of file
diff --git a/themes/soft.svg b/themes/soft.svg
new file mode 100644
index 0000000..5dac716
--- /dev/null
+++ b/themes/soft.svg
@@ -0,0 +1,12 @@
+
+  <svg width="96px" height="64px" xmlns="http://www.w3.org/2000/svg" baseProfile="full" version="1.1">
+    <rect width='96' height='64'  id='background' fill='#f9f5f5'></rect>
+    <circle cx='24' cy='24' r='8' id='f_high' fill='#968585'></circle>
+    <circle cx='40' cy='24' r='8' id='f_med' fill='#ce8ed7'></circle>
+    <circle cx='56' cy='24' r='8' id='f_low' fill='#ffffff'></circle>
+    <circle cx='72' cy='24' r='8' id='f_inv' fill='#ce8ed7'></circle>
+    <circle cx='24' cy='40' r='8' id='b_high' fill='#f9f5f5'></circle>
+    <circle cx='40' cy='40' r='8' id='b_med' fill='#968585'></circle>
+    <circle cx='56' cy='40' r='8' id='b_low' fill='#ffffff'></circle>
+    <circle cx='72' cy='40' r='8' id='b_inv' fill='#e1698d'></circle>
+  </svg>
\ No newline at end of file
diff --git a/themes/soft.thm b/themes/soft.thm
deleted file mode 100755
index b6ee97e..0000000
--- a/themes/soft.thm
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "meta": {
-    "author": "aeriform",
-    "version": 2,
-    "revision": 1
-  },
-  "data": {
-    "background": "#f9f5f5",
-    "f_high": "#968585",
-    "f_med": "#ce8ed7",
-    "f_low": "#ffffff",
-    "f_inv": "#ce8ed7",
-    "b_high": "#f9f5f5",
-    "b_med": "#968585",
-    "b_low": "#ffffff",
-    "b_inv": "#e1698d"
-  }
-}
\ No newline at end of file
diff --git a/themes/solitaire.thm b/themes/solitaire.thm
deleted file mode 100644
index e680388..0000000
--- a/themes/solitaire.thm
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "meta": {
-    "author": "unknown",
-    "version": 2,
-    "revision": 1
-  },
-  "data": {
-    "background": "#000000",
-    "f_high": "#bf4560",
-    "f_med": "#ffffff",
-    "f_low": "#4a4a4a",
-    "f_inv": "#ffffff",
-    "b_high": "#a1a1a1",
-    "b_med": "#1f1f1f",
-    "b_low": "#232323",
-    "b_inv": "#bf4560"
-  }
-}
\ No newline at end of file
diff --git a/themes/soyuz.svg b/themes/soyuz.svg
new file mode 100644
index 0000000..5d68778
--- /dev/null
+++ b/themes/soyuz.svg
@@ -0,0 +1,12 @@
+
+  <svg width="96px" height="64px" xmlns="http://www.w3.org/2000/svg" baseProfile="full" version="1.1">
+    <rect width='96' height='64' id='background' fill='#222'></rect>
+    <circle cx='24' cy='24' r='8' id='f_high' fill='#fc533e'></circle>
+    <circle cx='40' cy='24' r='8' id='f_med' fill='#999'></circle>
+    <circle cx='56' cy='24' r='8' id='f_low' fill='#555'></circle>
+    <circle cx='72' cy='24' r='8' id='f_inv' fill='#555'></circle>
+    <circle cx='24' cy='40' r='8' id='b_high' fill='#fc533e'></circle>
+    <circle cx='40' cy='40' r='8' id='b_med' fill='#999'></circle>
+    <circle cx='56' cy='40' r='8' id='b_low' fill='#333'></circle>
+    <circle cx='72' cy='40' r='8' id='b_inv' fill='#fff'></circle>
+  </svg>
\ No newline at end of file
diff --git a/themes/soyuz.thm b/themes/soyuz.thm
deleted file mode 100644
index 98724f9..0000000
--- a/themes/soyuz.thm
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "meta": {
-    "author": "unknown",
-    "version": 2,
-    "revision": 1
-  },
-  "data": {
-    "background": "#222",
-    "f_high": "#fc533e",
-    "f_med": "#999",
-    "f_low": "#555",
-    "f_inv": "#555",
-    "b_high": "#fc533e",
-    "b_med": "#999",
-    "b_low": "#333",
-    "b_inv": "#fff"
-  }
-}
\ No newline at end of file
diff --git a/themes/swiss.svg b/themes/swiss.svg
new file mode 100644
index 0000000..ca41cf0
--- /dev/null
+++ b/themes/swiss.svg
@@ -0,0 +1,12 @@
+
+  <svg width="96px" height="64px" xmlns="http://www.w3.org/2000/svg" baseProfile="full" version="1.1">
+    <rect width='96' height='64' id='background' fill='#f1f2f0'></rect>
+    <circle cx='24' cy='24' r='8' id='f_high' fill='black'></circle>
+    <circle cx='40' cy='24' r='8' id='f_med' fill='#867f86'></circle>
+    <circle cx='56' cy='24' r='8' id='f_low' fill='#a63e14'></circle>
+    <circle cx='72' cy='24' r='8' id='f_inv' fill='white'></circle>
+    <circle cx='24' cy='40' r='8' id='b_high' fill='#867f86'></circle>
+    <circle cx='40' cy='40' r='8' id='b_med' fill='#a63e14'></circle>
+    <circle cx='56' cy='40' r='8' id='b_low' fill='#dde0da'></circle>
+    <circle cx='72' cy='40' r='8' id='b_inv' fill='#a63e14'></circle>
+  </svg>
\ No newline at end of file
diff --git a/themes/swiss.thm b/themes/swiss.thm
deleted file mode 100644
index 8367863..0000000
--- a/themes/swiss.thm
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "meta": {
-    "author": "unknown",
-    "version": 2,
-    "revision": 1
-  },
-  "data": {
-    "background": "#f1f2f0",
-    "f_high": "black",
-    "f_med": "#867f86",
-    "f_low": "#a63e14",
-    "f_inv": "white",
-    "b_high": "#867f86",
-    "b_med": "#a63e14",
-    "b_low": "#dde0da",
-    "b_inv": "#a63e14"
-  }
-}
\ No newline at end of file
diff --git a/themes/tape.svg b/themes/tape.svg
new file mode 100644
index 0000000..cfcd255
--- /dev/null
+++ b/themes/tape.svg
@@ -0,0 +1,12 @@
+
+  <svg width="96px" height="64px" xmlns="http://www.w3.org/2000/svg" baseProfile="full" version="1.1">
+    <rect width='96' height='64' id='background' fill='#dad7cd'></rect>
+    <circle cx='24' cy='24' r='8' id='f_high' fill='#43423e'></circle>
+    <circle cx='40' cy='24' r='8' id='f_med' fill='#43423e'></circle>
+    <circle cx='56' cy='24' r='8' id='f_low' fill='#e5e3dc'></circle>
+    <circle cx='72' cy='24' r='8' id='f_inv' fill='#43423e'></circle>
+    <circle cx='24' cy='40' r='8' id='b_high' fill='#e5e3dc'></circle>
+    <circle cx='40' cy='40' r='8' id='b_med' fill='#43423e'></circle>
+    <circle cx='56' cy='40' r='8' id='b_low' fill='#e5e3dc'></circle>
+    <circle cx='72' cy='40' r='8' id='b_inv' fill='#eb3f48'></circle>
+  </svg>
\ No newline at end of file
diff --git a/themes/tape.thm b/themes/tape.thm
deleted file mode 100644
index f81eaec..0000000
--- a/themes/tape.thm
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "meta": {
-    "author": "aeriform",
-    "version": 2,
-    "revision": 1
-  },
-  "data": {
-    "background": "#dad7cd",
-    "f_high": "#43423e",
-    "f_med": "#43423e",
-    "f_low": "#e5e3dc",
-    "f_inv": "#43423e",
-    "b_high": "#e5e3dc",
-    "b_med": "#43423e",
-    "b_low": "#e5e3dc",
-    "b_inv": "#eb3f48"
-  }
-}
\ No newline at end of file
diff --git a/themes/tape_se.svg b/themes/tape_se.svg
new file mode 100644
index 0000000..05654c9
--- /dev/null
+++ b/themes/tape_se.svg
@@ -0,0 +1,12 @@
+
+  <svg width="96px" height="64px" xmlns="http://www.w3.org/2000/svg" baseProfile="full" version="1.1">
+    <rect width='96' height='64' id='background' fill='#2f2d2b'></rect>
+    <circle cx='24' cy='24' r='8' id='f_high' fill='#d9d6cc'></circle>
+    <circle cx='40' cy='24' r='8' id='f_med' fill='#3e3a38'></circle>
+    <circle cx='56' cy='24' r='8' id='f_low' fill='#454440'></circle>
+    <circle cx='72' cy='24' r='8' id='f_inv' fill='#d9d6cc'></circle>
+    <circle cx='24' cy='40' r='8' id='b_high' fill='#454440'></circle>
+    <circle cx='40' cy='40' r='8' id='b_med' fill='#d9d6cc'></circle>
+    <circle cx='56' cy='40' r='8' id='b_low' fill='#2f2d2b'></circle>
+    <circle cx='72' cy='40' r='8' id='b_inv' fill='#eb3f48'></circle>
+  </svg>
\ No newline at end of file
diff --git a/themes/tape_se.thm b/themes/tape_se.thm
deleted file mode 100755
index 436c5da..0000000
--- a/themes/tape_se.thm
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "meta": {
-    "author": "aeriform",
-    "version": 2,
-    "revision": 1
-  },
-  "data": {
-    "background": "#2f2d2b",
-    "f_high": "#d9d6cc",
-    "f_med": "#3e3a38",
-    "f_low": "#454440",
-    "f_inv": "#d9d6cc",
-    "b_high": "#454440",
-    "b_med": "#d9d6cc",
-    "b_low": "#2f2d2b",
-    "b_inv": "#eb3f48"
-  }
-}
\ No newline at end of file
diff --git a/themes/toxik.svg b/themes/toxik.svg
new file mode 100644
index 0000000..dcb6288
--- /dev/null
+++ b/themes/toxik.svg
@@ -0,0 +1,12 @@
+
+  <svg width="96px" height="64px" xmlns="http://www.w3.org/2000/svg" baseProfile="full" version="1.1">
+    <rect width='96' height='64' id='background' fill='#404040'></rect>
+    <circle cx='24' cy='24' r='8' id='f_high' fill='#ccd6d6'></circle>
+    <circle cx='40' cy='24' r='8' id='f_med' fill='#ccd6d6'></circle>
+    <circle cx='56' cy='24' r='8' id='f_low' fill='#464646'></circle>
+    <circle cx='72' cy='24' r='8' id='f_inv' fill='#ff681d'></circle>
+    <circle cx='24' cy='40' r='8' id='b_high' fill='#edeef2'></circle>
+    <circle cx='40' cy='40' r='8' id='b_med' fill='#464646'></circle>
+    <circle cx='56' cy='40' r='8' id='b_low' fill='#464646'></circle>
+    <circle cx='72' cy='40' r='8' id='b_inv' fill='#ff681d'></circle>
+  </svg>
\ No newline at end of file
diff --git a/themes/toxik.thm b/themes/toxik.thm
deleted file mode 100755
index 23365de..0000000
--- a/themes/toxik.thm
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "meta": {
-    "author": "aeriform",
-    "version": 2,
-    "revision": 1
-  },
-  "data": {
-    "background": "#404040",
-    "f_high": "#ccd6d6",
-    "f_med": "#ccd6d6",
-    "f_low": "#464646",
-    "f_inv": "#ff681d",
-    "b_high": "#edeef2",
-    "b_med": "#464646",
-    "b_low": "#464646",
-    "b_inv": "#ff681d"
-  }
-}
\ No newline at end of file