diff --git a/src/components/units/GameBody/ImageAutoGUI.vue b/src/components/units/GameBody/ImageAutoGUI.vue
index eba8982b..6c4b99e5 100644
--- a/src/components/units/GameBody/ImageAutoGUI.vue
+++ b/src/components/units/GameBody/ImageAutoGUI.vue
@@ -10,6 +10,11 @@
       :width="scaledWidth"
       :height="scaledHeight"
       :href="getImageSource(backgroundImagePath)"/>
+    <!-- <use v-if="backgroundImagePath != ''" x="0" y="0"
+      :width="scaledWidth"
+      :height="scaledHeight"
+      :href="getImageSource(backgroundImagePath) + '#BackgroundSVG'"
+      /> -->
 
     <!-- Draw M-type (arrow) move buttons below entities -->
     <g v-if="!animationPlaying && entitiesOverArrows"> 
@@ -31,6 +36,15 @@
         :width="entities[cell].scale * widthFactor"
         :height="entities[cell].scale * widthFactor"
         :href="getImageSource(entities[cell].image)"/>
+
+        <!-- <use class="entity" v-if="cell != '-' && cell in entities"
+          :id="'entity' + i"
+          :x="centers[i][0] - 0.5 * entities[cell].scale * widthFactor"
+          :y="centers[i][1] - 0.5 * entities[cell].scale * widthFactor"
+          :width="entities[cell].scale * widthFactor"
+          :height="entities[cell].scale * widthFactor"
+          :href="getImageSource(entities[cell].image) + '#EntitySVG'"
+        /> -->
     </g>
  
     <!-- Draw Foreground Image -->
diff --git a/src/models/images/svg/achi/achiboard.svg b/src/models/images/svg/achi/achiboard.svg
index 07c6d7c1..2dafd7b0 100644
--- a/src/models/images/svg/achi/achiboard.svg
+++ b/src/models/images/svg/achi/achiboard.svg
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<svg id="a" viewBox="0 0 100 100" xmlns="http://www.w3.org/2000/svg">
-  <rect x="10" y="10" width="80" height="80" stroke-width="1.5" stroke="black" fill="#d0f1f2"/>
-  <line x1="10" y1="10" x2="90" y2="90" stroke-width="1.5" stroke="black"/>
-  <line x1="10" y1="90" x2="90" y2="10" stroke-width="1.5" stroke="black"/>
-  <line x1="10" y1="50" x2="90" y2="50" stroke-width="1.5" stroke="black"/>
-  <line x1="50" y1="10" x2="50" y2="90" stroke-width="1.5"  stroke="black"/>
-
+<svg version="1.1" id="BackgroundSVG" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100">
+  <rect x="10" y="10" width="80" height="80" stroke-width="1.5" stroke="black" fill="#d0f1f2" />
+  <line x1="10" y1="10" x2="90" y2="90" stroke-width="1.5" stroke="black" />
+  <line x1="10" y1="90" x2="90" y2="10" stroke-width="1.5" stroke="black" />
+  <line x1="10" y1="50" x2="90" y2="50" stroke-width="1.5" stroke="black" />
+  <line x1="50" y1="10" x2="50" y2="90" stroke-width="1.5" stroke="black" />
 </svg>
\ No newline at end of file
diff --git a/src/models/images/svg/adugo/grid3x3.svg b/src/models/images/svg/adugo/grid3x3.svg
index 4cc24b4a..c4580c28 100644
--- a/src/models/images/svg/adugo/grid3x3.svg
+++ b/src/models/images/svg/adugo/grid3x3.svg
@@ -1,20 +1,18 @@
 <?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 30 30" style="enable-background:new 0 0 30 30;" xml:space="preserve">
-    <rect x="0" y="0" width="30" height="30" stroke="#000000" stroke-width="0.25" fill="#b7e2e7"/>
+<svg version="1.1" id="BackgroundSVG" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 30 30">
+    <rect x="0" y="0" width="30" height="30" stroke="#000000" stroke-width="0.25" fill="#b7e2e7" />
 
-    <line x1="5" y1="5" x2="25" y2="5" stroke="#000000" stroke-width="0.12"/>
-    <line x1="5" y1="15" x2="25" y2="15" stroke="#000000" stroke-width="0.12"/>
-    <line x1="5" y1="25" x2="25" y2="25" stroke="#000000" stroke-width="0.12"/>
+    <line x1="5" y1="5" x2="25" y2="5" stroke="#000000" stroke-width="0.12" />
+    <line x1="5" y1="15" x2="25" y2="15" stroke="#000000" stroke-width="0.12" />
+    <line x1="5" y1="25" x2="25" y2="25" stroke="#000000" stroke-width="0.12" />
 
-    <line x1="5" y1="5" x2="5" y2="25" stroke="#000000" stroke-width="0.12"/>
-    <line x1="15" y1="5" x2="15" y2="25" stroke="#000000" stroke-width="0.12"/>
-    <line x1="25" y1="5" x2="25" y2="25" stroke="#000000" stroke-width="0.12"/>
+    <line x1="5" y1="5" x2="5" y2="25" stroke="#000000" stroke-width="0.12" />
+    <line x1="15" y1="5" x2="15" y2="25" stroke="#000000" stroke-width="0.12" />
+    <line x1="25" y1="5" x2="25" y2="25" stroke="#000000" stroke-width="0.12" />
 
 
-    <line x1="5" y1="5" x2="25" y2="25" stroke="#000000" stroke-width="0.12"/>
-    <line x1="25" y1="5" x2="5" y2="25" stroke="#000000" stroke-width="0.12"/>
+    <line x1="5" y1="5" x2="25" y2="25" stroke="#000000" stroke-width="0.12" />
+    <line x1="25" y1="5" x2="5" y2="25" stroke="#000000" stroke-width="0.12" />
 
-    <rect x="0" y="0" width="30" height="30" stroke="#000000" stroke-width="0.25" fill="none"/>
+    <rect x="0" y="0" width="30" height="30" stroke="#000000" stroke-width="0.25" fill="none" />
 </svg>
\ No newline at end of file
diff --git a/src/models/images/svg/adugo/grid5x5.svg b/src/models/images/svg/adugo/grid5x5.svg
index 61015a7f..f04d374a 100644
--- a/src/models/images/svg/adugo/grid5x5.svg
+++ b/src/models/images/svg/adugo/grid5x5.svg
@@ -1,28 +1,26 @@
 <?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 50 50" style="enable-background:new 0 0 50 50;" xml:space="preserve">
-    <rect x="0" y="0" width="50" height="50" stroke="#000000" stroke-width="0.25" fill="#b7e2e7"/>
+<svg version="1.1" id="BackgroundSVG" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 50 50">
+    <rect x="0" y="0" width="50" height="50" stroke="#000000" stroke-width="0.25" fill="#b7e2e7" />
 
-    <line x1="5" y1="5" x2="45" y2="5" stroke="#000000" stroke-width="0.12"/>
-    <line x1="5" y1="15" x2="45" y2="15" stroke="#000000" stroke-width="0.12"/>
-    <line x1="5" y1="25" x2="45" y2="25" stroke="#000000" stroke-width="0.12"/>
-    <line x1="5" y1="35" x2="45" y2="35" stroke="#000000" stroke-width="0.12"/>
-    <line x1="5" y1="45" x2="45" y2="45" stroke="#000000" stroke-width="0.12"/>
+    <line x1="5" y1="5" x2="45" y2="5" stroke="#000000" stroke-width="0.12" />
+    <line x1="5" y1="15" x2="45" y2="15" stroke="#000000" stroke-width="0.12" />
+    <line x1="5" y1="25" x2="45" y2="25" stroke="#000000" stroke-width="0.12" />
+    <line x1="5" y1="35" x2="45" y2="35" stroke="#000000" stroke-width="0.12" />
+    <line x1="5" y1="45" x2="45" y2="45" stroke="#000000" stroke-width="0.12" />
 
-    <line x1="5" y1="5" x2="5" y2="45" stroke="#000000" stroke-width="0.12"/>
-    <line x1="15" y1="5" x2="15" y2="45" stroke="#000000" stroke-width="0.12"/>
-    <line x1="25" y1="5" x2="25" y2="45" stroke="#000000" stroke-width="0.12"/>
-    <line x1="35" y1="5" x2="35" y2="45" stroke="#000000" stroke-width="0.12"/>
-    <line x1="45" y1="5" x2="45" y2="45" stroke="#000000" stroke-width="0.12"/>
+    <line x1="5" y1="5" x2="5" y2="45" stroke="#000000" stroke-width="0.12" />
+    <line x1="15" y1="5" x2="15" y2="45" stroke="#000000" stroke-width="0.12" />
+    <line x1="25" y1="5" x2="25" y2="45" stroke="#000000" stroke-width="0.12" />
+    <line x1="35" y1="5" x2="35" y2="45" stroke="#000000" stroke-width="0.12" />
+    <line x1="45" y1="5" x2="45" y2="45" stroke="#000000" stroke-width="0.12" />
 
 
-    <line x1="5" y1="5" x2="45" y2="45" stroke="#000000" stroke-width="0.12"/>
-    <line x1="45" y1="5" x2="5" y2="45" stroke="#000000" stroke-width="0.12"/>
-    <line x1="25" y1="5" x2="5" y2="25" stroke="#000000" stroke-width="0.12"/>
-    <line x1="25" y1="5" x2="45" y2="25" stroke="#000000" stroke-width="0.12"/>
-    <line x1="25" y1="45" x2="45" y2="25" stroke="#000000" stroke-width="0.12"/>
-    <line x1="25" y1="45" x2="5" y2="25" stroke="#000000" stroke-width="0.12"/>
+    <line x1="5" y1="5" x2="45" y2="45" stroke="#000000" stroke-width="0.12" />
+    <line x1="45" y1="5" x2="5" y2="45" stroke="#000000" stroke-width="0.12" />
+    <line x1="25" y1="5" x2="5" y2="25" stroke="#000000" stroke-width="0.12" />
+    <line x1="25" y1="5" x2="45" y2="25" stroke="#000000" stroke-width="0.12" />
+    <line x1="25" y1="45" x2="45" y2="25" stroke="#000000" stroke-width="0.12" />
+    <line x1="25" y1="45" x2="5" y2="25" stroke="#000000" stroke-width="0.12" />
 
-    <rect x="0" y="0" width="50" height="50" stroke="#000000" stroke-width="0.25" fill="none"/>
+    <rect x="0" y="0" width="50" height="50" stroke="#000000" stroke-width="0.25" fill="none" />
 </svg>
\ No newline at end of file
diff --git a/src/models/images/svg/allqueenschess/board.svg b/src/models/images/svg/allqueenschess/board.svg
index 68e5f106..9642e8c9 100644
--- a/src/models/images/svg/allqueenschess/board.svg
+++ b/src/models/images/svg/allqueenschess/board.svg
@@ -1,13 +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 50 50" style="enable-background:new 0 0 50 50;" xml:space="preserve">
-    <style type="text/css">
+<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;
@@ -15,39 +14,39 @@
         }
     </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"/>
+    <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"/>
+    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" />
 
 </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 a81424d6..6515dd00 100644
--- a/src/models/images/svg/baghchal/grid5Diag.svg
+++ b/src/models/images/svg/baghchal/grid5Diag.svg
@@ -1,28 +1,27 @@
 <?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 50 60" style="enable-background:new 0 0 50 60;" xml:space="preserve">
-
+<svg version="1.1" id="BackgroundSVG" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 50 60">
     <style>
-    .small { font: 3px monospace; }
+        .small {
+            font: 3px monospace;
+        }
     </style>
-    <rect x="5" y="5" width="40" height="40" stroke="black" stroke-width="0.5" fill="#a1cfab"/>
+    <rect x="5" y="5" width="40" height="40" stroke="black" stroke-width="0.5" fill="#a1cfab" />
 
-    <line x1="15" y1="5" x2="15" y2="45" stroke="black" stroke-width="0.5"/>
-    <line x1="25" y1="5" x2="25" y2="45" stroke="black" stroke-width="0.5"/>
-    <line x1="35" y1="5" x2="35" y2="45" stroke="black" stroke-width="0.5"/>
+    <line x1="15" y1="5" x2="15" y2="45" stroke="black" stroke-width="0.5" />
+    <line x1="25" y1="5" x2="25" y2="45" stroke="black" stroke-width="0.5" />
+    <line x1="35" y1="5" x2="35" y2="45" stroke="black" stroke-width="0.5" />
 
-    <line x1="5" y1="15" x2="45" y2="15" stroke="black" stroke-width="0.5"/>
-    <line x1="5" y1="25" x2="45" y2="25" stroke="black" stroke-width="0.5"/>
-    <line x1="5" y1="35" x2="45" y2="35" stroke="black" stroke-width="0.5"/>
+    <line x1="5" y1="15" x2="45" y2="15" stroke="black" stroke-width="0.5" />
+    <line x1="5" y1="25" x2="45" y2="25" stroke="black" stroke-width="0.5" />
+    <line x1="5" y1="35" x2="45" y2="35" stroke="black" stroke-width="0.5" />
 
-    <line x1="5" y1="5" x2="45" y2="45" stroke="black" stroke-width="0.5"/>
-    <line x1="45" y1="5" x2="5" y2="45" stroke="black" stroke-width="0.5"/>
+    <line x1="5" y1="5" x2="45" y2="45" stroke="black" stroke-width="0.5" />
+    <line x1="45" y1="5" x2="5" y2="45" stroke="black" stroke-width="0.5" />
 
-    <line x1="5" y1="25" x2="25" y2="5" stroke="black" stroke-width="0.5"/>
-    <line x1="45" y1="25" x2="25" y2="5" stroke="black" stroke-width="0.5"/>
-    <line x1="45" y1="25" x2="25" y2="45" stroke="black" stroke-width="0.5"/>
-    <line x1="5" y1="25" x2="25" y2="45" stroke="black" stroke-width="0.5"/>
+    <line x1="5" y1="25" x2="25" y2="5" stroke="black" stroke-width="0.5" />
+    <line x1="45" y1="25" x2="25" y2="5" stroke="black" stroke-width="0.5" />
+    <line x1="45" y1="25" x2="25" y2="45" stroke="black" stroke-width="0.5" />
+    <line x1="5" y1="25" x2="25" y2="45" stroke="black" stroke-width="0.5" />
 
     <text x="8.5" y="53" class="small">Goats To Place:</text>
     <text x="8.5" y="56.5" class="small">Goats Captured:</text>
diff --git a/src/models/images/svg/beeline/board.svg b/src/models/images/svg/beeline/board.svg
index 9404b21b..6c2bb056 100644
--- a/src/models/images/svg/beeline/board.svg
+++ b/src/models/images/svg/beeline/board.svg
@@ -1,5 +1,5 @@
-<?xml version="1.0" standalone="no"?>
-<svg id="bc" viewBox="0 0 240 110" xmlns="http://www.w3.org/2000/svg">
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" id="BackgroundSVG" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 240 110">
     <defs>
         <g id="hex">
             <line x1="40" y1="20.0" x2="30" y2="37.3" style="stroke:rgb(0,0,0);stroke-width:2" stroke-linecap="round"/>
