Implemented

46 files changed, 598 insertions, 441 deletions

diff --git a/README.md b/README.md
index ebc5d9f..0a41bf9 100644
--- a/README.md
+++ b/README.md
@@ -7,15 +7,15 @@ This collection of themes are meant to be used with [Marabu](https://github.com/
 To install a theme, simply drag the `thm` file onto the application window.
 You are welcome to submit your own themes to this collection!
 
+## [ash](themes/ash.thm)
+![ash](assets/ash.svg)
+
 ## [apollo](themes/apollo.thm)
 ![apollo](assets/apollo.svg)
 
 ## [apollo11](themes/apollo11.thm)
 ![apollo11](assets/apollo11.svg)
 
-## [ash](themes/ash.thm)
-![ash](assets/ash.svg)
-
 ## [battlestation](themes/battlestation.thm)
 ![battlestation](assets/battlestation.svg)
 
@@ -28,12 +28,12 @@ You are welcome to submit your own themes to this collection!
 ## [cina](themes/cina.thm)
 ![cina](assets/cina.svg)
 
-## [commodore](themes/commodore.thm)
-![commodore](assets/commodore.svg)
-
 ## [coal](themes/coal.thm)
 ![coal](assets/coal.svg)
 
+## [commodore](themes/commodore.thm)
+![commodore](assets/commodore.svg)
+
 ## [deuveir](themes/deuveir.thm)
 ![deuveir](assets/deuveir.svg)
 
@@ -43,6 +43,9 @@ You are welcome to submit your own themes to this collection!
 ## [gameboy](themes/gameboy.thm)
 ![gameboy](assets/gameboy.svg)
 
+## [deuveir](themes/deuveir.thm)
+![deuveir](assets/deuveir.svg)
+
 ## [mahou](themes/mahou.thm)
 ![mahou](assets/mahou.svg)
 
diff --git a/assets/apollo.svg b/assets/apollo.svg
index 60bd49e..cfe1248 100644
--- a/assets/apollo.svg
+++ b/assets/apollo.svg
@@ -1,12 +1,12 @@
 
-  <svg class="vector" width="80px" height="48px" xmlns="http://www.w3.org/2000/svg" baseProfile="full" version="1.1">
-    <rect width='80' height='48' fill='#d6ded9' rx='5' ry='5'></rect>
-    <circle cx='16' cy='16' r='8' fill='black'></circle>
-    <circle cx='32' cy='16' r='8' fill='#e47464'></circle>
-    <circle cx='48' cy='16' r='8' fill='#cccccc'></circle>
-    <circle cx='64' cy='16' r='8' fill='#000000'></circle>
-    <circle cx='16' cy='32' r='8' fill='#ffffff'></circle>
-    <circle cx='32' cy='32' r='8' fill='#5f5353'></circle>
-    <circle cx='48' cy='32' r='8' fill='#afb7b2'></circle>
-    <circle cx='64' cy='32' r='8' fill='#e47464'></circle>
+  <svg class="vector" width="112px" height="64px" xmlns="http://www.w3.org/2000/svg" baseProfile="full" version="1.1">
+    <rect width='96' height='64' fill='#d6ded9' rx='5' ry='5'></rect>
+    <circle cx='24' cy='24' r='8' fill='black'></circle>
+    <circle cx='40' cy='24' r='8' fill='#e47464'></circle>
+    <circle cx='56' cy='24' r='8' fill='#cccccc'></circle>
+    <circle cx='72' cy='24' r='8' fill='#000000'></circle>
+    <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='#afb7b2'></circle>
+    <circle cx='72' cy='40' r='8' fill='#e47464'></circle>
   </svg>
\ No newline at end of file
diff --git a/assets/apollo11.svg b/assets/apollo11.svg
index fbd0b27..c7c8104 100644
--- a/assets/apollo11.svg
+++ b/assets/apollo11.svg
@@ -1,12 +1,12 @@
 
-  <svg class="vector" width="80px" height="48px" xmlns="http://www.w3.org/2000/svg" baseProfile="full" version="1.1">
-    <rect width='80' height='48' fill='#29272b' rx='5' ry='5'></rect>
-    <circle cx='16' cy='16' r='8' fill='white'></circle>
-    <circle cx='32' cy='16' r='8' fill='#e47464'></circle>
-    <circle cx='48' cy='16' r='8' fill='#66606b'></circle>
-    <circle cx='64' cy='16' r='8' fill='#000000'></circle>
-    <circle cx='16' cy='32' r='8' fill='#ffffff'></circle>
-    <circle cx='32' cy='32' r='8' fill='#5f5353'></circle>
-    <circle cx='48' cy='32' r='8' fill='#47424a'></circle>
-    <circle cx='64' cy='32' r='8' fill='#e47464'></circle>
+  <svg class="vector" width="112px" height="64px" xmlns="http://www.w3.org/2000/svg" baseProfile="full" version="1.1">
+    <rect width='96' height='64' fill='#29272b' rx='5' ry='5'></rect>
+    <circle cx='24' cy='24' r='8' fill='white'></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>
+    <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>
\ No newline at end of file
diff --git a/assets/ash.svg b/assets/ash.svg
index b6a6a5d..805b949 100644
--- a/assets/ash.svg
+++ b/assets/ash.svg
@@ -1,12 +1,12 @@
 
-  <svg class="vector" width="80px" height="48px" xmlns="http://www.w3.org/2000/svg" baseProfile="full" version="1.1">
-    <rect width='80' height='48' fill='#111111' rx='5' ry='5'></rect>
-    <circle cx='16' cy='16' r='8' fill='#c11e1e'></circle>
-    <circle cx='32' cy='16' r='8' fill='#c7d4de'></circle>
-    <circle cx='48' cy='16' r='8' fill='#444444'></circle>
-    <circle cx='64' cy='16' r='8' fill='#c7d4de'></circle>
-    <circle cx='16' cy='32' r='8' fill='#ffffff'></circle>
-    <circle cx='32' cy='32' r='8' fill='#c11e1e'></circle>
-    <circle cx='48' cy='32' r='8' fill='#1c1f21'></circle>
-    <circle cx='64' cy='32' r='8' fill='#c11e1e'></circle>
+  <svg class="vector" width="112px" height="64px" xmlns="http://www.w3.org/2000/svg" baseProfile="full" version="1.1">
+    <rect width='96' height='64' fill='#111111' rx='5' ry='5'></rect>
+    <circle cx='24' cy='24' r='8' fill='#c11e1e'></circle>
+    <circle cx='40' cy='24' r='8' fill='#c7d4de'></circle>
+    <circle cx='56' cy='24' r='8' fill='#444444'></circle>
+    <circle cx='72' cy='24' r='8' fill='#c7d4de'></circle>
+    <circle cx='24' cy='40' r='8' fill='#ffffff'></circle>
+    <circle cx='40' cy='40' r='8' fill='#c11e1e'></circle>
+    <circle cx='56' cy='40' r='8' fill='#1c1f21'></circle>
+    <circle cx='72' cy='40' r='8' fill='#c11e1e'></circle>
   </svg>
\ No newline at end of file
diff --git a/assets/battlestation.svg b/assets/battlestation.svg
index 3514bf1..7ac28fa 100644
--- a/assets/battlestation.svg
+++ b/assets/battlestation.svg
@@ -1,12 +1,12 @@
 
-  <svg class="vector" width="80px" height="48px" xmlns="http://www.w3.org/2000/svg" baseProfile="full" version="1.1">
-    <rect width='80' height='48' fill='#222' rx='5' ry='5'></rect>
-    <circle cx='16' cy='16' r='8' fill='#fff'></circle>
-    <circle cx='32' cy='16' r='8' fill='#777'></circle>
-    <circle cx='48' cy='16' r='8' fill='#444'></circle>
-    <circle cx='64' cy='16' r='8' fill='#000'></circle>
-    <circle cx='16' cy='32' r='8' fill='#000'></circle>
-    <circle cx='32' cy='32' r='8' fill='#affec7'></circle>
-    <circle cx='48' cy='32' r='8' fill='#000'></circle>
-    <circle cx='64' cy='32' r='8' fill='#affec7'></circle>
+  <svg class="vector" width="112px" height="64px" xmlns="http://www.w3.org/2000/svg" baseProfile="full" version="1.1">
+    <rect width='96' height='64' fill='#222' rx='5' ry='5'></rect>
+    <circle cx='24' cy='24' r='8' fill='#fff'></circle>
+    <circle cx='40' cy='24' r='8' fill='#777'></circle>
+    <circle cx='56' cy='24' r='8' fill='#444'></circle>
+    <circle cx='72' cy='24' r='8' fill='#000'></circle>
+    <circle cx='24' cy='40' r='8' fill='#000'></circle>
+    <circle cx='40' cy='40' r='8' fill='#affec7'></circle>
+    <circle cx='56' cy='40' r='8' fill='#000'></circle>
+    <circle cx='72' cy='40' r='8' fill='#affec7'></circle>
   </svg>
\ No newline at end of file
diff --git a/assets/berry.svg b/assets/berry.svg
index c630c5f..f4ec985 100644
--- a/assets/berry.svg
+++ b/assets/berry.svg
@@ -1,12 +1,12 @@
 
-  <svg class="vector" width="80px" height="48px" xmlns="http://www.w3.org/2000/svg" baseProfile="full" version="1.1">
-    <rect width='80' height='48' fill='#9EB7FF' rx='5' ry='5'></rect>
-    <circle cx='16' cy='16' r='8' fill='#FFFFFF'></circle>
-    <circle cx='32' cy='16' r='8' fill='#1C0A16'></circle>
-    <circle cx='48' cy='16' r='8' fill='#1C0A16'></circle>
-    <circle cx='64' cy='16' r='8' fill='#FFFFFF'></circle>
-    <circle cx='16' cy='32' r='8' fill='#6ADEDC'></circle>
-    <circle cx='32' cy='32' r='8' fill='#6ADEDC'></circle>
-    <circle cx='48' cy='32' r='8' fill='#1C0A16'></circle>
-    <circle cx='64' cy='32' r='8' fill='#6ADEDC'></circle>
+  <svg class="vector" width="112px" height="64px" xmlns="http://www.w3.org/2000/svg" baseProfile="full" version="1.1">
+    <rect width='96' height='64' fill='#9EB7FF' rx='5' ry='5'></rect>
+    <circle cx='24' cy='24' r='8' fill='#FFFFFF'></circle>
+    <circle cx='40' cy='24' r='8' fill='#1C0A16'></circle>
+    <circle cx='56' cy='24' r='8' fill='#1C0A16'></circle>
+    <circle cx='72' cy='24' r='8' fill='#FFFFFF'></circle>
+    <circle cx='24' cy='40' r='8' fill='#6ADEDC'></circle>
+    <circle cx='40' cy='40' r='8' fill='#6ADEDC'></circle>
+    <circle cx='56' cy='40' r='8' fill='#1C0A16'></circle>
+    <circle cx='72' cy='40' r='8' fill='#6ADEDC'></circle>
   </svg>
\ No newline at end of file
diff --git a/assets/blanc.svg b/assets/blanc.svg
index 02e0f27..1cb172f 100644
--- a/assets/blanc.svg
+++ b/assets/blanc.svg
@@ -1,12 +1,12 @@
 
-  <svg class="vector" width="80px" height="48px" xmlns="http://www.w3.org/2000/svg" baseProfile="full" version="1.1">
-    <rect width='80' height='48' fill='#eee' rx='5' ry='5'></rect>
-    <circle cx='16' cy='16' r='8' fill='#111'></circle>
-    <circle cx='32' cy='16' r='8' fill='#777'></circle>
-    <circle cx='48' cy='16' r='8' fill='#bbb'></circle>
-    <circle cx='64' cy='16' r='8' fill='#ccc'></circle>
-    <circle cx='16' cy='32' r='8' fill='#000'></circle>
-    <circle cx='32' cy='32' r='8' fill='#999'></circle>
-    <circle cx='48' cy='32' r='8' fill='#ddd'></circle>
-    <circle cx='64' cy='32' r='8' fill='#555'></circle>
+  <svg class="vector" width="112px" height="64px" xmlns="http://www.w3.org/2000/svg" baseProfile="full" version="1.1">
+    <rect width='96' height='64' fill='#eee' rx='5' ry='5'></rect>
+    <circle cx='24' cy='24' r='8' fill='#111'></circle>
+    <circle cx='40' cy='24' r='8' fill='#777'></circle>
+    <circle cx='56' cy='24' r='8' fill='#bbb'></circle>
+    <circle cx='72' cy='24' r='8' fill='#ccc'></circle>
+    <circle cx='24' cy='40' r='8' fill='#000'></circle>
+    <circle cx='40' cy='40' r='8' fill='#999'></circle>
+    <circle cx='56' cy='40' r='8' fill='#ddd'></circle>
+    <circle cx='72' cy='40' r='8' fill='#555'></circle>
   </svg>
\ No newline at end of file
diff --git a/assets/cina.svg b/assets/cina.svg
index 09daa1c..4469dde 100644
--- a/assets/cina.svg
+++ b/assets/cina.svg
@@ -1,12 +1,12 @@
 
-  <svg class="vector" width="80px" height="48px" xmlns="http://www.w3.org/2000/svg" baseProfile="full" version="1.1">
-    <rect width='80' height='48' fill='#000' rx='5' ry='5'></rect>
-    <circle cx='16' cy='16' r='8' fill='white'></circle>
-    <circle cx='32' cy='16' r='8' fill='#6ff'></circle>
-    <circle cx='48' cy='16' r='8' fill='#555'></circle>
-    <circle cx='64' cy='16' r='8' fill='#fff'></circle>
-    <circle cx='16' cy='32' r='8' fill='#89023E'></circle>
-    <circle cx='32' cy='32' r='8' fill='#89023E'></circle>
-    <circle cx='48' cy='32' r='8' fill='#222'></circle>
-    <circle cx='64' cy='32' r='8' fill='#F00'></circle>
+  <svg class="vector" width="112px" height="64px" xmlns="http://www.w3.org/2000/svg" baseProfile="full" version="1.1">
+    <rect width='96' height='64' fill='#000' rx='5' ry='5'></rect>
+    <circle cx='24' cy='24' r='8' fill='white'></circle>
+    <circle cx='40' cy='24' r='8' fill='#6ff'></circle>
+    <circle cx='56' cy='24' r='8' fill='#555'></circle>
+    <circle cx='72' cy='24' r='8' fill='#fff'></circle>
+    <circle cx='24' cy='40' r='8' fill='#89023E'></circle>
+    <circle cx='40' cy='40' r='8' fill='#89023E'></circle>
+    <circle cx='56' cy='40' r='8' fill='#222'></circle>
+    <circle cx='72' cy='40' r='8' fill='#F00'></circle>
   </svg>
\ No newline at end of file
diff --git a/assets/coal.svg b/assets/coal.svg
index ba08699..c78ee87 100644
--- a/assets/coal.svg
+++ b/assets/coal.svg
@@ -1,12 +1,12 @@
 
-  <svg class="vector" width="80px" height="48px" xmlns="http://www.w3.org/2000/svg" baseProfile="full" version="1.1">
-    <rect width='80' height='48' fill='#EDEAEA' rx='5' ry='5'></rect>
-    <circle cx='16' cy='16' r='8' fill='#393B3F'></circle>
-    <circle cx='32' cy='16' r='8' fill='#A3A3A4'></circle>
-    <circle cx='48' cy='16' r='8' fill='#808790'></circle>
-    <circle cx='64' cy='16' r='8' fill='#000'></circle>
-    <circle cx='16' cy='32' r='8' fill='#333333'></circle>
-    <circle cx='32' cy='32' r='8' fill='#777777'></circle>
-    <circle cx='48' cy='32' r='8' fill='#DDDDDD'></circle>
-    <circle cx='64' cy='32' r='8' fill='#fff'></circle>
+  <svg class="vector" width="112px" height="64px" xmlns="http://www.w3.org/2000/svg" baseProfile="full" version="1.1">
+    <rect width='96' height='64' fill='#EDEAEA' rx='5' ry='5'></rect>
+    <circle cx='24' cy='24' r='8' fill='#393B3F'></circle>
+    <circle cx='40' cy='24' r='8' fill='#A3A3A4'></circle>
+    <circle cx='56' cy='24' r='8' fill='#808790'></circle>
+    <circle cx='72' cy='24' r='8' fill='#000'></circle>
+    <circle cx='24' cy='40' r='8' fill='#333333'></circle>
+    <circle cx='40' cy='40' r='8' fill='#777777'></circle>
+    <circle cx='56' cy='40' r='8' fill='#DDDDDD'></circle>
+    <circle cx='72' cy='40' r='8' fill='#fff'></circle>
   </svg>
\ No newline at end of file
diff --git a/assets/commodore.svg b/assets/commodore.svg
index 8d39e46..3aaeac3 100644
--- a/assets/commodore.svg
+++ b/assets/commodore.svg
@@ -1,12 +1,12 @@
 
-  <svg class="vector" width="80px" height="48px" xmlns="http://www.w3.org/2000/svg" baseProfile="full" version="1.1">
-    <rect width='80' height='48' fill='#a5a7fc' rx='5' ry='5'></rect>
-    <circle cx='16' cy='16' r='8' fill='#FFF'></circle>
-    <circle cx='32' cy='16' r='8' fill='#FFF'></circle>
-    <circle cx='48' cy='16' r='8' fill='#444ae3'></circle>
-    <circle cx='64' cy='16' r='8' fill='#444ae3'></circle>
-    <circle cx='16' cy='32' r='8' fill='#FFF'></circle>
-    <circle cx='32' cy='32' r='8' fill='#444ae3'></circle>
-    <circle cx='48' cy='32' r='8' fill='#7479ee'></circle>
-    <circle cx='64' cy='32' r='8' fill='#fff'></circle>
+  <svg class="vector" width="112px" height="64px" xmlns="http://www.w3.org/2000/svg" baseProfile="full" version="1.1">
+    <rect width='96' height='64' fill='#a5a7fc' rx='5' ry='5'></rect>
+    <circle cx='24' cy='24' r='8' fill='#FFF'></circle>
+    <circle cx='40' cy='24' r='8' fill='#FFF'></circle>
+    <circle cx='56' cy='24' r='8' fill='#444ae3'></circle>
+    <circle cx='72' cy='24' r='8' fill='#444ae3'></circle>
+    <circle cx='24' cy='40' r='8' fill='#FFF'></circle>
+    <circle cx='40' cy='40' r='8' fill='#444ae3'></circle>
+    <circle cx='56' cy='40' r='8' fill='#7479ee'></circle>
+    <circle cx='72' cy='40' r='8' fill='#fff'></circle>
   </svg>
\ No newline at end of file
diff --git a/assets/deuveir.svg b/assets/deuveir.svg
index 8d4ff34..1e40adc 100644
--- a/assets/deuveir.svg
+++ b/assets/deuveir.svg
@@ -1,12 +1,12 @@
 
-  <svg class="vector" width="80px" height="48px" xmlns="http://www.w3.org/2000/svg" baseProfile="full" version="1.1">
-    <rect width='80' height='48' fill='#141414' rx='5' ry='5'></rect>
-    <circle cx='16' cy='16' r='8' fill='#f4f4f4'></circle>
-    <circle cx='32' cy='16' r='8' fill='#efefef'></circle>
-    <circle cx='48' cy='16' r='8' fill='#3d3d3d'></circle>
-    <circle cx='64' cy='16' r='8' fill='#141414'></circle>
-    <circle cx='16' cy='32' r='8' fill='#efefef'></circle>
-    <circle cx='32' cy='32' r='8' fill='#aa0000'></circle>
-    <circle cx='48' cy='32' r='8' fill='#000000'></circle>
-    <circle cx='64' cy='32' r='8' fill='#3d3d3d'></circle>
+  <svg class="vector" width="112px" height="64px" xmlns="http://www.w3.org/2000/svg" baseProfile="full" version="1.1">
+    <rect width='96' height='64' fill='#141414' rx='5' ry='5'></rect>
+    <circle cx='24' cy='24' r='8' fill='#f4f4f4'></circle>
+    <circle cx='40' cy='24' r='8' fill='#efefef'></circle>
+    <circle cx='56' cy='24' r='8' fill='#3d3d3d'></circle>
+    <circle cx='72' cy='24' r='8' fill='#141414'></circle>
+    <circle cx='24' cy='40' r='8' fill='#efefef'></circle>
+    <circle cx='40' cy='40' r='8' fill='#aa0000'></circle>
+    <circle cx='56' cy='40' r='8' fill='#000000'></circle>
+    <circle cx='72' cy='40' r='8' fill='#3d3d3d'></circle>
   </svg>
\ No newline at end of file
diff --git a/assets/donsol.svg b/assets/donsol.svg
index bc9a77e..ae49f54 100644
--- a/assets/donsol.svg
+++ b/assets/donsol.svg
@@ -1,12 +1,12 @@
 
-  <svg class="vector" width="80px" height="48px" xmlns="http://www.w3.org/2000/svg" baseProfile="full" version="1.1">
-    <rect width='80' height='48' fill='#000' rx='5' ry='5'></rect>
-    <circle cx='16' cy='16' r='8' fill='white'></circle>
-    <circle cx='32' cy='16' r='8' fill='#FF0000'></circle>
-    <circle cx='48' cy='16' r='8' fill='#cccccc'></circle>
-    <circle cx='64' cy='16' r='8' fill='#a93232'></circle>
-    <circle cx='16' cy='32' r='8' fill='#ffffff'></circle>
-    <circle cx='32' cy='32' r='8' fill='#000000'></circle>
-    <circle cx='48' cy='32' r='8' fill='#333333'></circle>
-    <circle cx='64' cy='32' r='8' fill='#a93232'></circle>
+  <svg class="vector" width="112px" height="64px" xmlns="http://www.w3.org/2000/svg" baseProfile="full" version="1.1">
+    <rect width='96' height='64' fill='#000' rx='5' ry='5'></rect>
+    <circle cx='24' cy='24' r='8' fill='white'></circle>
+    <circle cx='40' cy='24' r='8' fill='#FF0000'></circle>
+    <circle cx='56' cy='24' r='8' fill='#cccccc'></circle>
+    <circle cx='72' cy='24' r='8' fill='#a93232'></circle>
+    <circle cx='24' cy='40' r='8' fill='#ffffff'></circle>
+    <circle cx='40' cy='40' r='8' fill='#000000'></circle>
+    <circle cx='56' cy='40' r='8' fill='#333333'></circle>
+    <circle cx='72' cy='40' r='8' fill='#a93232'></circle>
   </svg>
\ No newline at end of file
diff --git a/assets/gameboy.svg b/assets/gameboy.svg
index b773416..08d865b 100644
--- a/assets/gameboy.svg
+++ b/assets/gameboy.svg
@@ -1,12 +1,12 @@
 
-  <svg class="vector" width="80px" height="48px" xmlns="http://www.w3.org/2000/svg" baseProfile="full" version="1.1">
-    <rect width='80' height='48' fill='#8b956d' rx='5' ry='5'></rect>
-    <circle cx='16' cy='16' r='8' fill='#c4cfa1'></circle>
-    <circle cx='32' cy='16' r='8' fill='#4d533c'></circle>
-    <circle cx='48' cy='16' r='8' fill='#4d533c'></circle>
-    <circle cx='64' cy='16' r='8' fill='#1f1f1f'></circle>
-    <circle cx='16' cy='32' r='8' fill='#c4cfa1'></circle>
-    <circle cx='32' cy='32' r='8' fill='#c4cfa1'></circle>
-    <circle cx='48' cy='32' r='8' fill='#1f1f1f'></circle>
-    <circle cx='64' cy='32' r='8' fill='#c4cfa1'></circle>
+  <svg class="vector" width="112px" height="64px" xmlns="http://www.w3.org/2000/svg" baseProfile="full" version="1.1">
+    <rect width='96' height='64' fill='#8b956d' rx='5' ry='5'></rect>
+    <circle cx='24' cy='24' r='8' fill='#c4cfa1'></circle>
+    <circle cx='40' cy='24' r='8' fill='#4d533c'></circle>
+    <circle cx='56' cy='24' r='8' fill='#4d533c'></circle>
+    <circle cx='72' cy='24' r='8' fill='#1f1f1f'></circle>
+    <circle cx='24' cy='40' r='8' fill='#c4cfa1'></circle>
+    <circle cx='40' cy='40' r='8' fill='#c4cfa1'></circle>
+    <circle cx='56' cy='40' r='8' fill='#1f1f1f'></circle>
+    <circle cx='72' cy='40' r='8' fill='#c4cfa1'></circle>
   </svg>
\ No newline at end of file
diff --git a/assets/mahou.svg b/assets/mahou.svg
index 10e63e9..9fe6bab 100644
--- a/assets/mahou.svg
+++ b/assets/mahou.svg
@@ -1,12 +1,12 @@
 
-  <svg class="vector" width="80px" height="48px" xmlns="http://www.w3.org/2000/svg" baseProfile="full" version="1.1">
-    <rect width='80' height='48' fill='#E0B1CB' rx='5' ry='5'></rect>
-    <circle cx='16' cy='16' r='8' fill='#231942'></circle>
-    <circle cx='32' cy='16' r='8' fill='#5E548E'></circle>
-    <circle cx='48' cy='16' r='8' fill='#BE95C4'></circle>
-    <circle cx='64' cy='16' r='8' fill='#E0B1CB'></circle>
-    <circle cx='16' cy='32' r='8' fill='#FFFFFF'></circle>
-    <circle cx='32' cy='32' r='8' fill='#5E548E'></circle>
-    <circle cx='48' cy='32' r='8' fill='#BE95C4'></circle>
-    <circle cx='64' cy='32' r='8' fill='#9F86C0'></circle>
+  <svg class="vector" width="112px" height="64px" xmlns="http://www.w3.org/2000/svg" baseProfile="full" version="1.1">
+    <rect width='96' height='64' fill='#E0B1CB' rx='5' ry='5'></rect>
+    <circle cx='24' cy='24' r='8' fill='#231942'></circle>
+    <circle cx='40' cy='24' r='8' fill='#5E548E'></circle>
+    <circle cx='56' cy='24' r='8' fill='#BE95C4'></circle>
+    <circle cx='72' cy='24' r='8' fill='#E0B1CB'></circle>
+    <circle cx='24' cy='40' r='8' fill='#FFFFFF'></circle>
+    <circle cx='40' cy='40' r='8' fill='#5E548E'></circle>
+    <circle cx='56' cy='40' r='8' fill='#BE95C4'></circle>
+    <circle cx='72' cy='40' r='8' fill='#9F86C0'></circle>
   </svg>
\ No newline at end of file
diff --git a/assets/marble.svg b/assets/marble.svg
index 48e8168..6aab10c 100644
--- a/assets/marble.svg
+++ b/assets/marble.svg
@@ -1,12 +1,12 @@
 
-  <svg class="vector" width="80px" height="48px" xmlns="http://www.w3.org/2000/svg" baseProfile="full" version="1.1">
-    <rect width='80' height='48' fill='#FBFBF2' rx='5' ry='5'></rect>
-    <circle cx='16' cy='16' r='8' fill='#847577'></circle>
-    <circle cx='32' cy='16' r='8' fill='#A6A2A2'></circle>
-    <circle cx='48' cy='16' r='8' fill='#A6A2A2'></circle>
-    <circle cx='64' cy='16' r='8' fill='#FFFCF9'></circle>
-    <circle cx='16' cy='32' r='8' fill='#CFD2CD'></circle>
-    <circle cx='32' cy='32' r='8' fill='#676164'></circle>
-    <circle cx='48' cy='32' r='8' fill='#A6A2A2'></circle>
-    <circle cx='64' cy='32' r='8' fill='#FFF'></circle>
+  <svg class="vector" width="112px" height="64px" xmlns="http://www.w3.org/2000/svg" baseProfile="full" version="1.1">
+    <rect width='96' height='64' fill='#FBFBF2' rx='5' ry='5'></rect>
+    <circle cx='24' cy='24' r='8' fill='#847577'></circle>
+    <circle cx='40' cy='24' r='8' fill='#A6A2A2'></circle>
+    <circle cx='56' cy='24' r='8' fill='#A6A2A2'></circle>
+    <circle cx='72' cy='24' r='8' fill='#FFFCF9'></circle>
+    <circle cx='24' cy='40' r='8' fill='#CFD2CD'></circle>
+    <circle cx='40' cy='40' r='8' fill='#676164'></circle>
+    <circle cx='56' cy='40' r='8' fill='#A6A2A2'></circle>
+    <circle cx='72' cy='40' r='8' fill='#FFF'></circle>
   </svg>
\ No newline at end of file
diff --git a/assets/noir.svg b/assets/noir.svg
index b5d3ba9..a692429 100644
--- a/assets/noir.svg
+++ b/assets/noir.svg
@@ -1,12 +1,12 @@
 
-  <svg class="vector" width="80px" height="48px" xmlns="http://www.w3.org/2000/svg" baseProfile="full" version="1.1">
-    <rect width='80' height='48' fill='#000' rx='5' ry='5'></rect>
-    <circle cx='16' cy='16' r='8' fill='#fff'></circle>
-    <circle cx='32' cy='16' r='8' fill='#999'></circle>
-    <circle cx='48' cy='16' r='8' fill='#555'></circle>
-    <circle cx='64' cy='16' r='8' fill='#000'></circle>
-    <circle cx='16' cy='32' r='8' fill='#000'></circle>
-    <circle cx='32' cy='32' r='8' fill='#555'></circle>
-    <circle cx='48' cy='32' r='8' fill='#222'></circle>
-    <circle cx='64' cy='32' r='8' fill='#fff'></circle>
+  <svg class="vector" width="112px" height="64px" xmlns="http://www.w3.org/2000/svg" baseProfile="full" version="1.1">
+    <rect width='96' height='64' fill='#000' rx='5' ry='5'></rect>
+    <circle cx='24' cy='24' r='8' fill='#fff'></circle>
+    <circle cx='40' cy='24' r='8' fill='#999'></circle>
+    <circle cx='56' cy='24' r='8' fill='#555'></circle>
+    <circle cx='72' cy='24' r='8' fill='#000'></circle>
+    <circle cx='24' cy='40' r='8' fill='#000'></circle>
+    <circle cx='40' cy='40' r='8' fill='#555'></circle>
+    <circle cx='56' cy='40' r='8' fill='#222'></circle>
+    <circle cx='72' cy='40' r='8' fill='#fff'></circle>
   </svg>
\ No newline at end of file
diff --git a/assets/pale.svg b/assets/pale.svg
index e6061ce..1145649 100644
--- a/assets/pale.svg
+++ b/assets/pale.svg
@@ -1,12 +1,12 @@
 
-  <svg class="vector" width="80px" height="48px" xmlns="http://www.w3.org/2000/svg" baseProfile="full" version="1.1">
-    <rect width='80' height='48' fill='#555' rx='5' ry='5'></rect>
-    <circle cx='16' cy='16' r='8' fill='#fff'></circle>
-    <circle cx='32' cy='16' r='8' fill='#999'></circle>
-    <circle cx='48' cy='16' r='8' fill='#bbb'></circle>
-    <circle cx='64' cy='16' r='8' fill='#555'></circle>
-    <circle cx='16' cy='32' r='8' fill='#000'></circle>
-    <circle cx='32' cy='32' r='8' fill='#999'></circle>
-    <circle cx='48' cy='32' r='8' fill='#666'></circle>
-    <circle cx='64' cy='32' r='8' fill='#ccc'></circle>
+  <svg class="vector" width="112px" height="64px" xmlns="http://www.w3.org/2000/svg" baseProfile="full" version="1.1">
+    <rect width='96' height='64' fill='#555' rx='5' ry='5'></rect>
+    <circle cx='24' cy='24' r='8' fill='#fff'></circle>
+    <circle cx='40' cy='24' r='8' fill='#999'></circle>
+    <circle cx='56' cy='24' r='8' fill='#bbb'></circle>
+    <circle cx='72' cy='24' r='8' fill='#555'></circle>
+    <circle cx='24' cy='40' r='8' fill='#000'></circle>
+    <circle cx='40' cy='40' r='8' fill='#999'></circle>
+    <circle cx='56' cy='40' r='8' fill='#666'></circle>
+    <circle cx='72' cy='40' r='8' fill='#ccc'></circle>
   </svg>
\ No newline at end of file
diff --git a/assets/raspberry.svg b/assets/raspberry.svg
index 1d70749..f9b0f63 100644
--- a/assets/raspberry.svg
+++ b/assets/raspberry.svg
@@ -1,12 +1,12 @@
 
-  <svg class="vector" width="80px" height="48px" xmlns="http://www.w3.org/2000/svg" baseProfile="full" version="1.1">
-    <rect width='80' height='48' fill='#30343F' rx='5' ry='5'></rect>
-    <circle cx='16' cy='16' r='8' fill='white'></circle>
-    <circle cx='32' cy='16' r='8' fill='#EA638C'></circle>
-    <circle cx='48' cy='16' r='8' fill='#71788E'></circle>
-    <circle cx='64' cy='16' r='8' fill='#89023E'></circle>
-    <circle cx='16' cy='32' r='8' fill='#89023E'></circle>
-    <circle cx='32' cy='32' r='8' fill='#89023E'></circle>
-    <circle cx='48' cy='32' r='8' fill='#23272F'></circle>
-    <circle cx='64' cy='32' r='8' fill='#FFD9DA'></circle>
+  <svg class="vector" width="112px" height="64px" xmlns="http://www.w3.org/2000/svg" baseProfile="full" version="1.1">
+    <rect width='96' height='64' fill='#30343F' rx='5' ry='5'></rect>
+    <circle cx='24' cy='24' r='8' fill='white'></circle>
+    <circle cx='40' cy='24' r='8' fill='#EA638C'></circle>
+    <circle cx='56' cy='24' r='8' fill='#71788E'></circle>
+    <circle cx='72' cy='24' r='8' fill='#89023E'></circle>
+    <circle cx='24' cy='40' r='8' fill='#89023E'></circle>
+    <circle cx='40' cy='40' r='8' fill='#89023E'></circle>
+    <circle cx='56' cy='40' r='8' fill='#23272F'></circle>
+    <circle cx='72' cy='40' r='8' fill='#FFD9DA'></circle>
   </svg>
\ No newline at end of file
diff --git a/assets/robo.svg b/assets/robo.svg
index 4acf3e3..223c4b4 100644
--- a/assets/robo.svg
+++ b/assets/robo.svg
@@ -1,12 +1,12 @@
 
-  <svg class="vector" width="80px" height="48px" xmlns="http://www.w3.org/2000/svg" baseProfile="full" version="1.1">
-    <rect width='80' height='48' fill='#655f5f' rx='5' ry='5'></rect>
-    <circle cx='16' cy='16' r='8' fill='#ffffff'></circle>
-    <circle cx='32' cy='16' r='8' fill='#b5b5b5'></circle>
-    <circle cx='48' cy='16' r='8' fill='#191919'></circle>
-    <circle cx='64' cy='16' r='8' fill='#ffffff'></circle>
-    <circle cx='16' cy='32' r='8' fill='#989898'></circle>
-    <circle cx='32' cy='32' r='8' fill='#ff8168'></circle>
-    <circle cx='48' cy='32' r='8' fill='#ff8168'></circle>
-    <circle cx='64' cy='32' r='8' fill='#ff8168'></circle>
+  <svg class="vector" width="112px" height="64px" xmlns="http://www.w3.org/2000/svg" baseProfile="full" version="1.1">
+    <rect width='96' height='64' fill='#655f5f' rx='5' ry='5'></rect>
+    <circle cx='24' cy='24' r='8' fill='#ffffff'></circle>
+    <circle cx='40' cy='24' r='8' fill='#b5b5b5'></circle>
+    <circle cx='56' cy='24' r='8' fill='#191919'></circle>
+    <circle cx='72' cy='24' r='8' fill='#ffffff'></circle>
+    <circle cx='24' cy='40' r='8' fill='#989898'></circle>
+    <circle cx='40' cy='40' r='8' fill='#ff8168'></circle>
+    <circle cx='56' cy='40' r='8' fill='#ff8168'></circle>
+    <circle cx='72' cy='40' r='8' fill='#ff8168'></circle>
   </svg>
\ No newline at end of file
diff --git a/assets/seaweed.svg b/assets/seaweed.svg
index a30d08c..a43c6da 100644
--- a/assets/seaweed.svg
+++ b/assets/seaweed.svg
@@ -1,12 +1,12 @@
 
-  <svg class="vector" width="80px" height="48px" xmlns="http://www.w3.org/2000/svg" baseProfile="full" version="1.1">
-    <rect width='80' height='48' fill='#CDEDFD' rx='5' ry='5'></rect>
-    <circle cx='16' cy='16' r='8' fill='#0B132B'></circle>
-    <circle cx='32' cy='16' r='8' fill='#172759'></circle>
-    <circle cx='48' cy='16' r='8' fill='#5BC0BE'></circle>
-    <circle cx='64' cy='16' r='8' fill='#3A506B'></circle>
-    <circle cx='16' cy='32' r='8' fill='#1C2541'></circle>
-    <circle cx='32' cy='32' r='8' fill='#1C2541'></circle>
-    <circle cx='48' cy='32' r='8' fill='#5BC0BE'></circle>
-    <circle cx='64' cy='32' r='8' fill='#6FFFE9'></circle>
+  <svg class="vector" width="112px" height="64px" xmlns="http://www.w3.org/2000/svg" baseProfile="full" version="1.1">
+    <rect width='96' height='64' fill='#CDEDFD' rx='5' ry='5'></rect>
+    <circle cx='24' cy='24' r='8' fill='#0B132B'></circle>
+    <circle cx='40' cy='24' r='8' fill='#172759'></circle>
+    <circle cx='56' cy='24' r='8' fill='#5BC0BE'></circle>
+    <circle cx='72' cy='24' r='8' fill='#3A506B'></circle>
+    <circle cx='24' cy='40' r='8' fill='#1C2541'></circle>
+    <circle cx='40' cy='40' r='8' fill='#1C2541'></circle>
+    <circle cx='56' cy='40' r='8' fill='#5BC0BE'></circle>
+    <circle cx='72' cy='40' r='8' fill='#6FFFE9'></circle>
   </svg>
\ No newline at end of file
diff --git a/assets/solitaire.svg b/assets/solitaire.svg
index d2d7d19..a1762e9 100644
--- a/assets/solitaire.svg
+++ b/assets/solitaire.svg
@@ -1,12 +1,12 @@
 
-  <svg class="vector" width="80px" height="48px" xmlns="http://www.w3.org/2000/svg" baseProfile="full" version="1.1">
-    <rect width='80' height='48' fill='#000000' rx='5' ry='5'></rect>
-    <circle cx='16' cy='16' r='8' fill='#bf4560'></circle>
-    <circle cx='32' cy='16' r='8' fill='#ffffff'></circle>
-    <circle cx='48' cy='16' r='8' fill='#4a4a4a'></circle>
-    <circle cx='64' cy='16' r='8' fill='#ffffff'></circle>
-    <circle cx='16' cy='32' r='8' fill='#a1a1a1'></circle>
-    <circle cx='32' cy='32' r='8' fill='#1f1f1f'></circle>
-    <circle cx='48' cy='32' r='8' fill='#232323'></circle>
-    <circle cx='64' cy='32' r='8' fill='#bf4560'></circle>
+  <svg class="vector" width="112px" height="64px" xmlns="http://www.w3.org/2000/svg" baseProfile="full" version="1.1">
+    <rect width='96' height='64' fill='#000000' rx='5' ry='5'></rect>
+    <circle cx='24' cy='24' r='8' fill='#bf4560'></circle>
+    <circle cx='40' cy='24' r='8' fill='#ffffff'></circle>
+    <circle cx='56' cy='24' r='8' fill='#4a4a4a'></circle>
+    <circle cx='72' cy='24' r='8' fill='#ffffff'></circle>
+    <circle cx='24' cy='40' r='8' fill='#a1a1a1'></circle>
+    <circle cx='40' cy='40' r='8' fill='#1f1f1f'></circle>
+    <circle cx='56' cy='40' r='8' fill='#232323'></circle>
+    <circle cx='72' cy='40' r='8' fill='#bf4560'></circle>
   </svg>
\ No newline at end of file
diff --git a/assets/soyuz.svg b/assets/soyuz.svg
index 6d0e4d4..cb32cb3 100644
--- a/assets/soyuz.svg
+++ b/assets/soyuz.svg
@@ -1,12 +1,12 @@
 
-  <svg class="vector" width="80px" height="48px" xmlns="http://www.w3.org/2000/svg" baseProfile="full" version="1.1">
-    <rect width='80' height='48' fill='#222' rx='5' ry='5'></rect>
-    <circle cx='16' cy='16' r='8' fill='#fc533e'></circle>
-    <circle cx='32' cy='16' r='8' fill='#999'></circle>
-    <circle cx='48' cy='16' r='8' fill='#555'></circle>
-    <circle cx='64' cy='16' r='8' fill='#555'></circle>
-    <circle cx='16' cy='32' r='8' fill='#fc533e'></circle>
-    <circle cx='32' cy='32' r='8' fill='#999'></circle>
-    <circle cx='48' cy='32' r='8' fill='#333'></circle>
-    <circle cx='64' cy='32' r='8' fill='#fff'></circle>
+  <svg class="vector" width="112px" height="64px" xmlns="http://www.w3.org/2000/svg" baseProfile="full" version="1.1">
+    <rect width='96' height='64' fill='#222' rx='5' ry='5'></rect>
+    <circle cx='24' cy='24' r='8' fill='#fc533e'></circle>
+    <circle cx='40' cy='24' r='8' fill='#999'></circle>
+    <circle cx='56' cy='24' r='8' fill='#555'></circle>
+    <circle cx='72' cy='24' r='8' fill='#555'></circle>
+    <circle cx='24' cy='40' r='8' fill='#fc533e'></circle>
+    <circle cx='40' cy='40' r='8' fill='#999'></circle>
+    <circle cx='56' cy='40' r='8' fill='#333'></circle>
+    <circle cx='72' cy='40' r='8' fill='#fff'></circle>
   </svg>
\ No newline at end of file
diff --git a/assets/swiss.svg b/assets/swiss.svg
index da4da41..8fc4c33 100644
--- a/assets/swiss.svg
+++ b/assets/swiss.svg
@@ -1,12 +1,12 @@
 
-  <svg class="vector" width="80px" height="48px" xmlns="http://www.w3.org/2000/svg" baseProfile="full" version="1.1">
-    <rect width='80' height='48' fill='#f1f2f0' rx='5' ry='5'></rect>
-    <circle cx='16' cy='16' r='8' fill='black'></circle>
-    <circle cx='32' cy='16' r='8' fill='#867f86'></circle>
-    <circle cx='48' cy='16' r='8' fill='#a63e14'></circle>
-    <circle cx='64' cy='16' r='8' fill='white'></circle>
-    <circle cx='16' cy='32' r='8' fill='#867f86'></circle>
-    <circle cx='32' cy='32' r='8' fill='#a63e14'></circle>
-    <circle cx='48' cy='32' r='8' fill='#dde0da'></circle>
-    <circle cx='64' cy='32' r='8' fill='#a63e14'></circle>
+  <svg class="vector" width="112px" height="64px" xmlns="http://www.w3.org/2000/svg" baseProfile="full" version="1.1">
+    <rect width='96' height='64' fill='#f1f2f0' rx='5' ry='5'></rect>
+    <circle cx='24' cy='24' r='8' fill='black'></circle>
+    <circle cx='40' cy='24' r='8' fill='#867f86'></circle>
+    <circle cx='56' cy='24' r='8' fill='#a63e14'></circle>
+    <circle cx='72' cy='24' r='8' fill='white'></circle>
+    <circle cx='24' cy='40' r='8' fill='#867f86'></circle>
+    <circle cx='40' cy='40' r='8' fill='#a63e14'></circle>
+    <circle cx='56' cy='40' r='8' fill='#dde0da'></circle>
+    <circle cx='72' cy='40' r='8' fill='#a63e14'></circle>
   </svg>
\ No newline at end of file
diff --git a/index.js b/index.js
index ffcac2b..7dca234 100644
--- a/index.js
+++ b/index.js
@@ -16,16 +16,16 @@ function build_svg(n,theme)
   var size = 16
 
   var html = `
-  <svg class="vector" width="${(size * 5)}px" height="${size * 3}px" xmlns="http://www.w3.org/2000/svg" baseProfile="full" version="1.1">
-    <rect width='${(size * 5)}' height='${(size * 3)}' fill='${theme.background}' rx='5' ry='5'></rect>
-    <circle cx='${size * 1}' cy='${size * 1}' r='${size/2}' fill='${theme.f_high}'></circle>
-    <circle cx='${size * 2}' cy='${size * 1}' r='${size/2}' fill='${theme.f_med}'></circle>
-    <circle cx='${size * 3}' cy='${size * 1}' r='${size/2}' fill='${theme.f_low}'></circle>
-    <circle cx='${size * 4}' cy='${size * 1}' r='${size/2}' fill='${theme.f_inv}'></circle>
-    <circle cx='${size * 1}' cy='${size * 2}' r='${size/2}' fill='${theme.b_high}'></circle>
-    <circle cx='${size * 2}' cy='${size * 2}' r='${size/2}' fill='${theme.b_med}'></circle>
-    <circle cx='${size * 3}' cy='${size * 2}' r='${size/2}' fill='${theme.b_low}'></circle>
-    <circle cx='${size * 4}' cy='${size * 2}' r='${size/2}' fill='${theme.b_inv}'></circle>
+  <svg class="vector" width="${(size * 6) + size}px" height="${(size * 4)}px" xmlns="http://www.w3.org/2000/svg" baseProfile="full" version="1.1">
+    <rect width='${(size * 6)}' height='${(size * 4)}' fill='${theme.data.background}' rx='5' ry='5'></rect>
+    <circle cx='${(size * 1.5)}' cy='${(size * 1.5)}' r='${size/2}' fill='${theme.data.f_high}'></circle>
+    <circle cx='${(size * 2.5)}' cy='${(size * 1.5)}' r='${size/2}' fill='${theme.data.f_med}'></circle>
+    <circle cx='${(size * 3.5)}' cy='${(size * 1.5)}' r='${size/2}' fill='${theme.data.f_low}'></circle>
+    <circle cx='${(size * 4.5)}' cy='${(size * 1.5)}' r='${size/2}' fill='${theme.data.f_inv}'></circle>
+    <circle cx='${(size * 1.5)}' cy='${(size * 2.5)}' r='${size/2}' fill='${theme.data.b_high}'></circle>
+    <circle cx='${(size * 2.5)}' cy='${(size * 2.5)}' r='${size/2}' fill='${theme.data.b_med}'></circle>
+    <circle cx='${(size * 3.5)}' cy='${(size * 2.5)}' r='${size/2}' fill='${theme.data.b_low}'></circle>
+    <circle cx='${(size * 4.5)}' cy='${(size * 2.5)}' r='${size/2}' fill='${theme.data.b_inv}'></circle>
   </svg>`
 
   fs.writeFile("assets/"+name+".svg", html, function(err) {
diff --git a/themes/apollo.thm b/themes/apollo.thm
index 1234fc6..0443dd4 100644
--- a/themes/apollo.thm
+++ b/themes/apollo.thm
@@ -1,11 +1,18 @@
 {
-  "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"
-}
+  "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
index 0281815..eb5491c 100644
--- a/themes/apollo11.thm
+++ b/themes/apollo11.thm
@@ -1,11 +1,18 @@
 {
-  "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"
+  "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
index 038c10b..275c773 100644
--- a/themes/ash.thm
+++ b/themes/ash.thm
@@ -1,11 +1,18 @@
 {
-  "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"
+  "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.thm b/themes/battlestation.thm
index 8b56f8b..abb2906 100644
--- a/themes/battlestation.thm
+++ b/themes/battlestation.thm
@@ -1,11 +1,18 @@
 {
-  "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"
+  "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.thm b/themes/berry.thm
index 86b3e6f..cdbffb7 100644
--- a/themes/berry.thm
+++ b/themes/berry.thm
@@ -1,11 +1,18 @@
 {
-  "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"
-}
+  "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
index fe4c09a..0e47310 100644
--- a/themes/blanc.thm
+++ b/themes/blanc.thm
@@ -1,11 +1,18 @@
 {
-  "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"
+  "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
index 871de78..c32c0f1 100644
--- a/themes/cina.thm
+++ b/themes/cina.thm
@@ -1,11 +1,18 @@
 {
-  "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"
+  "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.thm b/themes/coal.thm
index 061d292..cbbe530 100644
--- a/themes/coal.thm
+++ b/themes/coal.thm
@@ -1,11 +1,18 @@
 {
-  "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"
+  "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.thm b/themes/commodore.thm
index d6fdea0..3f76660 100644
--- a/themes/commodore.thm
+++ b/themes/commodore.thm
@@ -1,11 +1,18 @@
 {
-  "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"
+  "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/deuveir b/themes/deuveir
index 574d04f..329d7bd 100644
--- a/themes/deuveir
+++ b/themes/deuveir
@@ -1,11 +1,18 @@
 {
-  "background": "#141414",
-  "f_high": "#efefef",
-  "f_med": "#efefef",
-  "f_low": "#3d3d3d",
-  "f_inv": "#141414",
-  "b_high": "#efefef",
-  "b_med": "#aa0000",
-  "b_low": "#000000",
-  "b_inv": "#3d3d3d"
-}
+  "meta": {
+    "author": "unknown",
+    "version": 2,
+    "revision": 1
+  },
+  "data": {
+    "background": "#141414",
+    "f_high": "#efefef",
+    "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.thm b/themes/donsol.thm
index cc9b410..1cdab5f 100644
--- a/themes/donsol.thm
+++ b/themes/donsol.thm
@@ -1,11 +1,18 @@
 {
-  "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"
+  "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/gameboy.thm b/themes/gameboy.thm
index 754408a..ed462b6 100644
--- a/themes/gameboy.thm
+++ b/themes/gameboy.thm
@@ -1,11 +1,18 @@
 {
-  "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"
+  "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/mahou.thm b/themes/mahou.thm
index 67a392c..3c11332 100644
--- a/themes/mahou.thm
+++ b/themes/mahou.thm
@@ -1,11 +1,18 @@
 {
-  "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"
-}
+  "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.thm b/themes/marble.thm
index 8d2f0fb..199270d 100644
--- a/themes/marble.thm
+++ b/themes/marble.thm
@@ -1,11 +1,18 @@
 {
-  "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"
-}
+  "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/noir.thm b/themes/noir.thm
index 1da54ea..d8cf560 100644
--- a/themes/noir.thm
+++ b/themes/noir.thm
@@ -1,11 +1,18 @@
 {
-  "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"
+  "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
index e751117..2162da9 100644
--- a/themes/pale.thm
+++ b/themes/pale.thm
@@ -1,11 +1,18 @@
 {
-  "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"
+  "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/raspberry.thm b/themes/raspberry.thm
index 7429a4f..7b74fc7 100644
--- a/themes/raspberry.thm
+++ b/themes/raspberry.thm
@@ -1,11 +1,18 @@
 {
-  "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"
+  "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
index fab00bc..4d1bdda 100644
--- a/themes/robo.thm
+++ b/themes/robo.thm
@@ -1,11 +1,18 @@
 {
-  "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"
+  "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.thm b/themes/seaweed.thm
index 8595513..7303325 100644
--- a/themes/seaweed.thm
+++ b/themes/seaweed.thm
@@ -1,11 +1,18 @@
 {
-  "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"
-}
+  "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/solitaire.thm b/themes/solitaire.thm
index 0c30a4b..e680388 100644
--- a/themes/solitaire.thm
+++ b/themes/solitaire.thm
@@ -1,11 +1,18 @@
 {
-  "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"
+  "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.thm b/themes/soyuz.thm
index 74f2de6..98724f9 100644
--- a/themes/soyuz.thm
+++ b/themes/soyuz.thm
@@ -1,11 +1,18 @@
 {
-  "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"
+  "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.thm b/themes/swiss.thm
index 12802a5..8367863 100644
--- a/themes/swiss.thm
+++ b/themes/swiss.thm
@@ -1,11 +1,18 @@
 {
-  "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"
-}
+  "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