diff --git a/src/components/units/GameBody/AppGameBodyBoardRegular2D.vue b/src/components/units/GameBody/AppGameBodyBoardRegular2D.vue
index 055e0b68..73290efd 100644
--- a/src/components/units/GameBody/AppGameBodyBoardRegular2D.vue
+++ b/src/components/units/GameBody/AppGameBodyBoardRegular2D.vue
@@ -20,8 +20,8 @@
     const gameType = computed(() => (currentMatch.value ? currentMatch.value.gameType : ""));
     const imageAutoGUIData = computed(() => store.getters.imageAutoGUIData(gameType.value, gameId.value, variantId.value));
     const regular2DGameBoards: Record<string, any> = {
-        "ttt-misere": CustomGUITicTacToe,
-        "ttt-regular": CustomGUITicTacToe,
+        "tictactoe-misere": CustomGUITicTacToe,
+        "tictactoe-regular": CustomGUITicTacToe,
         "quarto-regular": CustomGUIQuarto,
         "sim-regular": CustomGUISim
     };
diff --git a/src/components/units/GameBody/AppGameBodyHeaderInstructions.vue b/src/components/units/GameBody/AppGameBodyHeaderInstructions.vue
index cebb2836..82a5c2d4 100644
--- a/src/components/units/GameBody/AppGameBodyHeaderInstructions.vue
+++ b/src/components/units/GameBody/AppGameBodyHeaderInstructions.vue
@@ -3,6 +3,7 @@
         <button @click="store.commit(mutationTypes.showInstructions, true)">𝓲</button>
         <UniPopupWindow v-if="options && options.showInstructions" @close="store.commit(mutationTypes.showInstructions, false)">
             <VueMarkdownIt class="c-markdown" :break="true" :linkify="true" :plugins="plugins" :source="instructions" />
+            If you worked on this project and were not properly credited, please email <a href="mailto: ddgarcia@cs.berkeley.edu">ddgarcia@cs.berkeley.edu</a> to request a correction.
         </UniPopupWindow>
     </div>
 </template>
diff --git a/src/models/images/svg/0to10by1or2/grid.svg b/src/models/images/svg/0to10by1or2/grid.svg
index 6d532e65..96ae4bbe 100644
--- a/src/models/images/svg/0to10by1or2/grid.svg
+++ b/src/models/images/svg/0to10by1or2/grid.svg
@@ -1,58 +1,60 @@
 <?xml version="1.0" encoding="utf-8"?>
 <svg version="1.1" id="BackgroundSVG" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 90 110">
-
     <style>
         .small { 
             text-anchor: middle;
             font-size: 3px;
             font-family: Helvetica;
-            fill: black
+            fill: black;
         }
     </style>
     <defs>
-        <linearGradient id="Gradient2" x1="0" x2="0" y1="0" y2="1">
+        <linearGradient id="Gradient" x1="0" x2="0" y1="0" y2="1">
             <stop offset="0%" stop-color="#3333fe"/>
             <stop offset="100%" stop-color="#00fff7"/>
         </linearGradient>
-
         <g id="cloud">
-            <rect x="0" y="0" width="12" height="3" fill="white"/>
-            <circle cx="6" cy="0" r="3" fill="white"/>
-            <circle cx="0" cy="0" r="3" fill="white"/>
-            <circle cx="12" cy="0" r="3" fill="white"/>
-            <circle cx="2" cy="-2" r="3" fill="white"/>
-            <circle cx="6" cy="-3" r="3" fill="white"/>
-            <circle cx="10" cy="-2" r="3" fill="white"/>
+            <g fill="white">
+            <rect x="0" y="0" width="12" height="3"/>
+            <circle cx="6" cy="0" r="3"/>
+            <circle cx="0" cy="0" r="3"/>
+            <circle cx="12" cy="0" r="3"/>
+            <circle cx="2" cy="-2" r="3"/>
+            <circle cx="6" cy="-3" r="3"/>
+            <circle cx="10" cy="-2" r="3"/>
+            </g>
         </g>
     </defs>
 
-    <rect x="0" y="0" width="90" height="110" fill="url(#Gradient2)"/>
+    <rect x="0" y="0" width="90" height="110" fill="url(#Gradient)"/>
 
     <circle cx="75" cy="10" r="6" fill="#ffff00"/>
+    <g fill="gray" stroke="#888888" stroke-width="0.5">
+        <path d="M0,90L5,70L20,120L0,120z"/>
+        <path d="M20,90L25,65L40,120z"/>
+        <path d="M10,90L15,60L28,95L50,130L0,120z"/>
+    </g>
+    <path d="M80,100h2v20h-2zM66,95h2v20h-2zM66,103L72,101L66,105z" fill="#543131"/>
+
+    <g fill="green">
+        <circle cx="80" cy="100" r="2"/>
+        <circle cx="79" cy="102" r="2"/>
+        <circle cx="83" cy="100" r="3"/>
+        <circle cx="79" cy="99" r="3"/>
+        <circle cx="82" cy="97" r="3"/>
+        <circle cx="65" cy="92" r="2.5"/>
+        <circle cx="69" cy="92" r="3"/>
+        <circle cx="65" cy="96" r="3"/>
+        <circle cx="69" cy="95" r="3"/>
+        <circle cx="66" cy="93" r="3"/>
+        <ellipse cx="71" cy="101" rx="2" ry="1"/>
+    </g>
 
-    <polygon points="0 90 5 70 20 120 0 120" fill="gray" stroke="#888888" stroke-width="0.5"/>
-    <polygon points="20 90 25 65 40 120" fill="gray" stroke="#888888" stroke-width="0.5"/>
-    <polygon points="10 90 15 60 28 95 50 130 0 120" fill="gray" stroke="#888888" stroke-width="0.5"/>
-
-    <rect x="80" y="100" width="2" height="20" fill="#543131"/>
-    <circle cx="80" cy="100" r="2" fill="green"/>
-    <circle cx="79" cy="102" r="2" fill="green"/>
-    <circle cx="83" cy="100" r="3" fill="green"/>
-    <circle cx="79" cy="99" r="3" fill="green"/>
-    <circle cx="82" cy="97" r="3" fill="green"/>
-
-    <rect x="66" y="95" width="2" height="20" fill="#543131"/>
-    <polygon points="66 103 72 101 66 105" fill="#543131"/>
-    <circle cx="65" cy="92" r="2.5" fill="green"/>
-    <circle cx="69" cy="92" r="3" fill="green"/>
-    <circle cx="65" cy="96" r="3" fill="green"/>
-    <circle cx="69" cy="95" r="3" fill="green"/>
-    <circle cx="66" cy="93" r="3" fill="green"/>
-    <ellipse cx="71" cy="101" rx="2" ry="1" fill="green"/>
-
-    <ellipse cx="60" cy="109" rx="20" ry="2" fill="#38a838"/>
-    <ellipse cx="10" cy="110" rx="40" ry="5" fill="#38a838"/>
-    <ellipse cx="90" cy="110" rx="30" ry="4" fill="#38a838"/>
+    <g fill="#38a838">
+        <ellipse cx="60" cy="109" rx="20" ry="2"/>
+        <ellipse cx="10" cy="110" rx="40" ry="5"/>
+        <ellipse cx="90" cy="110" rx="30" ry="4"/>
+    </g>
 
     <use href="#cloud" transform="translate(-20 0)">
         <animateTransform attributeName="transform" attributeType="XML"
@@ -103,23 +105,16 @@
     </use>
 
     <g>
-        <animate
-            attributeName="opacity"
-            values="0.2;0.8;0.2"
-            dur="3s"
-            repeatCount="indefinite" />
-
-        <text class="small" transform="matrix(1 0 0 1 39 96)">1</text>
-        <text class="small" transform="matrix(1 0 0 1 39 86)">2</text>
-        <text class="small" transform="matrix(1 0 0 1 39 76)">3</text>
-        <text class="small" transform="matrix(1 0 0 1 39 66)">4</text>
-        <text class="small" transform="matrix(1 0 0 1 39 56)">5</text>
-        <text class="small" transform="matrix(1 0 0 1 39 46)">6</text>
-        <text class="small" transform="matrix(1 0 0 1 39 36)">7</text>
-        <text class="small" transform="matrix(1 0 0 1 39 26)">8</text>
-        <text class="small" transform="matrix(1 0 0 1 39 16)">9</text>
-        <text class="small" style="fill:gold" transform="matrix(1 0 0 1 39 6)">10</text>
-
+        <animate attributeName="opacity" values="0.2;0.8;0.2" dur="3s" repeatCount="indefinite"/>
+        <text class="small" transform="translate(39 96)">1</text>
+        <text class="small" transform="translate(39 86)">2</text>
+        <text class="small" transform="translate(39 76)">3</text>
+        <text class="small" transform="translate(39 66)">4</text>
+        <text class="small" transform="translate(39 56)">5</text>
+        <text class="small" transform="translate(39 46)">6</text>
+        <text class="small" transform="translate(39 36)">7</text>
+        <text class="small" transform="translate(39 26)">8</text>
+        <text class="small" transform="translate(39 16)">9</text>
+        <text class="small" style="fill:gold" transform="translate(39 6)">10</text>
     </g>
-
 </svg>
\ No newline at end of file
diff --git a/src/models/images/svg/0to10by1or2/x.svg b/src/models/images/svg/0to10by1or2/x.svg
index ce7e0370..a559cef5 100644
--- a/src/models/images/svg/0to10by1or2/x.svg
+++ b/src/models/images/svg/0to10by1or2/x.svg
@@ -1,16 +1,7 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <svg version="1.1" id="EntitySVG" xmlns="http://www.w3.org/2000/svg" viewBox="-35.35 -60.7 500 500">
-	<path style="fill:black;" d="M226.657,323.625v86.399h-24.132v-86.399H226.657 M236.657,313.625h-44.132v106.399h44.132V313.625
-		L236.657,313.625z"/>
-	<path style="fill:#C4820E;" d="M246.552,382.86v30.15c0,9-7.29,16.29-16.28,16.29h-31.36c-8.99,0-16.28-7.29-16.28-16.29v-30.15
-		H246.552z"/>
-	<path style="fill:#003262;" d="M353.792,132.84c1.62,35.88-10.35,68.93-31.19,94.46c-31.76,38.89-59.99,80.5-85.95,123.49h-12.57
-		c11.12-42.99,23.22-84.6,36.82-123.49c8.94-25.53,14.07-58.58,13.37-94.46c-1.38-71.39-26.17-129.34-56.76-132.68
-		c-0.96-0.1-1.9-0.16-2.85-0.16c2.21,0,4.43,0.06,6.67,0.16C292.712,3.5,350.562,61.45,353.792,132.84z"/>
-	<path style="fill:#003262;" d="M205.172,350.79h-12.65c-26.69-43.63-56.17-85.5-87.69-125.83
-		c-18.47-23.62-29.47-53.35-29.47-85.66c0-76.93,62.35-139.28,139.28-139.3c-32.96,0.02-59.68,62.37-59.68,139.3
-		c0,32.31,4.72,62.04,12.63,85.66C181.092,265.29,193.732,307.16,205.172,350.79z"/>
-	<path style="fill:#FDB515;" d="M274.272,132.84c0.7,35.88-4.43,68.93-13.37,94.46c-13.6,38.89-25.7,80.5-36.82,123.49h-18.91
-		c-11.44-43.63-24.08-85.5-37.58-125.83c-7.91-23.62-12.63-53.35-12.63-85.66c0-76.93,26.72-139.28,59.68-139.3
-		c0.01,0,0.01,0,0.02,0c0.95,0,1.89,0.06,2.85,0.16C248.102,3.5,272.892,61.45,274.272,132.84z"/>
+	<path fill="#000" d="M226.657,323.625v86.399h-24.132v-86.399H226.657 M236.657,313.625h-44.132v106.399h44.132V313.625L236.657,313.625z"/>
+	<path fill="#C4820E" d="M246.552,382.86v30.15c0,9-7.29,16.29-16.28,16.29h-31.36c-8.99,0-16.28-7.29-16.28-16.29v-30.15H246.552z"/>
+	<path fill="#003262" d="M353.792,132.84c1.62,35.88-10.35,68.93-31.19,94.46c-31.76,38.89-59.99,80.5-85.95,123.49h-12.57c11.12-42.99,23.22-84.6,36.82-123.49c8.94-25.53,14.07-58.58,13.37-94.46c-1.38-71.39-26.17-129.34-56.76-132.68c-0.96-0.1-1.9-0.16-2.85-0.16c2.21,0,4.43,0.06,6.67,0.16C292.712,3.5,350.562,61.45,353.792,132.84zM205.172,350.79h-12.65c-26.69-43.63-56.17-85.5-87.69-125.83c-18.47-23.62-29.47-53.35-29.47-85.66c0-76.93,62.35-139.28,139.28-139.3c-32.96,0.02-59.68,62.37-59.68,139.3c0,32.31,4.72,62.04,12.63,85.66C181.092,265.29,193.732,307.16,205.172,350.79z"/>
+	<path fill="#FDB515" d="M274.272,132.84c0.7,35.88-4.43,68.93-13.37,94.46c-13.6,38.89-25.7,80.5-36.82,123.49h-18.91c-11.44-43.63-24.08-85.5-37.58-125.83c-7.91-23.62-12.63-53.35-12.63-85.66c0-76.93,26.72-139.28,59.68-139.3c0.01,0,0.01,0,0.02,0c0.95,0,1.89,0.06,2.85,0.16C248.102,3.5,272.892,61.45,274.272,132.84z"/>
 </svg>
\ No newline at end of file
diff --git a/src/models/images/svg/1dchess/grid.svg b/src/models/images/svg/1dchess/grid.svg
index e91dffc1..70bddf40 100644
--- a/src/models/images/svg/1dchess/grid.svg
+++ b/src/models/images/svg/1dchess/grid.svg
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <svg version="1.1" id="BackgroundSVG" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 80 10">
-    <rect x="0" y="0" width="80" height="10" fill="#FEC595"/>
-    <rect x="0" y="0" width="10" height="10" fill="#C97D41"/>
-    <rect x="20" y="0" width="10" height="10" fill="#C97D41"/>
-    <rect x="40" y="0" width="10" height="10" fill="#C97D41"/>
-    <rect x="60" y="0" width="10" height="10" fill="#C97D41"/>
+    <path d="M0,0h80v10h-80z" fill="#FEC595"/>
+    <path d="M0,0h10v10h-10zM20,0h10v10h-10zM40,0h10v10h-10zM60,0h10v10h-10z" fill="#C97D41"/>
 </svg>
\ No newline at end of file
diff --git a/src/models/images/svg/3spot/B.svg b/src/models/images/svg/3spot/B.svg
index 37a14a82..081a5eaf 100644
--- a/src/models/images/svg/3spot/B.svg
+++ b/src/models/images/svg/3spot/B.svg
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <svg version="1.1" id="EntitySVG" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 10 10">
-    <rect x="0" y="0" width="10" height="10" stroke="black" stroke-width="0.25" fill="blue"/>
+    <path d="M0,0h10v10h-10z" stroke="#000" stroke-width="0.25" fill="blue"/>
 </svg>
\ No newline at end of file
diff --git a/src/models/images/svg/3spot/R.svg b/src/models/images/svg/3spot/R.svg
index 8ea56cbf..0a23085b 100644
--- a/src/models/images/svg/3spot/R.svg
+++ b/src/models/images/svg/3spot/R.svg
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <svg version="1.1" id="EntitySVG" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 10 10">
-    <rect x="0" y="0" width="10" height="10" stroke="black" stroke-width="0.25" fill="red"/>
+    <path d="M0,0h10v10h-10z" stroke="#000" stroke-width="0.25" fill="red"/>
 </svg>
\ No newline at end of file
diff --git a/src/models/images/svg/3spot/W.svg b/src/models/images/svg/3spot/W.svg
index a7ce9dcd..06f638e3 100644
--- a/src/models/images/svg/3spot/W.svg
+++ b/src/models/images/svg/3spot/W.svg
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <svg version="1.1" id="EntitySVG" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 10 10">
-    <rect x="0" y="0" width="10" height="10" stroke="black" stroke-width="0.25" fill="white"/>
+    <path d="M0,0h10v10h-10z" stroke="#000" stroke-width="0.25" fill="white"/>
 </svg>
\ No newline at end of file
diff --git a/src/models/images/svg/3spot/grid.svg b/src/models/images/svg/3spot/grid.svg
index 0a8f2a3e..29cd836b 100644
--- a/src/models/images/svg/3spot/grid.svg
+++ b/src/models/images/svg/3spot/grid.svg
@@ -1,17 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <svg version="1.1" id="BackgroundSVG" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 30 40">
-    <rect x="0" y="0" width="30" height="30" stroke="black" stroke-width="0.25" fill="#555555"/>
-
-    <line x1="10" y1="0" x2="10" y2="30" stroke="black" stroke-width="0.25"/>
-    <line x1="20" y1="0" x2="20" y2="30" stroke="black" stroke-width="0.25"/>
-
-    <line x1="0" y1="10" x2="30" y2="10" stroke="black" stroke-width="0.25"/>
-    <line x1="0" y1="20" x2="30" y2="20" stroke="black" stroke-width="0.25"/>
-
-    <circle cx="5" cy="25" r="1" fill="black"/>
-    <circle cx="15" cy="25" r="1" fill="black"/>
-    <circle cx="25" cy="25" r="1" fill="black"/>
-
-    <rect x="1" y="32" width="8" height="6" fill="#5a70ff"/>
-    <rect x="21" y="32" width="8" height="6" fill="#f26464"/>
+    <defs><circle id="a" r="1" fill="#000"/></defs>
+    <path d="M0,0h30v30h-30zM10,0v30M20,0v30M0,10h30M0,20h30" stroke="#000" stroke-width="0.25" fill="#555"/>
+    <use href="#a" x="5" y="25"/><use href="#a" x="15" y="25"/><use href="#a" x="25" y="25"/>
+    <path d="M1,32h8v6h-8z" fill="#5a70ff"/>
+    <path d="M21,32h8v6h-8z" fill="#f26464"/>
 </svg>
\ No newline at end of file
diff --git a/src/models/images/svg/Lgame/G.svg b/src/models/images/svg/Lgame/G.svg
index d1da08ea..78bfd6bb 100644
--- a/src/models/images/svg/Lgame/G.svg
+++ b/src/models/images/svg/Lgame/G.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px"
-     y="0px"
-     viewBox="0 0 25 25" style="enable-background:new 0 0 25 25;" xml:space="preserve">
+<svg version="1.1" id="EntitySVG" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 25 25">
     <circle cx="12.5" cy="12.5" r="11" stroke="#2A2A2A" stroke-width="0.5" fill="gray"/>
 </svg>