diff --git a/src/models/images/svg/beeline/red_bee.svg b/src/models/images/svg/beeline/red_bee.svg
index d426f7c4..f80cd4b7 100644
--- a/src/models/images/svg/beeline/red_bee.svg
+++ b/src/models/images/svg/beeline/red_bee.svg
@@ -1 +1,70 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="1080" zoomAndPan="magnify" viewBox="0 0 810 809.999993" height="1080" preserveAspectRatio="xMidYMid meet" version="1.0"><defs><clipPath id="921e2a34c3"><path d="M 233.097656 275 L 571.664062 275 L 571.664062 724.5 L 233.097656 724.5 Z M 233.097656 275 " clip-rule="nonzero"/></clipPath><clipPath id="747e1f1a9f"><path d="M 445 200 L 792.519531 200 L 792.519531 432 L 445 432 Z M 445 200 " clip-rule="nonzero"/></clipPath></defs><path fill="#050606" d="M 515.417969 289.273438 C 515.472656 234.679688 466.015625 172.539062 404.933594 172.480469 C 343.847656 172.410156 294.261719 234.449219 294.207031 289.039062 C 294.148438 343.640625 343.710938 298.820312 404.800781 298.882812 C 465.886719 298.945312 515.355469 343.875 515.417969 289.273438 " fill-opacity="1" fill-rule="nonzero"/><path fill="#050606" d="M 466.625 302.679688 C 478.566406 306.085938 488.867188 309.027344 496.195312 309.03125 C 501.464844 309.039062 508.023438 309.042969 508.042969 289.269531 C 508.097656 239.71875 462.109375 179.828125 404.921875 179.769531 C 347.738281 179.707031 301.628906 239.503906 301.582031 289.050781 C 301.554688 308.828125 308.121094 308.835938 313.386719 308.839844 C 320.710938 308.847656 331.019531 305.925781 342.964844 302.546875 C 360.238281 297.652344 381.738281 291.570312 404.804688 291.59375 C 427.871094 291.613281 449.359375 297.75 466.625 302.679688 Z M 286.828125 289.035156 C 286.890625 231.703125 338.496094 165.117188 404.941406 165.183594 C 471.378906 165.257812 522.847656 231.949219 522.792969 289.28125 C 522.769531 312.082031 513.8125 323.636719 496.183594 323.617188 C 486.777344 323.609375 475.542969 320.398438 462.535156 316.691406 C 445.3125 311.777344 425.78125 306.195312 404.792969 306.179688 C 383.804688 306.152344 364.261719 311.691406 347.027344 316.566406 C 334.011719 320.253906 322.773438 323.4375 313.367188 323.425781 C 295.730469 323.40625 286.804688 311.835938 286.828125 289.035156 " fill-opacity="1" fill-rule="nonzero"/><path fill="#ff3131" d="M 403.1875 275.667969 C 492.324219 275.757812 564.523438 341.921875 564.40625 451.738281 C 564.300781 553.042969 512.550781 636.597656 433.039062 648.875 C 426.351562 649.90625 377.425781 649.703125 369.898438 648.371094 C 291.695312 634.5 241.496094 551.574219 241.597656 451.40625 C 241.714844 341.585938 314.042969 275.570312 403.1875 275.667969 " fill-opacity="1" fill-rule="nonzero"/><g clip-path="url(#921e2a34c3)"><path fill="#050606" d="M 248.582031 458.171875 C 248.476562 557.078125 298.734375 635.082031 370.792969 647.867188 C 382.261719 649.902344 424.875 649.371094 431.519531 648.34375 C 505.082031 636.988281 556.539062 558.917969 556.644531 458.492188 C 556.742188 359.265625 493.476562 289.894531 402.789062 289.804688 C 312.097656 289.703125 248.6875 358.945312 248.582031 458.171875 Z M 371.558594 665.308594 C 369.5625 663.378906 366.988281 662.191406 364.269531 661.632812 C 326.011719 653.695312 293.410156 630.027344 269.777344 592.972656 C 246.546875 556.542969 233.78125 508.667969 233.832031 458.152344 C 233.890625 403.75 251 357.34375 283.316406 323.949219 C 313.875 292.367188 356.308594 275.003906 402.800781 275.050781 C 449.292969 275.101562 491.691406 292.558594 522.183594 324.203125 C 554.429688 357.664062 571.441406 404.105469 571.386719 458.507812 C 571.277344 562.753906 518.414062 644.769531 441.816406 661.429688 C 437.910156 662.277344 434.523438 664.664062 432.386719 668.042969 C 419.371094 688.613281 416.734375 728.027344 405.800781 724.246094 C 390.523438 718.960938 388.386719 681.613281 371.558594 665.308594 " fill-opacity="1" fill-rule="nonzero"/></g><path fill="#050606" d="M 276.101562 578.589844 C 418.714844 514 531.421875 573.648438 532.546875 574.257812 L 562.210938 511.605469 C 556.519531 508.519531 420.933594 436.726562 250.597656 513.878906 L 276.101562 578.589844 " fill-opacity="1" fill-rule="nonzero"/><path fill="#050606" d="M 236.683594 450.605469 C 379.300781 385.097656 563.292969 443.175781 564.414062 443.796875 L 546.464844 373.65625 C 540.773438 370.515625 431.691406 287.964844 261.351562 366.203125 L 236.683594 450.605469 " fill-opacity="1" fill-rule="nonzero"/><path fill="#050606" d="M 344.496094 200.761719 L 359.070312 199.097656 C 358.835938 198 353.226562 171.929688 341.925781 144.753906 C 325.835938 106.074219 307.289062 86.039062 285.21875 83.511719 C 264.039062 81.089844 243.511719 94.929688 222.457031 125.832031 L 235.652344 130.679688 C 252.96875 105.257812 269.292969 92.648438 282.953125 94.203125 C 311.957031 97.523438 336.09375 161.328125 344.496094 200.761719 " fill-opacity="1" fill-rule="nonzero"/><path fill="#050606" d="M 222.296875 111.628906 C 216.675781 127.359375 223.109375 142.234375 236.679688 144.851562 C 250.246094 147.46875 265.804688 136.839844 271.433594 121.109375 C 277.054688 105.375 270.621094 90.5 257.050781 87.886719 C 243.480469 85.265625 227.917969 95.894531 222.296875 111.628906 " fill-opacity="1" fill-rule="nonzero"/><path fill="#050606" d="M 462.023438 200.886719 L 447.457031 199.1875 C 447.699219 198.09375 453.355469 172.035156 464.71875 144.882812 C 480.890625 106.234375 499.480469 86.242188 521.550781 83.765625 C 542.734375 81.378906 563.238281 95.269531 584.226562 126.207031 L 571.023438 131.023438 C 553.757812 105.570312 537.457031 92.929688 523.800781 94.457031 C 494.785156 97.714844 470.511719 161.460938 462.023438 200.886719 " fill-opacity="1" fill-rule="nonzero"/><path fill="#050606" d="M 584.417969 112.003906 C 590.007812 127.746094 583.535156 142.609375 569.96875 145.199219 C 556.390625 147.789062 540.851562 137.128906 535.261719 121.386719 C 529.671875 105.640625 536.140625 90.777344 549.710938 88.195312 C 563.285156 85.597656 578.824219 96.265625 584.417969 112.003906 " fill-opacity="1" fill-rule="nonzero"/><path fill="#ffffff" d="M 452.496094 411.832031 C 452.496094 411.832031 585.898438 320.332031 665.722656 379.976562 C 745.535156 439.625 726.222656 517.542969 655.683594 537.382812 C 585.140625 557.226562 452.496094 411.832031 452.496094 411.832031 " fill-opacity="1" fill-rule="nonzero"/><path fill="#050606" d="M 462.929688 413.179688 C 487.078125 438.371094 581.1875 532.292969 641.394531 532.363281 C 645.917969 532.367188 650.160156 531.816406 654.03125 530.730469 C 684.878906 522.050781 705.910156 501.316406 710.296875 475.265625 C 715.382812 445.027344 697.777344 412.34375 661.996094 385.609375 C 645.214844 373.066406 624.382812 366.695312 600.070312 366.671875 C 543.492188 366.609375 483.03125 400.761719 462.929688 413.179688 Z M 447.851562 416.625 L 442.351562 410.597656 L 448.988281 406.042969 C 452.15625 403.875 527.417969 352.824219 600.082031 352.902344 C 627.105469 352.929688 650.4375 360.144531 669.445312 374.339844 C 709.515625 404.292969 729.050781 441.957031 723.042969 477.6875 C 717.746094 509.152344 693.183594 533.957031 657.332031 544.039062 C 652.386719 545.433594 647.019531 546.132812 641.382812 546.128906 C 641.378906 546.128906 641.382812 546.128906 641.382812 546.128906 C 566.78125 546.046875 452.667969 421.910156 447.851562 416.625 " fill-opacity="1" fill-rule="nonzero"/><path fill="#ffffff" d="M 454.304688 409.082031 C 454.304688 409.082031 531.558594 207.128906 657.550781 207.226562 C 783.546875 207.332031 817.453125 304.941406 756.703125 381.554688 C 695.953125 458.175781 454.304688 409.082031 454.304688 409.082031 " fill-opacity="1" fill-rule="nonzero"/><g clip-path="url(#747e1f1a9f)"><path fill="#050606" d="M 514.039062 311.984375 C 487.828125 349.667969 470.359375 387.800781 463.523438 403.832031 C 484.949219 407.679688 546.085938 417.621094 607.515625 417.6875 C 607.519531 417.6875 607.527344 417.6875 607.527344 417.6875 C 680.777344 417.761719 730.652344 403.730469 751.753906 377.121094 C 778.808594 343.007812 786.695312 303.691406 772.847656 271.96875 C 756.832031 235.257812 714.824219 214.171875 657.542969 214.109375 C 595.242188 214.066406 545.117188 267.308594 514.039062 311.984375 Z M 453.085938 415.84375 L 445.328125 414.273438 L 448.308594 406.488281 C 449.105469 404.394531 468.328125 354.621094 503.472656 304.03125 C 550.621094 236.15625 603.902344 200.300781 657.621094 200.34375 C 720.082031 200.414062 766.363281 224.410156 784.589844 266.175781 C 800.609375 302.878906 792.035156 347.675781 761.648438 385.996094 C 737.664062 416.242188 685.808594 431.535156 607.515625 431.457031 C 607.507812 431.457031 607.515625 431.457031 607.503906 431.457031 C 530.402344 431.375 453.847656 416.003906 453.085938 415.84375 " fill-opacity="1" fill-rule="nonzero"/></g><path fill="#ffffff" d="M 357.378906 411.832031 C 357.378906 411.832031 223.976562 320.332031 144.15625 379.976562 C 64.335938 439.625 83.652344 517.542969 154.195312 537.382812 C 224.738281 557.226562 357.378906 411.832031 357.378906 411.832031 " fill-opacity="1" fill-rule="nonzero"/><path fill="#050606" d="M 209.808594 366.671875 C 185.5 366.695312 164.660156 373.066406 147.878906 385.609375 C 112.097656 412.34375 94.492188 445.027344 99.578125 475.265625 C 103.964844 501.316406 124.996094 522.050781 155.851562 530.730469 C 159.714844 531.816406 163.964844 532.367188 168.480469 532.363281 C 228.695312 532.292969 322.796875 438.371094 346.945312 413.179688 C 326.84375 400.761719 266.390625 366.609375 209.808594 366.671875 Z M 168.496094 546.128906 C 168.492188 546.128906 168.496094 546.128906 168.492188 546.128906 C 162.855469 546.132812 157.488281 545.433594 152.542969 544.039062 C 116.691406 533.957031 92.128906 509.152344 86.839844 477.6875 C 80.824219 441.957031 100.367188 404.292969 140.429688 374.339844 C 159.4375 360.144531 182.769531 352.929688 209.792969 352.902344 C 282.457031 352.824219 357.71875 403.875 360.886719 406.042969 L 367.523438 410.597656 L 362.027344 416.625 C 357.207031 421.910156 243.09375 546.046875 168.496094 546.128906 " fill-opacity="1" fill-rule="nonzero"/><path fill="#ffffff" d="M 355.578125 409.082031 C 355.578125 409.082031 278.316406 207.128906 152.324219 207.226562 C 26.328125 207.332031 -7.578125 304.941406 53.171875 381.554688 C 113.929688 458.175781 355.578125 409.082031 355.578125 409.082031 " fill-opacity="1" fill-rule="nonzero"/><path fill="#050606" d="M 152.332031 214.109375 C 95.050781 214.171875 53.042969 235.257812 37.027344 271.96875 C 23.1875 303.691406 31.066406 343.007812 58.117188 377.121094 C 79.222656 403.730469 129.097656 417.761719 202.347656 417.6875 C 202.347656 417.6875 202.355469 417.6875 202.359375 417.6875 C 263.785156 417.621094 324.929688 407.679688 346.347656 403.832031 C 339.515625 387.800781 322.046875 349.667969 295.835938 311.984375 C 264.757812 267.308594 214.636719 214.066406 152.332031 214.109375 Z M 202.371094 431.457031 C 202.367188 431.457031 202.367188 431.457031 202.359375 431.457031 C 124.066406 431.535156 72.210938 416.242188 48.226562 385.996094 C 17.839844 347.675781 9.265625 302.878906 25.285156 266.175781 C 43.507812 224.410156 89.792969 200.414062 152.257812 200.34375 C 205.972656 200.300781 259.253906 236.15625 306.402344 304.03125 C 341.546875 354.621094 360.769531 404.394531 361.574219 406.488281 L 364.546875 414.273438 L 356.792969 415.84375 C 356.027344 416.003906 279.472656 431.375 202.371094 431.457031 " fill-opacity="1" fill-rule="nonzero"/></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" id="EntitySVG" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 810 810">
+    <defs>
+        <clipPath id="921e2a34c3">
+            <path d="M 233.097656 275 L 571.664062 275 L 571.664062 724.5 L 233.097656 724.5 Z M 233.097656 275 "
+                clip-rule="nonzero" />
+        </clipPath>
+        <clipPath id="747e1f1a9f">
+            <path d="M 445 200 L 792.519531 200 L 792.519531 432 L 445 432 Z M 445 200 " clip-rule="nonzero" />
+        </clipPath>
+    </defs>
+    <path fill="#050606"
+        d="M 515.417969 289.273438 C 515.472656 234.679688 466.015625 172.539062 404.933594 172.480469 C 343.847656 172.410156 294.261719 234.449219 294.207031 289.039062 C 294.148438 343.640625 343.710938 298.820312 404.800781 298.882812 C 465.886719 298.945312 515.355469 343.875 515.417969 289.273438 "
+        fill-opacity="1" fill-rule="nonzero" />
+    <path fill="#050606"
+        d="M 466.625 302.679688 C 478.566406 306.085938 488.867188 309.027344 496.195312 309.03125 C 501.464844 309.039062 508.023438 309.042969 508.042969 289.269531 C 508.097656 239.71875 462.109375 179.828125 404.921875 179.769531 C 347.738281 179.707031 301.628906 239.503906 301.582031 289.050781 C 301.554688 308.828125 308.121094 308.835938 313.386719 308.839844 C 320.710938 308.847656 331.019531 305.925781 342.964844 302.546875 C 360.238281 297.652344 381.738281 291.570312 404.804688 291.59375 C 427.871094 291.613281 449.359375 297.75 466.625 302.679688 Z M 286.828125 289.035156 C 286.890625 231.703125 338.496094 165.117188 404.941406 165.183594 C 471.378906 165.257812 522.847656 231.949219 522.792969 289.28125 C 522.769531 312.082031 513.8125 323.636719 496.183594 323.617188 C 486.777344 323.609375 475.542969 320.398438 462.535156 316.691406 C 445.3125 311.777344 425.78125 306.195312 404.792969 306.179688 C 383.804688 306.152344 364.261719 311.691406 347.027344 316.566406 C 334.011719 320.253906 322.773438 323.4375 313.367188 323.425781 C 295.730469 323.40625 286.804688 311.835938 286.828125 289.035156 "
+        fill-opacity="1" fill-rule="nonzero" />
+    <path fill="#ff3131"
+        d="M 403.1875 275.667969 C 492.324219 275.757812 564.523438 341.921875 564.40625 451.738281 C 564.300781 553.042969 512.550781 636.597656 433.039062 648.875 C 426.351562 649.90625 377.425781 649.703125 369.898438 648.371094 C 291.695312 634.5 241.496094 551.574219 241.597656 451.40625 C 241.714844 341.585938 314.042969 275.570312 403.1875 275.667969 "
+        fill-opacity="1" fill-rule="nonzero" />
+    <g clip-path="url(#921e2a34c3)">
+        <path fill="#050606"
+            d="M 248.582031 458.171875 C 248.476562 557.078125 298.734375 635.082031 370.792969 647.867188 C 382.261719 649.902344 424.875 649.371094 431.519531 648.34375 C 505.082031 636.988281 556.539062 558.917969 556.644531 458.492188 C 556.742188 359.265625 493.476562 289.894531 402.789062 289.804688 C 312.097656 289.703125 248.6875 358.945312 248.582031 458.171875 Z M 371.558594 665.308594 C 369.5625 663.378906 366.988281 662.191406 364.269531 661.632812 C 326.011719 653.695312 293.410156 630.027344 269.777344 592.972656 C 246.546875 556.542969 233.78125 508.667969 233.832031 458.152344 C 233.890625 403.75 251 357.34375 283.316406 323.949219 C 313.875 292.367188 356.308594 275.003906 402.800781 275.050781 C 449.292969 275.101562 491.691406 292.558594 522.183594 324.203125 C 554.429688 357.664062 571.441406 404.105469 571.386719 458.507812 C 571.277344 562.753906 518.414062 644.769531 441.816406 661.429688 C 437.910156 662.277344 434.523438 664.664062 432.386719 668.042969 C 419.371094 688.613281 416.734375 728.027344 405.800781 724.246094 C 390.523438 718.960938 388.386719 681.613281 371.558594 665.308594 "
+            fill-opacity="1" fill-rule="nonzero" />
+    </g>
+    <path fill="#050606"
+        d="M 276.101562 578.589844 C 418.714844 514 531.421875 573.648438 532.546875 574.257812 L 562.210938 511.605469 C 556.519531 508.519531 420.933594 436.726562 250.597656 513.878906 L 276.101562 578.589844 "
+        fill-opacity="1" fill-rule="nonzero" />
+    <path fill="#050606"
+        d="M 236.683594 450.605469 C 379.300781 385.097656 563.292969 443.175781 564.414062 443.796875 L 546.464844 373.65625 C 540.773438 370.515625 431.691406 287.964844 261.351562 366.203125 L 236.683594 450.605469 "
+        fill-opacity="1" fill-rule="nonzero" />
+    <path fill="#050606"
+        d="M 344.496094 200.761719 L 359.070312 199.097656 C 358.835938 198 353.226562 171.929688 341.925781 144.753906 C 325.835938 106.074219 307.289062 86.039062 285.21875 83.511719 C 264.039062 81.089844 243.511719 94.929688 222.457031 125.832031 L 235.652344 130.679688 C 252.96875 105.257812 269.292969 92.648438 282.953125 94.203125 C 311.957031 97.523438 336.09375 161.328125 344.496094 200.761719 "
+        fill-opacity="1" fill-rule="nonzero" />
+    <path fill="#050606"
+        d="M 222.296875 111.628906 C 216.675781 127.359375 223.109375 142.234375 236.679688 144.851562 C 250.246094 147.46875 265.804688 136.839844 271.433594 121.109375 C 277.054688 105.375 270.621094 90.5 257.050781 87.886719 C 243.480469 85.265625 227.917969 95.894531 222.296875 111.628906 "
+        fill-opacity="1" fill-rule="nonzero" />
+    <path fill="#050606"
+        d="M 462.023438 200.886719 L 447.457031 199.1875 C 447.699219 198.09375 453.355469 172.035156 464.71875 144.882812 C 480.890625 106.234375 499.480469 86.242188 521.550781 83.765625 C 542.734375 81.378906 563.238281 95.269531 584.226562 126.207031 L 571.023438 131.023438 C 553.757812 105.570312 537.457031 92.929688 523.800781 94.457031 C 494.785156 97.714844 470.511719 161.460938 462.023438 200.886719 "
+        fill-opacity="1" fill-rule="nonzero" />
+    <path fill="#050606"
+        d="M 584.417969 112.003906 C 590.007812 127.746094 583.535156 142.609375 569.96875 145.199219 C 556.390625 147.789062 540.851562 137.128906 535.261719 121.386719 C 529.671875 105.640625 536.140625 90.777344 549.710938 88.195312 C 563.285156 85.597656 578.824219 96.265625 584.417969 112.003906 "
+        fill-opacity="1" fill-rule="nonzero" />
+    <path fill="#ffffff"
+        d="M 452.496094 411.832031 C 452.496094 411.832031 585.898438 320.332031 665.722656 379.976562 C 745.535156 439.625 726.222656 517.542969 655.683594 537.382812 C 585.140625 557.226562 452.496094 411.832031 452.496094 411.832031 "
+        fill-opacity="1" fill-rule="nonzero" />
+    <path fill="#050606"
+        d="M 462.929688 413.179688 C 487.078125 438.371094 581.1875 532.292969 641.394531 532.363281 C 645.917969 532.367188 650.160156 531.816406 654.03125 530.730469 C 684.878906 522.050781 705.910156 501.316406 710.296875 475.265625 C 715.382812 445.027344 697.777344 412.34375 661.996094 385.609375 C 645.214844 373.066406 624.382812 366.695312 600.070312 366.671875 C 543.492188 366.609375 483.03125 400.761719 462.929688 413.179688 Z M 447.851562 416.625 L 442.351562 410.597656 L 448.988281 406.042969 C 452.15625 403.875 527.417969 352.824219 600.082031 352.902344 C 627.105469 352.929688 650.4375 360.144531 669.445312 374.339844 C 709.515625 404.292969 729.050781 441.957031 723.042969 477.6875 C 717.746094 509.152344 693.183594 533.957031 657.332031 544.039062 C 652.386719 545.433594 647.019531 546.132812 641.382812 546.128906 C 641.378906 546.128906 641.382812 546.128906 641.382812 546.128906 C 566.78125 546.046875 452.667969 421.910156 447.851562 416.625 "
+        fill-opacity="1" fill-rule="nonzero" />
+    <path fill="#ffffff"
+        d="M 454.304688 409.082031 C 454.304688 409.082031 531.558594 207.128906 657.550781 207.226562 C 783.546875 207.332031 817.453125 304.941406 756.703125 381.554688 C 695.953125 458.175781 454.304688 409.082031 454.304688 409.082031 "
+        fill-opacity="1" fill-rule="nonzero" />
+    <g clip-path="url(#747e1f1a9f)">
+        <path fill="#050606"
+            d="M 514.039062 311.984375 C 487.828125 349.667969 470.359375 387.800781 463.523438 403.832031 C 484.949219 407.679688 546.085938 417.621094 607.515625 417.6875 C 607.519531 417.6875 607.527344 417.6875 607.527344 417.6875 C 680.777344 417.761719 730.652344 403.730469 751.753906 377.121094 C 778.808594 343.007812 786.695312 303.691406 772.847656 271.96875 C 756.832031 235.257812 714.824219 214.171875 657.542969 214.109375 C 595.242188 214.066406 545.117188 267.308594 514.039062 311.984375 Z M 453.085938 415.84375 L 445.328125 414.273438 L 448.308594 406.488281 C 449.105469 404.394531 468.328125 354.621094 503.472656 304.03125 C 550.621094 236.15625 603.902344 200.300781 657.621094 200.34375 C 720.082031 200.414062 766.363281 224.410156 784.589844 266.175781 C 800.609375 302.878906 792.035156 347.675781 761.648438 385.996094 C 737.664062 416.242188 685.808594 431.535156 607.515625 431.457031 C 607.507812 431.457031 607.515625 431.457031 607.503906 431.457031 C 530.402344 431.375 453.847656 416.003906 453.085938 415.84375 "
+            fill-opacity="1" fill-rule="nonzero" />
+    </g>
+    <path fill="#ffffff"
+        d="M 357.378906 411.832031 C 357.378906 411.832031 223.976562 320.332031 144.15625 379.976562 C 64.335938 439.625 83.652344 517.542969 154.195312 537.382812 C 224.738281 557.226562 357.378906 411.832031 357.378906 411.832031 "
+        fill-opacity="1" fill-rule="nonzero" />
+    <path fill="#050606"
+        d="M 209.808594 366.671875 C 185.5 366.695312 164.660156 373.066406 147.878906 385.609375 C 112.097656 412.34375 94.492188 445.027344 99.578125 475.265625 C 103.964844 501.316406 124.996094 522.050781 155.851562 530.730469 C 159.714844 531.816406 163.964844 532.367188 168.480469 532.363281 C 228.695312 532.292969 322.796875 438.371094 346.945312 413.179688 C 326.84375 400.761719 266.390625 366.609375 209.808594 366.671875 Z M 168.496094 546.128906 C 168.492188 546.128906 168.496094 546.128906 168.492188 546.128906 C 162.855469 546.132812 157.488281 545.433594 152.542969 544.039062 C 116.691406 533.957031 92.128906 509.152344 86.839844 477.6875 C 80.824219 441.957031 100.367188 404.292969 140.429688 374.339844 C 159.4375 360.144531 182.769531 352.929688 209.792969 352.902344 C 282.457031 352.824219 357.71875 403.875 360.886719 406.042969 L 367.523438 410.597656 L 362.027344 416.625 C 357.207031 421.910156 243.09375 546.046875 168.496094 546.128906 "
+        fill-opacity="1" fill-rule="nonzero" />
+    <path fill="#ffffff"
+        d="M 355.578125 409.082031 C 355.578125 409.082031 278.316406 207.128906 152.324219 207.226562 C 26.328125 207.332031 -7.578125 304.941406 53.171875 381.554688 C 113.929688 458.175781 355.578125 409.082031 355.578125 409.082031 "
+        fill-opacity="1" fill-rule="nonzero" />
+    <path fill="#050606"
+        d="M 152.332031 214.109375 C 95.050781 214.171875 53.042969 235.257812 37.027344 271.96875 C 23.1875 303.691406 31.066406 343.007812 58.117188 377.121094 C 79.222656 403.730469 129.097656 417.761719 202.347656 417.6875 C 202.347656 417.6875 202.355469 417.6875 202.359375 417.6875 C 263.785156 417.621094 324.929688 407.679688 346.347656 403.832031 C 339.515625 387.800781 322.046875 349.667969 295.835938 311.984375 C 264.757812 267.308594 214.636719 214.066406 152.332031 214.109375 Z M 202.371094 431.457031 C 202.367188 431.457031 202.367188 431.457031 202.359375 431.457031 C 124.066406 431.535156 72.210938 416.242188 48.226562 385.996094 C 17.839844 347.675781 9.265625 302.878906 25.285156 266.175781 C 43.507812 224.410156 89.792969 200.414062 152.257812 200.34375 C 205.972656 200.300781 259.253906 236.15625 306.402344 304.03125 C 341.546875 354.621094 360.769531 404.394531 361.574219 406.488281 L 364.546875 414.273438 L 356.792969 415.84375 C 356.027344 416.003906 279.472656 431.375 202.371094 431.457031 "
+        fill-opacity="1" fill-rule="nonzero" />
+</svg>
\ No newline at end of file
diff --git a/src/models/images/svg/beeline/yellow_bee.svg b/src/models/images/svg/beeline/yellow_bee.svg
index 680139f0..e04d432e 100644
--- a/src/models/images/svg/beeline/yellow_bee.svg
+++ b/src/models/images/svg/beeline/yellow_bee.svg
@@ -1 +1,70 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="1080" zoomAndPan="magnify" viewBox="0 0 810 809.999993" height="1080" preserveAspectRatio="xMidYMid meet" version="1.0"><defs><clipPath id="3764e17c45"><path d="M 233.097656 275 L 571.664062 275 L 571.664062 724.5 L 233.097656 724.5 Z M 233.097656 275 " clip-rule="nonzero"/></clipPath><clipPath id="f148a4e084"><path d="M 445 200 L 792.519531 200 L 792.519531 432 L 445 432 Z M 445 200 " clip-rule="nonzero"/></clipPath></defs><path fill="#050606" d="M 515.417969 289.273438 C 515.472656 234.679688 466.015625 172.539062 404.933594 172.480469 C 343.847656 172.410156 294.261719 234.449219 294.207031 289.039062 C 294.148438 343.640625 343.710938 298.820312 404.800781 298.882812 C 465.886719 298.945312 515.355469 343.875 515.417969 289.273438 " fill-opacity="1" fill-rule="nonzero"/><path fill="#050606" d="M 466.625 302.679688 C 478.566406 306.085938 488.867188 309.027344 496.195312 309.03125 C 501.464844 309.039062 508.023438 309.042969 508.042969 289.269531 C 508.097656 239.71875 462.109375 179.828125 404.921875 179.769531 C 347.738281 179.707031 301.628906 239.503906 301.582031 289.054688 C 301.554688 308.828125 308.121094 308.835938 313.386719 308.839844 C 320.710938 308.847656 331.019531 305.925781 342.964844 302.546875 C 360.238281 297.652344 381.738281 291.570312 404.804688 291.59375 C 427.871094 291.613281 449.359375 297.75 466.625 302.679688 Z M 286.828125 289.035156 C 286.890625 231.703125 338.496094 165.117188 404.941406 165.183594 C 471.378906 165.257812 522.847656 231.949219 522.792969 289.28125 C 522.769531 312.082031 513.8125 323.636719 496.183594 323.617188 C 486.777344 323.609375 475.542969 320.398438 462.535156 316.691406 C 445.3125 311.777344 425.78125 306.195312 404.792969 306.179688 C 383.804688 306.152344 364.261719 311.691406 347.027344 316.566406 C 334.011719 320.253906 322.773438 323.4375 313.367188 323.425781 C 295.730469 323.40625 286.804688 311.835938 286.828125 289.035156 " fill-opacity="1" fill-rule="nonzero"/><path fill="#ffde59" d="M 403.1875 275.667969 C 492.324219 275.757812 564.523438 341.921875 564.40625 451.738281 C 564.300781 553.042969 512.550781 636.597656 433.039062 648.875 C 426.351562 649.90625 377.425781 649.703125 369.898438 648.371094 C 291.695312 634.5 241.496094 551.574219 241.597656 451.40625 C 241.714844 341.585938 314.042969 275.570312 403.1875 275.667969 " fill-opacity="1" fill-rule="nonzero"/><g clip-path="url(#3764e17c45)"><path fill="#050606" d="M 248.582031 458.171875 C 248.476562 557.078125 298.734375 635.082031 370.792969 647.867188 C 382.261719 649.902344 424.875 649.371094 431.519531 648.34375 C 505.082031 636.988281 556.539062 558.917969 556.644531 458.492188 C 556.742188 359.265625 493.476562 289.894531 402.789062 289.804688 C 312.097656 289.703125 248.6875 358.945312 248.582031 458.171875 Z M 371.558594 665.308594 C 369.5625 663.378906 366.988281 662.191406 364.269531 661.632812 C 326.011719 653.695312 293.410156 630.027344 269.777344 592.972656 C 246.546875 556.542969 233.78125 508.667969 233.832031 458.152344 C 233.890625 403.75 251 357.34375 283.316406 323.949219 C 313.875 292.367188 356.308594 275.003906 402.800781 275.050781 C 449.292969 275.101562 491.691406 292.558594 522.183594 324.203125 C 554.429688 357.664062 571.441406 404.105469 571.386719 458.507812 C 571.277344 562.753906 518.414062 644.769531 441.816406 661.429688 C 437.910156 662.277344 434.523438 664.664062 432.386719 668.042969 C 419.371094 688.613281 416.734375 728.027344 405.800781 724.246094 C 390.523438 718.960938 388.386719 681.613281 371.558594 665.308594 " fill-opacity="1" fill-rule="nonzero"/></g><path fill="#050606" d="M 276.101562 578.589844 C 418.714844 514 531.421875 573.648438 532.546875 574.257812 L 562.210938 511.609375 C 556.519531 508.519531 420.933594 436.726562 250.597656 513.878906 L 276.101562 578.589844 " fill-opacity="1" fill-rule="nonzero"/><path fill="#050606" d="M 236.683594 450.605469 C 379.300781 385.097656 563.292969 443.175781 564.414062 443.796875 L 546.464844 373.65625 C 540.773438 370.515625 431.691406 287.964844 261.351562 366.203125 L 236.683594 450.605469 " fill-opacity="1" fill-rule="nonzero"/><path fill="#050606" d="M 344.496094 200.761719 L 359.070312 199.097656 C 358.835938 198 353.226562 171.933594 341.925781 144.753906 C 325.835938 106.074219 307.289062 86.039062 285.21875 83.511719 C 264.039062 81.089844 243.511719 94.929688 222.457031 125.832031 L 235.652344 130.679688 C 252.96875 105.257812 269.292969 92.648438 282.953125 94.203125 C 311.957031 97.523438 336.09375 161.328125 344.496094 200.761719 " fill-opacity="1" fill-rule="nonzero"/><path fill="#050606" d="M 222.296875 111.628906 C 216.675781 127.359375 223.109375 142.234375 236.679688 144.855469 C 250.246094 147.46875 265.804688 136.839844 271.433594 121.109375 C 277.054688 105.375 270.621094 90.5 257.050781 87.886719 C 243.480469 85.265625 227.917969 95.894531 222.296875 111.628906 " fill-opacity="1" fill-rule="nonzero"/><path fill="#050606" d="M 462.023438 200.886719 L 447.457031 199.1875 C 447.699219 198.09375 453.355469 172.035156 464.71875 144.882812 C 480.890625 106.234375 499.480469 86.242188 521.550781 83.765625 C 542.734375 81.378906 563.238281 95.269531 584.226562 126.207031 L 571.023438 131.023438 C 553.757812 105.570312 537.457031 92.929688 523.800781 94.457031 C 494.785156 97.714844 470.511719 161.460938 462.023438 200.886719 " fill-opacity="1" fill-rule="nonzero"/><path fill="#050606" d="M 584.417969 112.003906 C 590.007812 127.746094 583.535156 142.609375 569.96875 145.199219 C 556.390625 147.789062 540.851562 137.128906 535.261719 121.386719 C 529.671875 105.640625 536.140625 90.777344 549.710938 88.195312 C 563.285156 85.597656 578.824219 96.265625 584.417969 112.003906 " fill-opacity="1" fill-rule="nonzero"/><path fill="#ffffff" d="M 452.496094 411.832031 C 452.496094 411.832031 585.898438 320.332031 665.722656 379.976562 C 745.535156 439.625 726.222656 517.542969 655.683594 537.382812 C 585.140625 557.226562 452.496094 411.832031 452.496094 411.832031 " fill-opacity="1" fill-rule="nonzero"/><path fill="#050606" d="M 462.929688 413.179688 C 487.078125 438.371094 581.1875 532.292969 641.394531 532.363281 C 645.917969 532.367188 650.160156 531.816406 654.03125 530.730469 C 684.878906 522.050781 705.910156 501.316406 710.296875 475.265625 C 715.382812 445.027344 697.777344 412.34375 661.996094 385.609375 C 645.214844 373.066406 624.382812 366.695312 600.070312 366.671875 C 543.492188 366.609375 483.03125 400.761719 462.929688 413.179688 Z M 447.851562 416.625 L 442.351562 410.597656 L 448.988281 406.042969 C 452.15625 403.875 527.417969 352.824219 600.082031 352.902344 C 627.105469 352.929688 650.4375 360.144531 669.445312 374.339844 C 709.515625 404.292969 729.050781 441.957031 723.042969 477.6875 C 717.746094 509.152344 693.183594 533.957031 657.332031 544.039062 C 652.386719 545.433594 647.019531 546.136719 641.382812 546.128906 C 641.378906 546.128906 641.382812 546.128906 641.382812 546.128906 C 566.78125 546.046875 452.667969 421.910156 447.851562 416.625 " fill-opacity="1" fill-rule="nonzero"/><path fill="#ffffff" d="M 454.304688 409.082031 C 454.304688 409.082031 531.558594 207.128906 657.550781 207.226562 C 783.546875 207.332031 817.453125 304.941406 756.703125 381.554688 C 695.953125 458.175781 454.304688 409.082031 454.304688 409.082031 " fill-opacity="1" fill-rule="nonzero"/><g clip-path="url(#f148a4e084)"><path fill="#050606" d="M 514.039062 311.984375 C 487.828125 349.667969 470.359375 387.800781 463.523438 403.832031 C 484.949219 407.679688 546.085938 417.621094 607.515625 417.6875 C 607.519531 417.6875 607.527344 417.6875 607.527344 417.6875 C 680.777344 417.761719 730.652344 403.730469 751.753906 377.121094 C 778.808594 343.007812 786.695312 303.691406 772.847656 271.96875 C 756.832031 235.257812 714.824219 214.171875 657.542969 214.109375 C 595.242188 214.066406 545.117188 267.308594 514.039062 311.984375 Z M 453.085938 415.84375 L 445.328125 414.273438 L 448.308594 406.488281 C 449.105469 404.394531 468.328125 354.621094 503.472656 304.03125 C 550.621094 236.15625 603.902344 200.300781 657.621094 200.34375 C 720.082031 200.414062 766.363281 224.410156 784.589844 266.175781 C 800.609375 302.882812 792.035156 347.675781 761.648438 385.996094 C 737.664062 416.242188 685.808594 431.535156 607.515625 431.457031 C 607.507812 431.457031 607.515625 431.457031 607.503906 431.457031 C 530.402344 431.375 453.847656 416.003906 453.085938 415.84375 " fill-opacity="1" fill-rule="nonzero"/></g><path fill="#ffffff" d="M 357.378906 411.832031 C 357.378906 411.832031 223.976562 320.332031 144.15625 379.976562 C 64.335938 439.625 83.652344 517.542969 154.195312 537.382812 C 224.738281 557.226562 357.378906 411.832031 357.378906 411.832031 " fill-opacity="1" fill-rule="nonzero"/><path fill="#050606" d="M 209.808594 366.671875 C 185.5 366.695312 164.660156 373.066406 147.878906 385.609375 C 112.097656 412.34375 94.492188 445.027344 99.578125 475.265625 C 103.964844 501.316406 124.996094 522.050781 155.851562 530.730469 C 159.714844 531.816406 163.964844 532.367188 168.480469 532.363281 C 228.695312 532.292969 322.796875 438.371094 346.945312 413.179688 C 326.84375 400.761719 266.390625 366.609375 209.808594 366.671875 Z M 168.496094 546.128906 C 168.492188 546.128906 168.496094 546.128906 168.492188 546.128906 C 162.855469 546.136719 157.488281 545.433594 152.542969 544.039062 C 116.691406 533.957031 92.128906 509.152344 86.839844 477.6875 C 80.824219 441.957031 100.367188 404.292969 140.429688 374.339844 C 159.4375 360.144531 182.769531 352.929688 209.792969 352.902344 C 282.457031 352.824219 357.71875 403.875 360.886719 406.042969 L 367.523438 410.597656 L 362.027344 416.625 C 357.207031 421.910156 243.09375 546.046875 168.496094 546.128906 " fill-opacity="1" fill-rule="nonzero"/><path fill="#ffffff" d="M 355.578125 409.082031 C 355.578125 409.082031 278.316406 207.128906 152.324219 207.226562 C 26.328125 207.332031 -7.578125 304.941406 53.171875 381.554688 C 113.929688 458.175781 355.578125 409.082031 355.578125 409.082031 " fill-opacity="1" fill-rule="nonzero"/><path fill="#050606" d="M 152.332031 214.109375 C 95.050781 214.171875 53.042969 235.257812 37.027344 271.96875 C 23.1875 303.691406 31.066406 343.007812 58.117188 377.121094 C 79.222656 403.730469 129.097656 417.761719 202.347656 417.6875 C 202.347656 417.6875 202.355469 417.6875 202.359375 417.6875 C 263.785156 417.621094 324.929688 407.679688 346.347656 403.832031 C 339.515625 387.800781 322.046875 349.667969 295.835938 311.984375 C 264.757812 267.308594 214.636719 214.066406 152.332031 214.109375 Z M 202.371094 431.457031 C 202.367188 431.457031 202.367188 431.457031 202.359375 431.457031 C 124.066406 431.535156 72.210938 416.242188 48.226562 385.996094 C 17.839844 347.675781 9.265625 302.882812 25.285156 266.175781 C 43.507812 224.410156 89.792969 200.414062 152.257812 200.34375 C 205.972656 200.300781 259.253906 236.15625 306.402344 304.03125 C 341.546875 354.621094 360.769531 404.394531 361.574219 406.488281 L 364.546875 414.273438 L 356.792969 415.84375 C 356.027344 416.003906 279.472656 431.375 202.371094 431.457031 " fill-opacity="1" fill-rule="nonzero"/></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" id="EntitySVG" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 810 810">
+    <defs>
+        <clipPath id="3764e17c45">
+            <path d="M 233.097656 275 L 571.664062 275 L 571.664062 724.5 L 233.097656 724.5 Z M 233.097656 275 "
+                clip-rule="nonzero" />
+        </clipPath>
+        <clipPath id="f148a4e084">
+            <path d="M 445 200 L 792.519531 200 L 792.519531 432 L 445 432 Z M 445 200 " clip-rule="nonzero" />
+        </clipPath>
+    </defs>
+    <path fill="#050606"
+        d="M 515.417969 289.273438 C 515.472656 234.679688 466.015625 172.539062 404.933594 172.480469 C 343.847656 172.410156 294.261719 234.449219 294.207031 289.039062 C 294.148438 343.640625 343.710938 298.820312 404.800781 298.882812 C 465.886719 298.945312 515.355469 343.875 515.417969 289.273438 "
+        fill-opacity="1" fill-rule="nonzero" />
+    <path fill="#050606"
+        d="M 466.625 302.679688 C 478.566406 306.085938 488.867188 309.027344 496.195312 309.03125 C 501.464844 309.039062 508.023438 309.042969 508.042969 289.269531 C 508.097656 239.71875 462.109375 179.828125 404.921875 179.769531 C 347.738281 179.707031 301.628906 239.503906 301.582031 289.054688 C 301.554688 308.828125 308.121094 308.835938 313.386719 308.839844 C 320.710938 308.847656 331.019531 305.925781 342.964844 302.546875 C 360.238281 297.652344 381.738281 291.570312 404.804688 291.59375 C 427.871094 291.613281 449.359375 297.75 466.625 302.679688 Z M 286.828125 289.035156 C 286.890625 231.703125 338.496094 165.117188 404.941406 165.183594 C 471.378906 165.257812 522.847656 231.949219 522.792969 289.28125 C 522.769531 312.082031 513.8125 323.636719 496.183594 323.617188 C 486.777344 323.609375 475.542969 320.398438 462.535156 316.691406 C 445.3125 311.777344 425.78125 306.195312 404.792969 306.179688 C 383.804688 306.152344 364.261719 311.691406 347.027344 316.566406 C 334.011719 320.253906 322.773438 323.4375 313.367188 323.425781 C 295.730469 323.40625 286.804688 311.835938 286.828125 289.035156 "
+        fill-opacity="1" fill-rule="nonzero" />
+    <path fill="#2391ff"
+        d="M 403.1875 275.667969 C 492.324219 275.757812 564.523438 341.921875 564.40625 451.738281 C 564.300781 553.042969 512.550781 636.597656 433.039062 648.875 C 426.351562 649.90625 377.425781 649.703125 369.898438 648.371094 C 291.695312 634.5 241.496094 551.574219 241.597656 451.40625 C 241.714844 341.585938 314.042969 275.570312 403.1875 275.667969 "
+        fill-opacity="1" fill-rule="nonzero" />
+    <g clip-path="url(#3764e17c45)">
+        <path fill="#050606"
+            d="M 248.582031 458.171875 C 248.476562 557.078125 298.734375 635.082031 370.792969 647.867188 C 382.261719 649.902344 424.875 649.371094 431.519531 648.34375 C 505.082031 636.988281 556.539062 558.917969 556.644531 458.492188 C 556.742188 359.265625 493.476562 289.894531 402.789062 289.804688 C 312.097656 289.703125 248.6875 358.945312 248.582031 458.171875 Z M 371.558594 665.308594 C 369.5625 663.378906 366.988281 662.191406 364.269531 661.632812 C 326.011719 653.695312 293.410156 630.027344 269.777344 592.972656 C 246.546875 556.542969 233.78125 508.667969 233.832031 458.152344 C 233.890625 403.75 251 357.34375 283.316406 323.949219 C 313.875 292.367188 356.308594 275.003906 402.800781 275.050781 C 449.292969 275.101562 491.691406 292.558594 522.183594 324.203125 C 554.429688 357.664062 571.441406 404.105469 571.386719 458.507812 C 571.277344 562.753906 518.414062 644.769531 441.816406 661.429688 C 437.910156 662.277344 434.523438 664.664062 432.386719 668.042969 C 419.371094 688.613281 416.734375 728.027344 405.800781 724.246094 C 390.523438 718.960938 388.386719 681.613281 371.558594 665.308594 "
+            fill-opacity="1" fill-rule="nonzero" />
+    </g>
+    <path fill="#050606"
+        d="M 276.101562 578.589844 C 418.714844 514 531.421875 573.648438 532.546875 574.257812 L 562.210938 511.609375 C 556.519531 508.519531 420.933594 436.726562 250.597656 513.878906 L 276.101562 578.589844 "
+        fill-opacity="1" fill-rule="nonzero" />
+    <path fill="#050606"
+        d="M 236.683594 450.605469 C 379.300781 385.097656 563.292969 443.175781 564.414062 443.796875 L 546.464844 373.65625 C 540.773438 370.515625 431.691406 287.964844 261.351562 366.203125 L 236.683594 450.605469 "
+        fill-opacity="1" fill-rule="nonzero" />
+    <path fill="#050606"
+        d="M 344.496094 200.761719 L 359.070312 199.097656 C 358.835938 198 353.226562 171.933594 341.925781 144.753906 C 325.835938 106.074219 307.289062 86.039062 285.21875 83.511719 C 264.039062 81.089844 243.511719 94.929688 222.457031 125.832031 L 235.652344 130.679688 C 252.96875 105.257812 269.292969 92.648438 282.953125 94.203125 C 311.957031 97.523438 336.09375 161.328125 344.496094 200.761719 "
+        fill-opacity="1" fill-rule="nonzero" />
+    <path fill="#050606"
+        d="M 222.296875 111.628906 C 216.675781 127.359375 223.109375 142.234375 236.679688 144.855469 C 250.246094 147.46875 265.804688 136.839844 271.433594 121.109375 C 277.054688 105.375 270.621094 90.5 257.050781 87.886719 C 243.480469 85.265625 227.917969 95.894531 222.296875 111.628906 "
+        fill-opacity="1" fill-rule="nonzero" />
+    <path fill="#050606"
+        d="M 462.023438 200.886719 L 447.457031 199.1875 C 447.699219 198.09375 453.355469 172.035156 464.71875 144.882812 C 480.890625 106.234375 499.480469 86.242188 521.550781 83.765625 C 542.734375 81.378906 563.238281 95.269531 584.226562 126.207031 L 571.023438 131.023438 C 553.757812 105.570312 537.457031 92.929688 523.800781 94.457031 C 494.785156 97.714844 470.511719 161.460938 462.023438 200.886719 "
+        fill-opacity="1" fill-rule="nonzero" />
+    <path fill="#050606"
+        d="M 584.417969 112.003906 C 590.007812 127.746094 583.535156 142.609375 569.96875 145.199219 C 556.390625 147.789062 540.851562 137.128906 535.261719 121.386719 C 529.671875 105.640625 536.140625 90.777344 549.710938 88.195312 C 563.285156 85.597656 578.824219 96.265625 584.417969 112.003906 "
+        fill-opacity="1" fill-rule="nonzero" />
+    <path fill="#ffffff"
+        d="M 452.496094 411.832031 C 452.496094 411.832031 585.898438 320.332031 665.722656 379.976562 C 745.535156 439.625 726.222656 517.542969 655.683594 537.382812 C 585.140625 557.226562 452.496094 411.832031 452.496094 411.832031 "
+        fill-opacity="1" fill-rule="nonzero" />
+    <path fill="#050606"
+        d="M 462.929688 413.179688 C 487.078125 438.371094 581.1875 532.292969 641.394531 532.363281 C 645.917969 532.367188 650.160156 531.816406 654.03125 530.730469 C 684.878906 522.050781 705.910156 501.316406 710.296875 475.265625 C 715.382812 445.027344 697.777344 412.34375 661.996094 385.609375 C 645.214844 373.066406 624.382812 366.695312 600.070312 366.671875 C 543.492188 366.609375 483.03125 400.761719 462.929688 413.179688 Z M 447.851562 416.625 L 442.351562 410.597656 L 448.988281 406.042969 C 452.15625 403.875 527.417969 352.824219 600.082031 352.902344 C 627.105469 352.929688 650.4375 360.144531 669.445312 374.339844 C 709.515625 404.292969 729.050781 441.957031 723.042969 477.6875 C 717.746094 509.152344 693.183594 533.957031 657.332031 544.039062 C 652.386719 545.433594 647.019531 546.136719 641.382812 546.128906 C 641.378906 546.128906 641.382812 546.128906 641.382812 546.128906 C 566.78125 546.046875 452.667969 421.910156 447.851562 416.625 "
+        fill-opacity="1" fill-rule="nonzero" />
+    <path fill="#ffffff"
+        d="M 454.304688 409.082031 C 454.304688 409.082031 531.558594 207.128906 657.550781 207.226562 C 783.546875 207.332031 817.453125 304.941406 756.703125 381.554688 C 695.953125 458.175781 454.304688 409.082031 454.304688 409.082031 "
+        fill-opacity="1" fill-rule="nonzero" />
+    <g clip-path="url(#f148a4e084)">
+        <path fill="#050606"
+            d="M 514.039062 311.984375 C 487.828125 349.667969 470.359375 387.800781 463.523438 403.832031 C 484.949219 407.679688 546.085938 417.621094 607.515625 417.6875 C 607.519531 417.6875 607.527344 417.6875 607.527344 417.6875 C 680.777344 417.761719 730.652344 403.730469 751.753906 377.121094 C 778.808594 343.007812 786.695312 303.691406 772.847656 271.96875 C 756.832031 235.257812 714.824219 214.171875 657.542969 214.109375 C 595.242188 214.066406 545.117188 267.308594 514.039062 311.984375 Z M 453.085938 415.84375 L 445.328125 414.273438 L 448.308594 406.488281 C 449.105469 404.394531 468.328125 354.621094 503.472656 304.03125 C 550.621094 236.15625 603.902344 200.300781 657.621094 200.34375 C 720.082031 200.414062 766.363281 224.410156 784.589844 266.175781 C 800.609375 302.882812 792.035156 347.675781 761.648438 385.996094 C 737.664062 416.242188 685.808594 431.535156 607.515625 431.457031 C 607.507812 431.457031 607.515625 431.457031 607.503906 431.457031 C 530.402344 431.375 453.847656 416.003906 453.085938 415.84375 "
+            fill-opacity="1" fill-rule="nonzero" />
+    </g>
+    <path fill="#ffffff"
+        d="M 357.378906 411.832031 C 357.378906 411.832031 223.976562 320.332031 144.15625 379.976562 C 64.335938 439.625 83.652344 517.542969 154.195312 537.382812 C 224.738281 557.226562 357.378906 411.832031 357.378906 411.832031 "
+        fill-opacity="1" fill-rule="nonzero" />
+    <path fill="#050606"
+        d="M 209.808594 366.671875 C 185.5 366.695312 164.660156 373.066406 147.878906 385.609375 C 112.097656 412.34375 94.492188 445.027344 99.578125 475.265625 C 103.964844 501.316406 124.996094 522.050781 155.851562 530.730469 C 159.714844 531.816406 163.964844 532.367188 168.480469 532.363281 C 228.695312 532.292969 322.796875 438.371094 346.945312 413.179688 C 326.84375 400.761719 266.390625 366.609375 209.808594 366.671875 Z M 168.496094 546.128906 C 168.492188 546.128906 168.496094 546.128906 168.492188 546.128906 C 162.855469 546.136719 157.488281 545.433594 152.542969 544.039062 C 116.691406 533.957031 92.128906 509.152344 86.839844 477.6875 C 80.824219 441.957031 100.367188 404.292969 140.429688 374.339844 C 159.4375 360.144531 182.769531 352.929688 209.792969 352.902344 C 282.457031 352.824219 357.71875 403.875 360.886719 406.042969 L 367.523438 410.597656 L 362.027344 416.625 C 357.207031 421.910156 243.09375 546.046875 168.496094 546.128906 "
+        fill-opacity="1" fill-rule="nonzero" />
+    <path fill="#ffffff"
+        d="M 355.578125 409.082031 C 355.578125 409.082031 278.316406 207.128906 152.324219 207.226562 C 26.328125 207.332031 -7.578125 304.941406 53.171875 381.554688 C 113.929688 458.175781 355.578125 409.082031 355.578125 409.082031 "
+        fill-opacity="1" fill-rule="nonzero" />
+    <path fill="#050606"
+        d="M 152.332031 214.109375 C 95.050781 214.171875 53.042969 235.257812 37.027344 271.96875 C 23.1875 303.691406 31.066406 343.007812 58.117188 377.121094 C 79.222656 403.730469 129.097656 417.761719 202.347656 417.6875 C 202.347656 417.6875 202.355469 417.6875 202.359375 417.6875 C 263.785156 417.621094 324.929688 407.679688 346.347656 403.832031 C 339.515625 387.800781 322.046875 349.667969 295.835938 311.984375 C 264.757812 267.308594 214.636719 214.066406 152.332031 214.109375 Z M 202.371094 431.457031 C 202.367188 431.457031 202.367188 431.457031 202.359375 431.457031 C 124.066406 431.535156 72.210938 416.242188 48.226562 385.996094 C 17.839844 347.675781 9.265625 302.882812 25.285156 266.175781 C 43.507812 224.410156 89.792969 200.414062 152.257812 200.34375 C 205.972656 200.300781 259.253906 236.15625 306.402344 304.03125 C 341.546875 354.621094 360.769531 404.394531 361.574219 406.488281 L 364.546875 414.273438 L 356.792969 415.84375 C 356.027344 416.003906 279.472656 431.375 202.371094 431.457031 "
+        fill-opacity="1" fill-rule="nonzero" />
+</svg>
\ No newline at end of file
diff --git a/src/models/images/svg/change/graph.svg b/src/models/images/svg/change/graph.svg
index 550f400c..d9010e55 100644
--- a/src/models/images/svg/change/graph.svg
+++ b/src/models/images/svg/change/graph.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<svg viewBox="0 0 80 80" xmlns="http://www.w3.org/2000/svg">
+<svg version="1.1" id="BackgroundSVG" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 80 80">
     <circle cx="10" cy="17" r="2" fill="gray"/>
     <circle cx="10" cy="35" r="2" fill="gray"/>
     <circle cx="10" cy="53" r="2" fill="gray"/>
