diff --git a/assets/themes/hailhydrant/Twemoji12_1f692.svg b/assets/themes/hailhydrant/Twemoji12_1f692.svg
new file mode 100644
index 0000000..711c996
--- /dev/null
+++ b/assets/themes/hailhydrant/Twemoji12_1f692.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#CCD6DD" d="M35 8H13c-.552 0-1 .448-1 1s.448 1 1 1h2v2h2v-2h2v2h2v-2h2v2h2v-2h2v2h2v-2h2v2h2v-2h2c.553 0 1-.448 1-1s-.447-1-1-1zm1 5c0 .552-.447 1-1 1H13c-.552 0-1-.448-1-1s.448-1 1-1h22c.553 0 1 .448 1 1z"/><path fill="#DD2E44" d="M32 14H14s.041-2-2.979-2H5.146C0 12 0 19.959 0 19.959V27c0 2.209 1.791 4 4 4h28c2.209 0 4-1.791 4-4v-9c0-2.209-1.791-4-4-4z"/><path fill="#F5F8FA" d="M2 22h32v3H2z"/><circle fill="#292F33" cx="7" cy="31" r="4"/><circle fill="#8899A6" cx="7" cy="31" r="2"/><circle fill="#292F33" cx="28" cy="31" r="4"/><circle fill="#8899A6" cx="28" cy="31" r="2"/><path fill="#55ACEE" d="M7 20H2s0-6 3-6h2v6zm5 0H9v-6h1c1 0 2 1 2 2v4z"/><path fill="#FFAC33" d="M8 11c0 .552-.448 1-1 1H5c-.552 0-1-.448-1-1s.448-1 1-1h2c.552 0 1 .448 1 1z"/><path fill="#3B88C3" d="M10 11c0 .552-.448 1-1 1H7c-.552 0-1-.448-1-1s.448-1 1-1h2c.552 0 1 .448 1 1z"/></svg>
\ No newline at end of file
diff --git a/assets/themes/hailhydrant/Twemoji12_1f9ef.svg b/assets/themes/hailhydrant/Twemoji12_1f9ef.svg
new file mode 100644
index 0000000..e8b17ac
--- /dev/null
+++ b/assets/themes/hailhydrant/Twemoji12_1f9ef.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#66757F" d="M18 10c-1.1 0-2-.9-2-2V5c0-1.1.9-2 2-2s2 .9 2 2v3c0 1.1-.9 2-2 2z"/><circle fill="#DD2E44" cx="18" cy="15" r="6"/><path fill="#DD2E44" d="M16 8h4v4h-4zm6 28h-8c-1.1 0-2-.9-2-2V15h12v19c0 1.1-.9 2-2 2z"/><path fill="#292F33" d="M9.406 35.849l-4.492-1.263c-.529-.149-.838-.533-.685-.853l4.439-9.311c.458-.96 1.278-1.621 1.823-1.467l.22.062c.545.153.9 1.144.791 2.202l-1.065 10.26c-.038.353-.501.519-1.031.37z"/><path fill="#66757F" d="M26.022 2.248l-9.848 1.736c-.542.095-1.063-.27-1.158-.811-.095-.542.27-1.063.811-1.158L25.675.279c.542-.096 1.063.27 1.158.811.095.542-.27 1.063-.811 1.158z"/><path fill="#66757F" d="M25.055 7.36l-9.397-3.42c-.517-.188-.786-.765-.598-1.282.188-.517.765-.786 1.282-.598l9.397 3.42c.517.188.786.765.598 1.282-.188.517-.765.786-1.282.598z"/><path fill="#292F33" d="M10.524 24.407c-.042 0-.085-.004-.128-.011-.408-.07-.682-.459-.612-.867.726-4.203.161-6.198-.336-7.958-.386-1.364-.75-2.653-.33-4.556C10.052 6.786 13.745 5.25 16 5.25c.414 0 .75.336.75.75s-.336.75-.75.75c-1.225 0-4.586.824-5.417 4.589-.339 1.535-.067 2.495.309 3.824.515 1.819 1.155 4.083.372 8.622-.064.364-.382.622-.74.622z"/><circle fill="#CCD6DD" cx="16" cy="7" r="3"/><circle fill="#DD2E44" cx="16" cy="7" r="2"/><path fill="#EA596E" d="M16.5 10c-.828 0-1.5 1.567-1.5 3.5v22c0 .275.225.5.5.5h2c.275 0 .5-.225.5-.5v-22c0-1.933-.672-3.5-1.5-3.5z"/><path fill="#F5F8FA" d="M20.5 18h-5c-.825 0-1.5-.675-1.5-1.5v-2c0-.825.675-1.5 1.5-1.5h5c.825 0 1.5.675 1.5 1.5v2c0 .825-.675 1.5-1.5 1.5z"/><path fill="#77B255" d="M16 5c-.552 0-1.052.224-1.414.586L16 7l1.414-1.414C17.052 5.224 16.552 5 16 5z"/></svg>
\ No newline at end of file
diff --git a/assets/themes/hailhydrant/Twemoji12_26d1.svg b/assets/themes/hailhydrant/Twemoji12_26d1.svg
new file mode 100644
index 0000000..e8457ae
--- /dev/null
+++ b/assets/themes/hailhydrant/Twemoji12_26d1.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#D99E82" d="M29 17v5c0 4.142-4.896 9-11 9S7 26.142 7 22v-5H5v5c0 5.246 5.268 11 13 11s13-5.754 13-11v-5h-2z"/><path fill="#C1694F" d="M22 32.083C22 33.142 21.142 34 20.083 34h-4.166C14.858 34 14 33.142 14 32.083v-.166c0-1.059.858-1.917 1.917-1.917h4.166c1.059 0 1.917.858 1.917 1.917v.166z"/><path fill="#EA596E" d="M2 17c0-2.762 6.611-5 16-5s16 2.238 16 5c0 2.761-6.611 6-16 6S2 19.761 2 17z"/><path fill="#DD2E44" d="M3 16C3 9 9.198 2 18 2s15 7 15 14c0 1-6.198 4-15 4S3 17 3 16z"/><path fill="#A0041E" d="M25 19c-.553 0-1-.448-1-1 0-7.728-1.93-13.625-1.949-13.684-.174-.524.109-1.09.634-1.265.522-.173 1.089.109 1.264.632.08.24 1.876 5.71 2.04 13.223 1.139-.161 3.165-.602 5.564-1.801.494-.247 1.094-.047 1.342.447.247.494.047 1.095-.447 1.342C28.284 18.976 25.132 19 25 19zm-14 0c-.132 0-3.284-.024-7.447-2.106-.494-.247-.694-.848-.447-1.342.247-.493.847-.695 1.342-.447 2.399 1.2 4.425 1.64 5.565 1.801.164-7.513 1.959-12.983 2.039-13.223.175-.524.744-.805 1.264-.632.524.174.808.741.633 1.265C13.929 4.374 12 10.271 12 18c0 .552-.448 1-1 1z"/><path fill="#FFF" d="M21 12h-2v-2c0-.552-.448-1-1-1s-1 .448-1 1v2h-2c-.552 0-1 .448-1 1s.448 1 1 1h2v2c0 .552.448 1 1 1s1-.448 1-1v-2h2c.553 0 1-.448 1-1s-.447-1-1-1z"/></svg>
\ No newline at end of file
diff --git a/assets/themes/hailhydrant/hailhydrant.json b/assets/themes/hailhydrant/hailhydrant.json
index 41b9ac0..916964c 100644
--- a/assets/themes/hailhydrant/hailhydrant.json
+++ b/assets/themes/hailhydrant/hailhydrant.json
@@ -13,7 +13,7 @@
     "en"
   ],
   "maintainer": "",