\ No newline at end of file
diff --git a/src/models/images/svg/achi/achiboard.svg b/src/models/images/svg/achi/board.svg
similarity index 100%
rename from src/models/images/svg/achi/achiboard.svg
rename to src/models/images/svg/achi/board.svg
diff --git a/src/models/images/svg/allqueenschess/board.svg b/src/models/images/svg/allqueenschess/board.svg
index 9642e8c9..2018caea 100644
--- a/src/models/images/svg/allqueenschess/board.svg
+++ b/src/models/images/svg/allqueenschess/board.svg
@@ -1,52 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <svg version="1.1" id="BackgroundSVG" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 50 50">
-    <style>
-        .r {
-            fill: #888888;
-            width: 10px;
-            height: 10px;
-        }
-
-        .b {
-            fill: #DDDDDD;
-            width: 10px;
-            height: 10px;
-        }
-    </style>
-
-    <rect x="0" y="0" class="r" />
-    <rect x="10" y="0" class="b" />
-    <rect x="20" y="0" class="r" />
-    <rect x="30" y="0" class="b" />
-    <rect x="40" y="0" class="r" />
-
-    <rect x="0" y="10" class="b" />
-    <rect x="10" y="10" class="r" />
-    <rect x="20" y="10" class="b" />
-    <rect x="30" y="10" class="r" />
-    <rect x="40" y="10" class="b" />
-
-    <rect x="0" y="20" class="r" />
-    <rect x="10" y="20" class="b" />
-    <rect x="20" y="20" class="r" />
-    <rect x="30" y="20" class="b" />
-    <rect x="40" y="20" class="r" />
-
-    <rect x="0" y="30" class="b" />
-    <rect x="10" y="30" class="r" />
-    <rect x="20" y="30" class="b" />
-    <rect x="30" y="30" class="r" />
-    <rect x="40" y="30" class="b" />
-
-    <rect x="0" y="40" class="r" />
-    <rect x="10" y="40" class="b" />
-    <rect x="20" y="40" class="r" />
-    <rect x="30" y="40" class="b" />
-    <rect x="40" y="40" class="r" />
-
-    <rect x="0" y="0" width="50" height="50" stroke="#000000" stroke-width="0.5" fill="none" />
-
-    <path d="M 10 0 V 50 M 20 0 V 50 M 30 0 V 50 M 40 0 V 50 
-    M 0 10 H 50 M 0 20 H 50 M 0 30 H 50 M 0 40 H 50" stroke="black" stroke-width="0.25" />
-
+    <path d="M0,0h50v50h-50z" fill="#DDDDDD" />
+    <path d="M0,0h10v10h-10zM20,0h10v10h-10zM40,0h10v10h-10zM10,10h10v10h-10zM30,10h10v10h-10zM0,20h10v10h-10zM20,20h10v10h-10zM40,20h10v10h-10zM10,30h10v10h-10zM30,30h10v10h-10zM0,40h10v10h-10zM20,40h10v10h-10zM40,40h10v10h-10z" fill="#888888" />
 </svg>
\ No newline at end of file
diff --git a/src/models/images/svg/baghchal/G.svg b/src/models/images/svg/baghchal/G.svg
index 7eca2f7f..735a74be 100644
--- a/src/models/images/svg/baghchal/G.svg
+++ b/src/models/images/svg/baghchal/G.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 128 128">
+<svg version="1.1" id="EntitySVG" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 128 128">
     <path fill="#b68859" d="M66.67 49.49s5.07-2.25 9.57-3.1c4.5-.84 8.17-.7 8.17-.7s3.94-5.77 4.5-8.87s.63-5.98.7-6.48c.17-1.2 8.17-1.27 9.85 3.52c1.69 4.79-.42 10.56-1.83 12.67s-2.96 3.66-2.96 3.66s6.9 6.48 8.45 13.66s1.13 17.74 1.13 17.74s-.42 8.02-4.36 8.59c-3.94.56-8.73-3.03-9.43-3.87c-.7-.84-2.06-3.21-4.36-2.46c-2.6.84-3.27 3.84-3.8 6.48c-.66 3.24-1.64 11.5-1.64 11.5s-4.69 1.88-7.51 1.45c-2.82-.42-6.34-3.8-6.34-3.8s.28-4.22-1.13-5.07s-2.82 1.55-2.82 1.55l-5.63 6.19l-7.74-6.34s-.56-2.82-1.41-4.22c-.84-1.41-2.53-4.5-3.1-6.62c-1.4-5.21-.98-15.2-.98-15.2l-8.59-41.95l2.11-1.97s1.97-10.14 5.07-14.5s5.63-5.49 7.32-6.34s6.9-1.41 6.9 0s-2.39 3.24-3.8 5.49s-2.96 5.49-3.8 8.31S47.43 25 47.43 25l3.05.7s1.69-4.08 3.24-6.19c1.55-2.11 3.73-5 6.41-7.04c2.27-1.73 5.42-3.52 8.94-3.52c3.52 0 8.17.99 7.74 3.59c-.23 1.42-2.89.77-5.56 2.53c-3.25 2.14-6.76 5.7-9.36 11.68s-3.52 8.59-3.52 8.59s6.83 6.41 7.53 8.59s.77 5.56.77 5.56z"/>
     <path fill="#6d4938" d="M35.7 70.14s5.73 3.62 8.26 3.75c3.89.21 9.62-2.09 13.21-6.03s6.55-9.68 6.03-16.68c-.45-6.03-2.51-8.24-2.51-8.24s3.59 3.52 8.8 3.1c5.21-.42 9.43-3.59 11.05-6.76c1.28-2.5 2.46-5.56 1.69-6.12c-.77-.56-3.36 0-3.36 0l-9.81 4.43l-16.82 1.13l-17.6 25.13l1.06 6.29zM22.18 30.16c-.7.48.35 3.66 2.82 5.56s5.98 2.46 5.98 2.46l5.21-7.11s-12.67-1.83-14.01-.91z"/>
     <path fill="#855b52" d="M66.76 97.97s2.86 2.63 6.87 2.28c4.01-.35 7.63-2.93 7.63-2.93s-.8 8.21-.87 9.76c-.07 1.55-.21 6.1-.21 6.1s-5.07 5.44-7.81 4.95c-2.75-.49-6.57-5.3-6.5-6.22c.07-.92.66-5.04.8-7.16c.14-2.11.09-6.78.09-6.78zM56.32 96.72c4.29-.3 7.53-1.95 7.53-1.95s.23 6.01.14 7.6c-.16 2.78-.38 6.1-.66 6.95c-.28.84-9.41 2.04-9.41 2.04s-4.43-3.94-4.43-4.15c0-.21.23-3.21.33-5.44c.07-1.62-.42-6.66-.42-6.66s2.84 1.9 6.92 1.61zM90.04 85.77s3.03.33 5.07.12c2.04-.21 6.26-1.76 7.32-2.46c1.06-.7 1.83-1.83 1.83-1.83s-.42 8.73-.35 10.42c.07 1.69.07 5.7.07 5.7s-3.31 5.35-6.83 5.7c-3.52.35-7.11-6.15-7.11-6.15s.52-3.43.52-5.54c-.01-2.11-.52-5.96-.52-5.96zM39.71 32.88c.69.41 2.11-3.87 11.19-3.8c10 .07 15.27 4.93 16.05 5c.77.07 6.12 0 7.81-.14c1.69-.14 4.65-1.48 4.58-.49s-1.2 6.41-6.19 7.81c-5 1.41-13.44-1.62-15.06-1.76c-1.62-.14-3.03 0-2.89 2.46c.14 2.46-18.37 13.59-18.37 13.59s-13.54-6.31-13.75-7.09c-.21-.77 1.31-2.82 2.56-4.74c1.58-2.44 2.39-5.14 3.24-6.55c.84-1.41 2.18-3.24 2.18-3.24s-2.63.21-4.36-.54c-1.19-.51-4.15-2.49-4.29-3.19s3.31.07 6.12-.21c2.82-.28 8.09-3.24 8.09-3.24s1.76 1.41 2.25 2.75s.49 3.17.84 3.38z"/>
diff --git a/src/models/images/svg/baghchal/T.svg b/src/models/images/svg/baghchal/T.svg
index 61c784df..703dfc1f 100644
--- a/src/models/images/svg/baghchal/T.svg
+++ b/src/models/images/svg/baghchal/T.svg
@@ -1,103 +1,11 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" 
-	 viewBox="0 0 410.413 410.413" xml:space="preserve">
-<g>
-	<g>
-		<path style="fill:#FF9E16;" d="M8.641,268.504c-4.772,0-8.641-3.868-8.641-8.641v-76.971c0-28.401,23.104-51.503,51.503-51.503
-			h33.894c4.772,0,8.64,3.867,8.64,8.64c0,4.77-3.868,8.64-8.64,8.64H51.503c-18.871,0-34.223,15.353-34.223,34.224v76.971
-			C17.28,264.635,13.413,268.504,8.641,268.504z"/>
-		<g>
-			<polygon style="fill:#333E48;" points="0,190.514 0,194.918 11.953,192.715 			"/>
-			<path style="fill:#333E48;" d="M2.774,166.25c-0.686,2.003-1.264,4.057-1.701,6.163l11.324,7.803L2.774,166.25z"/>
-			<polygon style="fill:#333E48;" points="0,237.035 17.28,233.854 17.28,231.574 0,228.392 			"/>
-			<path style="fill:#333E48;" d="M20.65,141.678l9.663,8.517l-5.846-11.115C23.155,139.893,21.879,140.757,20.65,141.678z"/>
-			<polygon style="fill:#333E48;" points="17.28,212.134 17.28,207.409 4.452,209.773 			"/>
-			<path style="fill:#333E48;" d="M44.385,131.892l2.633,14.305l2.719-14.763C47.928,131.495,46.143,131.648,44.385,131.892z"/>
-			<path style="fill:#333E48;" d="M21.666,166.163c0.632-1.125,1.327-2.208,2.078-3.25l-8.216-5.66L21.666,166.163z"/>
-		</g>
-	</g>
-	<g>
-		<path style="fill:#B36F0F;" d="M144.426,173.016c-19.385,0-35.1,15.715-35.1,35.1v34.75h-3.304
-			c-16.551,0-29.969,13.416-29.969,29.969v54.343c0,13.5,10.945,24.444,24.444,24.444h44.146c3.869,0,7.004-3.138,7.004-7.004
-			c0-15.023-11.266-27.403-25.808-29.184v-31.294h12.614c22.684,0,41.071-18.387,41.071-41.071v-34.953
-			C179.525,188.73,163.811,173.016,144.426,173.016z"/>
-		<g>
-			<polygon style="fill:#333E48;" points="109.326,226.305 109.326,239.124 144.131,232.712 			"/>
-			<path style="fill:#333E48;" d="M76.585,267.228c-0.344,1.816-0.531,3.689-0.531,5.605v10.142l43.021-7.922L76.585,267.228z"/>
-			<polygon style="fill:#333E48;" points="140.428,220.178 179.525,227.379 179.525,212.978 			"/>
-			<path style="fill:#333E48;" d="M165.809,273.697c4.657-4.164,8.354-9.372,10.732-15.255l-46.789,8.614L165.809,273.697z"/>
-			<polygon style="fill:#333E48;" points="125.84,303.555 125.84,295.25 103.291,299.402 			"/>
-		</g>
-	</g>
-	<g>
-		<path style="fill:#B36F0F;" d="M312.58,315.328v-108.6c0-13.501-10.945-24.444-24.443-24.444c-13.5,0-24.444,10.943-24.444,24.444
-			v120.448c0,13.5,10.944,24.444,24.444,24.444h44.146c3.869,0,7.004-3.138,7.004-7.004
-			C339.287,329.283,327.555,316.698,312.58,315.328z"/>
-		<g>
-			<polygon style="fill:#333E48;" points="263.693,267.767 263.693,281.94 302.173,274.852 			"/>
-			<polygon style="fill:#333E48;" points="263.693,227.665 263.693,236.445 287.533,232.056 			"/>
-			<polygon style="fill:#333E48;" points="312.58,256.5 312.58,243.064 276.096,249.783 			"/>
-			<polygon style="fill:#333E48;" points="282.957,212.978 312.58,218.434 312.58,207.523 			"/>
-			<polygon style="fill:#333E48;" points="312.58,301.503 312.58,288.066 276.096,294.784 			"/>
-		</g>
-	</g>
-	<path style="fill:#FF9E16;" d="M305.799,117.676H113.345c-33.752,0-61.113,27.359-61.113,61.112v71.573h202.852
-		c40.777,0,73.832-33.056,73.832-73.833V140.79C328.916,128.026,318.566,117.676,305.799,117.676z"/>
-	<g>
-		<polygon style="fill:#333E48;" points="131.225,214.779 113.345,117.676 149.104,117.676 		"/>
-		<polygon style="fill:#333E48;" points="220.508,214.779 202.628,117.676 238.388,117.676 		"/>
-		<polygon style="fill:#333E48;" points="175.562,185.754 163.027,117.676 188.098,117.676 		"/>
-		<path style="fill:#333E48;" d="M71.45,134.318l9.471,51.436l11.882-64.528C84.774,124.09,77.528,128.59,71.45,134.318z"/>
-		<polygon style="fill:#333E48;" points="265.91,185.754 253.374,117.676 278.445,117.676 		"/>
-	</g>
-	<rect x="286.99" y="152.855" style="fill:#E8E8E8;" width="13.32" height="16.56"/>
-	<g>
-		<path style="fill:#FF9E16;" d="M408.086,112.204l-54.961-44.435h-31.011c-31.041,0-56.205,25.165-56.205,56.206
-			s25.164,56.204,56.205,56.204h31.011c31.042,0,56.205-25.163,56.205-56.204C409.331,119.937,408.896,116,408.086,112.204z"/>
-		<path style="fill:#333E48;" d="M295.024,74.726l6.547,35.558l7.547-40.986C304.13,70.479,299.398,72.314,295.024,74.726z"/>
-		<polygon style="fill:#333E48;" points="328.776,67.769 333.521,93.542 338.268,67.769 		"/>
-		<path style="fill:#E8E8E8;" d="M400.691,116.134h-76.979c-20.281,0-36.722,16.44-36.722,36.721c0,2.851,0.335,5.617,0.949,8.281
-			c-0.614,2.661-0.949,5.431-0.949,8.278c0,17.122,11.717,31.506,27.57,35.572c-1.755-4.286-2.728-8.977-2.728-13.895
-			c0-0.414,0.018-0.823,0.031-1.234c4.646,4.816,10.592,8.374,17.278,10.089c-1.345-3.286-2.227-6.81-2.566-10.491
-			c2.867-0.221,5.642-0.766,8.287-1.607v0.004l52.839-12.506c13.049-3.279,22.712-15.086,22.712-29.15v-20.342
-			C410.411,120.487,406.059,116.134,400.691,116.134z"/>
-		<circle style="fill:#333E48;" cx="344.052" cy="101.374" r="5.156"/>
-		<g>
-			<path style="fill:#333E48;" d="M410.411,113.208c0-1.615-1.31-2.925-2.926-2.925l-5.094,0.063
-				c-5.368,0.023-6.589,3.079-2.711,6.791l4.325,4.142c1.795,1.72,4.09,2.611,6.406,2.69L410.411,113.208L410.411,113.208z"/>
-		</g>
-		<g>
-			<path style="fill:#333E48;" d="M290.583,58.791c-7.305,0-13.228,5.921-13.228,13.228c0,7.306,5.922,13.228,13.228,13.228h8.068
-				c2.85,0,5.16-2.312,5.16-5.161V72.02C303.811,64.711,297.889,58.791,290.583,58.791z"/>
-			<path style="fill:#FF9C9F;" d="M292.114,82.416c-4.889,0-8.867-3.978-8.867-8.865c0-4.89,3.979-8.867,8.867-8.867
-				c4.889,0,8.867,3.978,8.867,8.867v8.066c0,0.44-0.358,0.799-0.8,0.799C300.181,82.417,292.114,82.417,292.114,82.416z"/>
-		</g>
-	</g>
-	<g>
-		<path style="fill:#FF9E16;" d="M96.8,173.016c-19.385,0-35.1,15.715-35.1,35.1v34.75h-3.303
-			c-16.551,0-29.969,13.416-29.969,29.969v54.343c0,13.5,10.944,24.444,24.444,24.444h44.146c3.869,0,7.004-3.138,7.004-7.004
-			c0-15.023-11.266-27.403-25.809-29.184v-31.294h12.614c22.684,0,41.071-18.387,41.071-41.071v-34.953
-			C131.899,188.73,116.185,173.016,96.8,173.016z"/>
-		<g>
-			<polygon style="fill:#333E48;" points="61.7,226.305 61.7,239.124 96.505,232.712 			"/>
-			<path style="fill:#333E48;" d="M28.959,267.228c-0.344,1.816-0.531,3.689-0.531,5.605v10.142l43.021-7.922L28.959,267.228z"/>
-			<polygon style="fill:#333E48;" points="92.802,220.178 131.899,227.379 131.899,212.978 			"/>
-			<path style="fill:#333E48;" d="M118.184,273.697c4.656-4.164,8.353-9.372,10.731-15.255l-46.789,8.614L118.184,273.697z"/>
-			<polygon style="fill:#333E48;" points="78.214,303.555 78.214,295.25 55.665,299.402 			"/>
-		</g>
-	</g>
-	<g>
-		<path style="fill:#FF9E16;" d="M264.954,315.328v-108.6c0-13.501-10.944-24.444-24.443-24.444
-			c-13.501,0-24.444,10.943-24.444,24.444v120.448c0,13.5,10.944,24.444,24.444,24.444h44.146c3.869,0,7.004-3.138,7.004-7.004
-			C291.661,329.283,279.929,316.698,264.954,315.328z"/>
-		<g>
-			<polygon style="fill:#333E48;" points="216.067,267.767 216.067,281.94 254.547,274.852 			"/>
-			<polygon style="fill:#333E48;" points="216.067,227.665 216.067,236.445 239.907,232.056 			"/>
-			<polygon style="fill:#333E48;" points="264.954,256.5 264.954,243.064 228.47,249.783 			"/>
-			<polygon style="fill:#333E48;" points="235.332,212.978 264.954,218.434 264.954,207.523 			"/>
-			<polygon style="fill:#333E48;" points="264.954,301.503 264.954,288.066 228.47,294.784 			"/>
-		</g>
-	</g>
-</g>
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" id="EntitySVG" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 410.413 410.413">
+	<path fill="#B36F0F" d="M144.426,173.016c-19.385,0-35.1,15.715-35.1,35.1v34.75h-3.304c-16.551,0-29.969,13.416-29.969,29.969v54.343c0,13.5,10.945,24.444,24.444,24.444h44.146c3.869,0,7.004-3.138,7.004-7.004c0-15.023-11.266-27.403-25.808-29.184v-31.294h12.614c22.684,0,41.071-18.387,41.071-41.071v-34.953C179.525,188.73,163.811,173.016,144.426,173.016zM312.58,315.328v-108.6c0-13.501-10.945-24.444-24.443-24.444c-13.5,0-24.444,10.943-24.444,24.444v120.448c0,13.5,10.944,24.444,24.444,24.444h44.146c3.869,0,7.004-3.138,7.004-7.004C339.287,329.283,327.555,316.698,312.58,315.328z"/>
+	<path fill="#FF9E16" d="M305.799,117.676H113.345c-33.752,0-61.113,27.359-61.113,61.112v71.573h202.852c40.777,0,73.832-33.056,73.832-73.833V140.79C328.916,128.026,318.566,117.676,305.799,117.676z"/>
+	<path fill="#333E48" d="M131.225,214.779L113.345,117.676L149.104,117.676zM220.508,214.779L202.628,117.676L238.388,117.676zM265.91,185.754L253.374,117.676L278.445,117.676z"/>
+	<path fill="#FF9E16" d="M8.641,268.504c-4.772,0-8.641-3.868-8.641-8.641v-76.971c0-28.401,23.104-51.503,51.503-51.503h33.894c4.772,0,8.64,3.867,8.64,8.64c0,4.77-3.868,8.64-8.64,8.64H51.503c-18.871,0-34.223,15.353-34.223,34.224v76.971C17.28,264.635,13.413,268.504,8.641,268.504zM408.086,112.204l-54.961-44.435h-31.011c-31.041,0-56.205,25.165-56.205,56.206s25.164,56.204,56.205,56.204h31.011c31.042,0,56.205-25.163,56.205-56.204C409.331,119.937,408.896,116,408.086,112.204zM96.8,173.016c-19.385,0-35.1,15.715-35.1,35.1v34.75h-3.303c-16.551,0-29.969,13.416-29.969,29.969v54.343c0,13.5,10.944,24.444,24.444,24.444h44.146c3.869,0,7.004-3.138,7.004-7.004c0-15.023-11.266-27.403-25.809-29.184v-31.294h12.614c22.684,0,41.071-18.387,41.071-41.071v-34.953C131.899,188.73,116.185,173.016,96.8,173.016zM264.954,315.328v-108.6c0-13.501-10.944-24.444-24.443-24.444c-13.501,0-24.444,10.943-24.444,24.444v120.448c0,13.5,10.944,24.444,24.444,24.444h44.146c3.869,0,7.004-3.138,7.004-7.004C291.661,329.283,279.929,316.698,264.954,315.328z"/>
+	<path fill="#E8E8E8" d="M400.691,116.134h-76.979c-20.281,0-36.722,16.44-36.722,36.721c0,2.851,0.335,5.617,0.949,8.281c-0.614,2.661-0.949,5.431-0.949,8.278c0,17.122,11.717,31.506,27.57,35.572c-1.755-4.286-2.728-8.977-2.728-13.895c0-0.414,0.018-0.823,0.031-1.234c4.646,4.816,10.592,8.374,17.278,10.089c-1.345-3.286-2.227-6.81-2.566-10.491c2.867-0.221,5.642-0.766,8.287-1.607v0.004l52.839-12.506c13.049-3.279,22.712-15.086,22.712-29.15v-20.342C410.411,120.487,406.059,116.134,400.691,116.134z"/>
+	<circle fill="#333E48" cx="344.052" cy="101.374" r="5.156"/>
+	<path fill="#333E48" d="M0,190.514L0,194.918L11.953,192.715zM0,237.035L17.28,233.854L17.28,231.574L0,228.392zM17.28,212.134L17.28,207.409L4.452,209.773zM21.666,166.163c0.632-1.125,1.327-2.208,2.078-3.25l-8.216-5.66L21.666,166.163zM44.385,131.892l2.633,14.305l2.719-14.763C47.928,131.495,46.143,131.648,44.385,131.892zM20.65,141.678l9.663,8.517l-5.846-11.115C23.155,139.893,21.879,140.757,20.65,141.678zM2.774,166.25c-0.686,2.003-1.264,4.057-1.701,6.163l11.324,7.803L2.774,166.25zM125.84,303.555L125.84,295.25L103.291,299.402zM165.809,273.697c4.657-4.164,8.354-9.372,10.732-15.255l-46.789,8.614L165.809,273.697zM263.693,267.767L263.693,281.94L302.173,274.852zM312.58,256.5L312.58,243.064L276.096,249.783zM312.58,301.503L312.58,288.066L276.096,294.784zM71.45,134.318l9.471,51.436l11.882-64.528C84.774,124.09,77.528,128.59,71.45,134.318zM175.562,185.754L163.027,117.676L188.098,117.676zM328.776,67.769L333.521,93.542L338.268,67.769zM295.024,74.726l6.547,35.558l7.547-40.986C304.13,70.479,299.398,72.314,295.024,74.726zM290.583,58.791c-7.305,0-13.228,5.921-13.228,13.228c0,7.306,5.922,13.228,13.228,13.228h8.068c2.85,0,5.16-2.312,5.16-5.161V72.02C303.811,64.711,297.889,58.791,290.583,58.791zM410.411,113.208c0-1.615-1.31-2.925-2.926-2.925l-5.094,0.063c-5.368,0.023-6.589,3.079-2.711,6.791l4.325,4.142c1.795,1.72,4.09,2.611,6.406,2.69L410.411,113.208L410.411,113.208zM61.7,226.305L61.7,239.124L96.505,232.712zM28.959,267.228c-0.344,1.816-0.531,3.689-0.531,5.605v10.142l43.021-7.922L28.959,267.228zM92.802,220.178L131.899,227.379L131.899,212.978zM118.184,273.697c4.656-4.164,8.353-9.372,10.731-15.255l-46.789,8.614L118.184,273.697zM78.214,303.555L78.214,295.25L55.665,299.402zM216.067,267.767L216.067,281.94L254.547,274.852zM216.067,227.665L216.067,236.445L239.907,232.056zM264.954,256.5L264.954,243.064L228.47,249.783zM235.332,212.978L264.954,218.434L264.954,207.523zM264.954,301.503L264.954,288.066L228.47,294.784z"/>
+	<path fill="#FF9C9F" d="M292.114,82.416c-4.889,0-8.867-3.978-8.867-8.865c0-4.89,3.979-8.867,8.867-8.867c4.889,0,8.867,3.978,8.867,8.867v8.066c0,0.44-0.358,0.799-0.8,0.799C300.181,82.417,292.114,82.417,292.114,82.416z"/>
 </svg>