diff --git a/src/models/images/svg/chess/lichess/B.svg b/src/models/images/svg/chess/lichess/B.svg
index 0875af35..8ba00c9a 100644
--- a/src/models/images/svg/chess/lichess/B.svg
+++ b/src/models/images/svg/chess/lichess/B.svg
@@ -1,4 +1,4 @@
-<svg width="45" height="45" clip-rule="evenodd" fill-rule="evenodd" image-rendering="optimizeQuality" shape-rendering="geometricPrecision" text-rendering="geometricPrecision" version="1.1" viewBox="0 0 50 50" xmlns="http://www.w3.org/2000/svg">
+<svg id="EntitySVG" width="45" height="45" clip-rule="evenodd" fill-rule="evenodd" image-rendering="optimizeQuality" shape-rendering="geometricPrecision" text-rendering="geometricPrecision" version="1.1" viewBox="0 0 50 50" xmlns="http://www.w3.org/2000/svg">
  <!-- Adapted from Lila "staunty" chess pieces by GitHub user sadsnake1 under CC BY-NC-SA 4.0:
       https://creativecommons.org/licenses/by-nc-sa/4.0/.
       The color of the piece has been modified from the original work, which can be found
diff --git a/src/models/images/svg/chess/lichess/K.svg b/src/models/images/svg/chess/lichess/K.svg
index d3a98302..1a34b3f4 100644
--- a/src/models/images/svg/chess/lichess/K.svg
+++ b/src/models/images/svg/chess/lichess/K.svg
@@ -1,4 +1,4 @@
-<svg width="45" height="45" clip-rule="evenodd" fill-rule="evenodd" image-rendering="optimizeQuality" shape-rendering="geometricPrecision" text-rendering="geometricPrecision" version="1.1" viewBox="0 0 50 50" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg id="EntitySVG" width="45" height="45" clip-rule="evenodd" fill-rule="evenodd" image-rendering="optimizeQuality" shape-rendering="geometricPrecision" text-rendering="geometricPrecision" version="1.1" viewBox="0 0 50 50" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
  <!-- Adapted from Lila "staunty" chess pieces by GitHub user sadsnake1 under CC BY-NC-SA 4.0:
       https://creativecommons.org/licenses/by-nc-sa/4.0/.
       The color of the piece has been modified from the original work, which can be found