-  "icon": "assets/themes/hailhydrant/logo.svg",
+  "icon": "./assets/themes/hailhydrant/logo.svg",
   "version": "0",
   "startLat": 13.67801,
   "startLon": 121.6625,
@@ -87,7 +87,7 @@
                 ]
               },
               "then": {
-                "en": "<img style=\"width:15px\" src=\"hydrant_pillar.svg\" /> Pillar type."
+                "en": "<img style=\"width:15px\" src=\"./assets/themes/hailhydrant/hydrant_pillar.svg\" /> Pillar type."
               }
             },
             {
@@ -97,7 +97,7 @@
                 ]
               },
               "then": {
-                "en": "<img style=\"width:15px\" src=\"hydrant_unknown.svg\" /> Pipe type."
+                "en": "<img style=\"width:15px\" src=\"./assets/themes/hailhydrant/hydrant_unknown.svg\" /> Pipe type."
               }
             },
             {
@@ -107,7 +107,7 @@
                 ]
               },
               "then": {
-                "en": "<img style=\"width:15px\" src=\"hydrant_unknown.svg\" /> Wall type."
+                "en": "<img style=\"width:15px\" src=\"./assets/themes/hailhydrant/hydrant_unknown.svg\" /> Wall type."
               }
             },
             {
@@ -117,7 +117,7 @@
                 ]
               },
               "then": {
-                "en": "<img style=\"width:15px\" src=\"hydrant_underground.svg\" /> Underground type."
+                "en": "<img style=\"width:15px\" src=\"./assets/themes/hailhydrant/hydrant_underground.svg\" /> Underground type."
               }
             }
           ]