\ No newline at end of file
diff --git a/src/models/images/svg/baghchal/grid5Diag.svg b/src/models/images/svg/baghchal/grid5Diag.svg
index 2eba6cd9..3b7630ef 100644
--- a/src/models/images/svg/baghchal/grid5Diag.svg
+++ b/src/models/images/svg/baghchal/grid5Diag.svg
@@ -1,29 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <svg version="1.1" id="BackgroundSVG" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 50 60">
-    <style>
-        .small {
-            font: 3px monospace;
-        }
-    </style>
-     <rect x="0" y="0" width="50" height="60" stroke="none" fill="#93c59f" />
-    <rect x="5" y="5" width="40" height="40" stroke="black" stroke-width="0.4" fill="#c8efd1" />
-
-    <line x1="15" y1="5" x2="15" y2="45" stroke="black" stroke-width="0.25" />
-    <line x1="25" y1="5" x2="25" y2="45" stroke="black" stroke-width="0.25" />
-    <line x1="35" y1="5" x2="35" y2="45" stroke="black" stroke-width="0.25" />
-
-    <line x1="5" y1="15" x2="45" y2="15" stroke="black" stroke-width="0.25" />
-    <line x1="5" y1="25" x2="45" y2="25" stroke="black" stroke-width="0.25" />
-    <line x1="5" y1="35" x2="45" y2="35" stroke="black" stroke-width="0.25" />
-
-    <line x1="5" y1="5" x2="45" y2="45" stroke="black" stroke-width="0.25" />
-    <line x1="45" y1="5" x2="5" y2="45" stroke="black" stroke-width="0.25" />
-
-    <line x1="5" y1="25" x2="25" y2="5" stroke="black" stroke-width="0.25" />
-    <line x1="45" y1="25" x2="25" y2="5" stroke="black" stroke-width="0.25" />
-    <line x1="45" y1="25" x2="25" y2="45" stroke="black" stroke-width="0.25" />
-    <line x1="5" y1="25" x2="25" y2="45" stroke="black" stroke-width="0.25" />
-
+    <style>.small {font: 3px monospace;}</style>
+    <path d="M0,0h50v60h-50z" fill="#93c59f" />
+    <path d="M5,5h40v40h-40z" stroke="#000" fill="#c8efd1" stroke-width="0.4" />
+    <path d="M5,5l40,40M45,5l-40,40M15,5v40M25,5v40M35,5v40M5,15h40M5,25h40M5,35h40M25,5l20,20l-20,20l-20,-20l20,-20" stroke="#000" stroke-width="0.25" fill="none" />
     <text x="8.5" y="53" class="small">Goats To Place:</text>
     <text x="8.5" y="56.5" class="small">Goats Captured:</text>
 </svg>
\ No newline at end of file
diff --git a/src/models/images/svg/beeline/board.svg b/src/models/images/svg/beeline/board.svg
index f01e90e7..0517590b 100644
--- a/src/models/images/svg/beeline/board.svg
+++ b/src/models/images/svg/beeline/board.svg
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <svg version="1.1" id="BackgroundSVG" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 240 144">
-    <defs>
-        <path id="hex" d="M40 20 l-10,17.3 l-20,0 l-10,-17.3 l10,-17.3 l20,0 l10,17.3 z" fill="#fac45f" stroke="black" stroke-width="2"/>
-    </defs>
-
+    <defs><path id="hex" d="M40 20 l-10,17.3 l-20,0 l-10,-17.3 l10,-17.3 l20,0 l10,17.3 z" fill="#fac45f" stroke="black" stroke-width="2"/></defs>
     <use href="#hex" x="100" y="0"/>
     <use href="#hex" x="70" y="17.3"/>
     <use href="#hex" x="130" y="17.3"/>
diff --git a/src/models/images/svg/chomp/p.svg b/src/models/images/svg/chomp/p.svg
index 006574d6..5c4e36cf 100644
--- a/src/models/images/svg/chomp/p.svg
+++ b/src/models/images/svg/chomp/p.svg
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
-     viewBox="0 0 25 25">
-    <rect x="0" y="0" width="25" height="25" fill="#784A10"/>
-    <rect x="0.5" y="0.5" width="24" height="24" fill="#7A553B"/>
+<svg version="1.1" id="EntitySVG" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 25 25">
+    <path d="M0.25,0.25h24.5v24.5h-24.5z" stroke-width="0.5" stroke="#784A10" fill="#7A553B"/>
     <circle cx="12.5" cy="12.5" r="10" fill="none" stroke-width="2" stroke="#784A10"/>
-    <line x1="5.42893218813" y1="5.42893218813" x2="19.5710678119" y2="19.5710678119" stroke-width="2" stroke="#784A10"/>
+    <line x1="5.4289321" y1="5.4289321" x2="19.571067" y2="19.571067" stroke-width="2" stroke="#784A10"/>
 </svg>
\ No newline at end of file
diff --git a/src/models/images/svg/chomp/x.svg b/src/models/images/svg/chomp/x.svg
index 314967fe..f1938b42 100644
--- a/src/models/images/svg/chomp/x.svg
+++ b/src/models/images/svg/chomp/x.svg
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" x="0" y="0" width="25" height="25" viewBox="0 0 25 25">
-    <rect x="0" y="0" width="25" height="25" fill="#784A10"/>
-    <rect x="0.5" y="0.5" width="24" height="24" fill="#7A553B"/>
+<svg version="1.1" id="EntitySVG" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 25 25">
+    <path d="M0.25,0.25h24.5v24.5h-24.5z" stroke-width="0.5" stroke="#784A10" fill="#7A553B"/>
 </svg>
\ No newline at end of file
diff --git a/src/models/images/svg/connect4/O.svg b/src/models/images/svg/connect4/O.svg
deleted file mode 100644
index 25e64567..00000000
--- a/src/models/images/svg/connect4/O.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px"
-     y="0px"
-     viewBox="0 0 10 10" style="enable-background:new 0 0 10 10;" xml:space="preserve">
-
-    <circle cx="5" cy="5" r="4.8"  fill="red"/>
-    
-</svg>
\ No newline at end of file
diff --git a/src/models/images/svg/connect4/X.svg b/src/models/images/svg/connect4/X.svg
deleted file mode 100644
index 7b23b860..00000000
--- a/src/models/images/svg/connect4/X.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px"
-     y="0px"
-     viewBox="0 0 10 10" style="enable-background:new 0 0 10 10;" xml:space="preserve">
-
-    <circle cx="5" cy="5" r="4.8" fill="blue"/>
-
-</svg>
\ No newline at end of file
diff --git a/src/models/images/svg/connect4/foreground6x6.svg b/src/models/images/svg/connect4/foreground6x6.svg
index fff3d01b..6e90eaf3 100644
--- a/src/models/images/svg/connect4/foreground6x6.svg
+++ b/src/models/images/svg/connect4/foreground6x6.svg
@@ -1,50 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px"
-     y="0px"
-     viewBox="0 0 60 70" style="enable-background:new 0 0 60 70;" xml:space="preserve">
-
-    <path d="M0 10 h60 v60 h-60zz
-      M1,15 a 4,4 0 1,0 8,0 a 4,4 0 1,0 -8,0
-      M11,15 a 4,4 0 1,0 8,0 a 4,4 0 1,0 -8,0
-      M21,15 a 4,4 0 1,0 8,0 a 4,4 0 1,0 -8,0
-      M31,15 a 4,4 0 1,0 8,0 a 4,4 0 1,0 -8,0
-      M41,15 a 4,4 0 1,0 8,0 a 4,4 0 1,0 -8,0
-      M51,15 a 4,4 0 1,0 8,0 a 4,4 0 1,0 -8,0
-
-      M1,25 a 4,4 0 1,0 8,0 a 4,4 0 1,0 -8,0
-      M11,25 a 4,4 0 1,0 8,0 a 4,4 0 1,0 -8,0
-      M21,25 a 4,4 0 1,0 8,0 a 4,4 0 1,0 -8,0
-      M31,25 a 4,4 0 1,0 8,0 a 4,4 0 1,0 -8,0
-      M41,25 a 4,4 0 1,0 8,0 a 4,4 0 1,0 -8,0
-      M51,25 a 4,4 0 1,0 8,0 a 4,4 0 1,0 -8,0
-
-      M1,35 a 4,4 0 1,0 8,0 a 4,4 0 1,0 -8,0
-      M11,35 a 4,4 0 1,0 8,0 a 4,4 0 1,0 -8,0
-      M21,35 a 4,4 0 1,0 8,0 a 4,4 0 1,0 -8,0
-      M31,35 a 4,4 0 1,0 8,0 a 4,4 0 1,0 -8,0
-      M41,35 a 4,4 0 1,0 8,0 a 4,4 0 1,0 -8,0
-      M51,35 a 4,4 0 1,0 8,0 a 4,4 0 1,0 -8,0
-
-      M1,45 a 4,4 0 1,0 8,0 a 4,4 0 1,0 -8,0
-      M11,45 a 4,4 0 1,0 8,0 a 4,4 0 1,0 -8,0
-      M21,45 a 4,4 0 1,0 8,0 a 4,4 0 1,0 -8,0
-      M31,45 a 4,4 0 1,0 8,0 a 4,4 0 1,0 -8,0
-      M41,45 a 4,4 0 1,0 8,0 a 4,4 0 1,0 -8,0
-      M51,45 a 4,4 0 1,0 8,0 a 4,4 0 1,0 -8,0
-
-      M1,55 a 4,4 0 1,0 8,0 a 4,4 0 1,0 -8,0
-      M11,55 a 4,4 0 1,0 8,0 a 4,4 0 1,0 -8,0
-      M21,55 a 4,4 0 1,0 8,0 a 4,4 0 1,0 -8,0
-      M31,55 a 4,4 0 1,0 8,0 a 4,4 0 1,0 -8,0
-      M41,55 a 4,4 0 1,0 8,0 a 4,4 0 1,0 -8,0
-      M51,55 a 4,4 0 1,0 8,0 a 4,4 0 1,0 -8,0
-
-      M1,65 a 4,4 0 1,0 8,0 a 4,4 0 1,0 -8,0
-      M11,65 a 4,4 0 1,0 8,0 a 4,4 0 1,0 -8,0
-      M21,65 a 4,4 0 1,0 8,0 a 4,4 0 1,0 -8,0
-      M31,65 a 4,4 0 1,0 8,0 a 4,4 0 1,0 -8,0
-      M41,65 a 4,4 0 1,0 8,0 a 4,4 0 1,0 -8,0
-      M51,65 a 4,4 0 1,0 8,0 a 4,4 0 1,0 -8,0
-      "  fill="gray" fill-rule="evenodd"/>
-
+<svg version="1.1" id="ForegroundSVG" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 60 70">
+    <defs>
+        <path id="z" d="M0,0h60v10.1h-60zM1,5a4,4 0 1,0 8,0 a4,4 0 1,0 -8,0M11,5 a 4,4 0 1,0 8,0 a 4,4 0 1,0 -8,0M21,5 a 4,4 0 1,0 8,0 a 4,4 0 1,0 -8,0M31,5 a 4,4 0 1,0 8,0 a 4,4 0 1,0 -8,0M41,5 a 4,4 0 1,0 8,0 a 4,4 0 1,0 -8,0M51,5 a 4,4 0 1,0 8,0 a 4,4 0 1,0 -8,0" fill="gray" fill-rule="evenodd"/>
+    </defs>
+    <use href="#z" x="0" y="10"/>
+    <use href="#z" x="0" y="20"/>
+    <use href="#z" x="0" y="30"/>
+    <use href="#z" x="0" y="40"/>
+    <use href="#z" x="0" y="50"/>
+    <use href="#z" x="0" y="60"/>
 </svg>