diff --git a/src/models/images/svg/chess/lichess/N.svg b/src/models/images/svg/chess/lichess/N.svg
index 0611f56f..6079d4be 100644
--- a/src/models/images/svg/chess/lichess/N.svg
+++ b/src/models/images/svg/chess/lichess/N.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg width="45" height="45" clip-rule="evenodd" fill-rule="evenodd" image-rendering="optimizeQuality" shape-rendering="geometricPrecision" text-rendering="geometricPrecision" version="1.1" viewBox="0 0 50 50" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+<svg id="EntitySVG" width="45" height="45" clip-rule="evenodd" fill-rule="evenodd" image-rendering="optimizeQuality" shape-rendering="geometricPrecision" text-rendering="geometricPrecision" version="1.1" viewBox="0 0 50 50" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
  <!-- Adapted from Lila "staunty" chess pieces by GitHub user sadsnake1 under CC BY-NC-SA 4.0:
       https://creativecommons.org/licenses/by-nc-sa/4.0/.
       The color of the piece has been modified from the original work, which can be found
diff --git a/src/models/images/svg/chess/lichess/P.svg b/src/models/images/svg/chess/lichess/P.svg
index c2814be5..323aa265 100644
--- a/src/models/images/svg/chess/lichess/P.svg
+++ b/src/models/images/svg/chess/lichess/P.svg
@@ -1,4 +1,4 @@
-<svg width="45" height="45" clip-rule="evenodd" fill-rule="evenodd" image-rendering="optimizeQuality" shape-rendering="geometricPrecision" text-rendering="geometricPrecision" version="1.1" viewBox="0 0 50 50" xmlns="http://www.w3.org/2000/svg">
+<svg id="EntitySVG" width="45" height="45" clip-rule="evenodd" fill-rule="evenodd" image-rendering="optimizeQuality" shape-rendering="geometricPrecision" text-rendering="geometricPrecision" version="1.1" viewBox="0 0 50 50" xmlns="http://www.w3.org/2000/svg">
  <!-- Adapted from Lila "staunty" chess pieces by GitHub user sadsnake1 under CC BY-NC-SA 4.0:
       https://creativecommons.org/licenses/by-nc-sa/4.0/.
       The color of the piece has been modified from the original work, which can be found