@@ -170,7 +170,7 @@
       ],
       "hideUnderlayingFeaturesMinPercentage": 0,
       "icon": {
-        "render": "hydrant.svg"
+        "render": "./assets/themes/hailhydrant/hydrant.svg"
       },
       "width": {
         "render": "8"
@@ -261,7 +261,7 @@
       ],
       "hideUnderlayingFeaturesMinPercentage": 0,
       "icon": {
-        "render": "Twemoji12_1f9ef.svg"
+        "render": "./assets/themes/hailhydrant/Twemoji12_1f9ef.svg"
       },
       "width": {
         "render": "8"
@@ -418,7 +418,7 @@
       ],
       "hideUnderlayingFeaturesMinPercentage": 0,
       "icon": {
-        "render": "Twemoji12_1f692.svg"
+        "render": "./assets/themes/hailhydrant/Twemoji12_1f692.svg"
       },
       "width": {
         "render": "8"
@@ -474,7 +474,7 @@
       "tagRenderings": [],
       "hideUnderlayingFeaturesMinPercentage": 0,
       "icon": {
-        "render": "Twemoji12_26d1.svg"
+        "render": "./assets/themes/hailhydrant/Twemoji12_26d1.svg"
       },
       "width": {
         "render": "8"
diff --git a/assets/themes/hailhydrant/hydrant.svg.1 b/assets/themes/hailhydrant/hydrant.svg.1
new file mode 100644
index 0000000..0dbda22
--- /dev/null
+++ b/assets/themes/hailhydrant/hydrant.svg.1
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.0" width="48" height="48" id="svg2">
+<defs id="defs4">
+<linearGradient id="lg1">
+ <stop id="stop5" style="stop-color:#ffffff;stop-opacity:1" offset="0"/>
+ <stop id="stop7" style="stop-color:#ffffff;stop-opacity:0" offset="1"/>
+</linearGradient>
+<linearGradient id="lg2">
+ <stop style="stop-color:#eeeeec;stop-opacity:1" offset="0"/>
+ <stop style="stop-color:#eeeeec;stop-opacity:0" offset="1"/>
+</linearGradient>
+<linearGradient id="lg3">
+ <stop style="stop-color:#000000;stop-opacity:1" offset="0"/>
+ <stop style="stop-color:#000000;stop-opacity:0" offset="1"/>
+</linearGradient>
+<linearGradient id="lg4">
+ <stop style="stop-color:#cc0000;stop-opacity:1" offset="0"/>
+ <stop style="stop-color:#ff9494;stop-opacity:1" offset="1"/>
+</linearGradient>
+<linearGradient id="lg5">
+ <stop style="stop-color:#a40000;stop-opacity:1" offset="0"/>
+ <stop style="stop-color:#ff6767;stop-opacity:1" offset="0.62"/>
+ <stop style="stop-color:#cc0000;stop-opacity:1" offset="1"/>
+</linearGradient>
+<linearGradient id="lg6">
+ <stop style="stop-color:#ff7171;stop-opacity:1" offset="0"/>
+ <stop style="stop-color:#cc0000;stop-opacity:1" offset="1"/>
+</linearGradient>
+<linearGradient id="lg7">
+ <stop style="stop-color:#ffffff;stop-opacity:1" offset="0"/>
+ <stop style="stop-color:#ffffff;stop-opacity:0" offset="1"/>
+</linearGradient>
+<linearGradient id="lg8">
+<stop style="stop-color:#f24e4e;stop-opacity:1" offset="0"/>
+<stop style="stop-color:#c10000;stop-opacity:1" offset="1"/>
+</linearGradient>
+<linearGradient x1="0.016" y1="24.5" x2="15.5" y2="27.78" id="lg9" xlink:href="#lg7" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.5,0,0,0.833,26.75,2.75)"/>
+<linearGradient x1="30" y1="7.9" x2="30" y2="10.433" id="lg10" xlink:href="#lg8" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.333,0,0,2.088,-6.5,9)"/>
+<linearGradient x1="6.5" y1="30.3" x2="15.5" y2="31" id="lg11" xlink:href="#lg7" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.5,0,0,0.833,6.748,2.75)"/>
+<linearGradient x1="30" y1="7.9" x2="30" y2="10.433" id="lg12" xlink:href="#lg8" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.333,0,0,2.088,-26.5,9)"/>
+<linearGradient x1="-6.6" y1="-26.95" x2="4.3" y2="-16" id="lg13" xlink:href="#lg7" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.25,0,0,1.25,22.25,53.5)"/>
+<linearGradient x1="-1.277" y1="-24.137" x2="1" y2="-15.62" id="lg14" xlink:href="#lg6" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.2,0,0,1.2,22.3,52.5)"/>
+<linearGradient x1="22" y1="25" x2="17" y2="25" id="lg15" xlink:href="#lg7" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.277,0,0,1,3.22,-2.3)"/>
+<linearGradient x1="22" y1="29" x2="18" y2="29" id="lg16" xlink:href="#lg2" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.5,0,0,1.14,-1,-3.7)"/>
+<linearGradient x1="22" y1="25" x2="17" y2="25" id="lg17" xlink:href="#lg7" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.277,0,0,1.135,-0.77,-2.87)"/>
+<linearGradient x1="22" y1="29" x2="18" y2="29" id="lg18" xlink:href="#lg2" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.5,0,0,1.14,-5,-4.3)"/>
+<linearGradient x1="22" y1="25" x2="17" y2="25" id="lg19" xlink:href="#lg7" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.277,0,0,1,-4.77,-2.3)"/>
+<linearGradient x1="22" y1="29" x2="18" y2="29" id="lg20" xlink:href="#lg2" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.5,0,0,1.14,-9,-3.79)"/>
+<linearGradient x1="18.25" y1="16.375" x2="46.33" y2="16.375" id="lg21" xlink:href="#lg7" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.19,0,0,0.122,18.8,4.4)"/>
+<linearGradient x1="43.3" y1="11.686" x2="5.25" y2="11.686" id="lg22" xlink:href="#lg5" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.194,0,0,0.213,18.8,3)"/>
+<linearGradient x1="19.5" y1="22.64" x2="36.06" y2="22.64" id="lg3927" xlink:href="#lg6" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.534,0,0,0.355,11.5,3)"/>
+<linearGradient x1="16" y1="9.5" x2="32" y2="9.5" id="lg3929" xlink:href="#lg7" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.928,0,0,0.906,1.24,1.4)"/>
+<linearGradient x1="19.5" y1="22.64" x2="36.06" y2="22.64" id="lg3932" xlink:href="#lg6" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.54,0,0,0.359,11.4,3)"/>
+<radialGradient cx="18" cy="27.858" r="15.45" fx="17.592" fy="24.538" id="radialGradient3935" xlink:href="#lg7" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.123,-0.149,-0.007,0.24,0.806,13.95)"/>
+<linearGradient x1="18.25" y1="16.375" x2="46.33" y2="16.375" id="lg3938" xlink:href="#lg7" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.62,0,0,0.843,8.6,3.18)"/>
+<linearGradient x1="29.731" y1="17" x2="21" y2="1.828" id="lg3941" xlink:href="#lg4" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.613,0,0,0.75,8.8,4.13)"/>
+<linearGradient x1="43.3" y1="11.686" x2="5.25" y2="11.686" id="lg3944" xlink:href="#lg5" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.65,0,0,0.867,8,2.86)"/>
+<radialGradient cx="24" cy="18.4675" r="14" fx="24" fy="18.4675" id="radialGradient3947" xlink:href="#lg3" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.7,0,0,0.214,7.214,16)"/>
+<linearGradient x1="5.66" y1="19.392" x2="40.25" y2="38.896" id="lg3950" xlink:href="#lg7" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.5,0,0,0.75,11.068,5)"/>
+<linearGradient x1="45.63" y1="17.86" x2="6.123" y2="17.86" id="lg3953" xlink:href="#lg5" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.5,0,0,0.75,10.25,5)"/>
+<radialGradient cx="18" cy="27.858" r="15.45" fx="17.592" fy="24.538" id="radialGradient3956" xlink:href="#lg7" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.123,-0.149,-0.007,0.24,0.806,36.95)"/>
+<linearGradient x1="18.25" y1="16.375" x2="46.3278" y2="16.375" id="lg3959" xlink:href="#lg7" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.62,0,0,0.843,8.62,26)"/>
+<linearGradient x1="29.731" y1="17" x2="21" y2="1.828" id="lg3962" xlink:href="#lg4" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.613,0,0,0.75,8.8,27.13)"/>
+<linearGradient x1="43.3" y1="11.686" x2="5.25" y2="11.686" id="lg3965" xlink:href="#lg5" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.65,0,0,0.867,8,26)"/>
+<radialGradient cx="24" cy="18.4675" r="14" fx="24" fy="18.4675" id="radialGradient3968" xlink:href="#lg3" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.7,0,0,0.214,7.214,39)"/>
+<radialGradient cx="23.97" cy="12.22" r="15" fx="23.97" fy="12.22" id="radialGradient3971" xlink:href="#lg3" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.75,0,0,0.348,5.83,37.25)"/>
+<linearGradient x1="22.14" y1="6.3" x2="27.6" y2="6.3" id="lg3261" xlink:href="#lg1" gradientUnits="userSpaceOnUse"/>
+</defs>
+<path d="M 36,41.5 C 36,44.538 30.627,47 24,47 C 17.3726,47 12,44.537 12,41.5 C 12,38.462 17.3726,36 24,36 C 30.627,36 36,38.462 36,41.5 z" style="opacity:0.9;fill:url(#radialGradient3971)"/>
+<path d="M 22.949,40 C 19.09,40.055 15.77,40.67 14,41.559 L 14,44.442 C 15.85,45.37 19.409,46 23.5,46 C 27.6,46 31.149,45.37 33,44.4426 L 33,41.559 C 31.149,40.634 27.6,40 23.5,40 C 23.3127,40 23.134,40 22.949,40 z" style="opacity:0.56;fill:url(#radialGradient3968)"/>
+<path d="M 22.481,31.5 C 17.44,31.774 13.5,34 13.5,36.689 L 13.5,39.3 C 13.5,42.163 18,44.5 23.5,44.5 C 29,44.5 33.5,42.163 33.5,39.3 L 33.5,36.68 C 33.5,33.818 29,31.5 23.5,31.5 C 23.145,31.5 22.817,31.49 22.481,31.5 z" style="fill:url(#lg3965);stroke:#a40000"/>
+<path d="M 33,36.66 C 33,39.144 28.745,41 23.5,41 C 18.26,41 13.804,38.976 14,36.5 C 14.1,35.357 15.196,34.194 16.93,33.337 C 18.624,32.5 20.92,31.954 23.5,32 C 26.081,32.05 28.405,32.5125 30.109,33.389 C 31.928,34.324 33,35.578 33,36.66 z" style="fill:url(#lg3962)"/>
+<path d="M 22.581,32.5 C 18.04,32.73 14.36,34.664 14.5,36.89 L 14.5,39.094 C 14.3426,41.409 18.523,43.5 23.489,43.5 C 28.454,43.5 32.728,41.397 32.5,39.093 L 32.5,36.89 C 32.643,34.568 28.455,32.508 23.489,32.5 C 23.178,32.5 22.883,32.5 22.581,32.5 z" style="opacity:0.56;fill:none;stroke:url(#lg3959)"/>
+<path d="M 32.44,36 C 33.072,38.567 28.65,40.555 23.514,40.5 C 18.408,40.4426 13.8,38.350 14.59,36 C 15.375,33.66 18.587,31.5 23.514,31.5 C 28.441,31.5 32.44,33.516 32.44,36 z" style="fill:none;stroke:url(#radialGradient3956)"/>
+<path d="M 22.672,10.5 C 18.94,10.68 15.5,12.2 15.5,14.287 C 15.5,16 15.5,32.983 15.5,34.717 C 15.5,36.81 19.05,38.5 23.4828,38.5 C 27.912,38.5 31.5,36.809 31.5,34.717 C 31.5,33.036 31.5,15.967 31.5,14.287 C 31.5,12.2 27.912,10.5 23.4828,10.5 C 23.275,10.5 23.066,10.5 22.862,10.5 C 22.797,10.5 22.737,10.5 22.672,10.5 z" style="fill:url(#lg3953);stroke:#a40000"/>
+<path d="M 22.951,11.5 C 19.54,11.62 16.819,12.946 16.517,14.486 C 16.5,14.5326 16.513,34.481 16.5,34.53 C 16.32,36 19.752,37.5 23.485,37.5 C 27.304,37.5 30.65,36 30.5,34.53 C 30.5,34.5 30.5,14.6 30.5,14.567 C 30.3527,12.871 27.262,11.5 23.485,11.5 C 23.304,11.5 23.129,11.497 22.951,11.5 z" style="opacity:0.7;fill:none;stroke:url(#lg3950)"/>
+<path d="M 22.949,17 C 19.1,17.055 15.77,17.67 14,18.559 L 14,21.4426 C 15.85,22.37 19.409,23 23.5,23 C 27.6,23 31.149,22.37 33,21.4426 L 33,18.559 C 31.149,17.634 27.6,17 23.5,17 C 23.3127,17 23.134,17 22.949,17 z" style="opacity:0.5;fill:url(#radialGradient3947)"/>
+<path d="M 22.481,8.508 C 17.44,8.774 13.5,11 13.5,13.689 L 13.5,16.3 C 13.5,19.163 18,21.5 23.5,21.5 C 29,21.5 33.5,19.163 33.5,16.3 L 33.5,13.68 C 33.5,10.818 29,8.508 23.5,8.508 C 23.145,8.5 22.82,8.5 22.5,8.51 z" style="fill:url(#lg3944);stroke:#a40000"/>
+<path d="M 33,13.66 C 33,16.144 28.745,18 23.5,18 C 18.26,18 13.804,15.975 14,13.5 C 14.1,12.357 15.196,11.194 16.93,10.337 C 18.624,9.5 20.92,8.954 23.5,9 C 26.081,9.05 28.405,9.5125 30.109,10.389 C 31.928,11.324 33,12.578 33,13.66 z" style="fill:url(#lg3941)"/>
+<path d="M 22.581,9.5 C 18.04,9.73 14.360,11.66 14.5,13.89 L 14.5,16.093 C 14.3426,18.409 18.5,20.5 23.489,20.5 C 28.454,20.5 32.728,18.397 32.5,16.094 L 32.5,13.890 C 32.643,11.568 28.455,9.508 23.489,9.5 C 23.178,9.5 22.88,9.5 22.581,9.5 z" style="opacity:0.56;fill:none;stroke:url(#lg3938)"/>
+<path d="M 32.44,13 C 33.072,15.567 28.65,17.556 23.514,17.5 C 18.408,17.4426 13.8,15.350 14.589,13 C 15.375,10.661 18.587,8.5 23.514,8.5 C 28.441,8.5 32.44,10.516 32.44,13 z" style="fill:none;stroke:url(#radialGradient3935)"/>
+<path d="M 23.47,4.5 C 22.863,4.5 22.255,4.608 21.66,4.8 C 21.347,4.89 21.061,5 20.758,5.167 C 20.75,5.171 20.73,5.163 20.73,5.167 C 19.262,5.9 17.965,7.2 17.142,9.144 C 17.142,9.144 16.769,10.634 16.587,11.727 C 16.519,12.076 16.5,12.405 16.5,12.627 C 16.5,14.408 19.626,15.5 23.5,15.5 C 24,15.5 24.4,15.5 24.9,15.471 C 28.096,15.235 30.5,14.185 30.5,12.627 C 30.5,12.405 30.48,12.076 30.4,11.727 C 30.23,10.63 29.86,9.14 29.86,9.14 C 29.036,7.2 27.738,5.9 26.27,5.167 C 26.26,5.163 26.25,5.17 26.24,5.167 C 25.94,5 25.65,4.887 25.33,4.8 C 25.053,4.7 24.75,4.635 24.4,4.58 C 24.4,4.58 24.4,4.58 24.4,4.587 C 24.094,4.54 23.784,4.5 23.471,4.5 z" style="fill:url(#lg3932);stroke:#a40000"/>
+<path d="M 20,7.279 C 20,7.279 21.198,6.059 21.18,6.066 C 19.94,6.67 18.81,7.792 18.079,9.519 C 18.042,9.671 17.746,10.886 17.58,11.84 C 17.5,12 17.5,12.35 17.5,12.6 C 17.5,12.773 17.57,12.897 17.79,13.114 C 18,13.33 18.37,13.58 18.9,13.8 C 20,14.214 21.67,14.5 23.5,14.5 C 24,14.5 24.4,14.5 24.83,14.472 C 26.33,14.362 27.6,14.05 28.427,13.65 C 29.25,13.25 29.5,12.9 29.5,12.6 C 29.5,12.438 29.465,12.132 29.4,11.868 C 29.3,11 29,10.3 28.92,9.52 C 28.18,7.8 27,6.58 25.68,6 C 25.6,6 27,7.33 27,7.33 C 25.9,8.837 20.892,8.86 20,7.28 z" style="fill:url(#lg3927);stroke:url(#lg3929)"/>
+<path d="M 23.2,2.502 C 21.681,2.568 20.5,3.1129 20.5,3.773 L 20.5,6.22 C 20.5,6.927 21.84,7.5 23.5,7.5 C 25.153,7.5 26.5,6.927 26.5,6.22 L 26.5,3.773 C 26.5,3.07 25.153,2.5 23.5,2.5 C 23.4,2.5 23.295,2.5 23.2,2.502 z" style="fill:url(#lg22);stroke:#a40000"/>
+<path d="M 23.2,5.547 C 22.651,5.562 22.124,5.64 21.8,5.723 C 21.48,5.8 21.5,5.55 21.5,5.5 L 21.5,6.04 C 21.679,6.285 22.6,6.5 23.5,6.5 C 24.061,6.5 25,6.376 25.5,6.04 L 25.5,5.5 C 25.5,5.56 25.5,5.792 25.127,5.707 C 24.758,5.622 24.17,5.548 23.5,5.547 C 23.38,5.547 23.312,5.546 23.262,5.547 z" style="opacity:0.56;fill:none;stroke:url(#lg21)"/>
+<path d="M 23.2,2.502 C 21.681,2.567 20.5,3.1125 20.5,3.7728 L 20.5,4.22 C 20.5,4.93 21.84,5.5 23.5,5.5 C 25.153,5.5 26.5,4.92 26.5,4.222 L 26.5,3.7728 C 26.5,3.07 25.153,2.5 23.5,2.5 C 23.4,2.5 23.295,2.5 23.194,2.5 z" style="fill:none;stroke:#a40000"/>
+<path d="M 19.5,22.5 C 20.331,22.5 21,22.946 21,23.5 L 21,34 C 21,34.554 20.331,35 19.5,35 C 18.66,35 18,34.554 18,34 L 18,23.5 C 18,22.946 18.66,22.5 19.5,22.5 z" style="opacity:0.9;fill:#cc0000"/>
+<path d="M 19.5,22.5 C 20.331,22.5 21,22.946 21,23.5 L 21,34 C 21,34.554 20.331,35 19.5,35 C 18.66,35 18,34.554 18,34 L 18,23.5 C 18,22.946 18.66,22.5 19.5,22.5 z" style="fill:url(#lg20)"/>
+<path d="M 19.5,23 C 20.054,23 20.5,23.223 20.5,23.5 L 20.5,34 C 20.5,34.277 20.054,34.5 19.5,34.5 C 18.946,34.5 18.5,34.277 18.5,34 L 18.5,23.5 C 18.5,23.223 18.946,23 19.5,23 z" style="opacity:0.4;fill:none;stroke:url(#lg19)"/>
+<path d="M 23.5,23 C 24.331,23 25,23.446 25,24 L 25,35 C 25,35.554 24.33,36 23.5,36 C 22.66,36 22,35.554 22,35 L 22,24 C 22,23.446 22.66,23 23.5,23 z" style="opacity:0.9;fill:#cc0000"/>
+<path d="M 23.5,23 C 24.331,23 25,23.446 25,24 L 25,35 C 25,35.554 24.33,36 23.5,36 C 22.66,36 22,35.554 22,35 L 22,24 C 22,23.446 22.66,23 23.5,23 z" style="fill:url(#lg18)"/>
+<path d="M 23.5,23.5 C 24.054,23.5 24.5,23.723 24.5,24 L 24.5,35 C 24.5,35.277 24.054,35.5 23.5,35.5 C 22.946,35.5 22.5,35.277 22.5,35 L 22.5,24 C 22.5,23.723 22.946,23.5 23.5,23.5 z" style="opacity:0.4;fill:none;stroke:url(#lg17)"/>
+<path d="M 27.5,22.5 C 28.331,22.5 29,22.946 29,23.5 L 29,34 C 29,34.554 28.33,35 27.5,35 C 26.66,35 26,34.55 26,34 L 26,23.5 C 26,22.946 26.66,22.5 27.5,22.5 z" style="opacity:0.9;fill:#cc0000"/>
+<path d="M 27.5,22.5 C 28.331,22.5 29,22.946 29,23.5 L 29,34 C 29,34.554 28.33,35 27.5,35 C 26.66,35 26,34.55 26,34 L 26,23.5 C 26,22.946 26.66,22.5 27.5,22.5 z" style="fill:url(#lg16)"/>
+<path d="M 27.5,23 C 28.054,23 28.5,23.223 28.5,23.5 L 28.5,34 C 28.5,34.277 28.054,34.5 27.5,34.5 C 26.946,34.5 26.5,34.277 26.5,34 L 26.5,23.5 C 26.5,23.223 26.946,23 27.5,23 z" style="opacity:0.4;fill:none;stroke:url(#lg15)"/>
+<path d="M 29.5,28.5 C 29.5,31.814 26.814,34.5 23.5,34.5 C 20.186,34.5 17.5,31.814 17.5,28.5 C 17.5,25.186 20.186,22.5 23.5,22.5 C 26.814,22.5 29.5,25.186 29.5,28.5 z" style="fill:url(#lg14);stroke:#a40000"/>
+<path d="M 23.5,23.5 C 20.724,23.5 18.5,25.724 18.5,28.5 C 18.5,31.276 20.724,33.5 23.5,33.5 C 26.276,33.5 28.5,31.276 28.5,28.5 C 28.5,25.724 26.276,23.5 23.5,23.5 z" style="fill:none;stroke:url(#lg13)"/>
+<path d="M 35.77,2.535 L 37.77,2.535 L 37.77,4.535 L 35.77,4.535 L 35.77,2.535 z" transform="matrix(0.707,0.707,-0.707,0.707,0,0)" style="fill:none;stroke:#a40000"/>
+<path d="M 36.27,3.036 L 37.27,3.036 L 37.27,4.036 L 36.27,4.036 L 36.27,3.036 z" transform="matrix(0.707,0.707,-0.707,0.707,0,0)" style="fill:#ff7b7b"/>
+<path d="M 13.5,20.5 C 14.608,20.5 15.5,21.107 15.5,21.86 L 15.5,31.14 C 15.5,31.893 14.608,32.5 13.5,32.5 C 12.392,32.5 11.5,31.893 11.5,31.14 L 11.5,21.86 C 11.5,21.107 12.392,20.5 13.5,20.5 z" style="fill:url(#lg12);stroke:#a40000"/>
+<path d="M 13.25,21.5 L 13.75,21.5 C 14.166,21.5 14.5,21.67 14.5,21.884 L 14.5,31.116 C 14.5,31.329 14.166,31.5 13.75,31.5 L 13.25,31.5 C 12.835,31.5 12.5,31.33 12.5,31.116 L 12.5,21.884 C 12.5,21.67 12.835,21.5 13.25,21.5 z" style="fill:none;stroke:url(#lg11)"/>
+<path d="M 33.5,20.5 C 34.608,20.5 35.5,21.107 35.5,21.86 L 35.5,31.14 C 35.5,31.893 34.608,32.5 33.5,32.5 C 32.392,32.5 31.5,31.893 31.5,31.14 L 31.5,21.86 C 31.5,21.107 32.392,20.5 33.5,20.5 z" style="fill:url(#lg10);stroke:#a40000"/>
+<path d="M 33.25,21.5 L 33.75,21.5 C 34.166,21.5 34.5,21.67 34.5,21.884 L 34.5,31.116 C 34.5,31.33 34.166,31.5 33.75,31.5 L 33.25,31.5 C 32.835,31.5 32.5,31.33 32.5,31.116 L 32.5,21.884 C 32.5,21.67 32.835,21.5 33.25,21.5 z" style="fill:none;stroke:url(#lg9)"/>
+<path d="M 11,24 C 11.554,24 12,24.446 12,25 L 12,28 C 12,28.554 11.554,29 11,29 C 10.446,29 10,28.554 10,28 L 10,25 C 10,24.446 10.446,24 11,24 z" style="fill:#a40000"/>
+<path d="M 36,24 C 36.554,24 37,24.446 37,25 L 37,28 C 37,28.554 36.554,29 36,29 C 35.446,29 35,28.554 35,28 L 35,25 C 35,24.446 35.446,24 36,24 z" style="fill:#a40000"/>
+<path d="M 21.075,3.655 C 20.94,3.78 20.95,4.225 21.07,4.345 C 22.02,5.264 25.29,5.21 25.94,4.29 C 26.054,4.13 26,3.784 25.9,3.66 C 25,2.77 22,2.77 21,3.65 z" style="opacity:0.46;fill:url(#lg3261)"/>
+</svg>
\ No newline at end of file
diff --git a/scripts/fixTheme.ts b/scripts/fixTheme.ts
index 2cc563f..b3d0404 100644
--- a/scripts/fixTheme.ts
+++ b/scripts/fixTheme.ts
@@ -16,6 +16,8 @@ if(process.argv.length == 2){
 }
 
 const path = process.argv[2]
+const dir = path.substring(0, path.lastIndexOf("/"))
+
 console.log("Fixing up ", path)
 
 const themeConfigJson : LayoutConfigJson = JSON.parse(readFileSync(path, "UTF8"))
@@ -47,7 +49,7 @@ for (const layerConfigJson of themeConfigJson.layers) {
             authors: [],
             sources: [remoteImage]
         })
-        replacements.push({source: remoteImage, destination: imgPath})
+        replacements.push({source: remoteImage, destination: `${dir}/${imgPath}`})
     }
 }
 
@@ -56,7 +58,6 @@ for (const replacement of replacements) {
     fixedThemeJson = fixedThemeJson.replace(new RegExp(replacement.source, "g"), replacement.destination)
 }
 
-const dir = path.substring(0, path.lastIndexOf("/"))
 const fixScriptPath = dir  + "/fix_script_"+path.replace(/\//g,"_")+".sh"
 writeFileSync(dir + "/generated.license_info.json", JSON.stringify(licenses, null, "  "))
 writeFileSync(fixScriptPath, linuxHints.join("\n"))