\ No newline at end of file
diff --git a/src/models/images/svg/connect4/foreground6x7.svg b/src/models/images/svg/connect4/foreground6x7.svg
index f07e0d65..7399a932 100644
--- a/src/models/images/svg/connect4/foreground6x7.svg
+++ b/src/models/images/svg/connect4/foreground6x7.svg
@@ -1,64 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px"
-     y="0px"
-     viewBox="0 0 70 70" style="enable-background:new 0 0 70 70;" xml:space="preserve">
-
-    <path d="M0 10 h70 v60 h-70zz
-      M1,15 a 4,4 0 1,0 8,0 a 4,4 0 1,0 -8,0
-      M11,15 a 4,4 0 1,0 8,0 a 4,4 0 1,0 -8,0
-      M21,15 a 4,4 0 1,0 8,0 a 4,4 0 1,0 -8,0
-      M31,15 a 4,4 0 1,0 8,0 a 4,4 0 1,0 -8,0
-      M41,15 a 4,4 0 1,0 8,0 a 4,4 0 1,0 -8,0
-      M51,15 a 4,4 0 1,0 8,0 a 4,4 0 1,0 -8,0
-      M61,15 a 4,4 0 1,0 8,0 a 4,4 0 1,0 -8,0
-
-      M1,25 a 4,4 0 1,0 8,0 a 4,4 0 1,0 -8,0
-      M11,25 a 4,4 0 1,0 8,0 a 4,4 0 1,0 -8,0
-      M21,25 a 4,4 0 1,0 8,0 a 4,4 0 1,0 -8,0
-      M31,25 a 4,4 0 1,0 8,0 a 4,4 0 1,0 -8,0
-      M41,25 a 4,4 0 1,0 8,0 a 4,4 0 1,0 -8,0
-      M51,25 a 4,4 0 1,0 8,0 a 4,4 0 1,0 -8,0
-      M61,25 a 4,4 0 1,0 8,0 a 4,4 0 1,0 -8,0
-
-      M1,35 a 4,4 0 1,0 8,0 a 4,4 0 1,0 -8,0
-      M11,35 a 4,4 0 1,0 8,0 a 4,4 0 1,0 -8,0
-      M21,35 a 4,4 0 1,0 8,0 a 4,4 0 1,0 -8,0
-      M31,35 a 4,4 0 1,0 8,0 a 4,4 0 1,0 -8,0
-      M41,35 a 4,4 0 1,0 8,0 a 4,4 0 1,0 -8,0
-      M51,35 a 4,4 0 1,0 8,0 a 4,4 0 1,0 -8,0
-      M61,35 a 4,4 0 1,0 8,0 a 4,4 0 1,0 -8,0
-
-      M1,45 a 4,4 0 1,0 8,0 a 4,4 0 1,0 -8,0
-      M11,45 a 4,4 0 1,0 8,0 a 4,4 0 1,0 -8,0
-      M21,45 a 4,4 0 1,0 8,0 a 4,4 0 1,0 -8,0
-      M31,45 a 4,4 0 1,0 8,0 a 4,4 0 1,0 -8,0
-      M41,45 a 4,4 0 1,0 8,0 a 4,4 0 1,0 -8,0
-      M51,45 a 4,4 0 1,0 8,0 a 4,4 0 1,0 -8,0
-      M61,45 a 4,4 0 1,0 8,0 a 4,4 0 1,0 -8,0
-
-      M1,55 a 4,4 0 1,0 8,0 a 4,4 0 1,0 -8,0
-      M11,55 a 4,4 0 1,0 8,0 a 4,4 0 1,0 -8,0
-      M21,55 a 4,4 0 1,0 8,0 a 4,4 0 1,0 -8,0
-      M31,55 a 4,4 0 1,0 8,0 a 4,4 0 1,0 -8,0
-      M41,55 a 4,4 0 1,0 8,0 a 4,4 0 1,0 -8,0
-      M51,55 a 4,4 0 1,0 8,0 a 4,4 0 1,0 -8,0
-      M61,55 a 4,4 0 1,0 8,0 a 4,4 0 1,0 -8,0
-
-      M1,65 a 4,4 0 1,0 8,0 a 4,4 0 1,0 -8,0
-      M11,65 a 4,4 0 1,0 8,0 a 4,4 0 1,0 -8,0
-      M21,65 a 4,4 0 1,0 8,0 a 4,4 0 1,0 -8,0
-      M31,65 a 4,4 0 1,0 8,0 a 4,4 0 1,0 -8,0
-      M41,65 a 4,4 0 1,0 8,0 a 4,4 0 1,0 -8,0
-      M51,65 a 4,4 0 1,0 8,0 a 4,4 0 1,0 -8,0
-      M61,65 a 4,4 0 1,0 8,0 a 4,4 0 1,0 -8,0
-
-      M1,75 a 4,4 0 1,0 8,0 a 4,4 0 1,0 -8,0
-      M11,75 a 4,4 0 1,0 8,0 a 4,4 0 1,0 -8,0
-      M21,75 a 4,4 0 1,0 8,0 a 4,4 0 1,0 -8,0
-      M31,75 a 4,4 0 1,0 8,0 a 4,4 0 1,0 -8,0
-      M41,75 a 4,4 0 1,0 8,0 a 4,4 0 1,0 -8,0
-      M51,75 a 4,4 0 1,0 8,0 a 4,4 0 1,0 -8,0
-      M61,75 a 4,4 0 1,0 8,0 a 4,4 0 1,0 -8,0
-      "  fill="gray" fill-rule="evenodd"/>
-
+<svg version="1.1" id="ForegroundSVG" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 70 70">
+    <defs>
+        <path id="z" d="M0,0h70v10.1h-70zM1,5a4,4 0 1,0 8,0 a4,4 0 1,0 -8,0M11,5 a 4,4 0 1,0 8,0 a 4,4 0 1,0 -8,0M21,5 a 4,4 0 1,0 8,0 a 4,4 0 1,0 -8,0M31,5 a 4,4 0 1,0 8,0 a 4,4 0 1,0 -8,0M41,5 a 4,4 0 1,0 8,0 a 4,4 0 1,0 -8,0M51,5 a 4,4 0 1,0 8,0 a 4,4 0 1,0 -8,0M61,5 a 4,4 0 1,0 8,0 a 4,4 0 1,0 -8,0" fill="gray" fill-rule="evenodd"/>
+    </defs>
+    <use href="#z" x="0" y="10"/>
+    <use href="#z" x="0" y="20"/>
+    <use href="#z" x="0" y="30"/>
+    <use href="#z" x="0" y="40"/>
+    <use href="#z" x="0" y="50"/>
+    <use href="#z" x="0" y="60"/>
 </svg>
\ No newline at end of file
diff --git a/src/models/images/svg/dao/B.svg b/src/models/images/svg/dao/B.svg
index 659db079..d1260ec2 100644
--- a/src/models/images/svg/dao/B.svg
+++ b/src/models/images/svg/dao/B.svg
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px"
-     y="0px"
-     viewBox="0 0 25 25" style="enable-background:new 0 0 25 25;" xml:space="preserve">
-
-    <circle cx="12.5" cy="12.5" r="12.5" fill="white"/>
+<svg version="1.1" id="EntitySVG" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 25 25">
+    <circle cx="12.5" cy="12.5" r="12.5" fill="#FFF"/>
 </svg>
\ No newline at end of file
diff --git a/src/models/images/svg/dao/W.svg b/src/models/images/svg/dao/W.svg
index a99e761d..5ed9037f 100644
--- a/src/models/images/svg/dao/W.svg
+++ b/src/models/images/svg/dao/W.svg
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px"
-     y="0px"
-     viewBox="0 0 25 25" style="enable-background:new 0 0 25 25;" xml:space="preserve">
-    
-    <circle cx="12.5" cy="12.5" r="12.5" fill="black"/>
+<svg version="1.1" id="EntitySVG" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 25 25">
+    <circle cx="12.5" cy="12.5" r="12.5" fill="#000"/>
 </svg>
\ No newline at end of file
diff --git a/src/models/images/svg/gameofy/dim5.svg b/src/models/images/svg/gameofy/dim5.svg
index 6d9fb85a..b45348cc 100644
--- a/src/models/images/svg/gameofy/dim5.svg
+++ b/src/models/images/svg/gameofy/dim5.svg
@@ -1,6 +1,7 @@
 <?xml version="1.0" standalone="no"?>
 <svg id="bc" viewBox="0 0 100 100" xmlns="http://www.w3.org/2000/svg">
     <defs>
+        <path stroke-linejoin="round" stroke="#000" stroke-width="2" d=""/>
         <g id="hex">
             <line x1="10" y1="30" x2="18.67" y2="25" style="stroke:rgb(0,0,0);stroke-width:2" stroke-linecap="round" />
             <line x1="18.67" y1="25" x2="18.67" y2="15" style="stroke:rgb(0,0,0);stroke-width:2" stroke-linecap="round" />
diff --git a/src/models/images/svg/general/blue_circle.svg b/src/models/images/svg/general/blue_circle.svg
index 2f58eab4..8f30ee63 100644
--- a/src/models/images/svg/general/blue_circle.svg
+++ b/src/models/images/svg/general/blue_circle.svg
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<svg id="bc" viewBox="0 0 100 100" xmlns="http://www.w3.org/2000/svg">
+<svg id="EntitySVG" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100">
     <circle cx="50" cy="50" r="45" fill="blue"/>
 </svg>
\ No newline at end of file
diff --git a/src/models/images/svg/general/red_circle.svg b/src/models/images/svg/general/red_circle.svg
index 2032a967..20423e91 100644
--- a/src/models/images/svg/general/red_circle.svg
+++ b/src/models/images/svg/general/red_circle.svg
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<svg id="bc" viewBox="0 0 100 100" xmlns="http://www.w3.org/2000/svg">
+<svg id="EntitySVG" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100">
     <circle cx="50" cy="50" r="45" fill="red"/>
 </svg>
\ No newline at end of file
diff --git a/src/models/images/svg/lewthwaitesgame/grid.svg b/src/models/images/svg/lewthwaitesgame/grid.svg
index d99cc031..4f5d0921 100644
--- a/src/models/images/svg/lewthwaitesgame/grid.svg
+++ b/src/models/images/svg/lewthwaitesgame/grid.svg
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <svg id="BackgroundSVG" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 50 50">
-    <rect x="0" y="0" width="50" height="50" fill="#b3a68e"/>
-    <path d="M5,5 h40 M5,15 h40 M5,25 h40 M5,35 h40 M5,45 h40 M5,5 v40 M15,5 v40 M25,5 v40 M35,5 v40 M45,5 v40" stroke="black" stroke-width="0.5" stroke-linecap="round"/>
+<path d="M0,0h50v50h-50z" fill="#b3a68e"/><path d="M5,5 h40 M5,15 h40 M5,25 h40 M5,35 h40 M5,45 h40 M5,5 v40 M15,5 v40 M25,5 v40 M35,5 v40 M45,5 v40" stroke="black" stroke-width="0.5" stroke-linecap="round"/>
 </svg>
\ No newline at end of file
diff --git a/src/models/images/svg/mutorere/board.svg b/src/models/images/svg/mutorere/board.svg
index 3a305580..4e28bd67 100644
--- a/src/models/images/svg/mutorere/board.svg
+++ b/src/models/images/svg/mutorere/board.svg
@@ -1,29 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<svg id="mtore" viewBox="-50 -50 100 100" xmlns="http://www.w3.org/2000/svg">
+<svg id="BackgroundSVG" xmlns="http://www.w3.org/2000/svg" viewBox="-50 -50 100 100">
     <circle cx="0" cy="0" r="50" fill="#CFCFCF"/>
-    <circle cx="0" cy="0" r="2" fill="black"/>
-    <line x1="0" y1="0" x2="17" y2="41.0416" stroke="black" stroke-width="1"/>
-    <line x1="0" y1="0" x2="17" y2="-41.0416" stroke="black" stroke-width="1"/>
-    <line x1="0" y1="0" x2="-17" y2="41.0416" stroke="black" stroke-width="1"/>
-    <line x1="0" y1="0" x2="-17" y2="-41.0416" stroke="black" stroke-width="1"/>
-    <line x1="0" y1="0" x2="41.0416" y2="17" stroke="black" stroke-width="1"/>
-    <line x1="0" y1="0" x2="-41.0416" y2="-17" stroke="black" stroke-width="1"/>
-    <line x1="0" y1="0" x2="41.0416" y2="-17" stroke="black" stroke-width="1"/>
-    <line x1="0" y1="0" x2="-41.0416" y2="17" stroke="black" stroke-width="1"/>
-    <line x1="17" y1="41.0416" x2="-17" y2="41.0416" stroke="black" stroke-width="1"/>
-    <circle cx="-17" cy="41.0416" r="2" fill="black"/>
-    <line x1="-17" y1="41.0416" x2="-41.0416" y2="17" stroke="black" stroke-width="1"/>
-    <circle cx="-41.0416" cy="17" r="2" fill="black"/>
-    <line x1="-41.0416" y1="17" x2="-41.0416" y2="-17"  stroke="black" stroke-width="1"/>
-    <circle cx="-41.0416" cy="-17" r="2" fill="black"/>
-    <line x1="-41.0416" y1="-17" x2="-17" y2="-41.0416"  stroke="black" stroke-width="1"/>
-    <circle cx="-17" cy="-41.0416" r="2" fill="black"/>
-    <line x1="-17" y1="-41.0416" x2="17" y2="-41.0416"  stroke="black" stroke-width="1"/>
-    <circle cx="17" cy="-41.0416" r="2" fill="black"/>
-    <line x1="17" y1="-41.0416" x2="41.0416" y2="-17" stroke="black" stroke-width="1"/>
-    <circle cx="41.0416" cy="-17" r="2" fill="black"/>
-    <line x1="41.0416" y1="-17" x2="41.0416" y2="17" stroke="black" stroke-width="1"/>
-    <circle cx="41.0416" cy="17" r="2" fill="black"/>
-    <line x1="41.0416" y1="17" x2="17" y2="41.0416" stroke="black" stroke-width="1"/>
-    <circle cx="17" cy="41.0416" r="2" fill="black"/>
+    <g fill="#000"><circle cx="0" cy="0" r="2"/><circle cx="-17" cy="41.0416" r="2"/><circle cx="-41.0416" cy="17" r="2"/><circle cx="-17" cy="-41.0416" r="2"/><circle cx="17" cy="-41.0416" r="2"/><circle cx="41.0416" cy="-17" r="2"/><circle cx="41.0416" cy="17" r="2"/><circle cx="17" cy="41.0416" r="2"/><circle cx="-41.0416" cy="-17" r="2"/></g>
+    <path d="M17,41.0416L-17,41.0416L-41.0416,17L-41.0416,-17L-17,-41.0416L17,-41.0416L41.0416,-17L41.0416,17zL-17,-41.0416M17,-41.0416L-17,41.0416M41.0416,-17L-41.0416,17M41.0416,17L-41.0416,-17" stroke="#000" fill="none"/>
 </svg>
\ No newline at end of file
diff --git a/src/models/images/svg/quickcross/H.svg b/src/models/images/svg/quickcross/H.svg
index abbf0375..ba7f57f8 100644
--- a/src/models/images/svg/quickcross/H.svg
+++ b/src/models/images/svg/quickcross/H.svg
@@ -1,3 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="-50 -50 100 100">  
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" id="EntitySVG" xmlns="http://www.w3.org/2000/svg" viewBox="-50 -50 100 100">  
     <line x1="-40" y1="0" x2="40" y2="0" stroke="#c1a37f" stroke-width="20" stroke-linecap="round"/>
 </svg>
\ No newline at end of file
diff --git a/src/models/images/svg/quickcross/V.svg b/src/models/images/svg/quickcross/V.svg
index c54c98b1..55f059c7 100644
--- a/src/models/images/svg/quickcross/V.svg
+++ b/src/models/images/svg/quickcross/V.svg
@@ -1,3 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="-50 -50 100 100">  
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" id="EntitySVG" xmlns="http://www.w3.org/2000/svg" viewBox="-50 -50 100 100">  
     <line x1="0" y1="-40" x2="0" y2="40" stroke="#c1a37f" stroke-width="20" stroke-linecap="round"/>
 </svg>
\ No newline at end of file
diff --git a/src/models/images/svg/quickcross/background.svg b/src/models/images/svg/quickcross/background.svg
index 50adb052..b78479f2 100644
--- a/src/models/images/svg/quickcross/background.svg
+++ b/src/models/images/svg/quickcross/background.svg
@@ -1,33 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <svg id="BackgroundSVG" viewBox="0 0 400 400" xmlns="http://www.w3.org/2000/svg">
-    
     <defs>
-        <g id="cross">
-            <line x1="-32" y1="0" x2="32" y2="0" style="stroke:black;stroke-width:6;stroke-linecap:round"/>
-            <line x1="0" y1="-32" x2="0" y2="32" style="stroke:black;stroke-width:6;stroke-linecap:round"/>
-        </g>
+        <path id="cross" stroke="#000" stroke-width="6" stroke-linecap="round" d="M-32,0h64M0,-32v64" />
     </defs>
-
     <rect x="0" y="0" width="400" height="400" rx="40" ry="40" fill="#48392e"/>
-
     <use href="#cross" x="50" y="50"/>
     <use href="#cross" x="50" y="150"/>
     <use href="#cross" x="50" y="250"/>
     <use href="#cross" x="50" y="350"/>
-
     <use href="#cross" x="150" y="50"/>
     <use href="#cross" x="150" y="150"/>
     <use href="#cross" x="150" y="250"/>
     <use href="#cross" x="150" y="350"/>
-
     <use href="#cross" x="250" y="50"/>
     <use href="#cross" x="250" y="150"/>
     <use href="#cross" x="250" y="250"/>
     <use href="#cross" x="250" y="350"/>
-
     <use href="#cross" x="350" y="50"/>
     <use href="#cross" x="350" y="150"/>
     <use href="#cross" x="350" y="250"/>
-    <use href="#cross" x="350" y="350"/>
-    
+    <use href="#cross" x="350" y="350"/>  
 </svg>
\ No newline at end of file
diff --git a/src/models/images/svg/quickcross/rotate.svg b/src/models/images/svg/quickcross/rotate.svg
index e97832ec..f6fcf979 100644
--- a/src/models/images/svg/quickcross/rotate.svg
+++ b/src/models/images/svg/quickcross/rotate.svg
@@ -1,4 +1,5 @@
-<svg id="MoveButtonSVG" xmlns="http://www.w3.org/2000/svg" viewBox="-200 -200 775 775">
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" id="MoveButtonSVG" xmlns="http://www.w3.org/2000/svg" viewBox="-200 -200 775 775">
     <rect x="-200" y="-200" height="775" width="775" fill="white" opacity="0.001" stroke-width="0"/>
-    <path d="M 302.566406 72.679688 C 273.167969 43.183594 232.582031 24.871094 187.621094 24.871094 C 97.703125 24.871094 25.074219 97.703125 25.074219 187.621094 C 25.074219 277.542969 97.703125 350.371094 187.621094 350.371094 C 263.402344 350.371094 326.875 298.496094 344.878906 228.308594 L 302.566406 228.308594 C 285.78125 275.710938 240.820312 309.683594 187.621094 309.683594 C 120.183594 309.683594 65.558594 255.0625 65.558594 187.621094 C 65.558594 120.183594 120.183594 65.558594 187.621094 65.558594 C 221.292969 65.558594 251.5 79.597656 273.574219 101.671875 L 207.964844 167.277344 L 350.371094 167.277344 L 350.371094 24.871094 Z M 302.566406 72.679688 " fill-opacity="1" fill-rule="nonzero"/>
+    <path d="M 302.566406 72.679688 C 273.167969 43.183594 232.582031 24.871094 187.621094 24.871094 C 97.703125 24.871094 25.074219 97.703125 25.074219 187.621094 C 25.074219 277.542969 97.703125 350.371094 187.621094 350.371094 C 263.402344 350.371094 326.875 298.496094 344.878906 228.308594 L 302.566406 228.308594 C 285.78125 275.710938 240.820312 309.683594 187.621094 309.683594 C 120.183594 309.683594 65.558594 255.0625 65.558594 187.621094 C 65.558594 120.183594 120.183594 65.558594 187.621094 65.558594 C 221.292969 65.558594 251.5 79.597656 273.574219 101.671875 L 207.964844 167.277344 L 350.371094 167.277344 L 350.371094 24.871094 Z M 302.566406 72.679688 "/>
 </svg>