diff --git a/src/models/images/svg/chess/lichess/Q.svg b/src/models/images/svg/chess/lichess/Q.svg
index 2ae65f4d..1441dab1 100644
--- a/src/models/images/svg/chess/lichess/Q.svg
+++ b/src/models/images/svg/chess/lichess/Q.svg
@@ -1,4 +1,4 @@
-<svg width="45" height="45" clip-rule="evenodd" fill-rule="evenodd" image-rendering="optimizeQuality" shape-rendering="geometricPrecision" text-rendering="geometricPrecision" version="1.1" viewBox="0 0 50 50" xmlns="http://www.w3.org/2000/svg">
+<svg id="EntitySVG" width="45" height="45" clip-rule="evenodd" fill-rule="evenodd" image-rendering="optimizeQuality" shape-rendering="geometricPrecision" text-rendering="geometricPrecision" version="1.1" viewBox="0 0 50 50" xmlns="http://www.w3.org/2000/svg">
  <!-- Adapted from Lila "staunty" chess pieces by GitHub user sadsnake1 under CC BY-NC-SA 4.0:
       https://creativecommons.org/licenses/by-nc-sa/4.0/.
       The color of the piece has been modified from the original work, which can be found
diff --git a/src/models/images/svg/chess/lichess/R.svg b/src/models/images/svg/chess/lichess/R.svg
index c524a9c0..0e8fbc14 100644
--- a/src/models/images/svg/chess/lichess/R.svg
+++ b/src/models/images/svg/chess/lichess/R.svg
@@ -1,4 +1,4 @@
-<svg width="45" height="45" clip-rule="evenodd" fill-rule="evenodd" image-rendering="optimizeQuality" shape-rendering="geometricPrecision" text-rendering="geometricPrecision" version="1.1" viewBox="0 0 50 50" xmlns="http://www.w3.org/2000/svg">
+<svg id="EntitySVG" width="45" height="45" clip-rule="evenodd" fill-rule="evenodd" image-rendering="optimizeQuality" shape-rendering="geometricPrecision" text-rendering="geometricPrecision" version="1.1" viewBox="0 0 50 50" xmlns="http://www.w3.org/2000/svg">
  <!-- Adapted from Lila "staunty" chess pieces by GitHub user sadsnake1 under CC BY-NC-SA 4.0:
       https://creativecommons.org/licenses/by-nc-sa/4.0/.
       The color of the piece has been modified from the original work, which can be found
diff --git a/src/models/images/svg/chess/lichess/bb.svg b/src/models/images/svg/chess/lichess/bb.svg
index 6bff33d9..0c683b37 100644
--- a/src/models/images/svg/chess/lichess/bb.svg
+++ b/src/models/images/svg/chess/lichess/bb.svg
@@ -1,4 +1,4 @@
-<svg width="45" height="45" clip-rule="evenodd" fill-rule="evenodd" image-rendering="optimizeQuality" shape-rendering="geometricPrecision" text-rendering="geometricPrecision" version="1.1" viewBox="0 0 50 50" xmlns="http://www.w3.org/2000/svg">
+<svg id="EntitySVG" width="45" height="45" clip-rule="evenodd" fill-rule="evenodd" image-rendering="optimizeQuality" shape-rendering="geometricPrecision" text-rendering="geometricPrecision" version="1.1" viewBox="0 0 50 50" xmlns="http://www.w3.org/2000/svg">
  <!-- Adapted from Lila "staunty" chess pieces by GitHub user sadsnake1 under CC BY-NC-SA 4.0:
       https://creativecommons.org/licenses/by-nc-sa/4.0/.
       The color of the piece has been modified from the original work, which can be found
diff --git a/src/models/images/svg/chess/lichess/grid.svg b/src/models/images/svg/chess/lichess/grid.svg
index 08ffac2f..2a7e69d8 100644
--- a/src/models/images/svg/chess/lichess/grid.svg
+++ b/src/models/images/svg/chess/lichess/grid.svg
@@ -1,7 +1,5 @@
 <?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 80 80" style="enable-background:new 0 0 80 80;" xml:space="preserve">
+<svg version="1.1" id="BackgroundSVG" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 80 80">
     <rect x="0" y="0" width="80" height="80" fill="#EBECD0"/>
 
     <rect x="10" y="0" width="10" height="10" fill="#779556"/>
diff --git a/src/models/images/svg/chess/lichess/kk.svg b/src/models/images/svg/chess/lichess/kk.svg
index 589648ad..b171d0fd 100644
--- a/src/models/images/svg/chess/lichess/kk.svg
+++ b/src/models/images/svg/chess/lichess/kk.svg
@@ -1,4 +1,4 @@
-<svg width="45" height="45" clip-rule="evenodd" fill-rule="evenodd" image-rendering="optimizeQuality" shape-rendering="geometricPrecision" text-rendering="geometricPrecision" version="1.1" viewBox="0 0 50 50" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg id="EntitySVG" width="45" height="45" clip-rule="evenodd" fill-rule="evenodd" image-rendering="optimizeQuality" shape-rendering="geometricPrecision" text-rendering="geometricPrecision" version="1.1" viewBox="0 0 50 50" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
  <!-- Adapted from Lila "staunty" chess pieces by GitHub user sadsnake1 under CC BY-NC-SA 4.0:
       https://creativecommons.org/licenses/by-nc-sa/4.0/.
       The color of the piece has been modified from the original work, which can be found
diff --git a/src/models/images/svg/chess/lichess/nn.svg b/src/models/images/svg/chess/lichess/nn.svg
index a58c2b13..0326e1e5 100644
--- a/src/models/images/svg/chess/lichess/nn.svg
+++ b/src/models/images/svg/chess/lichess/nn.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg width="45" height="45" clip-rule="evenodd" fill-rule="evenodd" image-rendering="optimizeQuality" shape-rendering="geometricPrecision" text-rendering="geometricPrecision" version="1.1" viewBox="0 0 50 50" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+<svg id="EntitySVG" width="45" height="45" clip-rule="evenodd" fill-rule="evenodd" image-rendering="optimizeQuality" shape-rendering="geometricPrecision" text-rendering="geometricPrecision" version="1.1" viewBox="0 0 50 50" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
  <!-- Adapted from Lila "staunty" chess pieces by GitHub user sadsnake1 under CC BY-NC-SA 4.0:
       https://creativecommons.org/licenses/by-nc-sa/4.0/.
       The color of the piece has been modified from the original work, which can be found
diff --git a/src/models/images/svg/chess/lichess/pp.svg b/src/models/images/svg/chess/lichess/pp.svg
index c683d5bc..6a4638b7 100644
--- a/src/models/images/svg/chess/lichess/pp.svg
+++ b/src/models/images/svg/chess/lichess/pp.svg
@@ -1,4 +1,4 @@
-<svg width="45" height="45" clip-rule="evenodd" fill-rule="evenodd" image-rendering="optimizeQuality" shape-rendering="geometricPrecision" text-rendering="geometricPrecision" version="1.1" viewBox="0 0 50 50" xmlns="http://www.w3.org/2000/svg">
+<svg id="EntitySVG" width="45" height="45" clip-rule="evenodd" fill-rule="evenodd" image-rendering="optimizeQuality" shape-rendering="geometricPrecision" text-rendering="geometricPrecision" version="1.1" viewBox="0 0 50 50" xmlns="http://www.w3.org/2000/svg">
  <!-- Adapted from Lila "staunty" chess pieces by GitHub user sadsnake1 under CC BY-NC-SA 4.0:
       https://creativecommons.org/licenses/by-nc-sa/4.0/.
       The color of the piece has been modified from the original work, which can be found