\ No newline at end of file
diff --git a/src/models/images/svg/topitop/t.svg b/src/models/images/svg/topitop/t.svg
index 7a59df4d..a7f9f6a1 100644
--- a/src/models/images/svg/topitop/t.svg
+++ b/src/models/images/svg/topitop/t.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <svg version="1.1" id="MoveButtonSVG" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 10 10">
 	<circle cx="5" cy="5" r="4.5" stroke="none" fill="white" opacity="0.001"/>
-	<circle cx="5" cy="5" r="4" stroke-width="1"/>
+	<circle cx="5" cy="5" r="4" fill="none" stroke-width="1"/>
 	<polygon points="4.0,6 4.5,4.5 5.5,4.5 6.0,6" fill="blue" stroke="none" />
 </svg>
diff --git a/src/models/images/svg/topitop/u.svg b/src/models/images/svg/topitop/u.svg
index 55729551..a39988fa 100644
--- a/src/models/images/svg/topitop/u.svg
+++ b/src/models/images/svg/topitop/u.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <svg version="1.1" id="MoveButtonSVG" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 10 10">
 	<circle cx="5" cy="5" r="4.5" stroke="none" fill="white" opacity="0.001"/>
-	<circle cx="5" cy="5" r="4" stroke-width="1"/>
+	<circle cx="5" cy="5" r="4" fill="none" stroke-width="1"/>
 	<polygon points="4.0,6 4.5,4.5 5.5,4.5 6.0,6" fill="red" stroke="none" />
 </svg>
diff --git a/src/models/images/svg/topitop/v.svg b/src/models/images/svg/topitop/v.svg
index 9a9d3e19..78640b16 100644
--- a/src/models/images/svg/topitop/v.svg
+++ b/src/models/images/svg/topitop/v.svg
@@ -2,7 +2,7 @@
 <svg version="1.1" id="MoveButtonSVG" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 10 10">
 
 	<circle cx="5" cy="5" r="4.5" stroke="none" fill="white" opacity="0.001"/>
-	<circle cx="5" cy="5" r="4" stroke-width="1" />
+	<circle cx="5" cy="5" r="4" fill="none" stroke-width="1" />
 	<polygon points="2.7,6.0 3.6,4.2 6.4,4.2 7.3,6" fill="#ffe599" stroke="none"/>
 
 </svg>
diff --git a/src/models/images/svg/topitop/w.svg b/src/models/images/svg/topitop/w.svg
index 60983cb0..6b09ab17 100644
--- a/src/models/images/svg/topitop/w.svg
+++ b/src/models/images/svg/topitop/w.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <svg version="1.1" id="MoveButtonSVG" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 10 10">
 	<circle cx="5" cy="5" r="4.5" stroke="none" fill="white" opacity="0.001"/>
-	<circle cx="5" cy="5" r="4" stroke-width="1" />
+	<circle cx="5" cy="5" r="4" fill="none" stroke-width="1" />
 	<polygon points="1.9,6.3 3.1,3.4 6.9,3.4 8.1,6.3" fill="#ffe599" stroke="none"/>
 </svg>
diff --git a/src/models/images/thumbnail/achi-regular.svg b/src/models/images/thumbnail/achi-regular.svg
index 3d430b8d..b9819fc6 100644
--- a/src/models/images/thumbnail/achi-regular.svg
+++ b/src/models/images/thumbnail/achi-regular.svg
@@ -1,54 +1,40 @@
 <?xml version="1.0" encoding="utf-8"?>
 <svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="3 3 96 96">
+    <path d="M10,10h80v80h-80zM10,10l80,80M90,10l-80,80M50,10v80M10,50h80" stroke-width="1.5" stroke="black" fill="#d0f1f2" />
     <defs>
-        <radialGradient id="path1" cx="-107.6189" cy="-90.5162" r="10" fx="-109.6206" fy="-92.5178"
-            gradientTransform="matrix(1 0 0 1 159.5 142.5)" gradientUnits="userSpaceOnUse">
-            <stop offset="0" stop-color="#000" />
-            <stop offset="1" stop-color="#000" stop-opacity="0" />
-        </radialGradient>
-
-        <radialGradient id="path2" cx="-109.6189" cy="-92.5162" r="10" fx="-114.623" fy="-97.5203"
-            gradientTransform="matrix(1 0 0 1 159.5 142.5)" gradientUnits="userSpaceOnUse">
-            <stop offset="0" stop-color="#888888" />
-            <stop offset="0.5" stop-color="#5B5B5B" />
-            <stop offset="1" stop-color="#000000" />
-        </radialGradient>
-
-        <radialGradient id="path3" cx="-107.5" cy="190.5449" r="10" fx="-109.5" fy="188.55"
-            gradientTransform="matrix(1 0 0 -1 159.5 242.5)" gradientUnits="userSpaceOnUse">
-            <stop offset="0" stop-color="#000000" />
-            <stop offset="1" stop-color="#000000" stop-opacity="0" />
-        </radialGradient>
-
-        <radialGradient id="path4" cx="-109.5" cy="192.55" r="10" fx="-114.5" fy="187.55"
-            gradientTransform="matrix(0 1 1 0 -142.5 159.5)" gradientUnits="userSpaceOnUse">
-            <stop offset="0" stop-color="#FFFFFF" />
-            <stop offset="0.5" stop-color="#DDDDDD" />
-            <stop offset="1" stop-color="#999999" />
-        </radialGradient>
-
-        <g id="b" transform="scale(0.6818) translate(-50,-50)">
-            <path fill="url(#path1)" d="M61.9,52
-            c0,5.5-4.5,10-10,10s-10-4.5-10-10s4.5-10,10-10S61.9,46.5,61.9,52z" />
-            <path fill="url(#path2)" d="M59.9,50
-            c0,5.5-4.5,10-10,10s-10-4.5-10-10s4.5-10,10-10S59.9,44.5,59.9,50z" />
-        </g>
-
-        <g id="w" transform="scale(0.6818) translate(-50,-50)">
-            <path fill="url(#path3)" d="M61.9,52
-            c0,5.5-4.5,10-10,10s-10-4.5-10-10s4.5-10,10-10S61.9,46.5,61.9,52z" />
-            <path fill="url(#path4)" d="M59.9,50
-            c0,5.5-4.5,10-10,10s-10-4.5-10-10s4.5-10,10-10S59.9,44.5,59.9,50z" />
-        </g>
+    <radialGradient id="rg1" cx="-107.6189" cy="-90.5162" r="10" fx="-109.6206" fy="-92.5178"
+        gradientTransform="matrix(1 0 0 1 159.5 142.5)" gradientUnits="userSpaceOnUse">
+        <stop offset="0" stop-color="#000" />
+        <stop offset="1" stop-color="#000" stop-opacity="0" />
+    </radialGradient>
+    <radialGradient id="rg2" cx="-109.6189" cy="-92.5162" r="10" fx="-114.623" fy="-97.5203"
+        gradientTransform="matrix(1 0 0 1 159.5 142.5)" gradientUnits="userSpaceOnUse">
+        <stop offset="0" stop-color="#888888" />
+        <stop offset="0.5" stop-color="#5B5B5B" />
+        <stop offset="1" stop-color="#000000" />
+    </radialGradient>
+    <radialGradient id="rg3" cx="-107.5" cy="190.5449" r="10" fx="-109.5" fy="188.55"
+        gradientTransform="matrix(1 0 0 -1 159.5 242.5)" gradientUnits="userSpaceOnUse">
+        <stop offset="0" stop-color="#000000" />
+        <stop offset="1" stop-color="#000000" stop-opacity="0" />
+    </radialGradient>
+    <radialGradient id="rg4" cx="-109.5" cy="192.55" r="10" fx="-114.5" fy="187.55"
+        gradientTransform="matrix(0 1 1 0 -142.5 159.5)" gradientUnits="userSpaceOnUse">
+        <stop offset="0" stop-color="#FFFFFF" />
+        <stop offset="0.5" stop-color="#DDDDDD" />
+        <stop offset="1" stop-color="#999999" />
+    </radialGradient>
+    <g id="b" transform="scale(0.6) translate(-50 -50)">
+        <path fill="url(#rg1)" d="M61.9,52c0,5.5-4.5,10-10,10s-10-4.5-10-10s4.5-10,10-10S61.9,46.5,61.9,52z" />
+        <path fill="url(#rg2)" d="M59.9,50c0,5.5-4.5,10-10,10s-10-4.5-10-10s4.5-10,10-10S59.9,44.5,59.9,50z" />
+    </g>
+    <g id="w" transform="scale(0.6) translate(-50 -50)">
+        <path fill="url(#rg3)" d="M61.9,52c0,5.5-4.5,10-10,10s-10-4.5-10-10s4.5-10,10-10S61.9,46.5,61.9,52z" />
+        <path fill="url(#rg4)" d="M59.9,50c0,5.5-4.5,10-10,10s-10-4.5-10-10s4.5-10,10-10S59.9,44.5,59.9,50z" />
+    </g>
     </defs>
-
     <path fill="#d0f1f2" stroke="black" stroke-width="1.5" d="M10,10h80v80h-80zM10,10l80,80M90,10l-80,80M50,10v80M10,50h80" />
     <path fill="#ffff00" stroke="#ffff00" d="M12.0,48.0L12.0,20.57L16.0,20.57L10.0,12.0L4.0,20.57L8.0,20.57L8.0,48.0ZM88.0,12.0L88.0,39.43L84.0,39.43L90.0,48.0L96.0,39.43L92.0,39.43L92.0,12.0ZM13.0,52.0L39.43,52.0L39.43,56.0L48.0,50.0L39.43,44.0L39.43,48.0L13.0,48.0ZM52.0,88.0L52.0,60.57L56.0,60.57L50.0,52.0L44.0,60.57L48.0,60.57L48.0,88.0Z" />
     <path fill="#800000" stroke="#800000" d="M86.46,10.0L56.06,41.11L53.23,38.28L51.41,48.59L61.72,46.77L58.89,43.94L89.29,12.83Z" />
-    <use href="#b" x="50" y="10" />
-    <use href="#w" x="90" y="10" />
-    <use href="#w" x="10" y="50" />
-    <use href="#b" x="10" y="90" />
-    <use href="#w" x="50" y="90" />
-    <use href="#b" x="90" y="90" />
+    <use href="#b" x="50" y="10"/><use href="#w" x="90" y="10"/><use href="#w" x="10" y="50"/><use href="#b" x="10" y="90"/><use href="#w" x="50" y="90"/><use href="#b" x="90" y="90"/>
 </svg>
\ No newline at end of file
diff --git a/src/models/images/thumbnail/baghchal-regular.svg b/src/models/images/thumbnail/baghchal-regular.svg
index 724eab13..665996e3 100644
--- a/src/models/images/thumbnail/baghchal-regular.svg
+++ b/src/models/images/thumbnail/baghchal-regular.svg
@@ -2,12 +2,14 @@
 <svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="1 1 48 48">
     <defs>
         <g id="t" transform="scale(0.017) translate(-205.2065,-205.2065)">
-            <path fill="#B36F0F" d="M144.426,173.016c-19.385,0-35.1,15.715-35.1,35.1v34.75h-3.304c-16.551,0-29.969,13.416-29.969,29.969v54.343c0,13.5,10.945,24.444,24.444,24.444h44.146c3.869,0,7.004-3.138,7.004-7.004c0-15.023-11.266-27.403-25.808-29.184v-31.294h12.614c22.684,0,41.071-18.387,41.071-41.071v-34.953C179.525,188.73,163.811,173.016,144.426,173.016zM312.58,315.328v-108.6c0-13.501-10.945-24.444-24.443-24.444c-13.5,0-24.444,10.943-24.444,24.444v120.448c0,13.5,10.944,24.444,24.444,24.444h44.146c3.869,0,7.004-3.138,7.004-7.004C339.287,329.283,327.555,316.698,312.58,315.328z" />
-            <path fill="#FF9E16" d="M8.641,268.504c-4.772,0-8.641-3.868-8.641-8.641v-76.971c0-28.401,23.104-51.503,51.503-51.503h33.894c4.772,0,8.64,3.867,8.64,8.64c0,4.77-3.868,8.64-8.64,8.64H51.503c-18.871,0-34.223,15.353-34.223,34.224v76.971C17.28,264.635,13.413,268.504,8.641,268.504zM305.799,117.676H113.345c-33.752,0-61.113,27.359-61.113,61.112v71.573h202.852c40.777,0,73.832-33.056,73.832-73.833V140.79C328.916,128.026,318.566,117.676,305.799,117.676zM408.086,112.204l-54.961-44.435h-31.011c-31.041,0-56.205,25.165-56.205,56.206s25.164,56.204,56.205,56.204h31.011c31.042,0,56.205-25.163,56.205-56.204C409.331,119.937,408.896,116,408.086,112.204zM96.8,173.016c-19.385,0-35.1,15.715-35.1,35.1v34.75h-3.303c-16.551,0-29.969,13.416-29.969,29.969v54.343c0,13.5,10.944,24.444,24.444,24.444h44.146c3.869,0,7.004-3.138,7.004-7.004c0-15.023-11.266-27.403-25.809-29.184v-31.294h12.614c22.684,0,41.071-18.387,41.071-41.071v-34.953C131.899,188.73,116.185,173.016,96.8,173.016zM264.954,315.328v-108.6c0-13.501-10.944-24.444-24.443-24.444c-13.501,0-24.444,10.943-24.444,24.444v120.448c0,13.5,10.944,24.444,24.444,24.444h44.146c3.869,0,7.004-3.138,7.004-7.004C291.661,329.283,279.929,316.698,264.954,315.328z" />
-            <path fill="#E8E8E8" d="M400.691,116.134h-76.979c-20.281,0-36.722,16.44-36.722,36.721c0,2.851,0.335,5.617,0.949,8.281c-0.614,2.661-0.949,5.431-0.949,8.278c0,17.122,11.717,31.506,27.57,35.572c-1.755-4.286-2.728-8.977-2.728-13.895c0-0.414,0.018-0.823,0.031-1.234c4.646,4.816,10.592,8.374,17.278,10.089c-1.345-3.286-2.227-6.81-2.566-10.491c2.867-0.221,5.642-0.766,8.287-1.607v0.004l52.839-12.506c13.049-3.279,22.712-15.086,22.712-29.15v-20.342C410.411,120.487,406.059,116.134,400.691,116.134z" />
-            <circle fill="#333E48" cx="344.052" cy="101.374" r="5.156" />
-            <path fill="#333E48" d="M131.225,214.779L113.345,117.676L149.104,117.676zM220.508,214.779L202.628,117.676L238.388,117.676zM175.562,185.754L163.027,117.676L188.098,117.676zM265.91,185.754L253.374,117.676L278.445,117.676zM61.7,226.305L61.7,239.124L96.505,232.712zM92.802,220.178L131.899,227.379L131.899,212.978zM78.214,303.555L78.214,295.25L55.665,299.402zM216.067,267.767L216.067,281.94L254.547,274.852zM216.067,227.665L216.067,236.445L239.907,232.056zM264.954,256.5L264.954,243.064L228.47,249.783zM235.332,212.978L264.954,218.434L264.954,207.523zM264.954,301.503L264.954,288.066L228.47,294.784zM71.45,134.318l9.471,51.436l11.882-64.528C84.774,124.09,77.528,128.59,71.45,134.318zM410.411,113.208c0-1.615-1.31-2.925-2.926-2.925l-5.094,0.063c-5.368,0.023-6.589,3.079-2.711,6.791l4.325,4.142c1.795,1.72,4.09,2.611,6.406,2.69L410.411,113.208L410.411,113.208zM290.583,58.791c-7.305,0-13.228,5.921-13.228,13.228c0,7.306,5.922,13.228,13.228,13.228h8.068c2.85,0,5.16-2.312,5.16-5.161V72.02C303.811,64.711,297.889,58.791,290.583,58.791zM28.959,267.228c-0.344,1.816-0.531,3.689-0.531,5.605v10.142l43.021-7.922L28.959,267.228zM118.184,273.697c4.656-4.164,8.353-9.372,10.731-15.255l-46.789,8.614L118.184,273.697z" />
-            <path fill="#FF9C9F" d="M292.114,82.416c-4.889,0-8.867-3.978-8.867-8.865c0-4.89,3.979-8.867,8.867-8.867c4.889,0,8.867,3.978,8.867,8.867v8.066c0,0.44-0.358,0.799-0.8,0.799C300.181,82.417,292.114,82.417,292.114,82.416z" />
+            <path fill="#B36F0F" d="M144.426,173.016c-19.385,0-35.1,15.715-35.1,35.1v34.75h-3.304c-16.551,0-29.969,13.416-29.969,29.969v54.343c0,13.5,10.945,24.444,24.444,24.444h44.146c3.869,0,7.004-3.138,7.004-7.004c0-15.023-11.266-27.403-25.808-29.184v-31.294h12.614c22.684,0,41.071-18.387,41.071-41.071v-34.953C179.525,188.73,163.811,173.016,144.426,173.016zM312.58,315.328v-108.6c0-13.501-10.945-24.444-24.443-24.444c-13.5,0-24.444,10.943-24.444,24.444v120.448c0,13.5,10.944,24.444,24.444,24.444h44.146c3.869,0,7.004-3.138,7.004-7.004C339.287,329.283,327.555,316.698,312.58,315.328z"/>
+            <path fill="#FF9E16" d="M305.799,117.676H113.345c-33.752,0-61.113,27.359-61.113,61.112v71.573h202.852c40.777,0,73.832-33.056,73.832-73.833V140.79C328.916,128.026,318.566,117.676,305.799,117.676z"/>
+            <path fill="#333E48" d="M131.225,214.779L113.345,117.676L149.104,117.676zM220.508,214.779L202.628,117.676L238.388,117.676zM265.91,185.754L253.374,117.676L278.445,117.676z"/>
+            <path fill="#FF9E16" d="M8.641,268.504c-4.772,0-8.641-3.868-8.641-8.641v-76.971c0-28.401,23.104-51.503,51.503-51.503h33.894c4.772,0,8.64,3.867,8.64,8.64c0,4.77-3.868,8.64-8.64,8.64H51.503c-18.871,0-34.223,15.353-34.223,34.224v76.971C17.28,264.635,13.413,268.504,8.641,268.504zM408.086,112.204l-54.961-44.435h-31.011c-31.041,0-56.205,25.165-56.205,56.206s25.164,56.204,56.205,56.204h31.011c31.042,0,56.205-25.163,56.205-56.204C409.331,119.937,408.896,116,408.086,112.204zM96.8,173.016c-19.385,0-35.1,15.715-35.1,35.1v34.75h-3.303c-16.551,0-29.969,13.416-29.969,29.969v54.343c0,13.5,10.944,24.444,24.444,24.444h44.146c3.869,0,7.004-3.138,7.004-7.004c0-15.023-11.266-27.403-25.809-29.184v-31.294h12.614c22.684,0,41.071-18.387,41.071-41.071v-34.953C131.899,188.73,116.185,173.016,96.8,173.016zM264.954,315.328v-108.6c0-13.501-10.944-24.444-24.443-24.444c-13.501,0-24.444,10.943-24.444,24.444v120.448c0,13.5,10.944,24.444,24.444,24.444h44.146c3.869,0,7.004-3.138,7.004-7.004C291.661,329.283,279.929,316.698,264.954,315.328z"/>
+            <path fill="#E8E8E8" d="M400.691,116.134h-76.979c-20.281,0-36.722,16.44-36.722,36.721c0,2.851,0.335,5.617,0.949,8.281c-0.614,2.661-0.949,5.431-0.949,8.278c0,17.122,11.717,31.506,27.57,35.572c-1.755-4.286-2.728-8.977-2.728-13.895c0-0.414,0.018-0.823,0.031-1.234c4.646,4.816,10.592,8.374,17.278,10.089c-1.345-3.286-2.227-6.81-2.566-10.491c2.867-0.221,5.642-0.766,8.287-1.607v0.004l52.839-12.506c13.049-3.279,22.712-15.086,22.712-29.15v-20.342C410.411,120.487,406.059,116.134,400.691,116.134z"/>
+            <circle fill="#333E48" cx="344.052" cy="101.374" r="5.156"/>
+            <path fill="#333E48" d="M0,190.514L0,194.918L11.953,192.715zM0,237.035L17.28,233.854L17.28,231.574L0,228.392zM17.28,212.134L17.28,207.409L4.452,209.773zM21.666,166.163c0.632-1.125,1.327-2.208,2.078-3.25l-8.216-5.66L21.666,166.163zM44.385,131.892l2.633,14.305l2.719-14.763C47.928,131.495,46.143,131.648,44.385,131.892zM20.65,141.678l9.663,8.517l-5.846-11.115C23.155,139.893,21.879,140.757,20.65,141.678zM2.774,166.25c-0.686,2.003-1.264,4.057-1.701,6.163l11.324,7.803L2.774,166.25zM125.84,303.555L125.84,295.25L103.291,299.402zM165.809,273.697c4.657-4.164,8.354-9.372,10.732-15.255l-46.789,8.614L165.809,273.697zM263.693,267.767L263.693,281.94L302.173,274.852zM312.58,256.5L312.58,243.064L276.096,249.783zM312.58,301.503L312.58,288.066L276.096,294.784zM71.45,134.318l9.471,51.436l11.882-64.528C84.774,124.09,77.528,128.59,71.45,134.318zM175.562,185.754L163.027,117.676L188.098,117.676zM328.776,67.769L333.521,93.542L338.268,67.769zM295.024,74.726l6.547,35.558l7.547-40.986C304.13,70.479,299.398,72.314,295.024,74.726zM290.583,58.791c-7.305,0-13.228,5.921-13.228,13.228c0,7.306,5.922,13.228,13.228,13.228h8.068c2.85,0,5.16-2.312,5.16-5.161V72.02C303.811,64.711,297.889,58.791,290.583,58.791zM410.411,113.208c0-1.615-1.31-2.925-2.926-2.925l-5.094,0.063c-5.368,0.023-6.589,3.079-2.711,6.791l4.325,4.142c1.795,1.72,4.09,2.611,6.406,2.69L410.411,113.208L410.411,113.208zM61.7,226.305L61.7,239.124L96.505,232.712zM28.959,267.228c-0.344,1.816-0.531,3.689-0.531,5.605v10.142l43.021-7.922L28.959,267.228zM92.802,220.178L131.899,227.379L131.899,212.978zM118.184,273.697c4.656-4.164,8.353-9.372,10.731-15.255l-46.789,8.614L118.184,273.697zM78.214,303.555L78.214,295.25L55.665,299.402zM216.067,267.767L216.067,281.94L254.547,274.852zM216.067,227.665L216.067,236.445L239.907,232.056zM264.954,256.5L264.954,243.064L228.47,249.783zM235.332,212.978L264.954,218.434L264.954,207.523zM264.954,301.503L264.954,288.066L228.47,294.784z"/>
+            <path fill="#FF9C9F" d="M292.114,82.416c-4.889,0-8.867-3.978-8.867-8.865c0-4.89,3.979-8.867,8.867-8.867c4.889,0,8.867,3.978,8.867,8.867v8.066c0,0.44-0.358,0.799-0.8,0.799C300.181,82.417,292.114,82.417,292.114,82.416z"/>
         </g>
         <g id="g" transform="scale(0.05) translate(-64,-64)">
             <path fill="#b68859" d="M66.67 49.49s5.07-2.25 9.57-3.1c4.5-.84 8.17-.7 8.17-.7s3.94-5.77 4.5-8.87s.63-5.98.7-6.48c.17-1.2 8.17-1.27 9.85 3.52c1.69 4.79-.42 10.56-1.83 12.67s-2.96 3.66-2.96 3.66s6.9 6.48 8.45 13.66s1.13 17.74 1.13 17.74s-.42 8.02-4.36 8.59c-3.94.56-8.73-3.03-9.43-3.87c-.7-.84-2.06-3.21-4.36-2.46c-2.6.84-3.27 3.84-3.8 6.48c-.66 3.24-1.64 11.5-1.64 11.5s-4.69 1.88-7.51 1.45c-2.82-.42-6.34-3.8-6.34-3.8s.28-4.22-1.13-5.07s-2.82 1.55-2.82 1.55l-5.63 6.19l-7.74-6.34s-.56-2.82-1.41-4.22c-.84-1.41-2.53-4.5-3.1-6.62c-1.4-5.21-.98-15.2-.98-15.2l-8.59-41.95l2.11-1.97s1.97-10.14 5.07-14.5s5.63-5.49 7.32-6.34s6.9-1.41 6.9 0s-2.39 3.24-3.8 5.49s-2.96 5.49-3.8 8.31S47.43 25 47.43 25l3.05.7s1.69-4.08 3.24-6.19c1.55-2.11 3.73-5 6.41-7.04c2.27-1.73 5.42-3.52 8.94-3.52c3.52 0 8.17.99 7.74 3.59c-.23 1.42-2.89.77-5.56 2.53c-3.25 2.14-6.76 5.7-9.36 11.68s-3.52 8.59-3.52 8.59s6.83 6.41 7.53 8.59s.77 5.56.77 5.56z"/>
@@ -18,29 +20,8 @@
             <path fill="#2e2e2e" d="M55.22 47.57c0 2.06-1.31 3.94-3.89 3.99c-2.21.04-3.07-1.79-3.14-3.85c-.09-2.63 1.79-3.95 3.66-3.99c2.43-.05 3.37 1.79 3.37 3.85zM25.42 52.77s3.66-2.01 4.12-2.25s1.65-.67 2.29.32c.63.99-.39 1.87-1.2 2.22c-.81.35-4.22 2.43-4.22 2.43s-.39 2.57-.04 2.85c.94.75 2.36 1.16 3.52 1.06c1.16-.11 2.08-.6 2.43-.67c.35-.07 1.34-.11 1.55.6c.21.7-.29 1.52-1.16 1.94c-1.04.49-2.08 1.01-3.84.7c-1.37-.24-2.46-.56-3.1-.99c-.63-.42-1.3-1.2-1.3-1.2s-.95 1.16-1.83 1.13c-.88-.04-2.01-.6-2.04-.7c-.04-.11-1.2-1.02-.67-2.01c.53-.99 1.72.35 2.46.46c.74.11 1.2-.39 1.27-.63c.07-.25.04-2.99.04-2.99s-1.58-2.04-1.94-2.39c-.35-.35-1.27-1.51-.32-2.22s1.58 0 1.83.21s2.15 2.13 2.15 2.13z"/>
         </g>
     </defs>
-
     <path d="M0,0h50v50h-50z" fill="#93c59f" />
     <path d="M5,5h40v40h-40zM5,5l40,40M45,5l-40,40M15,5v40M25,5v40M35,5v40M5,15h40M5,25h40M5,35h40M25,5l20,20l-20,20l-20,-20l20,-20" stroke="black" stroke-width="0.5" fill="#c8efd1" />
     <path d="M44.875,16.0L44.875,33.4644L44.625,33.4644L45.0,34.0L45.375,33.4644L45.125,33.4644L45.125,16.0A 0.125 0.125 0 0 0 44.875 16.0Z" fill="#008000" stroke="#008000" /><path d="M16.5,45.125L23.4644,45.125L23.4644,45.375L24.0,45.0L23.4644,44.625L23.4644,44.875L16.5,44.875A 0.125 0.125 0 0 0 16.5 45.125Z" fill="#ffff00" stroke="#ffff00" /><path d="M26.5,5.125L33.4644,5.125L33.4644,5.375L34.0,5.0L33.4644,4.625L33.4644,4.875L26.5,4.875A 0.125 0.125 0 0 0 26.5 5.125Z" fill="#ffff00" stroke="#ffff00" />
-
-    <use x="5" y="5" href="#g" />
-    <use x="15" y="5" href="#g" />
-    <use x="45" y="5" href="#g" />
-    <use x="5" y="15" href="#g" />
-    <use x="25" y="15" href="#g" />
-    <use x="35" y="15" href="#g" />
-    <use x="5" y="25" href="#g" />
-    <use x="15" y="25" href="#g" />
-    <use x="25" y="25" href="#g" />
-    <use x="45" y="25" href="#g" />
-    <use x="5" y="35" href="#g" />
-    <use x="35" y="35" href="#g" />
-    <use x="5" y="45" href="#g" />
-    <use x="35" y="45" href="#g" />
-    <use x="15" y="35" href="#g" />
-    <use x="25" y="5" href="#t" />
-    <use x="15" y="15" href="#t" />
-    <use x="45" y="15" href="#t" />
-    <use x="15" y="45" href="#t" />
-
+    <use x="5" y="5" href="#g"/><use x="15" y="5" href="#g"/><use x="45" y="5" href="#g"/><use x="5" y="15" href="#g"/><use x="25" y="15" href="#g"/><use x="35" y="15" href="#g"/><use x="5" y="25" href="#g"/><use x="15" y="25" href="#g"/><use x="25" y="25" href="#g"/><use x="45" y="25" href="#g"/><use x="5" y="35" href="#g"/><use x="35" y="35" href="#g"/><use x="5" y="45" href="#g"/><use x="35" y="45" href="#g"/><use x="15" y="35" href="#g"/><use x="25" y="5" href="#t"/><use x="15" y="15" href="#t"/><use x="45" y="15" href="#t"/><use x="15" y="45" href="#t"/>
 </svg>