diff --git a/src/models/images/svg/chess/lichess/qq.svg b/src/models/images/svg/chess/lichess/qq.svg
index 467917d6..f26248d4 100644
--- a/src/models/images/svg/chess/lichess/qq.svg
+++ b/src/models/images/svg/chess/lichess/qq.svg
@@ -1,4 +1,4 @@
-<svg width="45" height="45" clip-rule="evenodd" fill-rule="evenodd" image-rendering="optimizeQuality" shape-rendering="geometricPrecision" text-rendering="geometricPrecision" version="1.1" viewBox="0 0 50 50" xmlns="http://www.w3.org/2000/svg">
+<svg id="EntitySVG" width="45" height="45" clip-rule="evenodd" fill-rule="evenodd" image-rendering="optimizeQuality" shape-rendering="geometricPrecision" text-rendering="geometricPrecision" version="1.1" viewBox="0 0 50 50" xmlns="http://www.w3.org/2000/svg">
  <!-- Adapted from Lila "staunty" chess pieces by GitHub user sadsnake1 under CC BY-NC-SA 4.0:
       https://creativecommons.org/licenses/by-nc-sa/4.0/.
       The color of the piece has been modified from the original work, which can be found
diff --git a/src/models/images/svg/chess/lichess/rr.svg b/src/models/images/svg/chess/lichess/rr.svg
index 207895c8..218e7054 100644
--- a/src/models/images/svg/chess/lichess/rr.svg
+++ b/src/models/images/svg/chess/lichess/rr.svg
@@ -1,4 +1,4 @@
-<svg width="45" height="45" clip-rule="evenodd" fill-rule="evenodd" image-rendering="optimizeQuality" shape-rendering="geometricPrecision" text-rendering="geometricPrecision" version="1.1" viewBox="0 0 50 50" xmlns="http://www.w3.org/2000/svg">
+<svg id="EntitySVG" width="45" height="45" clip-rule="evenodd" fill-rule="evenodd" image-rendering="optimizeQuality" shape-rendering="geometricPrecision" text-rendering="geometricPrecision" version="1.1" viewBox="0 0 50 50" xmlns="http://www.w3.org/2000/svg">
  <!-- Adapted from Lila "staunty" chess pieces by GitHub user sadsnake1 under CC BY-NC-SA 4.0:
       https://creativecommons.org/licenses/by-nc-sa/4.0/.
       The color of the piece has been modified from the original work, which can be found
diff --git a/src/models/images/svg/chess/wikipedia/B.svg b/src/models/images/svg/chess/wikipedia/B.svg
index 18f034d5..43e7a1a3 100644
--- a/src/models/images/svg/chess/wikipedia/B.svg
+++ b/src/models/images/svg/chess/wikipedia/B.svg
@@ -1,6 +1,5 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="45" height="45">
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" id="EntitySVG" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 45 45">
   <g style="opacity:1; fill:none; fill-rule:evenodd; fill-opacity:1; stroke:#000000; stroke-width:1.5; stroke-linecap:round; stroke-linejoin:round; stroke-miterlimit:4; stroke-dasharray:none; stroke-opacity:1;" transform="translate(0,0.6)">
     <g style="fill:#ffffff; stroke:#000000; stroke-linecap:butt;">
       <path d="M 9,36 C 12.39,35.03 19.11,36.43 22.5,34 C 25.89,36.43 32.61,35.03 36,36 C 36,36 37.65,36.54 39,38 C 38.32,38.97 37.35,38.99 36,38.5 C 32.61,37.53 25.89,38.96 22.5,37.5 C 19.11,38.96 12.39,37.53 9,38.5 C 7.65,38.99 6.68,38.97 6,38 C 7.35,36.54 9,36 9,36 z"/>
diff --git a/src/models/images/svg/chess/wikipedia/K.svg b/src/models/images/svg/chess/wikipedia/K.svg
index 632ca1af..8b652db4 100644
--- a/src/models/images/svg/chess/wikipedia/K.svg
+++ b/src/models/images/svg/chess/wikipedia/K.svg
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="45" height="45">
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" id="EntitySVG" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 45 45">
   <g fill="none" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5">
     <path stroke-linejoin="miter" d="M22.5 11.63V6M20 8h5"/>
     <path fill="#fff" stroke-linecap="butt" stroke-linejoin="miter" d="M22.5 25s4.5-7.5 3-10.5c0 0-1-2.5-3-2.5s-3 2.5-3 2.5c-1.5 3 3 10.5 3 10.5"/>
diff --git a/src/models/images/svg/chess/wikipedia/N.svg b/src/models/images/svg/chess/wikipedia/N.svg
index 92feeee0..02680ea8 100644
--- a/src/models/images/svg/chess/wikipedia/N.svg
+++ b/src/models/images/svg/chess/wikipedia/N.svg
@@ -1,6 +1,5 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="45" height="45">
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" id="EntitySVG" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 45 45">
   <g style="opacity:1; fill:none; fill-opacity:1; fill-rule:evenodd; stroke:#000000; stroke-width:1.5; stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4; stroke-dasharray:none; stroke-opacity:1;" transform="translate(0,0.3)">
     <path
       d="M 22,10 C 32.5,11 38.5,18 38,39 L 15,39 C 15,30 25,32.5 23,18"
diff --git a/src/models/images/svg/chess/wikipedia/P.svg b/src/models/images/svg/chess/wikipedia/P.svg
index b265fe1b..8694f222 100644
--- a/src/models/images/svg/chess/wikipedia/P.svg
+++ b/src/models/images/svg/chess/wikipedia/P.svg
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="45" height="45">
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" id="EntitySVG" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 45 45">
   <path d="m 22.5,9 c -2.21,0 -4,1.79 -4,4 0,0.89 0.29,1.71 0.78,2.38 C 17.33,16.5 16,18.59 16,21 c 0,2.03 0.94,3.84 2.41,5.03 C 15.41,27.09 11,31.58 11,39.5 H 34 C 34,31.58 29.59,27.09 26.59,26.03 28.06,24.84 29,23.03 29,21 29,18.59 27.67,16.5 25.72,15.38 26.21,14.71 26.5,13.89 26.5,13 c 0,-2.21 -1.79,-4 -4,-4 z" style="opacity:1; fill:#ffffff; fill-opacity:1; fill-rule:nonzero; stroke:#000000; stroke-width:1.5; stroke-linecap:round; stroke-linejoin:miter; stroke-miterlimit:4; stroke-dasharray:none; stroke-opacity:1;"/>
 </svg>
diff --git a/src/models/images/svg/chess/wikipedia/Q.svg b/src/models/images/svg/chess/wikipedia/Q.svg
index 8df7c8f9..b5c84c04 100644
--- a/src/models/images/svg/chess/wikipedia/Q.svg
+++ b/src/models/images/svg/chess/wikipedia/Q.svg
@@ -1,6 +1,5 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="45" height="45">
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" id="EntitySVG" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 45 45">
   <g style="fill:#ffffff;stroke:#000000;stroke-width:1.5;stroke-linejoin:round">
     <path d="M 9,26 C 17.5,24.5 30,24.5 36,26 L 38.5,13.5 L 31,25 L 30.7,10.9 L 25.5,24.5 L 22.5,10 L 19.5,24.5 L 14.3,10.9 L 14,25 L 6.5,13.5 L 9,26 z"/>
     <path d="M 9,26 C 9,28 10.5,28 11.5,30 C 12.5,31.5 12.5,31 12,33.5 C 10.5,34.5 11,36 11,36 C 9.5,37.5 11,38.5 11,38.5 C 17.5,39.5 27.5,39.5 34,38.5 C 34,38.5 35.5,37.5 34,36 C 34,36 34.5,34.5 33,33.5 C 32.5,31 32.5,31.5 33.5,30 C 34.5,28 36,28 36,26 C 27.5,24.5 17.5,24.5 9,26 z"/>
diff --git a/src/models/images/svg/chess/wikipedia/R.svg b/src/models/images/svg/chess/wikipedia/R.svg
index ac03578e..1e082a09 100644
--- a/src/models/images/svg/chess/wikipedia/R.svg
+++ b/src/models/images/svg/chess/wikipedia/R.svg
@@ -1,6 +1,5 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="45" height="45">
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" id="EntitySVG" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 45 45">
   <g style="opacity:1; fill:#ffffff; fill-opacity:1; fill-rule:evenodd; stroke:#000000; stroke-width:1.5; stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4; stroke-dasharray:none; stroke-opacity:1;" transform="translate(0,0.3)">
     <path
       d="M 9,39 L 36,39 L 36,36 L 9,36 L 9,39 z "
diff --git a/src/models/images/svg/chess/wikipedia/bb.svg b/src/models/images/svg/chess/wikipedia/bb.svg
index b6a80061..e92e927b 100644
--- a/src/models/images/svg/chess/wikipedia/bb.svg
+++ b/src/models/images/svg/chess/wikipedia/bb.svg
@@ -1,6 +1,5 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="45" height="45">
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" id="EntitySVG" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 45 45">
   <g style="opacity:1; fill:none; fill-rule:evenodd; fill-opacity:1; stroke:#000000; stroke-width:1.5; stroke-linecap:round; stroke-linejoin:round; stroke-miterlimit:4; stroke-dasharray:none; stroke-opacity:1;" transform="translate(0,0.6)">
     <g style="fill:#000000; stroke:#000000; stroke-linecap:butt;">
       <path d="M 9,36 C 12.39,35.03 19.11,36.43 22.5,34 C 25.89,36.43 32.61,35.03 36,36 C 36,36 37.65,36.54 39,38 C 38.32,38.97 37.35,38.99 36,38.5 C 32.61,37.53 25.89,38.96 22.5,37.5 C 19.11,38.96 12.39,37.53 9,38.5 C 7.65,38.99 6.68,38.97 6,38 C 7.35,36.54 9,36 9,36 z"/>
diff --git a/src/models/images/svg/chess/wikipedia/grid.svg b/src/models/images/svg/chess/wikipedia/grid.svg
index 41a77c92..7279ae41 100644
--- a/src/models/images/svg/chess/wikipedia/grid.svg
+++ b/src/models/images/svg/chess/wikipedia/grid.svg
@@ -1,7 +1,5 @@
 <?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 80 80" style="enable-background:new 0 0 80 80;" xml:space="preserve">
+<svg version="1.1" id="BackgroundSVG" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 80 80">
     <rect x="0" y="0" width="80" height="80" fill="#FEC595"/>
 
     <rect x="10" y="0" width="10" height="10" fill="#C97D41"/>
diff --git a/src/models/images/svg/chess/wikipedia/kk.svg b/src/models/images/svg/chess/wikipedia/kk.svg
index ba2ac9fb..c16e9cf2 100644
--- a/src/models/images/svg/chess/wikipedia/kk.svg
+++ b/src/models/images/svg/chess/wikipedia/kk.svg
@@ -1,6 +1,5 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="45" height="45">
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" id="EntitySVG" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 45 45">
   <g style="fill:none; fill-opacity:1; fill-rule:evenodd; stroke:#000000; stroke-width:1.5; stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4; stroke-dasharray:none; stroke-opacity:1;">
     <path d="M 22.5,11.63 L 22.5,6" style="fill:none; stroke:#000000; stroke-linejoin:miter;" id="path6570"/>
     <path d="M 22.5,25 C 22.5,25 27,17.5 25.5,14.5 C 25.5,14.5 24.5,12 22.5,12 C 20.5,12 19.5,14.5 19.5,14.5 C 18,17.5 22.5,25 22.5,25" style="fill:#000000;fill-opacity:1; stroke-linecap:butt; stroke-linejoin:miter;"/>
diff --git a/src/models/images/svg/chess/wikipedia/nn.svg b/src/models/images/svg/chess/wikipedia/nn.svg
index 203c6fea..68aba950 100644
--- a/src/models/images/svg/chess/wikipedia/nn.svg
+++ b/src/models/images/svg/chess/wikipedia/nn.svg
@@ -1,6 +1,5 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="45" height="45">
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" id="EntitySVG" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 45 45">
   <g style="opacity:1; fill:none; fill-opacity:1; fill-rule:evenodd; stroke:#000000; stroke-width:1.5; stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4; stroke-dasharray:none; stroke-opacity:1;" transform="translate(0,0.3)">
     <path
       d="M 22,10 C 32.5,11 38.5,18 38,39 L 15,39 C 15,30 25,32.5 23,18"
diff --git a/src/models/images/svg/chess/wikipedia/pp.svg b/src/models/images/svg/chess/wikipedia/pp.svg
index b534de8f..15d08b8c 100644
--- a/src/models/images/svg/chess/wikipedia/pp.svg
+++ b/src/models/images/svg/chess/wikipedia/pp.svg
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="45" height="45">
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" id="EntitySVG" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 45 45">
   <path d="m 22.5,9 c -2.21,0 -4,1.79 -4,4 0,0.89 0.29,1.71 0.78,2.38 C 17.33,16.5 16,18.59 16,21 c 0,2.03 0.94,3.84 2.41,5.03 C 15.41,27.09 11,31.58 11,39.5 H 34 C 34,31.58 29.59,27.09 26.59,26.03 28.06,24.84 29,23.03 29,21 29,18.59 27.67,16.5 25.72,15.38 26.21,14.71 26.5,13.89 26.5,13 c 0,-2.21 -1.79,-4 -4,-4 z" style="opacity:1; fill:#000000; fill-opacity:1; fill-rule:nonzero; stroke:#000000; stroke-width:1.5; stroke-linecap:round; stroke-linejoin:miter; stroke-miterlimit:4; stroke-dasharray:none; stroke-opacity:1;"/>
 </svg>
diff --git a/src/models/images/svg/chess/wikipedia/qq.svg b/src/models/images/svg/chess/wikipedia/qq.svg
index e5577345..9cd27dbe 100644
--- a/src/models/images/svg/chess/wikipedia/qq.svg
+++ b/src/models/images/svg/chess/wikipedia/qq.svg
@@ -1,8 +1,5 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
-"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="45"
-height="45">
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" id="EntitySVG" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 45 45">
   <g style="fill:#000000;stroke:#000000;stroke-width:1.5; stroke-linecap:round;stroke-linejoin:round">
 
     <path d="M 9,26 C 17.5,24.5 30,24.5 36,26 L 38.5,13.5 L 31,25 L 30.7,10.9 L 25.5,24.5 L 22.5,10 L 19.5,24.5 L 14.3,10.9 L 14,25 L 6.5,13.5 L 9,26 z"
diff --git a/src/models/images/svg/chess/wikipedia/rr.svg b/src/models/images/svg/chess/wikipedia/rr.svg
index 4eec43c4..6522878c 100644
--- a/src/models/images/svg/chess/wikipedia/rr.svg
+++ b/src/models/images/svg/chess/wikipedia/rr.svg
@@ -1,6 +1,5 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="45" height="45">
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" id="EntitySVG" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 45 45">
   <g style="opacity:1; fill:#000000; fill-opacity:1; fill-rule:evenodd; stroke:#000000; stroke-width:1.5; stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4; stroke-dasharray:none; stroke-opacity:1;" transform="translate(0,0.3)">
     <path
       d="M 9,39 L 36,39 L 36,36 L 9,36 L 9,39 z "
diff --git a/src/models/images/svg/chinesechess/board.svg b/src/models/images/svg/chinesechess/board.svg
index 68173737..0394b1bc 100644
--- a/src/models/images/svg/chinesechess/board.svg
+++ b/src/models/images/svg/chinesechess/board.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Author: Jiachun Li -->
-<svg viewBox="0 0 900 1000" xmlns="http://www.w3.org/2000/svg">
+<svg id="BackgroundSVG" viewBox="0 0 900 1000" xmlns="http://www.w3.org/2000/svg">
     <rect x="0" y="0" width="900" height="1000" fill="#f1cb9d" />
     <rect x="45" y="45" width="810" height="910" fill="#f1cb9d" stroke="black" stroke-width="3"/>
     <rect x="50" y="50" width="800" height="900" fill="#f1cb9d" stroke="black" stroke-width="4" />
diff --git a/src/models/images/svg/chinesechess/graphical/advisor_b.svg b/src/models/images/svg/chinesechess/graphical/advisor_b.svg
index f20d8762..79560211 100644
--- a/src/models/images/svg/chinesechess/graphical/advisor_b.svg
+++ b/src/models/images/svg/chinesechess/graphical/advisor_b.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Author: Jiachun Li -->
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100">
+<svg id="EntitySVG" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100">
   <circle cx="50" cy="50" r="40" fill="#f1cb9d" stroke="#000000" stroke-width="1"/>
   <circle cx="50" cy="50" r="35" fill="#f1cb9d" stroke="#000000" stroke-width="2"/>
 	<!-- edited from By Inductiveload - Own work, Public Domain, https://commons.wikimedia.org/w/index.php?curid=5546303 -->
diff --git a/src/models/images/svg/chinesechess/graphical/advisor_r.svg b/src/models/images/svg/chinesechess/graphical/advisor_r.svg
index b8b38022..56a1e181 100644
--- a/src/models/images/svg/chinesechess/graphical/advisor_r.svg
+++ b/src/models/images/svg/chinesechess/graphical/advisor_r.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Author: Jiachun Li -->
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100">
+<svg id="EntitySVG" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100">
   <circle cx="50" cy="50" r="40" fill="#f1cb9d" stroke="#cf2020" stroke-width="1"/>
   <circle cx="50" cy="50" r="35" fill="#f1cb9d" stroke="#cf2020" stroke-width="2"/>
 	<!-- edited from By Inductiveload - Own work, Public Domain, https://commons.wikimedia.org/w/index.php?curid=5546303 -->
diff --git a/src/models/images/svg/chinesechess/graphical/cannon_b.svg b/src/models/images/svg/chinesechess/graphical/cannon_b.svg
index 3a2b5443..1b1d6da9 100644
--- a/src/models/images/svg/chinesechess/graphical/cannon_b.svg
+++ b/src/models/images/svg/chinesechess/graphical/cannon_b.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Author: Jiachun Li -->
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100">
+<svg id="EntitySVG" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100">
   <circle cx="50" cy="50" r="40" fill="#f1cb9d" stroke="#000000" stroke-width="1"/>
   <circle cx="50" cy="50" r="35" fill="#f1cb9d" stroke="#000000" stroke-width="2"/>
   <metadata> Svg Vector Icons : http://www.onlinewebfonts.com/icon </metadata>
diff --git a/src/models/images/svg/chinesechess/graphical/cannon_r.svg b/src/models/images/svg/chinesechess/graphical/cannon_r.svg
index f0fd56d4..2306c288 100644
--- a/src/models/images/svg/chinesechess/graphical/cannon_r.svg
+++ b/src/models/images/svg/chinesechess/graphical/cannon_r.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Author: Jiachun Li -->
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100">
+<svg id="EntitySVG" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100">
   <circle cx="50" cy="50" r="40" fill="#f1cb9d" stroke="#cf2020" stroke-width="1"/>
   <circle cx="50" cy="50" r="35" fill="#f1cb9d" stroke="#cf2020" stroke-width="2"/>
   <metadata> Svg Vector Icons : http://www.onlinewebfonts.com/icon </metadata>
diff --git a/src/models/images/svg/chinesechess/graphical/chariot_b.svg b/src/models/images/svg/chinesechess/graphical/chariot_b.svg
index aac8952d..286bac9a 100644
--- a/src/models/images/svg/chinesechess/graphical/chariot_b.svg
+++ b/src/models/images/svg/chinesechess/graphical/chariot_b.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Author: Jiachun Li -->
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100">
+<svg id="EntitySVG" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100">
   <circle cx="50" cy="50" r="40" fill="#f1cb9d" stroke="#000000" stroke-width="1"/>
   <circle cx="50" cy="50" r="35" fill="#f1cb9d" stroke="#000000" stroke-width="2"/>
   <text x="50" y="52" font-size="60" fill="#000000" text-anchor="middle" dominant-baseline="central">&#9820;</text>
diff --git a/src/models/images/svg/chinesechess/graphical/chariot_r.svg b/src/models/images/svg/chinesechess/graphical/chariot_r.svg
index 5013dbc2..6460e2d1 100644
--- a/src/models/images/svg/chinesechess/graphical/chariot_r.svg
+++ b/src/models/images/svg/chinesechess/graphical/chariot_r.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Author: Jiachun Li -->
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100">
+<svg id="EntitySVG" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100">
   <circle cx="50" cy="50" r="40" fill="#f1cb9d" stroke="#cf2020" stroke-width="1"/>
   <circle cx="50" cy="50" r="35" fill="#f1cb9d" stroke="#cf2020" stroke-width="2"/>
   <text x="50" y="52" font-size="60" fill="#cf2020" text-anchor="middle" dominant-baseline="central">&#9820;</text>
diff --git a/src/models/images/svg/chinesechess/graphical/elephant_b.svg b/src/models/images/svg/chinesechess/graphical/elephant_b.svg
index 42762818..33dd13d5 100644
--- a/src/models/images/svg/chinesechess/graphical/elephant_b.svg
+++ b/src/models/images/svg/chinesechess/graphical/elephant_b.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Author: Jiachun Li -->
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100">
+<svg id="EntitySVG" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100">
   <circle cx="50" cy="50" r="40" fill="#f1cb9d" stroke="#000000" stroke-width="1"/>
   <circle cx="50" cy="50" r="35" fill="#f1cb9d" stroke="#000000" stroke-width="2"/>
   <metadata> Svg Vector Icons : http://www.onlinewebfonts.com/icon </metadata>
diff --git a/src/models/images/svg/chinesechess/graphical/elephant_r.svg b/src/models/images/svg/chinesechess/graphical/elephant_r.svg
index baf61b13..fc14c753 100644
--- a/src/models/images/svg/chinesechess/graphical/elephant_r.svg
+++ b/src/models/images/svg/chinesechess/graphical/elephant_r.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Author: Jiachun Li -->
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100">
+<svg id="EntitySVG" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100">
   <circle cx="50" cy="50" r="40" fill="#f1cb9d" stroke="#cf2020" stroke-width="1"/>
   <circle cx="50" cy="50" r="35" fill="#f1cb9d" stroke="#cf2020" stroke-width="2"/>
   <metadata> Svg Vector Icons : http://www.onlinewebfonts.com/icon </metadata>
diff --git a/src/models/images/svg/chinesechess/graphical/general_b.svg b/src/models/images/svg/chinesechess/graphical/general_b.svg
index 4edbc8d3..3d87de5c 100644
--- a/src/models/images/svg/chinesechess/graphical/general_b.svg
+++ b/src/models/images/svg/chinesechess/graphical/general_b.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Author: Jiachun Li -->
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100">
+<svg id="EntitySVG" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100">
   <circle cx="50" cy="50" r="40" fill="#f1cb9d" stroke="#000000" stroke-width="1"/>
   <circle cx="50" cy="50" r="35" fill="#f1cb9d" stroke="#000000" stroke-width="2"/>
   <text x="50" y="52" font-size="60" fill="#000000" text-anchor="middle" dominant-baseline="central">&#9818;</text>
diff --git a/src/models/images/svg/chinesechess/graphical/general_r.svg b/src/models/images/svg/chinesechess/graphical/general_r.svg
index de34ec03..65109037 100644
--- a/src/models/images/svg/chinesechess/graphical/general_r.svg
+++ b/src/models/images/svg/chinesechess/graphical/general_r.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Author: Jiachun Li -->
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100">
+<svg id="EntitySVG" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100">
   <circle cx="50" cy="50" r="40" fill="#f1cb9d" stroke="#cf2020" stroke-width="1"/>
   <circle cx="50" cy="50" r="35" fill="#f1cb9d" stroke="#cf2020" stroke-width="2"/>
   <text x="50" y="52" font-size="60" fill="#cf2020" text-anchor="middle" dominant-baseline="central">&#9818;</text>
diff --git a/src/models/images/svg/chinesechess/graphical/horse_b.svg b/src/models/images/svg/chinesechess/graphical/horse_b.svg
index c47dd258..cb3d2627 100644
--- a/src/models/images/svg/chinesechess/graphical/horse_b.svg
+++ b/src/models/images/svg/chinesechess/graphical/horse_b.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Author: Jiachun Li -->
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100">
+<svg id="EntitySVG" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100">
   <circle cx="50" cy="50" r="40" fill="#f1cb9d" stroke="#000000" stroke-width="1"/>
   <circle cx="50" cy="50" r="35" fill="#f1cb9d" stroke="#000000" stroke-width="2"/>
   <text x="50" y="52" font-size="64" fill="#000000" text-anchor="middle" dominant-baseline="central">&#9822;</text>
diff --git a/src/models/images/svg/chinesechess/graphical/horse_r.svg b/src/models/images/svg/chinesechess/graphical/horse_r.svg
index b7347033..134fc172 100644
--- a/src/models/images/svg/chinesechess/graphical/horse_r.svg
+++ b/src/models/images/svg/chinesechess/graphical/horse_r.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Author: Jiachun Li -->
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100">
+<svg id="EntitySVG" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100">
   <circle cx="50" cy="50" r="40" fill="#f1cb9d" stroke="#cf2020" stroke-width="1"/>
   <circle cx="50" cy="50" r="35" fill="#f1cb9d" stroke="#cf2020" stroke-width="2"/>
   <text x="50" y="52" font-size="64" fill="#cf2020" text-anchor="middle" dominant-baseline="central">&#9822;</text>
diff --git a/src/models/images/svg/chinesechess/graphical/soldier_b.svg b/src/models/images/svg/chinesechess/graphical/soldier_b.svg
index 69f1249d..74544d18 100644
--- a/src/models/images/svg/chinesechess/graphical/soldier_b.svg
+++ b/src/models/images/svg/chinesechess/graphical/soldier_b.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Author: Jiachun Li -->
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100">
+<svg id="EntitySVG" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100">
   <circle cx="50" cy="50" r="40" fill="#f1cb9d" stroke="#000000" stroke-width="1"/>
   <circle cx="50" cy="50" r="35" fill="#f1cb9d" stroke="#000000" stroke-width="2"/>
   <text x="50" y="50" font-size="68" fill="#000000" text-anchor="middle" dominant-baseline="central">&#9823;</text>
diff --git a/src/models/images/svg/chinesechess/graphical/soldier_r.svg b/src/models/images/svg/chinesechess/graphical/soldier_r.svg
index e76f1f25..e03ea662 100644
--- a/src/models/images/svg/chinesechess/graphical/soldier_r.svg
+++ b/src/models/images/svg/chinesechess/graphical/soldier_r.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Author: Jiachun Li -->
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100">
+<svg id="EntitySVG" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100">
   <circle cx="50" cy="50" r="40" fill="#f1cb9d" stroke="#cf2020" stroke-width="1"/>
   <circle cx="50" cy="50" r="35" fill="#f1cb9d" stroke="#cf2020" stroke-width="2"/>
   <text x="50" y="50" font-size="68" fill="#cf2020" text-anchor="middle" dominant-baseline="central">&#9823;</text>
diff --git a/src/models/images/svg/chinesechess/regular/advisor_b.svg b/src/models/images/svg/chinesechess/regular/advisor_b.svg
index c760f5ea..eba833b1 100644
--- a/src/models/images/svg/chinesechess/regular/advisor_b.svg
+++ b/src/models/images/svg/chinesechess/regular/advisor_b.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Author: Jiachun Li -->
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100">
+<svg id="EntitySVG" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100">
   <circle cx="50" cy="50" r="40" fill="#f1cb9d" stroke="#000000" stroke-width="1"/>
   <circle cx="50" cy="50" r="35" fill="#f1cb9d" stroke="#000000" stroke-width="2"/>
   <text x="50" y="50" font-size="60" font-family="LiSu" text-anchor="middle" dominant-baseline="central" fill="#000000">士</text>
diff --git a/src/models/images/svg/chinesechess/regular/advisor_r.svg b/src/models/images/svg/chinesechess/regular/advisor_r.svg
index 894dd114..49bbda09 100644
--- a/src/models/images/svg/chinesechess/regular/advisor_r.svg
+++ b/src/models/images/svg/chinesechess/regular/advisor_r.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Author: Jiachun Li -->
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100">
+<svg id="EntitySVG" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100">
   <circle cx="50" cy="50" r="40" fill="#f1cb9d" stroke="#cf2020" stroke-width="1"/>
   <circle cx="50" cy="50" r="35" fill="#f1cb9d" stroke="#cf2020" stroke-width="2"/>
   <text x="50" y="50" font-size="60" font-family="LiSu" text-anchor="middle" dominant-baseline="central" fill="#cf2020">仕</text>
diff --git a/src/models/images/svg/chinesechess/regular/cannon_b.svg b/src/models/images/svg/chinesechess/regular/cannon_b.svg
index 59012f6e..e5816b0c 100644
--- a/src/models/images/svg/chinesechess/regular/cannon_b.svg
+++ b/src/models/images/svg/chinesechess/regular/cannon_b.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Author: Jiachun Li -->
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100">
+<svg id="EntitySVG" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100">
   <circle cx="50" cy="50" r="40" fill="#f1cb9d" stroke="#000000" stroke-width="1"/>
   <circle cx="50" cy="50" r="35" fill="#f1cb9d" stroke="#000000" stroke-width="2"/>
   <text x="50" y="50" font-size="60" font-family="LiSu" text-anchor="middle" dominant-baseline="central" fill="#000000">炮</text>
diff --git a/src/models/images/svg/chinesechess/regular/cannon_r.svg b/src/models/images/svg/chinesechess/regular/cannon_r.svg
index 11c4f8e0..f133eb2e 100644
--- a/src/models/images/svg/chinesechess/regular/cannon_r.svg
+++ b/src/models/images/svg/chinesechess/regular/cannon_r.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Author: Jiachun Li -->
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100">
+<svg id="EntitySVG" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100">
   <circle cx="50" cy="50" r="40" fill="#f1cb9d" stroke="#cf2020" stroke-width="1"/>
   <circle cx="50" cy="50" r="35" fill="#f1cb9d" stroke="#cf2020" stroke-width="2"/>
   <text x="50" y="50" font-size="60" font-family="LiSu" text-anchor="middle" dominant-baseline="central" fill="#cf2020">炮</text>
diff --git a/src/models/images/svg/chinesechess/regular/chariot_b.svg b/src/models/images/svg/chinesechess/regular/chariot_b.svg
index b2443878..a7cbadf1 100644
--- a/src/models/images/svg/chinesechess/regular/chariot_b.svg
+++ b/src/models/images/svg/chinesechess/regular/chariot_b.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Author: Jiachun Li -->
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100">
+<svg id="EntitySVG" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100">
   <circle cx="50" cy="50" r="40" fill="#f1cb9d" stroke="#000000" stroke-width="1"/>
   <circle cx="50" cy="50" r="35" fill="#f1cb9d" stroke="#000000" stroke-width="2"/>
   <text x="50" y="50" font-size="60" font-family="LiSu" text-anchor="middle" dominant-baseline="central" fill="#000000">車</text>
diff --git a/src/models/images/svg/chinesechess/regular/chariot_r.svg b/src/models/images/svg/chinesechess/regular/chariot_r.svg
index 3e301af2..9893abd7 100644
--- a/src/models/images/svg/chinesechess/regular/chariot_r.svg
+++ b/src/models/images/svg/chinesechess/regular/chariot_r.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Author: Jiachun Li -->
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100">
+<svg id="EntitySVG" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100">
   <circle cx="50" cy="50" r="40" fill="#f1cb9d" stroke="#cf2020" stroke-width="1"/>
   <circle cx="50" cy="50" r="35" fill="#f1cb9d" stroke="#cf2020" stroke-width="2"/>
   <text x="50" y="50" font-size="60" font-family="LiSu" text-anchor="middle" dominant-baseline="central" fill="#cf2020">車</text>
diff --git a/src/models/images/svg/chinesechess/regular/elephant_b.svg b/src/models/images/svg/chinesechess/regular/elephant_b.svg
index 91a817ec..31c172cf 100644
--- a/src/models/images/svg/chinesechess/regular/elephant_b.svg
+++ b/src/models/images/svg/chinesechess/regular/elephant_b.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Author: Jiachun Li -->
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100">
+<svg id="EntitySVG" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100">
   <circle cx="50" cy="50" r="40" fill="#f1cb9d" stroke="#000000" stroke-width="1"/>
   <circle cx="50" cy="50" r="35" fill="#f1cb9d" stroke="#000000" stroke-width="2"/>
   <text x="50" y="50" font-size="60" font-family="LiSu" text-anchor="middle" dominant-baseline="central" fill="#000000">象</text>