\ No newline at end of file
diff --git a/src/models/images/thumbnail/chomp-regular.svg b/src/models/images/thumbnail/chomp-regular.svg
new file mode 100644
index 00000000..f124d9f1
--- /dev/null
+++ b/src/models/images/thumbnail/chomp-regular.svg
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 -37.5 175 175">
+    <defs><g id="x"><rect x="0" y="0" width="25" height="25" fill="#784A10"/><rect x="0.5" y="0.5" width="24" height="24" fill="#7A553B"/></g></defs>
+    <use href="#x" x="0" y="0"/><use href="#x" x="0" y="25"/><use href="#x" x="25" y="25"/>
+    <use href="#x" x="50" y="25"/><use href="#x" x="75" y="25"/><use href="#x" x="0" y="50"/>
+    <use href="#x" x="25" y="50"/><use href="#x" x="50" y="50"/><use href="#x" x="75" y="50"/>
+    <use href="#x" x="100" y="50"/><use href="#x" x="125" y="50"/><use href="#x" x="0" y="75"/>
+    <use href="#x" x="25" y="75"/><use href="#x" x="50" y="75"/><use href="#x" x="75" y="75"/>
+    <use href="#x" x="100" y="75"/><use href="#x" x="125" y="75"/><use href="#x" x="150" y="75"/><use href="#x" x="175" y="75"/>
+    <g transform="translate(0 75)">
+        <circle cx="12.5" cy="12.5" r="10" fill="none" stroke-width="2" stroke="#784A10"/>
+        <line x1="5.42893218813" y1="5.42893218813" x2="19.5710678119" y2="19.5710678119" stroke-width="2" stroke="#784A10"/></g>
+    <g stroke="none">
+    <circle cx="62.5" cy="87.5" r="3.0" fill="#008000"/><circle cx="12.5" cy="37.5" r="3.0" fill="#008000" opacity="0.75" /><circle cx="12.5" cy="12.5" r="3.0" fill="#800000"/><circle cx="37.5" cy="37.5" r="3.0" fill="#800000" opacity="0.75" /><circle cx="62.5" cy="37.5" r="3.0" fill="#800000" opacity="0.75" /><circle cx="87.5" cy="37.5" r="3.0" fill="#800000" opacity="0.75" /><circle cx="37.5" cy="62.5" r="3.0" fill="#800000" opacity="0.75" /><circle cx="62.5" cy="62.5" r="3.0" fill="#800000" opacity="0.75" /><circle cx="87.5" cy="62.5" r="3.0" fill="#800000" opacity="0.75" /><circle cx="112.5" cy="62.5" r="3.0" fill="#800000" opacity="0.75" /><circle cx="137.5" cy="62.5" r="3.0" fill="#800000" opacity="0.75" /><circle cx="87.5" cy="87.5" r="3.0" fill="#800000" opacity="0.75" /><circle cx="112.5" cy="87.5" r="3.0" fill="#800000" opacity="0.75" /><circle cx="137.5" cy="87.5" r="3.0" fill="#800000" opacity="0.75" /><circle cx="162.5" cy="87.5" r="3.0" fill="#800000" opacity="0.75" /><circle cx="12.5" cy="62.5" r="3.0" fill="#800000" opacity="0.5" /><circle cx="37.5" cy="87.5" r="3.0" fill="#800000"/>    
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/models/images/thumbnail/connect4-6x6.png b/src/models/images/thumbnail/connect4-6x6.png
deleted file mode 100644
index 19194738..00000000
Binary files a/src/models/images/thumbnail/connect4-6x6.png and /dev/null differ
diff --git a/src/models/images/thumbnail/connect4-6x6.svg b/src/models/images/thumbnail/connect4-6x6.svg
new file mode 100644
index 00000000..0fc44406
--- /dev/null
+++ b/src/models/images/thumbnail/connect4-6x6.svg
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" id="ForegroundSVG" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 70 70">
+    <defs>
+        <path id="z" d="M0,0h60v10.1h-60zM1,5a4,4 0 1,0 8,0 a4,4 0 1,0 -8,0M11,5 a 4,4 0 1,0 8,0 a 4,4 0 1,0 -8,0M21,5 a 4,4 0 1,0 8,0 a 4,4 0 1,0 -8,0M31,5 a 4,4 0 1,0 8,0 a 4,4 0 1,0 -8,0M41,5 a 4,4 0 1,0 8,0 a 4,4 0 1,0 -8,0M51,5 a 4,4 0 1,0 8,0 a 4,4 0 1,0 -8,0" fill="gray" fill-rule="evenodd"/>
+    </defs>
+    <path fill="red" d="M5,70v-30h10v10h20v-40h10v50h10v10z"/>
+    <path fill="blue" d="M5,30h10v10h-10zM35,20h10v20h-10zM25,40h10v10h-10zm10,10h20v10h-10v10h-10zM55,60h10v10h-10zM15,70v-10h10v10z"/>
+    <use href="#z" x="5" y="10"/>
+    <use href="#z" x="5" y="20"/>
+    <use href="#z" x="5" y="30"/>
+    <use href="#z" x="5" y="40"/>
+    <use href="#z" x="5" y="50"/>
+    <use href="#z" x="5" y="60"/>
+    <path d="M9.35,1.2L9.35,6.0151L8.05,6.0151L10.0,8.8L11.95,6.0151L10.65,6.0151L10.65,1.2A 0.65 0.65 0 0 0 9.35 1.2Z" fill="#008000" stroke="#008000" /><path d="M59.35,1.2L59.35,6.0151L58.05,6.0151L60.0,8.8L61.95,6.0151L60.65,6.0151L60.65,1.2A 0.65 0.65 0 0 0 59.35 1.2Z" fill="#008000" stroke="#008000" /><path d="M19.35,1.2L19.35,6.0151L18.05,6.0151L20.0,8.8L21.95,6.0151L20.65,6.0151L20.65,1.2A 0.65 0.65 0 0 0 19.35 1.2Z" fill="#ffff00" stroke="#ffff00" /><path d="M29.35,1.2L29.35,6.0151L28.05,6.0151L30.0,8.8L31.95,6.0151L30.65,6.0151L30.65,1.2A 0.65 0.65 0 0 0 29.35 1.2Z" fill="#800000" stroke="#800000" /><path d="M49.35,1.2L49.35,6.0151L48.05,6.0151L50.0,8.8L51.95,6.0151L50.65,6.0151L50.65,1.2A 0.65 0.65 0 0 0 49.35 1.2Z" fill="#800000" stroke="#800000" />
+</svg>
\ No newline at end of file
diff --git a/src/models/images/thumbnail/connect4-regular.png b/src/models/images/thumbnail/connect4-regular.png
deleted file mode 100644
index c6ab03ae..00000000
Binary files a/src/models/images/thumbnail/connect4-regular.png and /dev/null differ
diff --git a/src/models/images/thumbnail/connect4-regular.svg b/src/models/images/thumbnail/connect4-regular.svg
new file mode 100644
index 00000000..e784b5f1
--- /dev/null
+++ b/src/models/images/thumbnail/connect4-regular.svg
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" id="ForegroundSVG" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 70 70">
+    <defs>
+        <path id="z" d="M0,0h70v10.1h-70zM1,5a4,4 0 1,0 8,0 a4,4 0 1,0 -8,0M11,5 a 4,4 0 1,0 8,0 a 4,4 0 1,0 -8,0M21,5 a 4,4 0 1,0 8,0 a 4,4 0 1,0 -8,0M31,5 a 4,4 0 1,0 8,0 a 4,4 0 1,0 -8,0M41,5 a 4,4 0 1,0 8,0 a 4,4 0 1,0 -8,0M51,5 a 4,4 0 1,0 8,0 a 4,4 0 1,0 -8,0M61,5 a 4,4 0 1,0 8,0 a 4,4 0 1,0 -8,0" fill="gray" fill-rule="evenodd"/>
+    </defs>
+    <path fill="blue" d="M0,70v-10h20v-10h10v-30h10v20h10v20h20v10z"/>
+    <path fill="red" d="M10,60v-20h10v20zM20,60h10v10h-10zM30,60v-20h10v20zM50,70v-20h10v20zM40,30h10v10h-10zM30,10h10v10h-10z"/>
+    <use href="#z" x="0" y="10"/>
+    <use href="#z" x="0" y="20"/>
+    <use href="#z" x="0" y="30"/>
+    <use href="#z" x="0" y="40"/>
+    <use href="#z" x="0" y="50"/>
+    <use href="#z" x="0" y="60"/>
+    <path d="M14.35,1.4L14.35,5.8151L13.05,5.8151L15.0,8.6L16.95,5.8151L15.65,5.8151L15.65,1.4A 0.65 0.65 0 0 0 14.35 1.4Z" fill="#008000" stroke="#008000" /><path d="M24.35,1.4L24.35,5.8151L23.05,5.8151L25.0,8.6L26.95,5.8151L25.65,5.8151L25.65,1.4A 0.65 0.65 0 0 0 24.35 1.4Z" fill="#008000" stroke="#008000" /><path d="M44.35,1.4L44.35,5.8151L43.05,5.8151L45.0,8.6L46.95,5.8151L45.65,5.8151L45.65,1.4A 0.65 0.65 0 0 0 44.35 1.4Z" fill="#008000" stroke="#008000" /><path d="M54.35,1.4L54.35,5.8151L53.05,5.8151L55.0,8.6L56.95,5.8151L55.65,5.8151L55.65,1.4A 0.65 0.65 0 0 0 54.35 1.4Z" fill="#ffff00" stroke="#ffff00" /><path d="M4.35,1.4L4.35,5.8151L3.05,5.8151L5.0,8.6L6.95,5.8151L5.65,5.8151L5.65,1.4A 0.65 0.65 0 0 0 4.35 1.4Z" fill="#800000" stroke="#800000" /><path d="M64.35,1.4L64.35,5.8151L63.05,5.8151L65.0,8.6L66.95,5.8151L65.65,5.8151L65.65,1.4A 0.65 0.65 0 0 0 64.35 1.4Z" fill="#800000" stroke="#800000" />
+</svg>
\ No newline at end of file
diff --git a/src/models/images/thumbnail/dao-regular.png b/src/models/images/thumbnail/dao-regular.png
deleted file mode 100644
index b37d11a9..00000000
Binary files a/src/models/images/thumbnail/dao-regular.png and /dev/null differ
diff --git a/src/models/images/thumbnail/dao-regular.svg b/src/models/images/thumbnail/dao-regular.svg
new file mode 100644
index 00000000..1dbe9663
--- /dev/null
+++ b/src/models/images/thumbnail/dao-regular.svg
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" id="BackgroundSVG" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100">
+    <path d="M0,0h100v100h-100z" stroke="#000" stroke-width="1.25" fill="#D8D9DA"/>
+    <path d="M0,25h100M0,50h100M0,75h100M25,0v100M50,0v100M75,0v100" stroke="#000" stroke-width="0.625"/>
+    <g fill="#FFFF00" stroke="#FFFF00"> 
+    <path d="M36.26256313292354,60.20190296114372L18.5850462963738,41.81727934340743L20.35281324934017,40.04951239044106L13.914213562373096,38.91421356237309L15.049512390441063,45.352813249340166L16.81727934340743,43.5850462963738L34.49479617995717,61.96966991411009A 1.25 1.25 0 0 0 36.26256313292354 60.20190296114372Z"/><path d="M59.5,86.25L44.855555,86.25L44.855555,83.75L39.5,87.5L44.855555,91.25L44.855555,88.75L59.5,88.75A 1.25 1.25 0 0 0 59.5 86.25Z"/><path d="M65.5,88.75L80.144445,88.75L80.144445,91.25L85.5,87.5L80.144445,83.75L80.144445,86.25L65.5,86.25A 1.25 1.25 0 0 0 65.5 88.75Z"/><path d="M13.75,85.5L13.75,69.855555L16.25,69.855555L12.5,64.5L8.75,69.855555L11.25,69.855555L11.25,85.5A 1.25 1.25 0 0 0 13.75 85.5Z"/><path d="M15.5,88.75L30.144445,88.75L30.144445,91.25L35.5,87.5L30.144445,83.75L30.144445,86.25L15.5,86.25A 1.25 1.25 0 0 0 15.5 88.75Z"/><path d="M86.25,64.5L86.25,80.144445L83.75,80.144445L87.5,85.5L91.25,80.144445L88.75,80.144445L88.75,64.5A 1.25 1.25 0 0 0 86.25 64.5Z"/><path d="M88.75,60.5L88.75,44.855555L91.25,44.855555L87.5,39.5L83.75,44.855555L86.25,44.855555L86.25,60.5A 1.25 1.25 0 0 0 88.75 60.5Z"/><path d="M36.25,64.5L36.25,80.144445L33.75,80.144445L37.5,85.5L41.25,80.144445L38.75,80.144445L38.75,64.5A 1.25 1.25 0 0 0 36.25 64.5Z"/><path d="M34.5,61.25L19.855555,61.25L19.855555,58.75L14.5,62.5L19.855555,66.25L19.855555,63.75L34.5,63.75A 1.25 1.25 0 0 0 34.5 61.25Z" fill="#800000" stroke="#800000" />
+    </g>
+    <g fill="#fff">
+        <circle cx="12.5" cy="87.5" r="11.25"/>
+        <circle cx="37.5" cy="62.5" r="11.25"/>
+        <circle cx="62.5" cy="87.5" r="11.25"/>
+        <circle cx="87.5" cy="62.5" r="11.25"/>
+    </g>
+    <g fill="#000">
+        <circle cx="12.5" cy="12.5" r="11.25"/>
+        <circle cx="37.5" cy="37.5" r="11.25"/>
+        <circle cx="62.5" cy="37.5" r="11.25"/>
+        <circle cx="62.5" cy="62.5" r="11.25"/>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/models/images/thumbnail/lewthwaitesgame-regular.png b/src/models/images/thumbnail/lewthwaitesgame-regular.png
deleted file mode 100644
index f7f01c3a..00000000
Binary files a/src/models/images/thumbnail/lewthwaitesgame-regular.png and /dev/null differ
diff --git a/src/models/images/thumbnail/lewthwaitesgame-regular.svg b/src/models/images/thumbnail/lewthwaitesgame-regular.svg
new file mode 100644
index 00000000..0e699536
--- /dev/null
+++ b/src/models/images/thumbnail/lewthwaitesgame-regular.svg
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100">
+<defs>
+    <radialGradient id="rg1" cx="-107.6189" cy="-90.5162" r="10" fx="-109.6206" fy="-92.5178"
+        gradientTransform="matrix(1 0 0 1 159.5 142.5)" gradientUnits="userSpaceOnUse">
+        <stop offset="0" stop-color="#000" />
+        <stop offset="1" stop-color="#000" stop-opacity="0" />
+    </radialGradient>
+    <radialGradient id="rg2" cx="-109.6189" cy="-92.5162" r="10" fx="-114.623" fy="-97.5203"
+        gradientTransform="matrix(1 0 0 1 159.5 142.5)" gradientUnits="userSpaceOnUse">
+        <stop offset="0" stop-color="#888888" />
+        <stop offset="0.5" stop-color="#5B5B5B" />
+        <stop offset="1" stop-color="#000000" />
+    </radialGradient>
+    <radialGradient id="rg3" cx="-107.5" cy="190.5449" r="10" fx="-109.5" fy="188.55"
+        gradientTransform="matrix(1 0 0 -1 159.5 242.5)" gradientUnits="userSpaceOnUse">
+        <stop offset="0" stop-color="#000000" />
+        <stop offset="1" stop-color="#000000" stop-opacity="0" />
+    </radialGradient>
+    <radialGradient id="rg4" cx="-109.5" cy="192.55" r="10" fx="-114.5" fy="187.55"
+        gradientTransform="matrix(0 1 1 0 -142.5 159.5)" gradientUnits="userSpaceOnUse">
+        <stop offset="0" stop-color="#FFFFFF" />
+        <stop offset="0.5" stop-color="#DDDDDD" />
+        <stop offset="1" stop-color="#999999" />
+    </radialGradient>
+    <g id="b" transform="scale(0.6) translate(-50 -50)">
+        <path fill="url(#rg1)" d="M61.9,52c0,5.5-4.5,10-10,10s-10-4.5-10-10s4.5-10,10-10S61.9,46.5,61.9,52z" />
+        <path fill="url(#rg2)" d="M59.9,50c0,5.5-4.5,10-10,10s-10-4.5-10-10s4.5-10,10-10S59.9,44.5,59.9,50z" />
+    </g>
+    <g id="w" transform="scale(0.6) translate(-50 -50)">
+        <path fill="url(#rg3)" d="M61.9,52c0,5.5-4.5,10-10,10s-10-4.5-10-10s4.5-10,10-10S61.9,46.5,61.9,52z" />
+        <path fill="url(#rg4)" d="M59.9,50c0,5.5-4.5,10-10,10s-10-4.5-10-10s4.5-10,10-10S59.9,44.5,59.9,50z" />
+    </g>
+    <g id="h">
+        <use href="#b" x="10" y="10"/>
+        <use href="#w" x="30" y="10"/>
+        <use href="#b" x="50" y="10"/>
+        <use href="#w" x="70" y="10"/>
+    </g>
+</defs>
+<path d="M0,0h100v100h-100z" fill="#b3a68e"/>
+<path d="M10,10h80M10,30h80M10,50h80M10,70h80M10,90h80M10,10v80M30,10v80M50,10v80M70,10v80M90,10v80" stroke="black" stroke-linecap="round"/>
+<path d="M67.0,49.0L56.2844,49.0L56.2844,47.0L52.0,50.0L56.2844,53.0L56.2844,51.0L67.0,51.0A 1.0 1.0 0 0 0 67.0 49.0Z" fill="#800000" stroke="#800000" /><path d="M33.0,51.0L43.7156,51.0L43.7156,53.0L48.0,50.0L43.7156,47.0L43.7156,49.0L33.0,49.0A 1.0 1.0 0 0 0 33.0 51.0Z" fill="#800000" stroke="#800000" /><path d="M51.0,68.0L51.0,56.2844L53.0,56.2844L50.0,52.0L47.0,56.2844L49.0,56.2844L49.0,68.0A 1.0 1.0 0 0 0 51.0 68.0Z" fill="#800000" stroke="#800000" /><path d="M49.0,32.0L49.0,43.7156L47.0,43.7156L50.0,48.0L53.0,43.7156L51.0,43.7156L51.0,32.0A 1.0 1.0 0 0 0 49.0 32.0Z" fill="#800000" stroke="#800000" />
+<use href="#h" x="0" y="0"/><use href="#h" x="20" y="60"/><use href="#h" x="20" y="20"/><use href="#h" x="0" y="80"/><use href="#b" x="90" y="10"/><use href="#w" x="10" y="30"/><use href="#b" x="10" y="50"/><use href="#w" x="30" y="50"/><use href="#w" x="70" y="50"/><use href="#b" x="90" y="50"/><use href="#w" x="10" y="70"/><use href="#b" x="90" y="90"/>
+</svg>
\ No newline at end of file
diff --git a/src/models/images/thumbnail/mutorere-misere.svg b/src/models/images/thumbnail/mutorere-misere.svg
new file mode 100644
index 00000000..522ad010
--- /dev/null
+++ b/src/models/images/thumbnail/mutorere-misere.svg
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg viewBox="-50 -50 100 100" xmlns="http://www.w3.org/2000/svg">
+    <defs>
+        <radialGradient id="rg0" cx="-107.6189" cy="-90.5162" r="10.0083" fx="-109.6206" fy="-92.5178"
+            gradientTransform="matrix(1 0 0 1 159.5 142.5)" gradientUnits="userSpaceOnUse">
+            <stop offset="0" style="stop-color:#000000" />
+            <stop offset="1" style="stop-color:#000000;stop-opacity:0" />
+        </radialGradient>
+        <radialGradient id="rg1" cx="-109.6189" cy="-92.5162" r="10.0083" fx="-114.623" fy="-97.5203"
+            gradientTransform="matrix(1 0 0 1 159.5 142.5)" gradientUnits="userSpaceOnUse">
+            <stop offset="0" stop-color="#b6a8fe" />
+            <stop offset="0.5" stop-color="#4960f7" />
+            <stop offset="1" stop-color="#0400f5" />
+        </radialGradient>
+        <radialGradient id="rg2" cx="-107.6189" cy="-90.5162" r="10.0083" fx="-109.6206" fy="-92.5178"
+            gradientTransform="matrix(1 0 0 1 159.5 142.5)" gradientUnits="userSpaceOnUse">
+            <stop offset="0" style="stop-color:#000000" />
+            <stop offset="1" style="stop-color:#000000;stop-opacity:0" />
+        </radialGradient>
+        <radialGradient id="rg3" cx="-109.6189" cy="-92.5162" r="10.0083" fx="-114.623" fy="-97.5203"
+            gradientTransform="matrix(1 0 0 1 159.5 142.5)" gradientUnits="userSpaceOnUse">
+            <stop offset="0" stop-color="#fea8a8" />
+            <stop offset="0.5" stop-color="#fc6464" />
+            <stop offset="1" stop-color="#d00000" />
+        </radialGradient>
+        <g id="b" transform="scale(0.5) translate(-50,-50)">
+            <path fill="url(#rg0)" d="M61.9,52c0,5.5-4.5,10-10,10s-10-4.5-10-10s4.5-10,10-10S61.9,46.5,61.9,52z" />
+            <path fill="url(#rg1)" d="M59.9,50c0,5.5-4.5,10-10,10s-10-4.5-10-10s4.5-10,10-10S59.9,44.5,59.9,50z" />
+        </g>
+        <g id="r" transform="scale(0.5) translate(-50,-50)">
+            <path fill="url(#rg2)" d="M61.9,52c0,5.5-4.5,10-10,10s-10-4.5-10-10s4.5-10,10-10S61.9,46.5,61.9,52z" />
+            <path fill="url(#rg3)" d="M59.9,50c0,5.5-4.5,10-10,10s-10-4.5-10-10s4.5-10,10-10S59.9,44.5,59.9,50z" />
+        </g>
+    </defs>
+    <circle cx="0" cy="0" r="50" fill="#CFCFCF"/>
+    <g fill="#000"><circle cx="0" cy="0" r="2"/><circle cx="-17" cy="41.0416" r="2"/><circle cx="-41.0416" cy="17" r="2"/><circle cx="-17" cy="-41.0416" r="2"/><circle cx="17" cy="-41.0416" r="2"/><circle cx="41.0416" cy="-17" r="2"/><circle cx="41.0416" cy="17" r="2"/><circle cx="17" cy="41.0416" r="2"/><circle cx="-41.0416" cy="-17" r="2"/></g>
+    <path d="M17,41.0416L-17,41.0416L-41.0416,17L-41.0416,-17L-17,-41.0416L17,-41.0416L41.0416,-17L41.0416,17zL-17,-41.0416M17,-41.0416L-17,41.0416M41.0416,-17L-41.0416,17M41.0416,17L-41.0416,-17" stroke="#000" fill="none"/>
+    <path d="M-14.4661,39.7678L-1.8389,8.3592L0.9327,9.5073L-0.7654,1.8478L-7.3822,6.0631L-4.6106,7.2112L-17.2378,38.6198A 1.5 1.5 0 0 0 -14.4661 39.7678Z" fill="#ffff00" stroke="#ffff00" /><path d="M14.4661,-39.7678L1.8389,-8.3592L-0.9327,-9.5073L0.7654,-1.8478L7.3822,-6.0631L4.6106,-7.2112L17.2378,-38.6198A 1.5 1.5 0 0 0 14.4661 -39.7678Z" fill="#ffff00" stroke="#ffff00" /><path d="M-38.844,-14.8488L-8.3592,-1.8389L-9.5073,0.9327L-1.8478,-0.7654L-6.0631,-7.3822L-7.2112,-4.6106L-37.6959,-17.6205A 1.5 1.5 0 0 0 -38.844 -14.8488Z" fill="#ffff00" stroke="#ffff00" />
+    <use href="#b" x="-17" y="-41.0416"/><use href="#b" x="41.0416" y="-17"/><use href="#b" x="41.0416" y="17"/><use href="#b" x="17" y="41.0416"/><use href="#r" x="17" y="-41.0416"/><use href="#r" x="-41.0416" y="-17"/><use href="#r" x="-41.0416" y="17"/><use href="#r" x="-17" y="41.0416"/>
+</svg>
\ No newline at end of file
diff --git a/src/models/images/thumbnail/mutorere-regular.png b/src/models/images/thumbnail/mutorere-regular.png
deleted file mode 100644
index afcefb4d..00000000
Binary files a/src/models/images/thumbnail/mutorere-regular.png and /dev/null differ
diff --git a/src/models/images/thumbnail/mutorere-regular.svg b/src/models/images/thumbnail/mutorere-regular.svg
new file mode 100644
index 00000000..768eb377
--- /dev/null
+++ b/src/models/images/thumbnail/mutorere-regular.svg
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg viewBox="-50 -50 100 100" xmlns="http://www.w3.org/2000/svg">
+    <defs>
+        <radialGradient id="rg0" cx="-107.6189" cy="-90.5162" r="10.0083" fx="-109.6206" fy="-92.5178"
+            gradientTransform="matrix(1 0 0 1 159.5 142.5)" gradientUnits="userSpaceOnUse">
+            <stop offset="0" style="stop-color:#000000" />
+            <stop offset="1" style="stop-color:#000000;stop-opacity:0" />
+        </radialGradient>
+        <radialGradient id="rg1" cx="-109.6189" cy="-92.5162" r="10.0083" fx="-114.623" fy="-97.5203"
+            gradientTransform="matrix(1 0 0 1 159.5 142.5)" gradientUnits="userSpaceOnUse">
+            <stop offset="0" stop-color="#b6a8fe" />
+            <stop offset="0.5" stop-color="#4960f7" />
+            <stop offset="1" stop-color="#0400f5" />
+        </radialGradient>
+        <radialGradient id="rg2" cx="-107.6189" cy="-90.5162" r="10.0083" fx="-109.6206" fy="-92.5178"
+            gradientTransform="matrix(1 0 0 1 159.5 142.5)" gradientUnits="userSpaceOnUse">
+            <stop offset="0" style="stop-color:#000000" />
+            <stop offset="1" style="stop-color:#000000;stop-opacity:0" />
+        </radialGradient>
+        <radialGradient id="rg3" cx="-109.6189" cy="-92.5162" r="10.0083" fx="-114.623" fy="-97.5203"
+            gradientTransform="matrix(1 0 0 1 159.5 142.5)" gradientUnits="userSpaceOnUse">
+            <stop offset="0" stop-color="#fea8a8" />
+            <stop offset="0.5" stop-color="#fc6464" />
+            <stop offset="1" stop-color="#d00000" />
+        </radialGradient>
+        <g id="b" transform="scale(0.5) translate(-50,-50)">
+            <path fill="url(#rg0)" d="M61.9,52c0,5.5-4.5,10-10,10s-10-4.5-10-10s4.5-10,10-10S61.9,46.5,61.9,52z" />
+            <path fill="url(#rg1)" d="M59.9,50c0,5.5-4.5,10-10,10s-10-4.5-10-10s4.5-10,10-10S59.9,44.5,59.9,50z" />
+        </g>
+        <g id="r" transform="scale(0.5) translate(-50,-50)">
+            <path fill="url(#rg2)" d="M61.9,52c0,5.5-4.5,10-10,10s-10-4.5-10-10s4.5-10,10-10S61.9,46.5,61.9,52z" />
+            <path fill="url(#rg3)" d="M59.9,50c0,5.5-4.5,10-10,10s-10-4.5-10-10s4.5-10,10-10S59.9,44.5,59.9,50z" />
+        </g>
+    </defs>
+    <circle cx="0" cy="0" r="50" fill="#CFCFCF"/>
+    <g fill="#000"><circle cx="0" cy="0" r="2"/><circle cx="-17" cy="41.0416" r="2"/><circle cx="-41.0416" cy="17" r="2"/><circle cx="-17" cy="-41.0416" r="2"/><circle cx="17" cy="-41.0416" r="2"/><circle cx="41.0416" cy="-17" r="2"/><circle cx="41.0416" cy="17" r="2"/><circle cx="17" cy="41.0416" r="2"/><circle cx="-41.0416" cy="-17" r="2"/></g>
+    <path d="M17,41.0416L-17,41.0416L-41.0416,17L-41.0416,-17L-17,-41.0416L17,-41.0416L41.0416,-17L41.0416,17zL-17,-41.0416M17,-41.0416L-17,41.0416M41.0416,-17L-41.0416,17M41.0416,17L-41.0416,-17" stroke="#000" fill="none"/>
+    <path d="M-14.4661,39.7678L-1.8389,8.3592L0.9327,9.5073L-0.7654,1.8478L-7.3822,6.0631L-4.6106,7.2112L-17.2378,38.6198A 1.5 1.5 0 0 0 -14.4661 39.7678Z" fill="#ffff00" stroke="#ffff00" /><path d="M-38.844,-14.8488L-8.3592,-1.8389L-9.5073,0.9327L-1.8478,-0.7654L-6.0631,-7.3822L-7.2112,-4.6106L-37.6959,-17.6205A 1.5 1.5 0 0 0 -38.844 -14.8488Z" fill="#ffff00" stroke="#ffff00" /><path d="M14.4661,-39.7678L1.8389,-8.3592L-0.9327,-9.5073L0.7654,-1.8478L7.3822,-6.0631L4.6106,-7.2112L17.2378,-38.6198A 1.5 1.5 0 0 0 14.4661 -39.7678Z" fill="#800000" stroke="#800000" />
+    <use href="#b" x="-17" y="-41.0416"/><use href="#b" x="41.0416" y="-17"/><use href="#b" x="41.0416" y="17"/><use href="#b" x="17" y="41.0416"/><use href="#r" x="17" y="-41.0416"/><use href="#r" x="-41.0416" y="-17"/><use href="#r" x="-41.0416" y="17"/><use href="#r" x="-17" y="41.0416"/>
+</svg>
\ No newline at end of file
diff --git a/src/models/images/thumbnail/quickcross-regular.png b/src/models/images/thumbnail/quickcross-regular.png
deleted file mode 100644
index dc04d7f6..00000000
Binary files a/src/models/images/thumbnail/quickcross-regular.png and /dev/null differ
diff --git a/src/models/images/thumbnail/quickcross-regular.svg b/src/models/images/thumbnail/quickcross-regular.svg
new file mode 100644
index 00000000..1fc82bdb
--- /dev/null
+++ b/src/models/images/thumbnail/quickcross-regular.svg
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg id="BackgroundSVG" viewBox="0 0 400 400" xmlns="http://www.w3.org/2000/svg">
+    <defs>
+        <path id="c" stroke="#000" stroke-width="6" stroke-linecap="round" d="M-32,0h64M0,-32v64" />
+        <path id="a" stroke-width="6" stroke-linecap="round" d="M-32,0h64" />
+        <path id="b" stroke-width="6" stroke-linecap="round" d="M0,-32v64" />
+        <path id="h" d="M-28,0h56" stroke="#c1a37f" stroke-width="16" stroke-linecap="round"/>
+        <path id="v" d="M0,-28v56" stroke="#c1a37f" stroke-width="16" stroke-linecap="round"/>
+        <path id="r" transform="scale(0.0903) translate(-187.5,-187.5)" d="M 302.566406 72.679688 C 273.167969 43.183594 232.582031 24.871094 187.621094 24.871094 C 97.703125 24.871094 25.074219 97.703125 25.074219 187.621094 C 25.074219 277.542969 97.703125 350.371094 187.621094 350.371094 C 263.402344 350.371094 326.875 298.496094 344.878906 228.308594 L 302.566406 228.308594 C 285.78125 275.710938 240.820312 309.683594 187.621094 309.683594 C 120.183594 309.683594 65.558594 255.0625 65.558594 187.621094 C 65.558594 120.183594 120.183594 65.558594 187.621094 65.558594 C 221.292969 65.558594 251.5 79.597656 273.574219 101.671875 L 207.964844 167.277344 L 350.371094 167.277344 L 350.371094 24.871094 Z M 302.566406 72.679688 " fill-opacity="1" fill-rule="nonzero"/>
+    </defs>
+    <rect x="0" y="0" width="400" height="400" rx="40" ry="40" fill="#48392e"/>
+    <use href="#c" x="50" y="50"/>
+    <use href="#c" x="50" y="150"/>
+    <use href="#c" x="50" y="250"/>
+    <use href="#c" x="50" y="350"/>
+    <use href="#c" x="150" y="50"/>
+    <use href="#c" x="150" y="150"/>
+    <use href="#c" x="150" y="250"/>
+    <use href="#c" x="150" y="350"/>
+    <use href="#c" x="250" y="50"/>
+    <use href="#c" x="250" y="150"/>
+    <use href="#c" x="250" y="250"/>
+    <use href="#c" x="250" y="350"/>
+    <use href="#c" x="350" y="50"/>
+    <use href="#c" x="350" y="150"/>
+    <use href="#c" x="350" y="250"/>
+    <use href="#c" x="350" y="350"/>
+
+    <use href="#v" x="50" y="50"/>
+    <use href="#v" x="250" y="50"/>
+    <use href="#v" x="150" y="150"/>
+    <use href="#h" x="350" y="150"/>
+    <use href="#h" x="50" y="250"/>
+    <use href="#h" x="250" y="250"/>
+    <use href="#v" x="50" y="350"/>
+    <use href="#h" x="250" y="350"/>
+    <use href="#h" x="350" y="350"/>
+    <g fill="#800000">
+        <use href="#r" x="50" y="50"/>
+        <use href="#r" x="250" y="50"/>
+        <use href="#r" x="150" y="150"/>
+        <use href="#r" x="350" y="150" fill="#FFFF00"/>
+        <use href="#r" x="50" y="250"/>
+        <use href="#r" x="250" y="250"/>
+        <use href="#r" x="50" y="350"/>
+        <use href="#r" x="250" y="350" fill="#FFFF00"/>
+        <use href="#r" x="350" y="350"/>
+    </g>
+    <g stroke="#FFFF00">
+        <use href="#a" x="150" y="50"/>
+        <use href="#a" x="50" y="150"/>
+        <use href="#b" x="150" y="250"/>
+        <use href="#b" x="350" y="250"/>
+        <use href="#b" x="150" y="350"/>
+    </g>
+    <use href="#b" x="250" y="150" stroke="#008000"/>
+    <g stroke="#800000">
+        <use href="#b" x="150" y="50"/>
+        <use href="#a" x="350" y="50"/>
+        <use href="#b" x="350" y="50"/>
+        <use href="#b" x="50" y="150"/>
+        <use href="#a" x="250" y="150"/>
+        <use href="#a" x="150" y="250"/>
+        <use href="#a" x="350" y="250"/>
+        <use href="#a" x="150" y="350"/>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/models/images/thumbnail/sim-regular.png b/src/models/images/thumbnail/sim-regular.png
deleted file mode 100644
index ad21b64c..00000000
Binary files a/src/models/images/thumbnail/sim-regular.png and /dev/null differ
diff --git a/src/models/images/thumbnail/sim-regular.svg b/src/models/images/thumbnail/sim-regular.svg
new file mode 100644
index 00000000..62df09a7
--- /dev/null
+++ b/src/models/images/thumbnail/sim-regular.svg
@@ -0,0 +1,10 @@
+<svg viewBox="-4.5 -4.5 9 9" xmlns="http://www.w3.org/2000/svg">
+    <path fill="none" d="M2,3.4641l-4,-6.9282,h4l-4,6.9282l6,-3.4641l-2,3.4641l-6,-3.4641l6,-3.4641" stroke-linejoin="round" stroke-width="0.3" stroke="red"/>
+    <path fill="none" d="M-4,0l2,-3.4641l6,3.4641h-8l2,3.4641h4v-6.9282l2,3.4641M-2,-3.4641v6.9282" stroke-linejoin="round" stroke-width="0.3" stroke="blue"/>
+    <circle cx="4" cy="0" r="0.3"/>
+    <circle cx="2" cy="3.4641" r="0.3"/>
+    <circle cx="-2" cy="3.4641" r="0.3"/>
+    <circle cx="-4" cy="0" r="0.3"/>
+    <circle cx="-2" cy="-3.4641" r="0.3"/>
+    <circle cx="2" cy="-3.4641" r="0.3"/>
+</svg>
\ No newline at end of file
diff --git a/src/models/images/thumbnail/tactix-regular.png b/src/models/images/thumbnail/tactix-regular.png
deleted file mode 100644
index 105d2129..00000000
Binary files a/src/models/images/thumbnail/tactix-regular.png and /dev/null differ
diff --git a/src/models/images/thumbnail/tactix-regular.svg b/src/models/images/thumbnail/tactix-regular.svg
new file mode 100644
index 00000000..ea54f497
--- /dev/null
+++ b/src/models/images/thumbnail/tactix-regular.svg
@@ -0,0 +1,10 @@
+<svg version="1.1" id="BackgroundSVG" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100">
+    <path d="M0,0 h100 v100 h-100 z" fill="none" stroke="#000000" stroke-width="1.25"/>
+    <path d="M25,0 v100 M50,0 v100 M75,0 v100 M0,25 h100 M0,50 h100 M0,75 h100" stroke="#000" stroke-width="0.625"/>
+    <defs><circle id="c" r="11" stroke="#2A2A2A" stroke-width="0.5" fill="gray"/></defs>
+    <use href="#c" x="12.5" y="12.5"/><use href="#c" x="37.5" y="12.5"/><use href="#c" x="87.5" y="12.5"/><use href="#c" x="12.5" y="37.5"/><use href="#c" x="87.5" y="37.5"/><use href="#c" x="12.5" y="62.5"/><use href="#c" x="37.5" y="62.5"/><use href="#c" x="87.5" y="62.5"/><use href="#c" x="12.5" y="87.5"/><use href="#c" x="37.5" y="87.5"/><use href="#c" x="62.5" y="87.5"/><use href="#c" x="87.5" y="87.5"/>
+    <g stroke="#800000" fill="#800000">
+    <circle cx="12.5" cy="37.5" r="2" fill="#008000" stroke="none" /><circle cx="87.5" cy="62.5" r="2" fill="#008000" stroke="none" /><circle cx="87.5" cy="12.5" r="2" stroke="none" /><circle cx="87.5" cy="37.5" r="2" stroke="none" /><circle cx="12.5" cy="87.5" r="2" stroke="none" /><circle cx="37.5" cy="87.5" r="2" stroke="none" /><circle cx="62.5" cy="87.5" r="2" stroke="none" /><circle cx="12.5" cy="12.5" r="2" stroke="none" opacity="0.75" /><circle cx="37.5" cy="12.5" r="2" stroke="none" opacity="0.75" /><circle cx="12.5" cy="62.5" r="2" stroke="none" opacity="0.75" /><circle cx="37.5" cy="62.5" r="2" stroke="none" opacity="0.75" /><circle cx="87.5" cy="87.5" r="2" stroke="none" opacity="0.75" />
+    <line x1="26.25" y1="85" x2="73.75" y2="85" stroke-linecap="round" stroke="#008000" /><line x1="27" y1="51.25" x2="27" y2="98.75" stroke-linecap="round" stroke="#008000" /><line x1="4" y1="1.25" x2="4" y2="73.75" stroke-linecap="round" opacity="0.75" /><line x1="1.25" y1="2" x2="48.75" y2="2" stroke-linecap="round" opacity="0.5" /><line x1="1.25" y1="52" x2="48.75" y2="52" stroke-linecap="round" /><line x1="1.25" y1="77" x2="48.75" y2="77" stroke-linecap="round" /><line x1="51.25" y1="77" x2="98.75" y2="77" stroke-linecap="round" /><line x1="2" y1="1.25" x2="2" y2="48.75" stroke-linecap="round" /><line x1="10" y1="26.25" x2="10" y2="73.75" stroke-linecap="round" /><line x1="2" y1="51.25" x2="2" y2="98.75" stroke-linecap="round" /><line x1="77" y1="1.25" x2="77" y2="48.75" stroke-linecap="round" /><line x1="85" y1="26.25" x2="85" y2="73.75" stroke-linecap="round" /><line x1="77" y1="51.25" x2="77" y2="98.75" stroke-linecap="round" /><line x1="1.25" y1="79" x2="73.75" y2="79" stroke-linecap="round" /><line x1="26.25" y1="83" x2="98.75" y2="83" stroke-linecap="round" /><line x1="8" y1="26.25" x2="8" y2="98.75" stroke-linecap="round" /><line x1="79" y1="1.25" x2="79" y2="73.75" stroke-linecap="round" /><line x1="83" y1="26.25" x2="83" y2="98.75" stroke-linecap="round" /><line x1="1.25" y1="81" x2="98.75" y2="81" stroke-linecap="round" /><line x1="6" y1="1.25" x2="6" y2="98.75" stroke-linecap="round" /><line x1="81" y1="1.25" x2="81" y2="98.75" stroke-linecap="round" />
+    </g>
+</svg>
diff --git a/src/models/images/thumbnail/tictactoe-misere.svg b/src/models/images/thumbnail/tictactoe-misere.svg
new file mode 100644
index 00000000..031815aa
--- /dev/null
+++ b/src/models/images/thumbnail/tictactoe-misere.svg
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg viewBox="0 0 66 66" xmlns="http://www.w3.org/2000/svg">
+    <path d="M1,22 h64 M1,44 h64 M22,1 v64 M44,1 v64" stroke-width="2" stroke="#bcbec0"/>
+    <g fill="none" stroke="red" stroke-width="2">
+    <circle cx="11" cy="33" r="8"/>
+    <circle cx="33" cy="33" r="8"/>
+    </g>
+    <path d="M25,3l16,16M25,19l16,-16M47,25l16,16M47,41l16,-16" stroke="blue" stroke-width="2"/>
+    <g fill="#800000">
+    <circle cx="11" cy="11" r="5"/>
+    <circle cx="55" cy="11" r="5"/>
+    <circle cx="11" cy="55" r="5"/>
+    <circle cx="33" cy="55" r="5" fill="#FFFF00"/>
+    <circle cx="55" cy="55" r="5"/>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/models/images/thumbnail/tictactoe-regular.svg b/src/models/images/thumbnail/tictactoe-regular.svg
new file mode 100644
index 00000000..cd70503f
--- /dev/null
+++ b/src/models/images/thumbnail/tictactoe-regular.svg
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg viewBox="0 0 66 66" xmlns="http://www.w3.org/2000/svg">
+    <path d="M1,22 h64 M1,44 h64 M22,1 v64 M44,1 v64" stroke-width="2" stroke="#bcbec0"/>
+    <g fill="none" stroke="red" stroke-width="2">
+    <circle cx="11" cy="33" r="8"/>
+    <circle cx="33" cy="33" r="8"/>
+    </g>
+    <path d="M25,3l16,16M25,19l16,-16M47,25l16,16M47,41l16,-16" stroke="blue" stroke-width="2"/>
+    <g fill="#ffff00">
+    <circle cx="11" cy="11" r="5"/>
+    <circle cx="55" cy="11" r="5" fill="#008000"/>
+    <circle cx="11" cy="55" r="5"/>
+    <circle cx="33" cy="55" r="5" fill="#800000"/>
+    <circle cx="55" cy="55" r="5"/>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/models/images/thumbnail/ttt-regular.svg b/src/models/images/thumbnail/ttt-regular.svg
deleted file mode 100644
index 03074444..00000000
--- a/src/models/images/thumbnail/ttt-regular.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg viewBox="0 0 66 66" xmlns="http://www.w3.org/2000/svg">
-    <path d="M1,22 h64 M1,44 h64 M22,1 v64 M44,1 v64" stroke-width="2" stroke="#bcbec0"/>
-    <circle cx="11" cy="33" r="8" fill="none" stroke="red" stroke-width="2"/>
-    <circle cx="33" cy="33" r="8" fill="none" stroke="red" stroke-width="2"/>
-    <path d="M25,3 l16,16 M25,19 l16,-16 M47,25 l16,16 M47,41 l16,-16" stroke="blue" stroke-width="2"/>
-    <circle cx="11" cy="11" r="5" fill="#ffff00"/>
-    <circle cx="55" cy="11" r="5" fill="#008000"/>
-    <circle cx="11" cy="55" r="5" fill="#ffff00"/>
-    <circle cx="33" cy="55" r="5" fill="#800000"/>
-    <circle cx="55" cy="55" r="5" fill="#ffff00"/>
-</svg>
\ No newline at end of file
diff --git a/src/scripts/gamesmanUni/moveAnimation.ts b/src/scripts/gamesmanUni/moveAnimation.ts
index 3e959990..bb90df56 100644
--- a/src/scripts/gamesmanUni/moveAnimation.ts
+++ b/src/scripts/gamesmanUni/moveAnimation.ts
@@ -250,7 +250,7 @@ const animateImageAutoGUI = (volume: number, currPosition: string, nextPosition:
 export const handleMoveAnimation = (volume: number, currentMatch: Types.Match, moveObj: Types.Move) => {
     const currPosition = currentMatch.round.position.position;
     const nextPosition = moveObj.position;
-    if (currentMatch.gameId === 'ttt') {
+    if (currentMatch.gameId === 'tictactoe') {
         return animateTTT(volume, moveObj);
     } else if (currentMatch.gameId === 'sim') {
         return animateSim(volume, moveObj);
@@ -282,7 +282,7 @@ export const handleMoveAnimation = (volume: number, currentMatch: Types.Match, m
     fails to load.
 */
 export const animationEpilogue = (currentMatch: Types.Match) => {
-    if (currentMatch.gameId === 'ttt') {
+    if (currentMatch.gameId === 'tictactoe') {
         return; // todo
     } else if (currentMatch.gameId === 'sim') {
         return; // todo