diff --git a/src/models/images/svg/chinesechess/regular/elephant_r.svg b/src/models/images/svg/chinesechess/regular/elephant_r.svg
index eaa067a0..f7ef6686 100644
--- a/src/models/images/svg/chinesechess/regular/elephant_r.svg
+++ b/src/models/images/svg/chinesechess/regular/elephant_r.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Author: Jiachun Li -->
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100">
+<svg id="EntitySVG" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100">
   <circle cx="50" cy="50" r="40" fill="#f1cb9d" stroke="#cf2020" stroke-width="1"/>
   <circle cx="50" cy="50" r="35" fill="#f1cb9d" stroke="#cf2020" stroke-width="2"/>
   <text x="50" y="50" font-size="56" font-family="LiSu" text-anchor="middle" dominant-baseline="central" fill="#cf2020">相</text>
diff --git a/src/models/images/svg/chinesechess/regular/general_b.svg b/src/models/images/svg/chinesechess/regular/general_b.svg
index 3ed6ea25..e340d3b1 100644
--- a/src/models/images/svg/chinesechess/regular/general_b.svg
+++ b/src/models/images/svg/chinesechess/regular/general_b.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Author: Jiachun Li -->
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100">
+<svg id="EntitySVG" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100">
   <circle cx="50" cy="50" r="40" fill="#f1cb9d" stroke="#000000" stroke-width="1"/>
   <circle cx="50" cy="50" r="35" fill="#f1cb9d" stroke="#000000" stroke-width="2"/>
   <text x="50" y="50" font-size="56" font-family="LiSu" text-anchor="middle" dominant-baseline="central" fill="#000000">將</text>
diff --git a/src/models/images/svg/chinesechess/regular/general_r.svg b/src/models/images/svg/chinesechess/regular/general_r.svg
index 7320b571..c3a9f994 100644
--- a/src/models/images/svg/chinesechess/regular/general_r.svg
+++ b/src/models/images/svg/chinesechess/regular/general_r.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Author: Jiachun Li -->
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100">
+<svg id="EntitySVG" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100">
   <circle cx="50" cy="50" r="40" fill="#f1cb9d" stroke="#cf2020" stroke-width="1"/>
   <circle cx="50" cy="50" r="35" fill="#f1cb9d" stroke="#cf2020" stroke-width="2"/>
   <text x="50" y="50" font-size="58" font-family="LiSu" text-anchor="middle" dominant-baseline="central" fill="#cf2020">帥</text>
diff --git a/src/models/images/svg/chinesechess/regular/horse_b.svg b/src/models/images/svg/chinesechess/regular/horse_b.svg
index 8607022f..c828b87c 100644
--- a/src/models/images/svg/chinesechess/regular/horse_b.svg
+++ b/src/models/images/svg/chinesechess/regular/horse_b.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Author: Jiachun Li -->
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100">
+<svg id="EntitySVG" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100">
   <circle cx="50" cy="50" r="40" fill="#f1cb9d" stroke="#000000" stroke-width="1"/>
   <circle cx="50" cy="50" r="35" fill="#f1cb9d" stroke="#000000" stroke-width="2"/>
   <text x="50" y="50" font-size="58" font-family="LiSu" text-anchor="middle" dominant-baseline="central" fill="#000000">馬</text>
diff --git a/src/models/images/svg/chinesechess/regular/horse_r.svg b/src/models/images/svg/chinesechess/regular/horse_r.svg
index 126d1686..8f726c76 100644
--- a/src/models/images/svg/chinesechess/regular/horse_r.svg
+++ b/src/models/images/svg/chinesechess/regular/horse_r.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Author: Jiachun Li -->
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100">
+<svg id="EntitySVG" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100">
   <circle cx="50" cy="50" r="40" fill="#f1cb9d" stroke="#cf2020" stroke-width="1"/>
   <circle cx="50" cy="50" r="35" fill="#f1cb9d" stroke="#cf2020" stroke-width="2"/>
   <text x="50" y="50" font-size="58" font-family="LiSu" text-anchor="middle" dominant-baseline="central" fill="#cf2020">馬</text>
diff --git a/src/models/images/svg/chinesechess/regular/soldier_b.svg b/src/models/images/svg/chinesechess/regular/soldier_b.svg
index 77f7de83..1de4d7a3 100644
--- a/src/models/images/svg/chinesechess/regular/soldier_b.svg
+++ b/src/models/images/svg/chinesechess/regular/soldier_b.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Author: Jiachun Li -->
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100">
+<svg id="EntitySVG" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100">
   <circle cx="50" cy="50" r="40" fill="#f1cb9d" stroke="#000000" stroke-width="1"/>
   <circle cx="50" cy="50" r="35" fill="#f1cb9d" stroke="#000000" stroke-width="2"/>
   <text x="50" y="50" font-size="60" font-family="LiSu" text-anchor="middle" dominant-baseline="central" fill="#000000">卒</text>
diff --git a/src/models/images/svg/chinesechess/regular/soldier_r.svg b/src/models/images/svg/chinesechess/regular/soldier_r.svg
index 443b9f3b..6bdcf024 100644
--- a/src/models/images/svg/chinesechess/regular/soldier_r.svg
+++ b/src/models/images/svg/chinesechess/regular/soldier_r.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Author: Jiachun Li -->
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100">
+<svg id="EntitySVG" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100">
   <circle cx="50" cy="50" r="40" fill="#f1cb9d" stroke="#cf2020" stroke-width="1"/>
   <circle cx="50" cy="50" r="35" fill="#f1cb9d" stroke="#cf2020" stroke-width="2"/>
   <text x="50" y="50" font-size="58" font-family="LiSu" text-anchor="middle" dominant-baseline="central" fill="#cf2020">兵</text>
diff --git a/src/models/images/svg/general/blackpiece.svg b/src/models/images/svg/general/blackpiece.svg
index 22111340..7edb387e 100644
--- a/src/models/images/svg/general/blackpiece.svg
+++ b/src/models/images/svg/general/blackpiece.svg
@@ -1,26 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 26.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<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="39 39 22 22" style="enable-background:new 39 39 22 22;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:url(#path6000_00000129887211141538828870000005751685046540346772_);}
-	.st1{fill:url(#path6001_00000015317886506602013140000000047751402487301011_);}
-</style>
-<g id="blackPiece">
-	
-		<radialGradient id="path6000_00000133498797375483631040000012904421654305643412_" 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"/>
+<svg version="1.1" id="EntitySVG" xmlns="http://www.w3.org/2000/svg" viewBox="39 39 22 22">
+
+	<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>
-	<path id="path6000" style="fill:url(#path6000_00000133498797375483631040000012904421654305643412_);" 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"/>
-	
-		<radialGradient id="path6001_00000092449180234355965330000008259959042322749862_" 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" style="stop-color:#888888"/>
-		<stop  offset="0.5" style="stop-color:#5B5B5B"/>
-		<stop  offset="1" style="stop-color:#000000"/>
+
+	<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" style="stop-color:#888888" />
+		<stop offset="0.5" style="stop-color:#5B5B5B" />
+		<stop offset="1" style="stop-color:#000000" />
 	</radialGradient>
-	<path id="path6001" style="fill:url(#path6001_00000092449180234355965330000008259959042322749862_);" 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>
-</svg>
+
+	<path style="fill:url(#rg0);" 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 style="fill:url(#rg1);" 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" />
+</svg>
\ No newline at end of file
diff --git a/src/models/images/svg/general/whitepiece.svg b/src/models/images/svg/general/whitepiece.svg
index 5c9bcbc7..fbda462a 100644
--- a/src/models/images/svg/general/whitepiece.svg
+++ b/src/models/images/svg/general/whitepiece.svg
@@ -1,26 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 26.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<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="39 39 22 22" style="enable-background:new 39 39 22 22;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:url(#path5000_00000065059536763306469790000010329495910554484378_);}
-	.st1{fill:url(#path5001_00000020374274019483077910000007311732843498047920_);}
-</style>
-<g id="whitePiece">
-	
-		<radialGradient id="path5000_00000160900586571137936520000018105018385988611260_" cx="-107.5" cy="190.5449" r="10.0003" fx="-109.5001" fy="188.5448" gradientTransform="matrix(1 0 0 -1 159.5 242.5)" gradientUnits="userSpaceOnUse">
-		<stop  offset="0" style="stop-color:#000000"/>
-		<stop  offset="1" style="stop-color:#000000;stop-opacity:0"/>
-	</radialGradient>
-	<path id="path5000" style="fill:url(#path5000_00000160900586571137936520000018105018385988611260_);" d="M62,52
-		c0,5.5-4.5,10-10,10s-10-4.5-10-10s4.5-10,10-10S62,46.4,62,52z"/>
-	
-		<radialGradient id="path5001_00000078021996235810866850000002033070460799578258_" cx="-109.5" cy="192.5449" r="10.0003" fx="-114.5001" fy="187.5448" gradientTransform="matrix(-1.346898e-10 1 1 1.346898e-10 -142.5 159.5)" gradientUnits="userSpaceOnUse">
-		<stop  offset="0" style="stop-color:#FFFFFF"/>
-		<stop  offset="0.5" style="stop-color:#DDDDDD"/>
-		<stop  offset="1" style="stop-color:#999999"/>
-	</radialGradient>
-	<path id="path5001" style="fill:url(#path5001_00000078021996235810866850000002033070460799578258_);" d="M50,60
-		c-5.5,0-10-4.5-10-10s4.5-10,10-10s10,4.5,10,10S55.6,60,50,60z"/>
-</g>
+<svg version="1.1" id="EntitySVG" xmlns="http://www.w3.org/2000/svg" viewBox="39 39 22 22">
+	<g>
+		<defs>
+			<radialGradient id="rg0" cx="-107.5" cy="190.5449" r="10.0003" fx="-109.5001" fy="188.5448"
+				gradientTransform="matrix(1 0 0 -1 159.5 242.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.5" cy="192.5449" r="10.0003" fx="-114.5001" fy="187.5448"
+				gradientTransform="matrix(-1.346898e-10 1 1 1.346898e-10 -142.5 159.5)" gradientUnits="userSpaceOnUse">
+				<stop offset="0" style="stop-color:#FFFFFF" />
+				<stop offset="0.5" style="stop-color:#DDDDDD" />
+				<stop offset="1" style="stop-color:#999999" />
+			</radialGradient>
+		</defs>
+
+		<path fill="url('#rg0')" d="M62,52
+			c0,5.5-4.5,10-10,10s-10-4.5-10-10s4.5-10,10-10S62,46.4,62,52z" />
+
+		<path fill="url('#rg1')" d="M50,60
+			c-5.5,0-10-4.5-10-10s4.5-10,10-10s10,4.5,10,10S55.6,60,50,60z" />
+	</g>
 </svg>
diff --git a/src/scripts/gamesmanUni/moveAnimation.ts b/src/scripts/gamesmanUni/moveAnimation.ts
index f01987c4..a113d150 100644
--- a/src/scripts/gamesmanUni/moveAnimation.ts
+++ b/src/scripts/gamesmanUni/moveAnimation.ts
@@ -138,12 +138,14 @@ const animateImageAutoGUI = (volume: number, currPosition: string, nextPosition:
                     if (appearingChar in entities) {
                         entitiesAppear = true;
                         var newElement = document.createElementNS("http://www.w3.org/2000/svg", 'image');
+                        //var newElement = document.createElementNS("http://www.w3.org/2000/svg", 'use');
                         newElement.setAttribute("class", "appearingEntity");
                         newElement.setAttribute("x", (centers[i][0] - 0.5 * entities[appearingChar].scale * widthFactor).toString());
                         newElement.setAttribute("y", (centers[i][1] - 0.5 * entities[appearingChar].scale * widthFactor).toString());
                         newElement.setAttribute("width", (entities[appearingChar].scale * widthFactor).toString());
                         newElement.setAttribute("height", (entities[appearingChar].scale * widthFactor).toString());
                         newElement.setAttribute("href", getImageSource(entities[appearingChar].image));
+                        //newElement.setAttribute("href", getImageSource(entities[appearingChar].image) + '#EntitySVG');
                         newElement.setAttribute("opacity", "0.001");
                         g.appendChild(newElement);
                     }
@@ -151,11 +153,11 @@ const animateImageAutoGUI = (volume: number, currPosition: string, nextPosition:
             }
         }
         if (foregroundImagePath !== "") { // Redraw foreground image in front of any newly introduced entities
-            var newElement = document.createElementNS("http://www.w3.org/2000/svg", 'image');
-            newElement.setAttribute("width", scaledWidth.toString());
-            newElement.setAttribute("height", scaledHeight.toString());
-            newElement.setAttribute("href", getImageSource(foregroundImagePath));
-            g.appendChild(newElement);
+            var newForeGroundElement = document.createElementNS("http://www.w3.org/2000/svg", 'image');
+            newForeGroundElement.setAttribute("width", scaledWidth.toString());
+            newForeGroundElement.setAttribute("height", scaledHeight.toString());
+            newForeGroundElement.setAttribute("href", getImageSource(foregroundImagePath));
+            g.appendChild(newForeGroundElement);
         }
         if (entitiesAppear) {
             gsap.fromTo(".appearingEntity", {opacity: 0.001}, {duration: 0.5, opacity: 1});
@@ -202,12 +204,14 @@ const animateImageAutoGUI = (volume: number, currPosition: string, nextPosition:
             if (appearingChar in entities) {
                 entitiesAppear = true;
                 var newElement = document.createElementNS("http://www.w3.org/2000/svg", 'image');
+                //var newElement = document.createElementNS("http://www.w3.org/2000/svg", 'use');
                 newElement.setAttribute("class", "appearingEntity");
                 newElement.setAttribute("x", (centers[i][0] - 0.5 * entities[appearingChar].scale * widthFactor).toString());
                 newElement.setAttribute("y", (centers[i][1] - 0.5 * entities[appearingChar].scale * widthFactor).toString());
                 newElement.setAttribute("width", (entities[appearingChar].scale * widthFactor).toString());
                 newElement.setAttribute("height", (entities[appearingChar].scale * widthFactor).toString());
                 newElement.setAttribute("href", getImageSource(entities[appearingChar].image));
+                //newElement.setAttribute("href", getImageSource(entities[appearingChar].image) + '#EntitySVG');
                 newElement.setAttribute("opacity", "0");
                 g.appendChild(newElement);
             }
@@ -221,25 +225,27 @@ const animateImageAutoGUI = (volume: number, currPosition: string, nextPosition:
 
             movingChar = currBoard[idxFrom];
             if (movingChar in entities) {
-                gsap.fromTo("#entity" + idxFrom, {autoAlpha: 1}, {duration: 0.001, autoAlpha: 0});
+                gsap.fromTo("#entity" + idxFrom, {autoAlpha: 1}, {duration: 0.001, autoAlpha: 0.001});
                 var newElement = document.createElementNS("http://www.w3.org/2000/svg", 'image');
+                //var newElement = document.createElementNS("http://www.w3.org/2000/svg", 'use');
                 newElement.setAttribute("id", "movingEntity" + idxFrom);
                 newElement.setAttribute("x", (fromCoords[0] - 0.5 * entities[movingChar].scale * widthFactor).toString());
                 newElement.setAttribute("y", (fromCoords[1] - 0.5 * entities[movingChar].scale * widthFactor).toString());
                 newElement.setAttribute("width", (entities[movingChar].scale * widthFactor).toString());
                 newElement.setAttribute("height", (entities[movingChar].scale * widthFactor).toString());
                 newElement.setAttribute("href", getImageSource(entities[movingChar].image));
+                //newElement.setAttribute("href", getImageSource(entities[movingChar].image) + '#EntitySVG');
                 g.appendChild(newElement);
                 gsap.to("#movingEntity" + idxFrom, {duration: 0.5, x: toCoords[0] - fromCoords[0], y: toCoords[1] - fromCoords[1]});
             }
         }
 
         if (foregroundImagePath !== "") { // Redraw foreground image in front of any newly introduced entities
-            var newElement = document.createElementNS("http://www.w3.org/2000/svg", 'image');
-            newElement.setAttribute("width", scaledWidth.toString());
-            newElement.setAttribute("height", scaledHeight.toString());
-            newElement.setAttribute("href", getImageSource(foregroundImagePath));
-            g.appendChild(newElement);
+            var newForeGroundElement = document.createElementNS("http://www.w3.org/2000/svg", 'image');
+            newForeGroundElement.setAttribute("width", scaledWidth.toString());
+            newForeGroundElement.setAttribute("height", scaledHeight.toString());
+            newForeGroundElement.setAttribute("href", getImageSource(foregroundImagePath));
+            g.appendChild(newForeGroundElement);
         }
         if (fadeInIdxs.length > 0) {
             gsap.fromTo(".appearingEntity", {opacity: 0.001}, {duration: 0.5, opacity: 1});