diff --git a/.docker/default.conf b/.docker/default.conf
new file mode 100644
index 00000000..9d3a7b22
--- /dev/null
+++ b/.docker/default.conf
@@ -0,0 +1,21 @@
+server {
+    listen       80;
+    listen  [::]:80;
+    server_name  localhost;
+
+    location / {
+        root   /usr/share/nginx/html;
+        index  index.html;
+        add_header Content-Security-Policy "default-src 'self'; script-src 'self' 'unsafe-inline'; style-src 'self' 'unsafe-inline'; font-src data: 'self'";
+        add_header X-XSS-Protection "1; mode=block";
+      	add_header X-Frame-Options "DENY";
+      	add_header X-Content-Type-Options nosniff;
+      	add_header Referrer-Policy "strict-origin";
+    }
+
+    error_page   500 502 503 504  /50x.html;
+    location = /50x.html {
+        root   /usr/share/nginx/html;
+    }
+
+}
diff --git a/.gitignore b/.gitignore
index 1104b06f..eb169d8d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-run_php_server.bat
+.bat
 .vscode
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 00000000..fbf5a425
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,7 @@
+FROM nginx:stable-alpine
+
+# Copy the contents of the repo to the container
+COPY . /usr/share/nginx/html
+
+# Move the customized nginx config file to the nginx folder
+RUN mv /usr/share/nginx/html/.docker/default.conf /etc/nginx/conf.d/default.conf
diff --git a/LICENSE b/LICENSE
index 24402ab6..45f950ac 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright 2018-2020 Max Ganiev (Azgaar), azgaar.fmg@yandex.by
+Copyright 2017-2021 Max Haniyeu (Azgaar), azgaar.fmg@yandex.com
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/index.css b/index.css
index 01b0584a..58b824a5 100644
--- a/index.css
+++ b/index.css
@@ -169,23 +169,28 @@ a {
   font-size: 0.8em;
 }
 
-#statesBody,
-#provincesBody {
-  stroke-width: 2;
-  fill-rule: evenodd;
-  mask: url(#land);
-}
-
-#relig,
-#biomes,
-#cults {
-  fill-rule: evenodd;
-  mask: url(#land);
+#statesBody {
+  stroke-width: 3;
 }
 
 #statesHalo {
   fill: none;
-  filter: url(#blur5);
+  stroke-linecap: round;
+  stroke-linejoin: round;
+}
+
+#provincesBody {
+  stroke-width: 0.2;
+}
+
+#statesBody,
+#provincesBody,
+#relig,
+#biomes,
+#cults {
+  stroke-linejoin: round;
+  fill-rule: evenodd;
+  mask: url(#land);
 }
 
 #borders {
@@ -197,6 +202,7 @@ a {
   stroke: none;
   mask: url(#land);
   cursor: pointer;
+  fill-rule: nonzero;
 }
 
 #anchors {
@@ -979,6 +985,12 @@ body button.noicon {
   cursor: pointer;
 }
 
+#controlCells > .current {
+  fill: #82c8ff40;
+  stroke: #82c8ff;
+  stroke-width: 0.4;
+}
+
 #vertices > circle {
   fill: #ff0000;
   stroke: #841f1f;
@@ -1116,6 +1128,12 @@ div#regimentSelectorBody > div > div {
   fill: none;
 }
 
+#debug > text {
+  font-size: 2px;
+  text-anchor: middle;
+  dominant-baseline: central;
+}
+
 .selectedCell {
   stroke-width: 1;
   stroke: #da3126;
@@ -1697,6 +1715,12 @@ rect.fillRect {
   text-align: center;
 }
 
+div.editorLine {
+  margin: 0.2em 0;
+  padding: 0 0.2em;
+  font-size: 0.9em;
+}
+
 #emblemDownloadControl > input {
   width: 4.1em;
 }
@@ -2058,10 +2082,6 @@ svg.button {
   width: 16em;
 }
 
-#reliefEditor input[type='number'] {
-  width: 3em;
-}
-
 #reliefIconsDiv {
   margin-top: 2px;
   padding: 2px;
diff --git a/index.html b/index.html
index 314fa9ad..bd13708a 100644
--- a/index.html
+++ b/index.html
@@ -45,36 +45,36 @@
     xmlns:svg="http://www.w3.org/2000/svg">
     <defs>
       <g id="filters">
-        <filter id="blurFilter" x="-1" y="-1" width="100" height="100">
+        <filter id="blurFilter" name="Blur 0.2" x="-1" y="-1" width="100" height="100">
           <feGaussianBlur in="SourceGraphic" stdDeviation="0.2"/>
         </filter>
-        <filter id="blur1" x="-1" y="-1" width="100" height="100">
+        <filter id="blur1" name="Blur 1" x="-1" y="-1" width="100" height="100">
           <feGaussianBlur in="SourceGraphic" stdDeviation="1"/>
         </filter>
-        <filter id="blur3" x="-1" y="-1" width="100" height="100">
+        <filter id="blur3" name="Blur 3" x="-1" y="-1" width="100" height="100">
           <feGaussianBlur in="SourceGraphic" stdDeviation="3"/>
         </filter>
-        <filter id="blur5" x="-1" y="-1" width="100" height="100">
+        <filter id="blur5" name="Blur 5" x="-1" y="-1" width="100" height="100">
           <feGaussianBlur in="SourceGraphic" stdDeviation="5"/>
         </filter>
-        <filter id="blur7" x="-1" y="-1" width="100" height="100">
+        <filter id="blur7" name="Blur 7" x="-1" y="-1" width="100" height="100">
           <feGaussianBlur in="SourceGraphic" stdDeviation="7"/>
         </filter>
-        <filter id="blur10" x="-1" y="-1" width="100" height="100">
+        <filter id="blur10" name="Blur 10" x="-1" y="-1" width="100" height="100">
           <feGaussianBlur in="SourceGraphic" stdDeviation="10"/>
         </filter>
-        <filter id="splotch">
+        <filter id="splotch" name="Splotch">
           <feTurbulence type="fractalNoise" baseFrequency=".01" numOctaves="4"/>
           <feColorMatrix values="0 0 0 0 0, 0 0 0 0 0, 0 0 0 0 0, 0 0 0 -0.9 1.2" result="texture"/>
           <feComposite in="SourceGraphic" in2="texture" operator="in"/>
         </filter>
-        <filter id="bluredSplotch">
+        <filter id="bluredSplotch" name="Blurred Splotch">
           <feTurbulence type="fractalNoise" baseFrequency=".01" numOctaves="4"/>
           <feColorMatrix values="0 0 0 0 0, 0 0 0 0 0, 0 0 0 0 0, 0 0 0 -0.9 1.2" result="texture"/>
           <feComposite in="SourceGraphic" in2="texture" operator="in"/>
           <feGaussianBlur stdDeviation="4"/>
         </filter>
-        <filter id="dropShadow">
+        <filter id="dropShadow" name="Shadow 2">
           <feGaussianBlur in="SourceAlpha" stdDeviation="2"/>
           <feOffset dx="1" dy="2"/>
           <feMerge>
@@ -82,7 +82,7 @@
               <feMergeNode in="SourceGraphic"/>
           </feMerge>
         </filter>
-        <filter id="dropShadow01">
+        <filter id="dropShadow01" name="Shadow 0.1">
           <feGaussianBlur in="SourceAlpha" stdDeviation=".1"/>
           <feOffset dx=".2" dy=".3"/>
           <feMerge>
@@ -90,7 +90,7 @@
               <feMergeNode in="SourceGraphic"/>
           </feMerge>
         </filter>
-        <filter id="dropShadow05">
+        <filter id="dropShadow05" name="Shadow 0.5">
           <feGaussianBlur in="SourceAlpha" stdDeviation=".5"/>
           <feOffset dx=".5" dy=".7"/>
           <feMerge>
@@ -98,23 +98,23 @@
               <feMergeNode in="SourceGraphic"/>
           </feMerge>
         </filter>
-        <filter id="outline">
+        <filter id="outline" name="Outline">
           <feGaussianBlur in="SourceAlpha" stdDeviation="1"/>
           <feMerge>
               <feMergeNode/>
               <feMergeNode in="SourceGraphic"/>
           </feMerge>
         </filter>
-        <filter id="pencil">
+        <filter id="pencil" name="Pencil">
           <feTurbulence baseFrequency="0.03" numOctaves="6" type="fractalNoise"/>
           <feDisplacementMap scale="3" in="SourceGraphic" xChannelSelector="R" yChannelSelector="G"/>
         </filter>
-        <filter id="turbulence">
+        <filter id="turbulence" name="Turbulence">
           <feTurbulence baseFrequency="0.1" numOctaves="3" type="fractalNoise"/>
           <feDisplacementMap scale="10" in="SourceGraphic" xChannelSelector="R" yChannelSelector="G"/>
         </filter>
 
-        <filter id="paper" x="-20%" y="-20%" width="140%" height="140%" filterUnits="objectBoundingBox" primitiveUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+        <filter id="paper" name="Paper" x="-20%" y="-20%" width="140%" height="140%" filterUnits="objectBoundingBox" primitiveUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
           <feGaussianBlur stdDeviation="1 1" x="0%" y="0%" width="100%" height="100%" in="SourceGraphic" edgeMode="none" result="blur"/>
           <feTurbulence type="fractalNoise" baseFrequency="0.05 0.05" numOctaves="4" seed="1" stitchTiles="stitch" result="turbulence"/>
           <feDiffuseLighting surfaceScale="2" diffuseConstant="1" lighting-color="#707070" in="turbulence" result="diffuseLighting">
@@ -124,7 +124,7 @@
           <feComposite in="composite" in2="SourceGraphic" operator="in" x="0%" y="0%" width="100%" height="100%" result="composite1"/>
         </filter>
 
-        <filter id="crumpled" x="-20%" y="-20%" width="140%" height="140%" filterUnits="objectBoundingBox" primitiveUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+        <filter id="crumpled" name="Crumpled" x="-20%" y="-20%" width="140%" height="140%" filterUnits="objectBoundingBox" primitiveUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
           <feGaussianBlur stdDeviation="2 2" x="0%" y="0%" width="100%" height="100%" in="SourceGraphic" edgeMode="none" result="blur"/>
           <feTurbulence type="turbulence" baseFrequency="0.05 0.05" numOctaves="4" seed="1" stitchTiles="stitch" result="turbulence"/>
           <feDiffuseLighting surfaceScale="2" diffuseConstant="1" lighting-color="#828282" in="turbulence" result="diffuseLighting">
@@ -134,16 +134,16 @@
           <feComposite in="composite" in2="SourceGraphic" operator="in" x="0%" y="0%" width="100%" height="100%" result="composite1"/>
         </filter>
 
-        <filter id="filter-grayscale">
+        <filter id="filter-grayscale" name="Grayscale">
           <feColorMatrix values="0.3333 0.3333 0.3333 0 0 0.3333 0.3333 0.3333 0 0 0.3333 0.3333 0.3333 0 0 0 0 0 1 0"/>
         </filter>
-        <filter id="filter-sepia">
+        <filter id="filter-sepia" name="Sepia">
           <feColorMatrix values="0.393 0.769 0.189 0 0 0.349 0.686 0.168 0 0 0.272 0.534 0.131 0 0 0 0 0 1 0"/>
         </filter>
-        <filter id="filter-dingy">
+        <filter id="filter-dingy" name="Dingy">
           <feColorMatrix values="1 0 0 0 0 0 1 0 0 0 0 0.3 0.3 0 0 0 0 0 1 0"></feColorMatrix>
         </filter>
-        <filter id="filter-tint">
+        <filter id="filter-tint" name="Tint">
           <feColorMatrix values="1.1 0 0 0 0  0 1.1 0 0 0  0 0 0.9 0 0  0 0 0 1 0"></feColorMatrix>
         </filter>
       </g>
@@ -235,7 +235,7 @@
   <div id="loading">
     <div id="titleName"><t data-t="titleName">Azgaar's</t></div>
     <div id="title"><t data-t="title">Fantasy Map Generator</t></div>
-    <div id="version"><t data-t="version">v. </t>1.63</div>
+    <div id="version"><t data-t="version">v. </t>1.65</div>
     <p id="loading-text"><t data-t="loading">LOADING</t><span>.</span><span>.</span><span>.</span></p>
   </div>
 
@@ -319,13 +319,15 @@
       </div>
 
       <div id="styleContent" class="tabcontent">
-        <p data-tip="Select a style preset" style="display: inline-block">Style preset:</p>
+        <p data-tip="Select a style preset. State labels may required regeneration if font is changed" style="display: inline-block">Style preset:</p>
         <select data-tip="Select a style preset" id="stylePreset" onchange="changeStylePreset(this.value)" style="width:45%">
           <option value="styleDefault" data-system=1 selected>Default</option>
           <option value="styleAncient" data-system=1>Ancient</option>
           <option value="styleGloom" data-system=1>Gloom</option>
           <option value="styleClean" data-system=1>Clean</option>
-          <option value="styleMonochrome" data-system=1>Monochrome (for heightmap)</option>
+          <option value="styleLight" data-system=1>Light</option>
+          <option value="styleWatercolor" data-system=1>Watercolor</option>
+          <option value="styleMonochrome" data-system=1>Monochrome</option>
         </select>
         <button id="addStyleButton" data-tip="Click to save current style as a new preset" class="icon-plus styleButton" style="display: inline-block" onclick="addStylePreset()"></button>
         <button id="removeStyleButton" data-tip="Click to remove current custom style preset" class="icon-minus styleButton" style="display: none" onclick="removeStylePreset()"></button>
@@ -367,16 +369,15 @@
           <option value="compass">Wind Rose</option>
           <option value="zones">Zones</option>
         </select>
-        <!-- <button id="restoreStyle" data-tip="Click to restore default style for all elements" class="icon-ccw styleButton" onclick="askToRestoreDefaultStyle()"></button> -->
 
         <table id="styleElements">
-          <caption id="styleIsOff" data-tip="The selected layer is not visible. See the buttons above to toggle it on">Please ensure the element is toggled on!</caption>
+          <caption id="styleIsOff" data-tip="The selected layer is not visible. Toogle it on to see style changes effect">Ensure the element visibility is toggled on!</caption>
 
           <tbody id="styleGroup">
             <tr data-tip="Select element group">
               <td><b>Group</b></td>
               <td>
-                <select id="styleGroupSelect"><option value="regions">regions</option></select>
+                <select id="styleGroupSelect"></select>
               </td>
             </tr>
           </tbody>
@@ -391,24 +392,6 @@
             </tr>
           </tbody>
 
-          <tbody id="styleStates" style="display: block">
-            <tr data-tip="Set states halo effect width">
-              <td>Halo width</td>
-              <td>
-                <input id="styleStatesHaloWidth" type="range" min=0 max=30 step=.1 value=10>
-                <output id="styleStatesHaloWidthOutput">10</output>
-              </td>
-            </tr>
-
-            <tr data-tip="Set states halo effect opacity. 0: invisible, 1: solid">
-              <td>Halo opacity</td>
-              <td>
-                <input id="styleStatesHaloOpacity" type="range" min=0 max=1 step=0.01 value=1>
-                <output id="styleStatesHaloOpacityOutput">1</output>
-              </td>
-            </tr>
-          </tbody>
-
           <tbody id="styleLegend">
             <tr data-tip="Set maximum number of items in one column">
               <td>Column items</td>
@@ -600,7 +583,7 @@
           </tbody>
 
           <tbody id="styleRelief">
-              <tr data-tip="Select set of relief icons. The change will trigger icons regeneration">
+              <tr data-tip="Select set of relief icons. All relief icons will be regenerated">
                   <td>Style</td>
                   <td>
                     <select id="styleReliefSet">
@@ -611,15 +594,15 @@
                   </td>
                 </tr>
 
-            <tr data-tip="Define the size of relief icons">
+            <tr data-tip="Define the size of relief icons. All relief icons will be regenerated">
               <td>Size</td>
               <td>
-                <input id="styleReliefSizeInput" data-stored="reliefSize" type="range" min=.2 max=3 step=.01 value=1>
-                <output id="styleReliefSizeOutput">1</output>
+                <input id="styleReliefSizeInput" data-stored="reliefSize" type="range" min=.2 max=4 step=.01>
+                <output id="styleReliefSizeOutput"></output>
               </td>
             </tr>
 
-            <tr data-tip="Define the density of relief icons. Highly affects performance!">
+            <tr data-tip="Define the density of relief icons. All relief icons will be regenerated. Highly affects performance!">
               <td>Density</td>
               <td>
                 <input id="styleReliefDensityInput" data-stored="reliefDensity" type="range" min=.3 max=.8 step=.01 value=.4>
@@ -697,8 +680,8 @@
             <tr data-tip="Set font size">
               <td>Font size</td>
               <td>
-                <button id="styleFontPlus" data-tip="Multiply font size by 1.1" class="whiteButton">+</button>
-                <button id="styleFontMinus" data-tip="Multiply font size by 0.9" class="whiteButton" >-</button>
+                <button id="styleFontPlus" data-tip="Increase font" class="whiteButton">+</button>
+                <button id="styleFontMinus" data-tip="Descrease font" class="whiteButton" >-</button>
                 <input id="styleFontSize" type="number" min=.5 max=100 step=.1 value=14>
               </td>
             </tr>
@@ -761,6 +744,45 @@
             </tr>
           </tbody>
 
+          <tbody id="styleStates" style="display: block">
+            <tr data-tip="Set states fill opacity. 0: invisible, 1: solid">
+              <td>Body opacity</td>
+              <td>
+                <input id="styleStatesBodyOpacity" type="range" min=0 max=1 step=0.01>
+                <output id="styleStatesBodyOpacityOutput"></output>
+              </td>
+            </tr>
+
+            <tr data-tip="Select filter for states fill. Please note filters may cause performance issues!">
+              <td>Body filter</td>
+              <td><select id="styleStatesBodyFilter"/></td>
+            </tr>
+
+            <tr data-tip="Set states halo effect width">
+              <td>Halo width</td>
+              <td>
+                <input id="styleStatesHaloWidth" type="range" min=0 max=30 step=.1 value=10>
+                <output id="styleStatesHaloWidthOutput">10</output>
+              </td>
+            </tr>
+
+            <tr data-tip="Set states halo effect opacity. 0: invisible, 1: solid">
+              <td>Halo opacity</td>
+              <td>
+                <input id="styleStatesHaloOpacity" type="range" min=0 max=1 step=0.01 value=1>
+                <output id="styleStatesHaloOpacityOutput">1</output>
+              </td>
+            </tr>
+
+            <tr data-tip="Select halo effect power (blur). Set to 0 to make it solid line">
+              <td>Halo blur</td>
+              <td>
+                <input id="styleStatesHaloBlur" type="range" min=0 max=10 step=0.01 value=4>
+                <output id="styleStatesHaloBlurOutput">4</output>
+              </td>
+            </tr>
+          </tbody>
+
           <tbody id="styleHeightmap">
             <tr data-tip="Select color scheme for the element">
               <td>Color scheme</td>
@@ -830,21 +852,21 @@
             <tr data-tip="Set state emblems size multiplier">
               <td>State Size</td>
               <td>
-                <input id="styleEmblemsStateSizeInput" data-stored="styleEmblemsStateSize" type="number" min=0 max=5 step=.02 value=1 />
+                <input id="emblemsStateSizeInput" data-stored="emblemsStateSize" type="number" min=0 max=5 step=.02 value=1 />
               </td>
             </tr>
 
             <tr data-tip="Set province emblems size multiplier">
               <td>Province Size</td>
               <td>
-                <input id="styleEmblemsProvinceSizeInput" data-stored="styleEmblemsProvinceSize" type="number" min=0 max=5 step=.02 value=1 />
+                <input id="emblemsProvinceSizeInput" data-stored="emblemsProvinceSize" type="number" min=0 max=5 step=.02 value=1 />
               </td>
             </tr>
 
             <tr data-tip="Set burg emblems size multiplier">
               <td>Burg Size</td>
               <td>
-                <input id="styleEmblemsBurgSizeInput" data-stored="styleEmblemsBurgSize" type="number" min=0 max=5 step=.02 value=1 />
+                <input id="emblemsBurgSizeInput" data-stored="emblemsBurgSize" type="number" min=0 max=5 step=.02 value=1 />
               </td>
             </tr>
 
@@ -859,29 +881,7 @@
           <tbody id="styleFilter" style="display: block">
             <tr data-tip="Select filter for element. Please note filters may cause performance issues!">
               <td>Filter</td>
-              <td>
-                <select id="styleFilterInput">
-                  <option value="" selected>None</option>
-                  <option value="url(#blurFilter)">Blur 0.2</option>
-                  <option value="url(#blur1)">Blur 1</option>
-                  <option value="url(#blur3)">Blur 3</option>
-                  <option value="url(#blur5)">Blur 5</option>
-                  <option value="url(#blur7)">Blur 7</option>
-                  <option value="url(#blur10)">Blur 10</option>
-                  <option value="url(#splotch)">Splotch</option>
-                  <option value="url(#bluredSplotch)">Blurred Splotch</option>
-                  <option value="url(#dropShadow01)">Shadow 0.1</option>
-                  <option value="url(#dropShadow05)">Shadow 0.5</option>
-                  <option value="url(#dropShadow)">Shadow 2</option>
-                  <option value="url(#outline)">Outline</option>
-                  <option value="url(#pencil)">Pencil</option>
-                  <option value="url(#turbulence)">Turbulence</option>
-                  <option value="url(#paper)">Paper</option>
-                  <option value="url(#crumpled)">Crumpled</option>
-                  <option value="url(#filter-grayscale)">Grayscale</option>
-                  <option value="url(#filter-sepia)">Sepia</option>
-                </select>
-              </td>
+              <td><select id="styleFilterInput"/></td>
             </tr>
           </tbody>
 
@@ -923,6 +923,13 @@
                 <label for="hideLabels" class="checkbox-label">Toggle visibility automatically</label>
               </td>
             </tr>
+
+            <tr data-tip="Allow system to rescale labels on zoom">
+              <td colspan=2>
+                <input id="rescaleLabels" class="checkbox" type="checkbox" onchange="invokeActiveZooming()" checked>
+                <label for="rescaleLabels" class="checkbox-label">Rescale on zoom</label>
+              </td>
+            </tr>
           </tbody>
         </table>
 
@@ -1013,17 +1020,18 @@
             <td>Map template</td>
             <td>
               <select id="templateInput" data-stored="template">
-                <option value="Volcano">Volcano</option>
-                <option value="High Island">High Island</option>
-                <option value="Low Island">Low Island</option>
-                <option value="Continents">Two Continents</option>
-                <option value="Archipelago">Archipelago</option>
-                <option value="Atoll">Atoll</option>
-                <option value="Mediterranean">Mediterranean</option>
-                <option value="Peninsula">Peninsula</option>
-                <option value="Pangea">Pangea</option>
-                <option value="Isthmus">Isthmus</option>
-                <option value="Shattered">Shattered</option>
+                <option value="volcano">Volcano</option>
+                <option value="highIsland">High Island</option>
+                <option value="lowIsland">Low Island</option>
+                <option value="continents">Two Continents</option>
+                <option value="archipelago">Archipelago</option>
+                <option value="atoll">Atoll</option>
+                <option value="mediterranean">Mediterranean</option>
+                <option value="peninsula">Peninsula</option>
+                <option value="pangea">Pangea</option>
+                <option value="isthmus">Isthmus</option>
+                <option value="shattered">Shattered</option>
+                <option value="taklamakan">Taklamakan</option>
               </select>
             </td>
             <td></td>
@@ -1291,6 +1299,18 @@
             </td>
           </tr>
 
+          <tr data-tip="Select shape rendering model">
+            <td></td>
+            <td>Shape rendering</td>
+            <td>
+              <select id="shapeRendering" data-stored="shapeRendering">
+                <option value="geometricPrecision" selected>Best quality</option>
+                <option value="optimizeSpeed">Best performace</option>
+              </select>
+            </td>
+            <td></td>
+          </tr>
+
           <!-- <tr data-tip="Select language (not all languages are fully supported). Reload the page to apply">
             <td></td>
             <td>Language</td>
@@ -1357,7 +1377,7 @@
 
         <div id="addFeature">
           <p>Click to add:</p>
-          <button id="addBurgTool" data-tip="Click on map to place a burg. Hold Shift to add multiple. Shortcut: Shift + 1">Burg</button>
+          <button id="addBurgTool" data-tip="Click on map to place a burg. Hold <kbd>Shift</kbd> to add multiple. Shortcut: Shift + 1">Burg</button>
           <button id="addLabel" data-tip="Click on map to place label. Hold Shift to add multiple. Shortcut: Shift + 2">Label</button>
           <button id="addRiver" data-tip="Click on map to place a river. Hold Shift to add multiple. Shortcut: Shift + 3">River</button>
           <button id="addRoute" data-tip="Click on map to place a route. Shortcut: Shift + 4">Route</button>
@@ -1647,19 +1667,19 @@
           <input id="riverWidth" disabled/>
         </div>
 
-        <div data-tip="River source width in pixels">
+        <div data-tip="River additional width. Default value is 0">
           <div class="label">Source width:</div>
           <input id="riverSourceWidth" type="number" min=0 max=3 step=.1 />
         </div>
 
-        <div data-tip="River width multiplier">
+        <div data-tip="River width multiplier. Default value is 1">
           <div class="label">Width modifier:</div>
           <input id="riverWidthFactor" type="number" min=.1 max=4 step=.1 />
         </div>
       </div>
 
       <div id="riverBottom">
-        <button id="riverNew" data-tip="Create new river clicking on map" class="icon-map-pin"></button>
+        <button id="riverCreateSelectingCells" data-tip="Create new river selecting river cells" class="icon-map-pin"></button>
         <button id="riverEditStyle" data-tip="Edit style for all rivers in Style Editor" class="icon-brush"></button>
         <button id="riverElevationProfile" data-tip="Show the elevation profile for the river" class="icon-chart-area"></button>
         <button id="riverLegend" data-tip="Edit free text notes (legend) for the river" class="icon-edit"></button>
@@ -1667,6 +1687,14 @@
       </div>
     </div>
 
+    <div id="riverCreator" class="dialog" style="display: none">
+      <div id="riverCreatorBody" class="table"></div>
+      <div id="riverCreatorBottom">
+        <button id="riverCreatorComplete" data-tip="Complete river creation" class="icon-check"></button>
+        <button id="riverCreatorCancel" data-tip="Cancel the creation" class="icon-cancel"></button>
+      </div>
+    </div>
+
     <div id="lakeEditor" class="dialog" style="display: none">
       <div id="lakeBody" style="padding-bottom: .3em">
         <div>
@@ -1927,7 +1955,7 @@
         <button id="reliefCopy" data-tip="Copy selected relief icon" class="icon-clone"></button>
         <button id="reliefMoveFront" data-tip="Move selected relief icon to front" class="icon-level-up"></button>
         <button id="reliefMoveBack" data-tip="Move selected relief icon back" class="icon-level-down"></button>
-        <button id="reliefRemove" data-tip="Remove selected relief icon. Shortcut: Delete" class="icon-trash fastDelete"></button>
+        <button id="reliefRemove" data-tip="Remove selected relief icon or icon type. Shortcut: Delete" class="icon-trash fastDelete"></button>
       </div>
     </div>
 
@@ -2327,18 +2355,19 @@
     <div id="templateEditor" class="dialog stable" style="display: none">
       <div id="templateTop">
         <i>Select template: </i><select id="templateSelect" style="width:16em" data-prev="templateCustom" data-tip="Select base template">
-          <option value="templateCustom" selected>Custom</option>
-          <option value="templateVolcano">Volcano</option>
-          <option value="templateHighIsland">High Island</option>
-          <option value="templateLowIsland">Low Island</option>
-          <option value="templateContinents">Two Continents</option>
-          <option value="templateArchipelago">Archipelago</option>
-          <option value="templateAtoll">Atoll</option>
-          <option value="templateMediterranean">Mediterranean</option>
-          <option value="templatePeninsula">Peninsula</option>
-          <option value="templatePangea">Pangea</option>
-          <option value="templateIsthmus">Isthmus</option>
-          <option value="templateShattered">Shattered</option>
+          <option value="custom" selected>Custom</option>
+          <option value="volcano">Volcano</option>
+          <option value="highIsland">High Island</option>
+          <option value="lowIsland">Low Island</option>
+          <option value="continents">Two Continents</option>
+          <option value="archipelago">Archipelago</option>
+          <option value="atoll">Atoll</option>
+          <option value="mediterranean">Mediterranean</option>
+          <option value="peninsula">Peninsula</option>
+          <option value="pangea">Pangea</option>
+          <option value="isthmus">Isthmus</option>
+          <option value="shattered">Shattered</option>
+          <option value="taklamakan">Taklamakan</option>
         </select>
       </div>
       <div id="templateTools">
@@ -2553,6 +2582,7 @@
             <option value="Diarchy">Diarchy</option>
             <option value="Federation">Federation</option>
             <option value="Free City">Free City</option>
+            <option value="Most Serene Republic">Most Serene Republic</option>
             <option value="Oligarchy">Oligarchy</option>
             <option value="Protectorate">Protectorate</option>
             <option value="Republic">Republic</option>
@@ -2575,10 +2605,17 @@
             <option value="Tribes">United Tribes</option>
           </optgroup>
           <optgroup label="Theocracy">
+            <option value="Bishopric">Bishopric</option>
             <option value="Brotherhood">Brotherhood</option>
             <option value="Caliphate">Caliphate</option>
             <option value="Diocese">Diocese</option>
+            <option value="Divine Duchy">Divine Duchy</option>
+            <option value="Divine Grand Duchy">Divine Grand Duchy</option>
+            <option value="Divine Principality">Divine Principality</option>
+            <option value="Divine Kingdom">Divine Kingdom</option>
+            <option value="Divine Empire">Divine Empire</option>
             <option value="Eparchy">Eparchy</option>
+            <option value="Holy State">Holy State</option>
             <option value="Imamah">Imamah</option>
             <option value="Theocracy">Theocracy</option>
           </optgroup>
@@ -3275,7 +3312,8 @@
 
       <div id="riversBottom">
         <button id="riversOverviewRefresh" data-tip="Refresh the Editor" class="icon-cw"></button>
-        <button id="addNewRiver" data-tip="Add a new river. Hold Shift to add multiple" class="icon-plus"></button>
+        <button id="addNewRiver" data-tip="Automatically add river starting from clicked cell. Hold Shift to add multiple" class="icon-plus"></button>
+        <button id="riverCreateNew" data-tip="Create new river selecting river cells" class="icon-map-pin"></button>
         <button id="riversBasinHighlight" data-tip="Toggle basin highlight mode" class="icon-sitemap"></button>
         <button id="riversExport" data-tip="Save rivers-related data as a text file (.csv)" class="icon-download"></button>
         <button id="riversRemoveAll" data-tip="Remove all rivers" class="icon-trash"></button>
@@ -3432,6 +3470,11 @@
           <input id="options3dSunZ" type="number" min=-1500 max=1500 step=100 style="width:4.7em">
         </div>
 
+        <div data-tip="Toggle 3d labels" style="margin: .6em 0 .3em -.2em">
+          <input id="options3dMeshLabels3d" class="checkbox" type="checkbox">
+          <label for="options3dMeshLabels3d" class="checkbox-label"><i>Show 3D labels</i></label>
+        </div>
+
         <div data-tip="Toggle sky mode" style="margin: .6em 0 .3em -.2em">
           <input id="options3dMeshSkyMode" class="checkbox" type="checkbox">
           <label for="options3dMeshSkyMode" class="checkbox-label"><i>Show sky and extend water</i></label>
@@ -3601,12 +3644,12 @@
           <path d="m20,58 h70 m-62,3 h50" stroke="#5c5c70" stroke-dasharray="7, 11" stroke-width="1"></path>
         </symbol>
         <symbol id="relief-deciduous-1" viewBox="0 0 100 100">
-          <path d="m50,52 v7 h1 v-7 h-0.5 q13,-7 0,-16 q-13,9 0,16" fill="#fff" stroke="#5c5c70"></path>
-          <path d="m50,52 q-12,-7 0,-16 q-3.5,10 0,15.5" fill="#999999"></path>
+          <path d="m49.5,52 v7 h1 v-7 h-0.5 q13,-7 0,-16 q-13,9 0,16" fill="#fff" stroke="#5c5c70"></path>
+          <path d="M 50,51.5 C 44,49 40,43 50,36.5" fill="#999999"></path>
         </symbol>
         <symbol id="relief-conifer-1" viewBox="0 0 100 100">
-          <path d="m50,55 v4 h1 v-4 l4.5,0 -4,-8 l3.5,0 -4.5,-9 -4,9 3,0 -3.5,8 7,0" fill="#fff" stroke="#5c5c70"></path>
-          <path d="m46,55 l4,-8 -4,0 5,-9 -2.5,9 l1.5,0 -2,8" fill="#999999"></path>
+          <path d="m49.5,55 v4 h1 v-4 l4.5,0 -4,-8 l3.5,0 -4.5,-9 -4,9 3,0 -3.5,8 7,0" fill="#fff" stroke="#5c5c70"></path>
+          <path d="m 46,54.5 3.5,-8 H 46.6 L 50,39 v 15.5 z" fill="#999999"></path>
         </symbol>
         <symbol id="relief-acacia-1" viewBox="0 0 100 100">
           <path d="m34.5 44.5 c 1.8, -3 8.1, -5.7 12.6, -5.4 6, -2.2 9.3, -0.9 11.9, 1.3 1.7, 0.2 3.2,-0.3 5.2, 2.2 2.7, 1.2 3.7, 2.4 2.7, 3.7 -1.6, 0.3 -2.2, 0 -4.7, -1.6 -5.2, 0.1 -7, 0.7 -8.7, -0.9 -2.8, 1 -3.6, 0 -9.7, 0.2 -4.6, 0 -8, 1.6 -9.3, 0.4 z" fill="#fff"></path>
@@ -3623,7 +3666,7 @@
           <path d="m 49.5,53.1 c 0,-3.4 -2.4,-4.8 -3,-5.4 1,1.8 2.4,3.7 1.8,5.4 z M 51,53.2 C 51.4,49.6 49.6,47.9 48,46.8 c 1.1,1.8 2.8,4.6 1.8,6.5 z M 51.4,51.4 c 0.6,-1.9 1.8,-3.4 3,-4.3 -0.8,0.3 -2.9,1.5 -3.4,2.8 0.2,0.4 0.3,0.8 0.4,1.5 z M 52.9,53.2 c -0.7,-1.9 0.5,-3.3 1.5,-4.4 -1.7,1 -3,2.2 -2.7,4.4 z" fill="#5c5c70" stroke="none"></path>
         </symbol>
         <symbol id="relief-swamp-1" viewBox="0 0 100 100">
-          <path d="m50,46 v6 l3,-4 m-3,4 l-3,-4 m-7,4.5 h4 m4,0 h4 m4,0 h4" fill="none" stroke="#5c5c70"></path>
+          <path d="m 50,46 v 6 m 0,0 3,-4 m -3,4 -3,-4 m -6,4.5 h 3 m 4,0 h 4 m 4,0 3,0" fill="none" stroke="#5c5c70" stroke-linecap="round"></path>
         </symbol>
         <symbol id="relief-dune-1" viewBox="0 0 100 100">
           <path d="m 28.7,52.8 c 5,-3.9 10,-8.2 15.8,-8.3 4.5,0 10.8,3.8 15.2,6.5 3.5,2.2 6.8,2 6.8,2" fill="none" stroke="#5c5c70" stroke-width="1.8"></path>
@@ -4432,6 +4475,7 @@
   <script src="libs/delaunator.min.js"></script>
   <script src="modules/utils.js"></script>
   <script src="modules/voronoi.js"></script>
+  <script src="modules/heightmap-templates.js"></script>
   <script src="modules/heightmap-generator.js"></script>
   <script src="modules/ocean-layers.js"></script>
   <script src="modules/river-generator.js"></script>
@@ -4448,6 +4492,7 @@
   <script src="libs/lineclip.min.js"></script>
   <script src="libs/jquery-ui.min.js"></script>
   <script src="libs/alea.min.js"></script>
+  <script src="modules/fonts.js"></script>
   <script src="modules/ui/layers.js"></script>
   <script src="modules/ui/measurers.js"></script>
 
@@ -4473,6 +4518,7 @@
   <script defer src="modules/ui/coastline-editor.js"></script>
   <script defer src="modules/ui/labels-editor.js"></script>
   <script defer src="modules/ui/rivers-editor.js"></script>
+  <script defer src="modules/ui/rivers-creator.js"></script>
   <script defer src="modules/ui/relief-editor.js"></script>
   <script defer src="modules/ui/religions-editor.js"></script>
   <script defer src="modules/ui/markers-editor.js"></script>
diff --git a/libs/delaunator.min.js b/libs/delaunator.min.js
index 6c8af070..1f63da53 100644
--- a/libs/delaunator.min.js
+++ b/libs/delaunator.min.js
@@ -1 +1 @@
-!function(t,i){"object"==typeof exports&&"undefined"!=typeof module?module.exports=i():"function"==typeof define&&define.amd?define(i):t.Delaunator=i()}(this,function(){"use strict";var t=Math.pow(2,-52),i=function(i){var n=i.length>>1;if(n>0&&"number"!=typeof i[0])throw new Error("Expected coords to contain numbers.");this.coords=i;var s=2*n-5,l=this.triangles=new Uint32Array(3*s),o=this.halfedges=new Int32Array(3*s);this._hashSize=Math.ceil(Math.sqrt(n));for(var f=this.hullPrev=new Uint32Array(n),u=this.hullNext=new Uint32Array(n),v=this.hullTri=new Uint32Array(n),d=new Int32Array(this._hashSize).fill(-1),_=new Uint32Array(n),y=1/0,g=1/0,c=-1/0,w=-1/0,p=0;p<n;p++){var b=i[2*p],x=i[2*p+1];b<y&&(y=b),x<g&&(g=x),b>c&&(c=b),x>w&&(w=x),_[p]=p}for(var z,S,k,A=(y+c)/2,T=(g+w)/2,M=1/0,K=0;K<n;K++){var m=r(A,T,i[2*K],i[2*K+1]);m<M&&(z=K,M=m)}var U=i[2*z],L=i[2*z+1];M=1/0;for(var N=0;N<n;N++)if(N!==z){var E=r(U,L,i[2*N],i[2*N+1]);E<M&&E>0&&(S=N,M=E)}for(var D=i[2*S],F=i[2*S+1],I=1/0,P=0;P<n;P++)if(P!==z&&P!==S){var j=h(U,L,D,F,i[2*P],i[2*P+1]);j<I&&(k=P,I=j)}var q=i[2*k],B=i[2*k+1];if(I===1/0)throw new Error("No Delaunay triangulation exists for this input.");if(a(U,L,D,F,q,B)){var C=S,G=D,H=F;S=k,D=q,F=B,k=C,q=G,B=H}var J=function(t,i,r,a,h,e){var n=r-t,s=a-i,l=h-t,o=e-i,f=n*n+s*s,u=l*l+o*o,v=.5/(n*o-s*l);return{x:t+(o*f-s*u)*v,y:i+(n*u-l*f)*v}}(U,L,D,F,q,B);this._cx=J.x,this._cy=J.y;for(var O=new Float64Array(n),Q=0;Q<n;Q++)O[Q]=r(i[2*Q],i[2*Q+1],J.x,J.y);!function t(i,r,a,h){if(h-a<=20)for(var n=a+1;n<=h;n++){for(var s=i[n],l=r[s],o=n-1;o>=a&&r[i[o]]>l;)i[o+1]=i[o--];i[o+1]=s}else{var f=a+h>>1,u=a+1,v=h;e(i,f,u),r[i[a]]>r[i[h]]&&e(i,a,h),r[i[u]]>r[i[h]]&&e(i,u,h),r[i[a]]>r[i[u]]&&e(i,a,u);for(var d=i[u],_=r[d];;){do{u++}while(r[i[u]]<_);do{v--}while(r[i[v]]>_);if(v<u)break;e(i,u,v)}i[a+1]=i[v],i[v]=d,h-u+1>=v-a?(t(i,r,u,h),t(i,r,a,v-1)):(t(i,r,a,v-1),t(i,r,u,h))}}(_,O,0,n-1),this.hullStart=z;var R=3;u[z]=f[k]=S,u[S]=f[z]=k,u[k]=f[S]=z,v[z]=0,v[S]=1,v[k]=2,d[this._hashKey(U,L)]=z,d[this._hashKey(D,F)]=S,d[this._hashKey(q,B)]=k,this.trianglesLen=0,this._addTriangle(z,S,k,-1,-1,-1);for(var V=0,W=void 0,X=void 0;V<_.length;V++){var Y=_[V],Z=i[2*Y],$=i[2*Y+1];if(!(V>0&&Math.abs(Z-W)<=t&&Math.abs($-X)<=t)&&(W=Z,X=$,Y!==z&&Y!==S&&Y!==k)){for(var tt=0,it=0,rt=this._hashKey(Z,$);it<this._hashSize&&(-1===(tt=d[(rt+it)%this._hashSize])||tt===u[tt]);it++);for(var at=tt=f[tt],ht=void 0;ht=u[at],!a(Z,$,i[2*at],i[2*at+1],i[2*ht],i[2*ht+1]);)if((at=ht)===tt){at=-1;break}if(-1!==at){var et=this._addTriangle(at,Y,u[at],-1,-1,v[at]);v[Y]=this._legalize(et+2),v[at]=et,R++;for(var nt=u[at];ht=u[nt],a(Z,$,i[2*nt],i[2*nt+1],i[2*ht],i[2*ht+1]);)et=this._addTriangle(nt,Y,ht,v[Y],-1,v[nt]),v[Y]=this._legalize(et+2),u[nt]=nt,R--,nt=ht;if(at===tt)for(;a(Z,$,i[2*(ht=f[at])],i[2*ht+1],i[2*at],i[2*at+1]);)et=this._addTriangle(ht,Y,at,-1,v[at],v[ht]),this._legalize(et+2),v[ht]=et,u[at]=at,R--,at=ht;this.hullStart=f[Y]=at,u[at]=f[nt]=Y,u[Y]=nt,d[this._hashKey(Z,$)]=Y,d[this._hashKey(i[2*at],i[2*at+1])]=at}}}this.hull=new Uint32Array(R);for(var st=0,lt=this.hullStart;st<R;st++)this.hull[st]=lt,lt=u[lt];this.hullPrev=this.hullNext=this.hullTri=null,this.triangles=l.subarray(0,this.trianglesLen),this.halfedges=o.subarray(0,this.trianglesLen)};function r(t,i,r,a){var h=t-r,e=i-a;return h*h+e*e}function a(t,i,r,a,h,e){return(a-i)*(h-r)-(r-t)*(e-a)<0}function h(t,i,r,a,h,e){var n=r-t,s=a-i,l=h-t,o=e-i,f=n*n+s*s,u=l*l+o*o,v=.5/(n*o-s*l),d=(o*f-s*u)*v,_=(n*u-l*f)*v;return d*d+_*_}function e(t,i,r){var a=t[i];t[i]=t[r],t[r]=a}function n(t){return t[0]}function s(t){return t[1]}return i.from=function(t,r,a){void 0===r&&(r=n),void 0===a&&(a=s);for(var h=t.length,e=new Float64Array(2*h),l=0;l<h;l++){var o=t[l];e[2*l]=r(o),e[2*l+1]=a(o)}return new i(e)},i.prototype._hashKey=function(t,i){return Math.floor((r=t-this._cx,a=i-this._cy,h=r/(Math.abs(r)+Math.abs(a)),(a>0?3-h:1+h)/4*this._hashSize))%this._hashSize;var r,a,h},i.prototype._legalize=function(t){var i=this.triangles,r=this.coords,a=this.halfedges,h=a[t],e=t-t%3,n=h-h%3,s=e+(t+1)%3,l=e+(t+2)%3,o=n+(h+2)%3;if(-1===h)return l;var f,u,v,d,_,y,g,c,w,p,b,x,z,S,k,A,T=i[l],M=i[t],K=i[s],m=i[o];if(f=r[2*T],u=r[2*T+1],v=r[2*M],d=r[2*M+1],_=r[2*K],y=r[2*K+1],g=r[2*m],c=r[2*m+1],(w=f-g)*((x=d-c)*(A=(z=_-g)*z+(S=y-c)*S)-(k=(b=v-g)*b+x*x)*S)-(p=u-c)*(b*A-k*z)+(w*w+p*p)*(b*S-x*z)<0){i[t]=m,i[h]=T;var U=a[o];if(-1===U){var L=this.hullStart;do{if(this.hullTri[L]===o){this.hullTri[L]=t;break}L=this.hullNext[L]}while(L!==this.hullStart)}this._link(t,U),this._link(h,a[l]),this._link(l,o);var N=n+(h+1)%3;return this._legalize(t),this._legalize(N)}return l},i.prototype._link=function(t,i){this.halfedges[t]=i,-1!==i&&(this.halfedges[i]=t)},i.prototype._addTriangle=function(t,i,r,a,h,e){var n=this.trianglesLen;return this.triangles[n]=t,this.triangles[n+1]=i,this.triangles[n+2]=r,this._link(n,a),this._link(n+1,h),this._link(n+2,e),this.trianglesLen+=3,n},i});
+!function(t,i){"object"==typeof exports&&"undefined"!=typeof module?module.exports=i():"function"==typeof define&&define.amd?define(i):(t="undefined"!=typeof globalThis?globalThis:t||self).Delaunator=i()}(this,(function(){"use strict";const t=134217729;function i(t,i,s,e,n){let h,r,l,o,a=i[0],f=e[0],c=0,u=0;f>a==f>-a?(h=a,a=i[++c]):(h=f,f=e[++u]);let _=0;if(c<t&&u<s)for(f>a==f>-a?(r=a+h,l=h-(r-a),a=i[++c]):(r=f+h,l=h-(r-f),f=e[++u]),h=r,0!==l&&(n[_++]=l);c<t&&u<s;)f>a==f>-a?(r=h+a,o=r-h,l=h-(r-o)+(a-o),a=i[++c]):(r=h+f,o=r-h,l=h-(r-o)+(f-o),f=e[++u]),h=r,0!==l&&(n[_++]=l);for(;c<t;)r=h+a,o=r-h,l=h-(r-o)+(a-o),a=i[++c],h=r,0!==l&&(n[_++]=l);for(;u<s;)r=h+f,o=r-h,l=h-(r-o)+(f-o),f=e[++u],h=r,0!==l&&(n[_++]=l);return 0===h&&0!==_||(n[_++]=h),_}function s(t){return new Float64Array(t)}const e=s(4),n=s(8),h=s(12),r=s(16),l=s(4);function o(s,o,a,f,c,u){const _=(o-u)*(a-c),d=(s-c)*(f-u),g=_-d;if(0===_||0===d||_>0!=d>0)return g;const y=Math.abs(_+d);return Math.abs(g)>=33306690738754716e-32*y?g:-function(s,o,a,f,c,u,_){let d,g,y,w,b,A,k,M,p,x,S,T,z,U,m,K,L,v;const F=s-c,P=a-c,E=o-u,H=f-u;U=F*H,A=t*F,k=A-(A-F),M=F-k,A=t*H,p=A-(A-H),x=H-p,m=M*x-(U-k*p-M*p-k*x),K=E*P,A=t*E,k=A-(A-E),M=E-k,A=t*P,p=A-(A-P),x=P-p,L=M*x-(K-k*p-M*p-k*x),S=m-L,b=m-S,e[0]=m-(S+b)+(b-L),T=U+S,b=T-U,z=U-(T-b)+(S-b),S=z-K,b=z-S,e[1]=z-(S+b)+(b-K),v=T+S,b=v-T,e[2]=T-(v-b)+(S-b),e[3]=v;let I=function(t,i){let s=i[0];for(let e=1;e<t;e++)s+=i[e];return s}(4,e),N=22204460492503146e-32*_;if(I>=N||-I>=N)return I;if(b=s-F,d=s-(F+b)+(b-c),b=a-P,y=a-(P+b)+(b-c),b=o-E,g=o-(E+b)+(b-u),b=f-H,w=f-(H+b)+(b-u),0===d&&0===g&&0===y&&0===w)return I;if(N=11093356479670487e-47*_+33306690738754706e-32*Math.abs(I),I+=F*w+H*d-(E*y+P*g),I>=N||-I>=N)return I;U=d*H,A=t*d,k=A-(A-d),M=d-k,A=t*H,p=A-(A-H),x=H-p,m=M*x-(U-k*p-M*p-k*x),K=g*P,A=t*g,k=A-(A-g),M=g-k,A=t*P,p=A-(A-P),x=P-p,L=M*x-(K-k*p-M*p-k*x),S=m-L,b=m-S,l[0]=m-(S+b)+(b-L),T=U+S,b=T-U,z=U-(T-b)+(S-b),S=z-K,b=z-S,l[1]=z-(S+b)+(b-K),v=T+S,b=v-T,l[2]=T-(v-b)+(S-b),l[3]=v;const j=i(4,e,4,l,n);U=F*w,A=t*F,k=A-(A-F),M=F-k,A=t*w,p=A-(A-w),x=w-p,m=M*x-(U-k*p-M*p-k*x),K=E*y,A=t*E,k=A-(A-E),M=E-k,A=t*y,p=A-(A-y),x=y-p,L=M*x-(K-k*p-M*p-k*x),S=m-L,b=m-S,l[0]=m-(S+b)+(b-L),T=U+S,b=T-U,z=U-(T-b)+(S-b),S=z-K,b=z-S,l[1]=z-(S+b)+(b-K),v=T+S,b=v-T,l[2]=T-(v-b)+(S-b),l[3]=v;const q=i(j,n,4,l,h);U=d*w,A=t*d,k=A-(A-d),M=d-k,A=t*w,p=A-(A-w),x=w-p,m=M*x-(U-k*p-M*p-k*x),K=g*y,A=t*g,k=A-(A-g),M=g-k,A=t*y,p=A-(A-y),x=y-p,L=M*x-(K-k*p-M*p-k*x),S=m-L,b=m-S,l[0]=m-(S+b)+(b-L),T=U+S,b=T-U,z=U-(T-b)+(S-b),S=z-K,b=z-S,l[1]=z-(S+b)+(b-K),v=T+S,b=v-T,l[2]=T-(v-b)+(S-b),l[3]=v;const D=i(q,h,4,l,r);return r[D-1]}(s,o,a,f,c,u,y)}const a=Math.pow(2,-52),f=new Uint32Array(512);class c{static from(t,i=w,s=b){const e=t.length,n=new Float64Array(2*e);for(let h=0;h<e;h++){const e=t[h];n[2*h]=i(e),n[2*h+1]=s(e)}return new c(n)}constructor(t){const i=t.length>>1;if(i>0&&"number"!=typeof t[0])throw new Error("Expected coords to contain numbers.");this.coords=t;const s=Math.max(2*i-5,0);this._triangles=new Uint32Array(3*s),this._halfedges=new Int32Array(3*s),this._hashSize=Math.ceil(Math.sqrt(i)),this._hullPrev=new Uint32Array(i),this._hullNext=new Uint32Array(i),this._hullTri=new Uint32Array(i),this._hullHash=new Int32Array(this._hashSize).fill(-1),this._ids=new Uint32Array(i),this._dists=new Float64Array(i),this.update()}update(){const{coords:t,_hullPrev:i,_hullNext:s,_hullTri:e,_hullHash:n}=this,h=t.length>>1;let r=1/0,l=1/0,f=-1/0,c=-1/0;for(let i=0;i<h;i++){const s=t[2*i],e=t[2*i+1];s<r&&(r=s),e<l&&(l=e),s>f&&(f=s),e>c&&(c=e),this._ids[i]=i}const _=(r+f)/2,y=(l+c)/2;let w,b,A,k=1/0;for(let i=0;i<h;i++){const s=u(_,y,t[2*i],t[2*i+1]);s<k&&(w=i,k=s)}const M=t[2*w],p=t[2*w+1];k=1/0;for(let i=0;i<h;i++){if(i===w)continue;const s=u(M,p,t[2*i],t[2*i+1]);s<k&&s>0&&(b=i,k=s)}let x=t[2*b],S=t[2*b+1],T=1/0;for(let i=0;i<h;i++){if(i===w||i===b)continue;const s=d(M,p,x,S,t[2*i],t[2*i+1]);s<T&&(A=i,T=s)}let z=t[2*A],U=t[2*A+1];if(T===1/0){for(let i=0;i<h;i++)this._dists[i]=t[2*i]-t[0]||t[2*i+1]-t[1];g(this._ids,this._dists,0,h-1);const i=new Uint32Array(h);let s=0;for(let t=0,e=-1/0;t<h;t++){const n=this._ids[t];this._dists[n]>e&&(i[s++]=n,e=this._dists[n])}return this.hull=i.subarray(0,s),this.triangles=new Uint32Array(0),void(this.halfedges=new Uint32Array(0))}if(o(M,p,x,S,z,U)<0){const t=b,i=x,s=S;b=A,x=z,S=U,A=t,z=i,U=s}const m=function(t,i,s,e,n,h){const r=s-t,l=e-i,o=n-t,a=h-i,f=r*r+l*l,c=o*o+a*a,u=.5/(r*a-l*o);return{x:t+(a*f-l*c)*u,y:i+(r*c-o*f)*u}}(M,p,x,S,z,U);this._cx=m.x,this._cy=m.y;for(let i=0;i<h;i++)this._dists[i]=u(t[2*i],t[2*i+1],m.x,m.y);g(this._ids,this._dists,0,h-1),this._hullStart=w;let K=3;s[w]=i[A]=b,s[b]=i[w]=A,s[A]=i[b]=w,e[w]=0,e[b]=1,e[A]=2,n.fill(-1),n[this._hashKey(M,p)]=w,n[this._hashKey(x,S)]=b,n[this._hashKey(z,U)]=A,this.trianglesLen=0,this._addTriangle(w,b,A,-1,-1,-1);for(let h,r,l=0;l<this._ids.length;l++){const f=this._ids[l],c=t[2*f],u=t[2*f+1];if(l>0&&Math.abs(c-h)<=a&&Math.abs(u-r)<=a)continue;if(h=c,r=u,f===w||f===b||f===A)continue;let _=0;for(let t=0,i=this._hashKey(c,u);t<this._hashSize&&(_=n[(i+t)%this._hashSize],-1===_||_===s[_]);t++);_=i[_];let d,g=_;for(;d=s[g],o(c,u,t[2*g],t[2*g+1],t[2*d],t[2*d+1])>=0;)if(g=d,g===_){g=-1;break}if(-1===g)continue;let y=this._addTriangle(g,f,s[g],-1,-1,e[g]);e[f]=this._legalize(y+2),e[g]=y,K++;let k=s[g];for(;d=s[k],o(c,u,t[2*k],t[2*k+1],t[2*d],t[2*d+1])<0;)y=this._addTriangle(k,f,d,e[f],-1,e[k]),e[f]=this._legalize(y+2),s[k]=k,K--,k=d;if(g===_)for(;d=i[g],o(c,u,t[2*d],t[2*d+1],t[2*g],t[2*g+1])<0;)y=this._addTriangle(d,f,g,-1,e[g],e[d]),this._legalize(y+2),e[d]=y,s[g]=g,K--,g=d;this._hullStart=i[f]=g,s[g]=i[k]=f,s[f]=k,n[this._hashKey(c,u)]=f,n[this._hashKey(t[2*g],t[2*g+1])]=g}this.hull=new Uint32Array(K);for(let t=0,i=this._hullStart;t<K;t++)this.hull[t]=i,i=s[i];this.triangles=this._triangles.subarray(0,this.trianglesLen),this.halfedges=this._halfedges.subarray(0,this.trianglesLen)}_hashKey(t,i){return Math.floor(function(t,i){const s=t/(Math.abs(t)+Math.abs(i));return(i>0?3-s:1+s)/4}(t-this._cx,i-this._cy)*this._hashSize)%this._hashSize}_legalize(t){const{_triangles:i,_halfedges:s,coords:e}=this;let n=0,h=0;for(;;){const r=s[t],l=t-t%3;if(h=l+(t+2)%3,-1===r){if(0===n)break;t=f[--n];continue}const o=r-r%3,a=l+(t+1)%3,c=o+(r+2)%3,u=i[h],d=i[t],g=i[a],y=i[c];if(_(e[2*u],e[2*u+1],e[2*d],e[2*d+1],e[2*g],e[2*g+1],e[2*y],e[2*y+1])){i[t]=y,i[r]=u;const e=s[c];if(-1===e){let i=this._hullStart;do{if(this._hullTri[i]===c){this._hullTri[i]=t;break}i=this._hullPrev[i]}while(i!==this._hullStart)}this._link(t,e),this._link(r,s[h]),this._link(h,c);const l=o+(r+1)%3;n<f.length&&(f[n++]=l)}else{if(0===n)break;t=f[--n]}}return h}_link(t,i){this._halfedges[t]=i,-1!==i&&(this._halfedges[i]=t)}_addTriangle(t,i,s,e,n,h){const r=this.trianglesLen;return this._triangles[r]=t,this._triangles[r+1]=i,this._triangles[r+2]=s,this._link(r,e),this._link(r+1,n),this._link(r+2,h),this.trianglesLen+=3,r}}function u(t,i,s,e){const n=t-s,h=i-e;return n*n+h*h}function _(t,i,s,e,n,h,r,l){const o=t-r,a=i-l,f=s-r,c=e-l,u=n-r,_=h-l,d=f*f+c*c,g=u*u+_*_;return o*(c*g-d*_)-a*(f*g-d*u)+(o*o+a*a)*(f*_-c*u)<0}function d(t,i,s,e,n,h){const r=s-t,l=e-i,o=n-t,a=h-i,f=r*r+l*l,c=o*o+a*a,u=.5/(r*a-l*o),_=(a*f-l*c)*u,d=(r*c-o*f)*u;return _*_+d*d}function g(t,i,s,e){if(e-s<=20)for(let n=s+1;n<=e;n++){const e=t[n],h=i[e];let r=n-1;for(;r>=s&&i[t[r]]>h;)t[r+1]=t[r--];t[r+1]=e}else{let n=s+1,h=e;y(t,s+e>>1,n),i[t[s]]>i[t[e]]&&y(t,s,e),i[t[n]]>i[t[e]]&&y(t,n,e),i[t[s]]>i[t[n]]&&y(t,s,n);const r=t[n],l=i[r];for(;;){do{n++}while(i[t[n]]<l);do{h--}while(i[t[h]]>l);if(h<n)break;y(t,n,h)}t[s+1]=t[h],t[h]=r,e-n+1>=h-s?(g(t,i,n,e),g(t,i,s,h-1)):(g(t,i,s,h-1),g(t,i,n,e))}}function y(t,i,s){const e=t[i];t[i]=t[s],t[s]=e}function w(t){return t[0]}function b(t){return t[1]}return c}));
diff --git a/libs/pell.js b/libs/pell.js
index 9274f50d..c13589a0 100644
--- a/libs/pell.js
+++ b/libs/pell.js
@@ -1,163 +1,157 @@
-(function (global, factory) {
-  typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
-  typeof define === 'function' && define.amd ? define(factory) :
-  (global.Pell = factory());
-}(this, (function () { 'use strict';
+"use strict";
 
-  const defaultParagraphSeparatorString = 'defaultParagraphSeparator'
-  const formatBlock = 'formatBlock'
-  const addEventListener = (parent, type, listener) => parent.addEventListener(type, listener)
-  const appendChild = (parent, child) => parent.appendChild(child)
-  const createElement = tag => document.createElement(tag)
-  const queryCommandState = command => document.queryCommandState(command)
-  const queryCommandValue = command => document.queryCommandValue(command)
-  const exec = (command, value = null) => document.execCommand(command, false, value)
+window.Pell = (function () {
+  const defaultParagraphSeparatorString = "defaultParagraphSeparator";
+  const formatBlock = "formatBlock";
+  const addEventListener = (parent, type, listener) => parent.addEventListener(type, listener);
+  const appendChild = (parent, child) => parent.appendChild(child);
+  const createElement = tag => document.createElement(tag);
+  const queryCommandState = command => document.queryCommandState(command);
+  const queryCommandValue = command => document.queryCommandValue(command);
+  const exec = (command, value = null) => document.execCommand(command, false, value);
 
   const defaultActions = {
     bold: {
-      icon: '<b>B</b>',
-      title: 'Bold',
-      state: () => queryCommandState('bold'),
-      result: () => exec('bold')
+      icon: "<b>B</b>",
+      title: "Bold",
+      state: () => queryCommandState("bold"),
+      result: () => exec("bold")
     },
     italic: {
-      icon: '<i>I</i>',
-      title: 'Italic',
-      state: () => queryCommandState('italic'),
-      result: () => exec('italic')
+      icon: "<i>I</i>",
+      title: "Italic",
+      state: () => queryCommandState("italic"),
+      result: () => exec("italic")
     },
     underline: {
-      icon: '<u>U</u>',
-      title: 'Underline',
-      state: () => queryCommandState('underline'),
-      result: () => exec('underline')
+      icon: "<u>U</u>",
+      title: "Underline",
+      state: () => queryCommandState("underline"),
+      result: () => exec("underline")
     },
     strikethrough: {
-      icon: '<strike>S</strike>',
-      title: 'Strike-through',
-      state: () => queryCommandState('strikeThrough'),
-      result: () => exec('strikeThrough')
+      icon: "<strike>S</strike>",
+      title: "Strike-through",
+      state: () => queryCommandState("strikeThrough"),
+      result: () => exec("strikeThrough")
     },
     heading1: {
-      icon: '<b>H<sub>1</sub></b>',
-      title: 'Heading 1',
-      result: () => exec(formatBlock, '<h1>')
+      icon: "<b>H<sub>1</sub></b>",
+      title: "Heading 1",
+      result: () => exec(formatBlock, "<h1>")
     },
     heading2: {
-      icon: '<b>H<sub>2</sub></b>',
-      title: 'Heading 2',
-      result: () => exec(formatBlock, '<h2>')
+      icon: "<b>H<sub>2</sub></b>",
+      title: "Heading 2",
+      result: () => exec(formatBlock, "<h2>")
     },
     paragraph: {
-      icon: '&#182;',
-      title: 'Paragraph',
-      result: () => exec(formatBlock, '<p>')
+      icon: "&#182;",
+      title: "Paragraph",
+      result: () => exec(formatBlock, "<p>")
     },
     quote: {
-      icon: '&#8220; &#8221;',
-      title: 'Quote',
-      result: () => exec(formatBlock, '<blockquote>')
+      icon: "&#8220; &#8221;",
+      title: "Quote",
+      result: () => exec(formatBlock, "<blockquote>")
     },
     olist: {
-      icon: '&#35;',
-      title: 'Ordered List',
-      result: () => exec('insertOrderedList')
+      icon: "&#35;",
+      title: "Ordered List",
+      result: () => exec("insertOrderedList")
     },
     ulist: {
-      icon: '&#8226;',
-      title: 'Unordered List',
-      result: () => exec('insertUnorderedList')
+      icon: "&#8226;",
+      title: "Unordered List",
+      result: () => exec("insertUnorderedList")
     },
     code: {
-      icon: '&lt;/&gt;',
-      title: 'Code',
-      result: () => exec(formatBlock, '<pre>')
+      icon: "&lt;/&gt;",
+      title: "Code",
+      result: () => exec(formatBlock, "<pre>")
     },
     line: {
-      icon: '&#8213;',
-      title: 'Horizontal Line',
-      result: () => exec('insertHorizontalRule')
+      icon: "&#8213;",
+      title: "Horizontal Line",
+      result: () => exec("insertHorizontalRule")
     },
     link: {
-      icon: '&#128279;',
-      title: 'Link',
-      result: () => navigator.clipboard.readText().then(url => exec('createLink', url))
+      icon: "&#128279;",
+      title: "Link",
+      result: () => navigator.clipboard.readText().then(url => exec("createLink", url))
     },
     image: {
-      icon: '&#128247;',
-      title: 'Image',
+      icon: "&#128247;",
+      title: "Image",
       result: () => {
-        navigator.clipboard.readText().then(url => exec('insertImage', url))
-        exec('enableObjectResizing')
+        navigator.clipboard.readText().then(url => exec("insertImage", url));
+        exec("enableObjectResizing");
       }
     }
-  }
-  
+  };
+
   const defaultClasses = {
-    actionbar: 'pell-actionbar',
-    button: 'pell-button',
-    content: 'pell-content',
-    selected: 'pell-button-selected'
-  }
-  
+    actionbar: "pell-actionbar",
+    button: "pell-button",
+    content: "pell-content",
+    selected: "pell-button-selected"
+  };
+
   const init = settings => {
     const actions = settings.actions
-      ? (
-        settings.actions.map(action => {
-          if (typeof action === 'string') return defaultActions[action]
-          else if (defaultActions[action.name]) return { ...defaultActions[action.name], ...action }
-          return action
+      ? settings.actions.map(action => {
+          if (typeof action === "string") return defaultActions[action];
+          else if (defaultActions[action.name]) return {...defaultActions[action.name], ...action};
+          return action;
         })
-      )
-      : Object.keys(defaultActions).map(action => defaultActions[action])
-  
-    const classes = { ...defaultClasses, ...settings.classes }
-  
-    const defaultParagraphSeparator = settings[defaultParagraphSeparatorString] || 'div'
-  
-    const actionbar = createElement('div')
-    actionbar.className = classes.actionbar
-    appendChild(settings.element, actionbar)
-  
-    const content = settings.element.content = createElement('div')
-    content.contentEditable = true
-    content.className = classes.content
-    content.oninput = ({ target: { firstChild } }) => {
-      if (firstChild && firstChild.nodeType === 3) exec(formatBlock, `<${defaultParagraphSeparator}>`)
-      else if (content.innerHTML === '<br>') content.innerHTML = ''
-      settings.onChange(content.innerHTML)
-    }
-    content.onkeydown = event => {
-      if (event.key === 'Enter' && queryCommandValue(formatBlock) === 'blockquote') {
-        setTimeout(() => exec(formatBlock, `<${defaultParagraphSeparator}>`), 0)
-      }
-    }
-    appendChild(settings.element, content)
-  
-    actions.forEach(action => {
-      const button = createElement('button')
-      button.className = classes.button
-      button.innerHTML = action.icon
-      button.title = action.title
-      button.setAttribute('type', 'button')
-      button.onclick = () => action.result() && content.focus()
-  
-      if (action.state) {
-        const handler = () => button.classList[action.state() ? 'add' : 'remove'](classes.selected)
-        addEventListener(content, 'keyup', handler)
-        addEventListener(content, 'mouseup', handler)
-        addEventListener(button, 'click', handler)
-      }
-  
-      appendChild(actionbar, button)
-    })
-  
-    if (settings.styleWithCSS) exec('styleWithCSS')
-    exec(defaultParagraphSeparatorString, defaultParagraphSeparator)
-  
-    return settings.element
-  }
-  
-  return {exec, init}
+      : Object.keys(defaultActions).map(action => defaultActions[action]);
 
-})));
\ No newline at end of file
+    const classes = {...defaultClasses, ...settings.classes};
+
+    const defaultParagraphSeparator = settings[defaultParagraphSeparatorString] || "div";
+
+    const actionbar = createElement("div");
+    actionbar.className = classes.actionbar;
+    appendChild(settings.element, actionbar);
+
+    const content = (settings.element.content = createElement("div"));
+    content.contentEditable = true;
+    content.className = classes.content;
+    content.oninput = ({target: {firstChild}}) => {
+      if (firstChild && firstChild.nodeType === 3) exec(formatBlock, `<${defaultParagraphSeparator}>`);
+      else if (content.innerHTML === "<br>") content.innerHTML = "";
+      settings.onChange(content.innerHTML);
+    };
+    content.onkeydown = event => {
+      if (event.key === "Enter" && queryCommandValue(formatBlock) === "blockquote") {
+        setTimeout(() => exec(formatBlock, `<${defaultParagraphSeparator}>`), 0);
+      }
+    };
+    appendChild(settings.element, content);
+
+    actions.forEach(action => {
+      const button = createElement("button");
+      button.className = classes.button;
+      button.innerHTML = action.icon;
+      button.title = action.title;
+      button.setAttribute("type", "button");
+      button.onclick = () => action.result() && content.focus();
+
+      if (action.state) {
+        const handler = () => button.classList[action.state() ? "add" : "remove"](classes.selected);
+        addEventListener(content, "keyup", handler);
+        addEventListener(content, "mouseup", handler);
+        addEventListener(button, "click", handler);
+      }
+
+      appendChild(actionbar, button);
+    });
+
+    if (settings.styleWithCSS) exec("styleWithCSS");
+    exec(defaultParagraphSeparatorString, defaultParagraphSeparator);
+
+    return settings.element;
+  };
+
+  return {exec, init};
+})();
diff --git a/main.js b/main.js
index 4ecab781..d9486241 100644
--- a/main.js
+++ b/main.js
@@ -1,9 +1,9 @@
 // Azgaar (azgaar.fmg@yandex.com). Minsk, 2017-2021. MIT License
 // https://github.com/Azgaar/Fantasy-Map-Generator
 
-'use strict';
-const version = '1.63'; // generator version
-document.title += ' v' + version;
+"use strict";
+const version = "1.652"; // generator version
+document.title += " v" + version;
 
 // Logging constants
 const PRODUCTION = window.location.host;
@@ -123,16 +123,30 @@ let customization = 0; // 0 - no; 1 = heightmap draw; 2 - states draw; 3 - add s
 
 let biomesData = applyDefaultBiomesSystem();
 let nameBases = Names.getNameBases(); // cultures-related data
-const fonts = ['Almendra+SC', 'Georgia', 'Arial', 'Times+New+Roman', 'Comic+Sans+MS', 'Lucida+Sans+Unicode', 'Courier+New']; // default web-safe fonts
+const fonts = ["Almendra+SC", "Georgia", "Arial", "Times+New+Roman", "Comic+Sans+MS", "Lucida+Sans+Unicode", "Courier+New", "Verdana", "Arial", "Impact"]; // default fonts
 
 let color = d3.scaleSequential(d3.interpolateSpectral); // default color scheme
 const lineGen = d3.line().curve(d3.curveBasis); // d3 line generator with default curve interpolation
 
 // d3 zoom behavior
-let scale = 1,
-  viewX = 0,
-  viewY = 0;
-const zoom = d3.zoom().scaleExtent([1, 20]).on('zoom', zoomed);
+let scale = 1;
+let viewX = 0;
+let viewY = 0;
+
+const zoomThrottled = throttle(doWorkOnZoom, 100);
+function zoomed() {
+  const {k, x, y} = d3.event.transform;
+
+  const isScaleChanged = Boolean(scale - k);
+  const isPositionChanged = Boolean(viewX - x || viewY - y);
+
+  scale = k;
+  viewX = x;
+  viewY = y;
+
+  zoomThrottled(isScaleChanged, isPositionChanged);
+}
+const zoom = d3.zoom().scaleExtent([1, 20]).on("zoom", zoomed);
 
 // default options
 let options = {pinNotes: false}; // options object
@@ -399,26 +413,17 @@ function applyDefaultBiomesSystem() {
 }
 
 function showWelcomeMessage() {
-  const post = link('https://www.patreon.com/posts/48228540', 'Main changes:');
-  const changelog = link('https://github.com/Azgaar/Fantasy-Map-Generator/wiki/Changelog', 'previous version');
-  const reddit = link('https://www.reddit.com/r/FantasyMapGenerator', 'Reddit community');
-  const discord = link('https://discordapp.com/invite/X7E84HU', 'Discord server');
-  const patreon = link('https://www.patreon.com/azgaar', 'Patreon');
+  const changelog = link("https://github.com/Azgaar/Fantasy-Map-Generator/wiki/Changelog", "previous version");
+  const reddit = link("https://www.reddit.com/r/FantasyMapGenerator", "Reddit community");
+  const discord = link("https://discordapp.com/invite/X7E84HU", "Discord server");
+  const patreon = link("https://www.patreon.com/azgaar", "Patreon");
 
   alertMessage.innerHTML = `The Fantasy Map Generator is updated up to version <b>${version}</b>.
     This version is compatible with ${changelog}, loaded <i>.map</i> files will be auto-updated.
-    <ul>${post}
-      <li>River overview and River editor rework</li>
-      <li>River generation code refactored and optimized</li>
-      <li>Rivers discharge (flux) and mouth width calculated</li>
-      <li>Lake editor rework</li>
-      <li>Lake type based on evaporation and river system</li>
-      <li>Lake flux, inlets and outlet tracked properly</li>
-      <li>Lake outlet width depends on flux</li>
-      <li>Lakes now have names</li>
-      <li>Rulers rework (v1.61)</li>
-      <li>New ocean pattern by Kiwiroo (v1.61)</li>
-      <li>Water erosion rework (v1.62)</li>
+    <ul>Main changes:
+      <li>Ability to add river selecting its cells</li>
+      <li>Keep river course on edit</li>
+      <li>Refactor river rendering code</li>
     </ul>
 
     <p>Join our ${discord} and ${reddit} to ask questions, share maps, discuss the Generator and Worlbuilding, report bugs and propose new features.</p>
@@ -438,31 +443,25 @@ function showWelcomeMessage() {
   });
 }
 
-function zoomed() {
-  const transform = d3.event.transform;
-  const scaleDiff = scale - transform.k;
-  const positionDiff = (viewX - transform.x) | (viewY - transform.y);
-  if (!positionDiff && !scaleDiff) return;
+function doWorkOnZoom(isScaleChanged, isPositionChanged) {
+  viewbox.attr("transform", `translate(${viewX} ${viewY}) scale(${scale})`);
 
-  scale = transform.k;
-  viewX = transform.x;
-  viewY = transform.y;
-  viewbox.attr('transform', transform);
+  if (isPositionChanged) drawCoordinates();
 
-  // update grid only if view position
-  if (positionDiff) drawCoordinates();
-
-  // rescale only if zoom is changed
-  if (scaleDiff) {
+  if (isScaleChanged) {
     invokeActiveZooming();
     drawScaleBar();
   }
 
   // zoom image converter overlay
-  const canvas = document.getElementById('canvas');
-  if (canvas && +canvas.style.opacity) {
-    const img = document.getElementById('image');
-    const ctx = canvas.getContext('2d');
+  if (customization === 1) {
+    const canvas = document.getElementById("canvas");
+    if (!canvas || canvas.style.opacity === "0") return;
+
+    const img = document.getElementById("imageToConvert");
+    if (!img) return;
+
+    const ctx = canvas.getContext("2d");
     ctx.clearRect(0, 0, canvas.width, canvas.height);
     ctx.setTransform(scale, 0, 0, scale, viewX, viewY);
     ctx.drawImage(img, 0, 0, canvas.width, canvas.height);
@@ -499,15 +498,16 @@ function invokeActiveZooming() {
   }
 
   // rescale lables on zoom
-  if (labels.style('display') !== 'none') {
-    labels.selectAll('g').each(function (d) {
-      if (this.id === 'burgLabels') return;
+  if (labels.style("display") !== "none") {
+    labels.selectAll("g").each(function () {
+      if (this.id === "burgLabels") return;
       const desired = +this.dataset.size;
       const relative = Math.max(rn((desired + desired / scale) / 2, 2), 1);
-      this.getAttribute('font-size', relative);
-      const hidden = hideLabels.checked && (relative * scale < 6 || relative * scale > 50);
-      if (hidden) this.classList.add('hidden');
-      else this.classList.remove('hidden');
+      if (rescaleLabels.checked) this.setAttribute("font-size", relative);
+
+      const hidden = hideLabels.checked && (relative * scale < 6 || relative * scale > 60);
+      if (hidden) this.classList.add("hidden");
+      else this.classList.remove("hidden");
     });
   }
 
@@ -530,13 +530,14 @@ function invokeActiveZooming() {
 
   // change states halo width
   if (!customization) {
-    const haloSize = rn(statesHalo.attr('data-width') / scale, 1);
-    statesHalo.attr('stroke-width', haloSize).style('display', haloSize > 3 ? 'block' : 'none');
+    const desired = +statesHalo.attr("data-width");
+    const haloSize = rn(desired / scale ** 0.8, 2);
+    statesHalo.attr("stroke-width", haloSize).style("display", haloSize > 0.1 ? "block" : "none");
   }
 
   // rescale map markers
-  if (+markers.attr('rescale') && markers.style('display') !== 'none') {
-    markers.selectAll('use').each(function (d) {
+  if (+markers.attr("rescale") && markers.style("display") !== "none") {
+    markers.selectAll("use").each(function () {
       const x = +this.dataset.x,
         y = +this.dataset.y,
         desired = +this.dataset.size;
@@ -639,6 +640,7 @@ function generate() {
     drawCoastline();
 
     Rivers.generate();
+    drawRivers();
     Lakes.defineGroup();
     defineBiomes();
 
@@ -1316,6 +1318,15 @@ function reMarkFeatures() {
   cells.haven = cells.i.length < 65535 ? new Uint16Array(cells.i.length) : new Uint32Array(cells.i.length); // cell haven (opposite water cell);
   cells.harbor = new Uint8Array(cells.i.length); // cell harbor (number of adjacent water cells);
 
+  const defineHaven = i => {
+    const water = cells.c[i].filter(c => cells.h[c] < 20);
+    const dist2 = water.map(c => (cells.p[i][0] - cells.p[c][0]) ** 2 + (cells.p[i][1] - cells.p[c][1]) ** 2);
+    const closest = water[dist2.indexOf(Math.min.apply(Math, dist2))];
+
+    cells.haven[i] = closest;
+    cells.harbor[i] = water.length;
+  };
+
   for (let i = 1, queue = [0]; queue[0] !== -1; i++) {
     const start = queue[0]; // first cell
     cells.f[start] = i; // assign feature number
@@ -1331,8 +1342,7 @@ function reMarkFeatures() {
         if (land && !eLand) {
           cells.t[q] = 1;
           cells.t[e] = -1;
-          cells.harbor[q]++;
-          if (!cells.haven[q]) cells.haven[q] = e;
+          if (!cells.haven[q]) defineHaven(q);
         } else if (land && eLand) {
           if (!cells.t[e] && cells.t[q] === 1) cells.t[e] = 2;
           else if (!cells.t[q] && cells.t[e] === 1) cells.t[q] = 2;
@@ -2146,8 +2156,13 @@ const regenerateMap = debounce(function () {
   generate();
   restoreLayers();
   if (ThreeD.options.isOn) ThreeD.redraw();
+<<<<<<< HEAD
   if ($('#worldConfigurator').is(':visible')) editWorld();
 }, 500);
+=======
+  if ($("#worldConfigurator").is(":visible")) editWorld();
+}, 1000);
+>>>>>>> 597f9ae038fbcc149315df9b1618e64744fb929d
 
 // clear the map
 function undraw() {
diff --git a/modules/burgs-and-states.js b/modules/burgs-and-states.js
index b10d5e0a..bd340dd6 100644
--- a/modules/burgs-and-states.js
+++ b/modules/burgs-and-states.js
@@ -1,12 +1,9 @@
-(function (global, factory) {
-  typeof exports === 'object' && typeof module !== 'undefined' ? (module.exports = factory()) : typeof define === 'function' && define.amd ? define(factory) : (global.BurgsAndStates = factory());
-})(this, function () {
-  'use strict';
+'use strict';
 
+window.BurgsAndStates = (function () {
   const generate = function () {
-    const cells = pack.cells,
-      cultures = pack.cultures,
-      n = cells.i.length;
+    const {cells, cultures} = pack;
+    const n = cells.i.length;
 
     cells.burg = new Uint16Array(n); // cell burg
     cells.road = new Uint16Array(n); // cell road power
@@ -80,6 +77,7 @@
       TIME && console.time('createStates');
       const states = [{i: 0, name: 'Neutrals'}];
       const colors = getColors(burgs.length - 1);
+      const each5th = each(5);
 
       burgs.forEach(function (b, i) {
         if (!i) return; // skip first element
@@ -93,7 +91,7 @@
 
         // states data
         const expansionism = rn(Math.random() * powerInput.value + 1, 1);
-        const basename = b.name.length < 9 && b.cell % 5 === 0 ? b.name : Names.getCultureShort(b.culture);
+        const basename = b.name.length < 9 && each5th(b.cell) ? b.name : Names.getCultureShort(b.culture);
         const name = Names.getState(basename, b.culture);
         const type = cultures[b.culture].type;
 
@@ -110,10 +108,10 @@
     // place secondary settlements based on geo and economical evaluation
     function placeTowns() {
       TIME && console.time('placeTowns');
-      const score = new Int16Array(cells.s.map((s) => s * Math.random())); // a bit randomized cell score for towns placement
-      const sorted = cells.i.filter((i) => score[i] > 0 && cells.culture[i] && !cells.burg[i]).sort((a, b) => score[b] - score[a]); // filtered and sorted array of indexes
+      const score = new Int16Array(cells.s.map((s) => s * gauss(1, 3, 0, 20, 3))); // a bit randomized cell score for towns placement
+      const sorted = cells.i.filter((i) => !cells.burg[i] && score[i] > 0 && cells.culture[i]).sort((a, b) => score[b] - score[a]); // filtered and sorted array of indexes
 
-      const desiredNumber = manorsInput.value == 1000 ? rn(sorted.length / 6 / (grid.points.length / 10000) ** 0.8) : +manorsInput.value;
+      const desiredNumber = manorsInput.value == 1000 ? rn(sorted.length / 5 / (grid.points.length / 10000) ** 0.8) : manorsInput.valueAsNumber;
       const burgsNumber = Math.min(desiredNumber, sorted.length); // towns to generate
       let burgsAdded = 0;
 
@@ -175,9 +173,9 @@
 
       if (b.port) {
         b.population = b.population * 1.3; // increase port population
-        const e = cells.v[i].filter((v) => vertices.c[v].some((c) => c === cells.haven[i])); // vertices of common edge
-        b.x = rn((vertices.p[e[0]][0] + vertices.p[e[1]][0]) / 2, 2);
-        b.y = rn((vertices.p[e[0]][1] + vertices.p[e[1]][1]) / 2, 2);
+        const [x, y] = getMiddlePoint(i, haven);
+        b.x = x;
+        b.y = y;
       }
 
       // add random factor
@@ -477,9 +475,7 @@
   // calculate and draw curved state labels for a list of states
   const drawStateLabels = function (list) {
     TIME && console.time('drawStateLabels');
-    const cells = pack.cells,
-      features = pack.features,
-      states = pack.states;
+    const {cells, features, states} = pack;
     const paths = []; // text paths
     lineGen.curve(d3.curveBundle.beta(1));
 
@@ -572,8 +568,8 @@
     }
 
     void (function drawLabels() {
-      const g = labels.select('#states'),
-        t = defs.select('#textPaths');
+      const g = labels.select('#states');
+      const t = defs.select('#textPaths');
       const displayed = layerIsOn('toggleLabels');
       if (!displayed) toggleLabels();
 
@@ -602,8 +598,8 @@
           .attr('id', 'textPath_stateLabel' + id);
         const pathLength = p[1].length > 1 ? textPath.node().getTotalLength() / letterLength : 0; // path length in letters
 
-        let lines = [],
-          ratio = 100;
+        let lines = [];
+        let ratio = 100;
 
         if (pathLength < s.name.length) {
           // only short name will fit
@@ -622,10 +618,9 @@
         // prolongate path if it's too short
         if (pathLength && pathLength < lines[0].length) {
           const points = p[1];
-          const f = points[0],
-            l = points[points.length - 1];
-          const dx = l[0] - f[0],
-            dy = l[1] - f[1];
+          const f = points[0];
+          const l = points[points.length - 1];
+          const [dx, dy] = [l[0] - f[0], l[1] - f[1]];
           const mod = Math.abs((letterLength * lines[0].length) / dx) / 2;
           points[0] = [rn(f[0] - dx * mod), rn(f[1] - dy * mod)];
           points[points.length - 1] = [rn(l[0] + dx * mod), rn(l[1] + dy * mod)];
@@ -653,8 +648,8 @@
         if (lines.length < 2) return;
 
         // check whether multilined label is generally inside the state. If no, replace with short name label
-        const cs = pack.cells.state,
-          b = el.parentNode.getBBox();
+        const cs = pack.cells.state;
+        const b = el.parentNode.getBBox();
         const c1 = () => +cs[findCell(b.x, b.y)] === id;
         const c2 = () => +cs[findCell(b.x + b.width / 2, b.y)] === id;
         const c3 = () => +cs[findCell(b.x + b.width, b.y)] === id;
@@ -950,30 +945,31 @@
     });
 
     const monarchy = ['Duchy', 'Grand Duchy', 'Principality', 'Kingdom', 'Empire']; // per expansionism tier
-    const republic = {Republic: 75, Federation: 4, Oligarchy: 2, Tetrarchy: 1, Triumvirate: 1, Diarchy: 1, 'Trade Company': 4, Junta: 1}; // weighted random
+    const republic = {Republic: 75, Federation: 4, Oligarchy: 2, 'Most Serene Republic': 2, Tetrarchy: 1, Triumvirate: 1, Diarchy: 1, 'Trade Company': 4, Junta: 1}; // weighted random
     const union = {Union: 3, League: 4, Confederation: 1, 'United Kingdom': 1, 'United Republic': 1, 'United Provinces': 2, Commonwealth: 1, Heptarchy: 1}; // weighted random
-    const theocracy = {Theocracy: 20, Brotherhood: 1, Thearchy: 2, See: 1};
+    const theocracy = {Theocracy: 20, Brotherhood: 1, Thearchy: 2, See: 1, 'Holy State': 1};
     const anarchy = {'Free Territory': 2, Council: 3, Commune: 1, Community: 1};
 
     for (const s of states) {
       if (list && !list.includes(s.i)) continue;
+      const tier = expTiers[s.i];
 
       const religion = pack.cells.religion[s.center];
       const isTheocracy = (religion && pack.religions[religion].expansion === 'state') || (P(0.1) && ['Organized', 'Cult'].includes(pack.religions[religion].type));
-      const isAnarchy = P(0.01 - expTiers[s.i] / 500);
+      const isAnarchy = P(0.01 - tier / 500);
 
       if (isTheocracy) s.form = 'Theocracy';
       else if (isAnarchy) s.form = 'Anarchy';
       else s.form = s.type === 'Naval' ? rw(naval) : rw(generic);
-      s.formName = selectForm(s);
+      s.formName = selectForm(s, tier);
       s.fullName = getFullName(s);
     }
 
-    function selectForm(s) {
+    function selectForm(s, tier) {
       const base = pack.cultures[s.culture].base;
 
       if (s.form === 'Monarchy') {
-        const form = monarchy[expTiers[s.i]];
+        const form = monarchy[tier];
         // Default name depends on exponent tier, some culture bases have special names for tiers
         if (s.diplomacy) {
           if (form === 'Duchy' && s.neighbors.length > 1 && rand(6) < s.neighbors.length && s.diplomacy.includes('Vassal')) return 'Marches'; // some vassal dutchies on borderland
@@ -995,7 +991,7 @@
 
       if (s.form === 'Republic') {
         // Default name is from weighted array, special case for small states with only 1 burg
-        if (expTiers[s.i] < 2 && s.burgs === 1) {
+        if (tier < 2 && s.burgs === 1) {
           if (trimVowels(s.name) === trimVowels(pack.burgs[s.capital].name)) {
             s.name = pack.burgs[s.capital].name;
             return 'Free City';
@@ -1009,10 +1005,15 @@
       if (s.form === 'Anarchy') return rw(anarchy);
 
       if (s.form === 'Theocracy') {
-        if (P(0.5) && [0, 1, 2, 3, 4, 6, 8, 9, 13, 15, 20].includes(base)) return 'Diocese'; // Euporean
-        if (P(0.9) && [7, 5].includes(base)) return 'Eparchy'; // Greek, Ruthenian
+        // European
+        if ([0, 1, 2, 3, 4, 6, 8, 9, 13, 15, 20].includes(base)) {
+          if (P(0.1)) return 'Divine ' + monarchy[tier];
+          if (tier < 2 && P(0.5)) return 'Diocese';
+          if (tier < 2 && P(0.5)) return 'Bishopric';
+        }
+        if (tier < 2 && P(0.9) && [7, 5].includes(base)) return 'Eparchy'; // Greek, Ruthenian
         if (P(0.9) && [21, 16].includes(base)) return 'Imamah'; // Nigerian, Turkish
-        if (P(0.8) && [18, 17, 28].includes(base)) return 'Caliphate'; // Arabic, Berber, Swahili
+        if (tier > 2 && P(0.8) && [18, 17, 28].includes(base)) return 'Caliphate'; // Arabic, Berber, Swahili
         return rw(theocracy);
       }
     }
@@ -1255,4 +1256,4 @@
     generateProvinces,
     updateCultures
   };
-});
+})();
diff --git a/modules/coa-generator.js b/modules/coa-generator.js
index 32ed2947..b93653e0 100644
--- a/modules/coa-generator.js
+++ b/modules/coa-generator.js
@@ -1,170 +1,364 @@
-(function (global, factory) {
-  typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
-  typeof define === 'function' && define.amd ? define(factory) :
-  (global.COA = factory());
-}(this, (function () {'use strict';
+"use strict";
 
+window.COA = (function () {
   const tinctures = {
-    field: { metals: 3, colours: 4, stains: +P(.03), patterns: 1 },
-    division: { metals: 5, colours: 8, stains: +P(.03), patterns: 1 },
-    charge: { metals: 2, colours: 3, stains: +P(.05), patterns: 0 },
-    metals: { argent: 3, or: 2 },
-    colours: { gules: 5, azure: 4, sable: 3, purpure: 3, vert: 2 },
-    stains: { murrey: 1, sanguine: 1, tenné: 1 },
+    field: {metals: 3, colours: 4, stains: +P(0.03), patterns: 1},
+    division: {metals: 5, colours: 8, stains: +P(0.03), patterns: 1},
+    charge: {metals: 2, colours: 3, stains: +P(0.05), patterns: 0},
+    metals: {argent: 3, or: 2},
+    colours: {gules: 5, azure: 4, sable: 3, purpure: 3, vert: 2},
+    stains: {murrey: 1, sanguine: 1, tenné: 1},
     patterns: {
-      semy: 8, ermine: 6,
-      vair: 4, counterVair: 1, vairInPale: 1, vairEnPointe: 2, vairAncien: 2,
-      potent: 2, counterPotent: 1, potentInPale: 1, potentEnPointe: 1,
-      chequy: 8, lozengy: 5, fusily: 2, pally: 8, barry: 10, gemelles: 1,
-      bendy: 8, bendySinister: 4, palyBendy: 2, barryBendy: 1,
-      pappellony: 2, pappellony2: 3, scaly: 1, plumetty: 1,
-      masoned: 6, fretty: 3, grillage: 1, chainy: 1, maily: 2, honeycombed: 1 }
-  }
+      semy: 8,
+      ermine: 6,
+      vair: 4,
+      counterVair: 1,
+      vairInPale: 1,
+      vairEnPointe: 2,
+      vairAncien: 2,
+      potent: 2,
+      counterPotent: 1,
+      potentInPale: 1,
+      potentEnPointe: 1,
+      chequy: 8,
+      lozengy: 5,
+      fusily: 2,
+      pally: 8,
+      barry: 10,
+      gemelles: 1,
+      bendy: 8,
+      bendySinister: 4,
+      palyBendy: 2,
+      barryBendy: 1,
+      pappellony: 2,
+      pappellony2: 3,
+      scaly: 1,
+      plumetty: 1,
+      masoned: 6,
+      fretty: 3,
+      grillage: 1,
+      chainy: 1,
+      maily: 2,
+      honeycombed: 1
+    }
+  };
 
   const charges = {
     // categories selection
-    types: { conventional: 30, crosses: 10, animals: 2, animalHeads: 1, birds: 2, fantastic: 3, plants: 1, agriculture: 1, arms: 3, bodyparts: 1, people: 1, architecture: 1, miscellaneous: 3, inescutcheon: 3 },
-    single: { conventional: 12, crosses: 8, plants: 2, animals: 10, animalHeads: 2, birds: 4, fantastic: 7, agriculture: 1, arms: 6, bodyparts: 1, people: 2, architecture: 1, miscellaneous: 10, inescutcheon: 5 },
-    semy: { conventional: 12, crosses: 3, plants: 1 },
+    types: {conventional: 30, crosses: 10, animals: 2, animalHeads: 1, birds: 2, fantastic: 3, plants: 1, agriculture: 1, arms: 3, bodyparts: 1, people: 1, architecture: 1, miscellaneous: 3, inescutcheon: 3},
+    single: {conventional: 12, crosses: 8, plants: 2, animals: 10, animalHeads: 2, birds: 4, fantastic: 7, agriculture: 1, arms: 6, bodyparts: 1, people: 2, architecture: 1, miscellaneous: 10, inescutcheon: 5},
+    semy: {conventional: 12, crosses: 3, plants: 1},
     // generic categories
     conventional: {
-      lozenge: 2, fusil: 4, mascle: 4, rustre: 2, lozengeFaceted: 3, lozengePloye: 1, roundel: 4, roundel2: 3, annulet: 4,
-      mullet: 5, mulletPierced: 1, mulletFaceted: 1, mullet4: 3, mullet6: 4, mullet6Pierced: 1, mullet6Faceted: 1, mullet7: 1, mullet8: 1, mullet10: 1,
-      estoile: 1, compassRose: 1, billet: 5, delf: 0, triangle: 3, trianglePierced: 1, goutte: 4, heart: 4, pique: 2, carreau: 1, trefle: 2,
-      fleurDeLis: 6, sun: 3, sunInSplendour: 1, crescent: 5, fountain: 1
+      lozenge: 2,
+      fusil: 4,
+      mascle: 4,
+      rustre: 2,
+      lozengeFaceted: 3,
+      lozengePloye: 1,
+      roundel: 4,
+      roundel2: 3,
+      annulet: 4,
+      mullet: 5,
+      mulletPierced: 1,
+      mulletFaceted: 1,
+      mullet4: 3,
+      mullet6: 4,
+      mullet6Pierced: 1,
+      mullet6Faceted: 1,
+      mullet7: 1,
+      mullet8: 1,
+      mullet10: 1,
+      estoile: 1,
+      compassRose: 1,
+      billet: 5,
+      delf: 0,
+      triangle: 3,
+      trianglePierced: 1,
+      goutte: 4,
+      heart: 4,
+      pique: 2,
+      carreau: 1,
+      trefle: 2,
+      fleurDeLis: 6,
+      sun: 3,
+      sunInSplendour: 1,
+      crescent: 5,
+      fountain: 1
     },
     crosses: {
-      crossHummetty: 15, crossVoided: 1, crossPattee: 2, crossPatteeAlisee: 1, crossFormee: 1, crossFormee2: 2, crossPotent: 2, crossJerusalem:1,
-      crosslet: 1, crossClechy: 3, crossBottony: 1, crossFleury: 3, crossPatonce: 1, crossPommy: 1, crossGamma: 1, crossArrowed: 1, crossFitchy: 1,
-      crossCercelee: 1, crossMoline: 2, crossFourchy: 1, crossAvellane: 1, crossErminee: 1, crossBiparted: 1, crossMaltese: 3, crossTemplar: 2,
-      crossCeltic: 1, crossCeltic2: 1, crossTriquetra: 1, crossCarolingian: 1, crossOccitan: 1, crossSaltire: 3, crossBurgundy: 1,
-      crossLatin: 3, crossPatriarchal: 1, crossOrthodox: 1, crossCalvary: 1, crossDouble: 1, crossTau: 1, crossSantiago: 1, crossAnkh: 1
+      crossHummetty: 15,
+      crossVoided: 1,
+      crossPattee: 2,
+      crossPatteeAlisee: 1,
+      crossFormee: 1,
+      crossFormee2: 2,
+      crossPotent: 2,
+      crossJerusalem: 1,
+      crosslet: 1,
+      crossClechy: 3,
+      crossBottony: 1,
+      crossFleury: 3,
+      crossPatonce: 1,
+      crossPommy: 1,
+      crossGamma: 1,
+      crossArrowed: 1,
+      crossFitchy: 1,
+      crossCercelee: 1,
+      crossMoline: 2,
+      crossFourchy: 1,
+      crossAvellane: 1,
+      crossErminee: 1,
+      crossBiparted: 1,
+      crossMaltese: 3,
+      crossTemplar: 2,
+      crossCeltic: 1,
+      crossCeltic2: 1,
+      crossTriquetra: 1,
+      crossCarolingian: 1,
+      crossOccitan: 1,
+      crossSaltire: 3,
+      crossBurgundy: 1,
+      crossLatin: 3,
+      crossPatriarchal: 1,
+      crossOrthodox: 1,
+      crossCalvary: 1,
+      crossDouble: 1,
+      crossTau: 1,
+      crossSantiago: 1,
+      crossAnkh: 1
     },
     animals: {
-      lionRampant: 5, lionPassant: 2, lionPassantGuardant: 1, wolfRampant: 1, wolfPassant: 1, wolfStatant: 1, greyhoundCourant: 1, boarRampant: 1,
-      horseRampant: 2, horseSalient: 1, bearRampant: 2, bearPassant: 1, bullPassant: 1, goat: 1, lamb: 1, elephant: 1, camel: 1
+      lionRampant: 5,
+      lionPassant: 2,
+      lionPassantGuardant: 1,
+      wolfRampant: 1,
+      wolfPassant: 1,
+      wolfStatant: 1,
+      greyhoundCourant: 1,
+      boarRampant: 1,
+      horseRampant: 2,
+      horseSalient: 1,
+      bearRampant: 2,
+      bearPassant: 1,
+      bullPassant: 1,
+      goat: 1,
+      lamb: 1,
+      elephant: 1,
+      camel: 1
     },
-    animalHeads: { wolfHeadErased: 1, bullHeadCaboshed: 1, deerHeadCaboshed: 1, lionHeadCaboshed: 2 },
-    fantastic: { dragonPassant: 2, dragonRampant: 2, wyvern: 1, wyvernWithWingsDisplayed: 1, griffinPassant: 1, griffinRampant: 1, eagleTwoHeards: 2, unicornRampant: 1, pegasus: 1, serpent: 1 },
-    birds: { eagle: 9, raven: 1, cock: 3, parrot: 1, swan: 2, swanErased: 1, heron: 1, owl: 1 },
-    plants: { tree: 1, oak: 1, cinquefoil: 1, rose: 1 },
-    agriculture: { garb: 1, rake: 1 },
-    arms: { sword: 5, sabre: 1, sabresCrossed: 1, hatchet: 2, axe: 2, lochaberAxe: 1, mallet: 1, bowWithArrow: 2, bow: 1, arrow: 1, arrowsSheaf: 1, helmet: 2 },
-    bodyparts: { hand: 4, head: 1, headWreathed: 1 },
-    people: { cavalier: 3, monk: 1, angel: 2 },
-    architecture: { tower: 1, castle: 1 },
+    animalHeads: {wolfHeadErased: 1, bullHeadCaboshed: 1, deerHeadCaboshed: 1, lionHeadCaboshed: 2},
+    fantastic: {dragonPassant: 2, dragonRampant: 2, wyvern: 1, wyvernWithWingsDisplayed: 1, griffinPassant: 1, griffinRampant: 1, eagleTwoHeards: 2, unicornRampant: 1, pegasus: 1, serpent: 1},
+    birds: {eagle: 9, raven: 1, cock: 3, parrot: 1, swan: 2, swanErased: 1, heron: 1, owl: 1},
+    plants: {tree: 1, oak: 1, cinquefoil: 1, rose: 1},
+    agriculture: {garb: 1, rake: 1},
+    arms: {sword: 5, sabre: 1, sabresCrossed: 1, hatchet: 2, axe: 2, lochaberAxe: 1, mallet: 1, bowWithArrow: 2, bow: 1, arrow: 1, arrowsSheaf: 1, helmet: 2},
+    bodyparts: {hand: 4, head: 1, headWreathed: 1},
+    people: {cavalier: 3, monk: 1, angel: 2},
+    architecture: {tower: 1, castle: 1},
     miscellaneous: {
-      crown: 3, orb: 1, chalice: 1, key: 1, buckle: 1, bugleHorn: 1, bugleHorn2: 1, bell: 2, pot: 1, bucket: 1, horseshoe: 3,
-      attire: 1, stagsAttires: 1, ramsHorn: 1, cowHorns: 2, wing: 1, wingSword: 1, lute: 1, harp: 1, wheel: 2, crosier: 1, fasces: 1, log: 1
+      crown: 3,
+      orb: 1,
+      chalice: 1,
+      key: 1,
+      buckle: 1,
+      bugleHorn: 1,
+      bugleHorn2: 1,
+      bell: 2,
+      pot: 1,
+      bucket: 1,
+      horseshoe: 3,
+      attire: 1,
+      stagsAttires: 1,
+      ramsHorn: 1,
+      cowHorns: 2,
+      wing: 1,
+      wingSword: 1,
+      lute: 1,
+      harp: 1,
+      wheel: 2,
+      crosier: 1,
+      fasces: 1,
+      log: 1
     },
     // selection based on culture type:
-    Naval: { anchor: 3, boat: 1, lymphad: 2, armillarySphere: 1, escallop: 1, dolphin: 1 },
-    Highland: { tower: 1, raven: 1, wolfHeadErased: 1, wolfPassant: 1, goat: 1, axe: 1 },
-    River: { tower: 1, garb: 1, rake: 1, boat: 1, pike: 2, bullHeadCaboshed: 1 },
-    Lake: { cancer: 2, escallop: 1, pike: 2, heron: 1, boat: 1, boat2: 2 },
-    Nomadic: { pot: 1, buckle: 1, wheel: 2, sabre: 2, sabresCrossed: 1, bow: 2, arrow: 1, horseRampant: 1, horseSalient: 1, crescent: 1, camel: 3 },
-    Hunting: { bugleHorn: 2, bugleHorn2: 1, stagsAttires: 2, attire: 2, hatchet: 1, bowWithArrow: 1, arrowsSheaf: 1, deerHeadCaboshed: 1, wolfStatant: 1, oak: 1 },
+    Naval: {anchor: 3, boat: 1, lymphad: 2, armillarySphere: 1, escallop: 1, dolphin: 1},
+    Highland: {tower: 1, raven: 1, wolfHeadErased: 1, wolfPassant: 1, goat: 1, axe: 1},
+    River: {tower: 1, garb: 1, rake: 1, boat: 1, pike: 2, bullHeadCaboshed: 1},
+    Lake: {cancer: 2, escallop: 1, pike: 2, heron: 1, boat: 1, boat2: 2},
+    Nomadic: {pot: 1, buckle: 1, wheel: 2, sabre: 2, sabresCrossed: 1, bow: 2, arrow: 1, horseRampant: 1, horseSalient: 1, crescent: 1, camel: 3},
+    Hunting: {bugleHorn: 2, bugleHorn2: 1, stagsAttires: 2, attire: 2, hatchet: 1, bowWithArrow: 1, arrowsSheaf: 1, deerHeadCaboshed: 1, wolfStatant: 1, oak: 1},
     // selection based on type
-    City: { key: 3, bell: 2, lute: 1, tower: 1, castle: 1, mallet: 1 },
-    Capital: { crown: 4, orb: 1, lute: 1, castle: 3, tower: 1 },
-    Сathedra: { chalice: 1, orb: 1, crosier: 2, lamb: 1, monk: 2, angel: 3, crossLatin: 2, crossPatriarchal: 1, crossOrthodox: 1, crossCalvary: 1 },
+    City: {key: 3, bell: 2, lute: 1, tower: 1, castle: 1, mallet: 1},
+    Capital: {crown: 4, orb: 1, lute: 1, castle: 3, tower: 1},
+    Сathedra: {chalice: 1, orb: 1, crosier: 2, lamb: 1, monk: 2, angel: 3, crossLatin: 2, crossPatriarchal: 1, crossOrthodox: 1, crossCalvary: 1},
     // specific cases
-    natural: { fountain: "azure", garb: "or", raven: "sable" }, // charges to mainly use predefined colours
-    sinister: [ // charges that can be sinister
-      "crossGamma", "lionRampant", "lionPassant", "wolfRampant", "wolfPassant", "wolfStatant", "wolfHeadErased", "greyhoundСourant", "boarRampant",
-      "horseRampant", "horseSalient", "bullPassant", "bearRampant", "bearPassant", "goat", "lamb", "elephant", "eagle", "raven", "cock", "parrot",
-      "swan", "swanErased", "heron", "pike", "dragonPassant", "dragonRampant", "wyvern", "wyvernWithWingsDisplayed", "griffinPassant", "griffinRampant",
-      "unicornRampant", "pegasus", "serpent", "hatchet", "lochaberAxe", "hand", "wing", "wingSword", "lute", "harp", "bow", "head", "headWreathed",
-      "knight", "lymphad", "log", "crosier", "dolphin", "sabre", "monk", "owl", "axe", "camel", "fasces", "lionPassantGuardant", "helmet"],
-    reversed: [ // charges that can be reversed
-      "goutte", "mullet", "mullet7", "crescent", "crossTau", "cancer", "sword", "sabresCrossed", "hand",
-      "horseshoe", "bowWithArrow", "arrow", "arrowsSheaf", "rake", "crossTriquetra", "crossLatin", "crossTau"
+    natural: {fountain: "azure", garb: "or", raven: "sable"}, // charges to mainly use predefined colours
+    sinister: [
+      // charges that can be sinister
+      "crossGamma",
+      "lionRampant",
+      "lionPassant",
+      "wolfRampant",
+      "wolfPassant",
+      "wolfStatant",
+      "wolfHeadErased",
+      "greyhoundСourant",
+      "boarRampant",
+      "horseRampant",
+      "horseSalient",
+      "bullPassant",
+      "bearRampant",
+      "bearPassant",
+      "goat",
+      "lamb",
+      "elephant",
+      "eagle",
+      "raven",
+      "cock",
+      "parrot",
+      "swan",
+      "swanErased",
+      "heron",
+      "pike",
+      "dragonPassant",
+      "dragonRampant",
+      "wyvern",
+      "wyvernWithWingsDisplayed",
+      "griffinPassant",
+      "griffinRampant",
+      "unicornRampant",
+      "pegasus",
+      "serpent",
+      "hatchet",
+      "lochaberAxe",
+      "hand",
+      "wing",
+      "wingSword",
+      "lute",
+      "harp",
+      "bow",
+      "head",
+      "headWreathed",
+      "knight",
+      "lymphad",
+      "log",
+      "crosier",
+      "dolphin",
+      "sabre",
+      "monk",
+      "owl",
+      "axe",
+      "camel",
+      "fasces",
+      "lionPassantGuardant",
+      "helmet"
+    ],
+    reversed: [
+      // charges that can be reversed
+      "goutte",
+      "mullet",
+      "mullet7",
+      "crescent",
+      "crossTau",
+      "cancer",
+      "sword",
+      "sabresCrossed",
+      "hand",
+      "horseshoe",
+      "bowWithArrow",
+      "arrow",
+      "arrowsSheaf",
+      "rake",
+      "crossTriquetra",
+      "crossLatin",
+      "crossTau"
     ]
-  }
+  };
 
   const positions = {
-    conventional: { e: 20, abcdefgzi: 3, beh: 3, behdf: 2, acegi: 1, kn: 3, bhdf: 1, jeo: 1, abc: 3, jln: 6, jlh: 3, kmo: 2, jleh: 1, def: 3, abcpqh: 4, ABCDEFGHIJKL: 1 },
-    complex: { e: 40, beh: 1, kn: 1, jeo: 1, abc: 2, jln: 7, jlh: 2, def: 1, abcpqh: 1 },
+    conventional: {e: 20, abcdefgzi: 3, beh: 3, behdf: 2, acegi: 1, kn: 3, bhdf: 1, jeo: 1, abc: 3, jln: 6, jlh: 3, kmo: 2, jleh: 1, def: 3, abcpqh: 4, ABCDEFGHIJKL: 1},
+    complex: {e: 40, beh: 1, kn: 1, jeo: 1, abc: 2, jln: 7, jlh: 2, def: 1, abcpqh: 1},
     divisions: {
-      perPale: { e: 15, pq: 5, jo: 2, jl: 2, ABCDEFGHIJKL: 1 },
-      perFess: { e: 12, kn: 4, jkl: 2, gizgiz: 1, jlh: 3, kmo: 1, ABCDEFGHIJKL: 1 },
-      perBend: { e: 5, lm: 5, bcfdgh: 1 },
-      perBendSinister: { e: 1, jo: 1 },
-      perCross: { e: 4, jlmo: 1, j: 1, jo: 2, jl: 1 },
-      perChevron: { e: 1, jlh: 1, dfk: 1, dfbh: 2, bdefh: 1 },
-      perChevronReversed: { e: 1, mok: 2, dfh: 2, dfbh: 1, bdefh: 1 },
-      perSaltire: { bhdf: 8, e: 3, abcdefgzi: 1, bh: 1, df: 1, ABCDEFGHIJKL: 1 },
-      perPile: { ee: 3, be: 2, abceh: 1, abcabc: 1, jleh: 1 }
+      perPale: {e: 15, pq: 5, jo: 2, jl: 2, ABCDEFGHIJKL: 1},
+      perFess: {e: 12, kn: 4, jkl: 2, gizgiz: 1, jlh: 3, kmo: 1, ABCDEFGHIJKL: 1},
+      perBend: {e: 5, lm: 5, bcfdgh: 1},
+      perBendSinister: {e: 1, jo: 1},
+      perCross: {e: 4, jlmo: 1, j: 1, jo: 2, jl: 1},
+      perChevron: {e: 1, jlh: 1, dfk: 1, dfbh: 2, bdefh: 1},
+      perChevronReversed: {e: 1, mok: 2, dfh: 2, dfbh: 1, bdefh: 1},
+      perSaltire: {bhdf: 8, e: 3, abcdefgzi: 1, bh: 1, df: 1, ABCDEFGHIJKL: 1},
+      perPile: {ee: 3, be: 2, abceh: 1, abcabc: 1, jleh: 1}
     },
     ordinariesOn: {
-      pale: { ee: 12, beh: 10, kn: 3, bb: 1 },
-      fess: { ee: 1, def: 3 },
-      bar: { defdefdef: 1 },
-      fessCotissed: { ee: 1, def: 3 },
-      fessDoubleCotissed: { ee: 1, defdef: 3 },
-      bend: { ee: 2, jo: 1, joe: 1 },
-      bendSinister: { ee: 1, lm: 1, lem: 4 },
-      bendlet: { joejoejoe: 1 },
-      bendletSinister: { lemlemlem: 1 },
-      bordure: { ABCDEFGHIJKL: 1 },
-      chief: { abc: 5, bbb: 1 },
-      quarter: { jjj: 1 },
-      canton: { yyyy: 1 },
-      cross: { eeee: 1, behdfbehdf: 3, behbehbeh: 2 },
-      crossParted: { e: 5, ee: 1 },
-      saltire: { ee: 5, jlemo: 1 },
-      saltireParted: { e: 5, ee: 1 },
-      pall: { ee: 1, jleh: 5, jlhh: 3 },
-      pallReversed: { ee: 1, bemo: 5 },
-      pile: { bbb: 1 },
-      pileInBend: { eeee: 1, eeoo: 1 },
-      pileInBendSinister: { eeee: 1, eemm: 1 }
+      pale: {ee: 12, beh: 10, kn: 3, bb: 1},
+      fess: {ee: 1, def: 3},
+      bar: {defdefdef: 1},
+      fessCotissed: {ee: 1, def: 3},
+      fessDoubleCotissed: {ee: 1, defdef: 3},
+      bend: {ee: 2, jo: 1, joe: 1},
+      bendSinister: {ee: 1, lm: 1, lem: 4},
+      bendlet: {joejoejoe: 1},
+      bendletSinister: {lemlemlem: 1},
+      bordure: {ABCDEFGHIJKL: 1},
+      chief: {abc: 5, bbb: 1},
+      quarter: {jjj: 1},
+      canton: {yyyy: 1},
+      cross: {eeee: 1, behdfbehdf: 3, behbehbeh: 2},
+      crossParted: {e: 5, ee: 1},
+      saltire: {ee: 5, jlemo: 1},
+      saltireParted: {e: 5, ee: 1},
+      pall: {ee: 1, jleh: 5, jlhh: 3},
+      pallReversed: {ee: 1, bemo: 5},
+      pile: {bbb: 1},
+      pileInBend: {eeee: 1, eeoo: 1},
+      pileInBendSinister: {eeee: 1, eemm: 1}
     },
     ordinariesOff: {
-      pale: { yyy: 1 },
-      fess: { abc: 3, abcz: 1 },
-      bar: { abc: 2, abcgzi: 1, jlh: 5, bgi: 2, ach: 1 },
-      gemelle: { abc: 1 },
-      bend: { ccg: 2, ccc: 1 },
-      bendSinister: { aai: 2, aaa: 1 },
-      bendlet: { ccg: 2, ccc: 1 },
-      bendletSinister: { aai: 2, aaa: 1 },
-      bordure: { e: 4, jleh:2, kenken: 1, peqpeq: 1 },
-      orle: { e: 4, jleh: 1, kenken: 1, peqpeq: 1 },
-      chief: { emo: 2, emoz: 1, ez: 2 },
-      terrace: { e: 5, def: 1, bdf: 3 },
-      mount: { e: 5, def: 1, bdf: 3 },
-      point: { e: 2, def: 1, bdf: 3, acbdef: 1 },
-      flaunches: { e: 3, kn: 1, beh: 3 },
-      gyron: { bh: 1 },
-      quarter: { e: 1 },
-      canton: { e: 5, beh: 1, def: 1, bdefh: 1, kn: 1 },
-      cross: { acgi: 1 },
-      pall: { BCKFEILGJbdmfo: 1 },
-      pallReversed: { aczac: 1 },
-      chevron: { ach: 3, hhh: 1 },
-      chevronReversed: { bbb: 1 },
-      pile: { acdfgi: 1, acac: 1 },
-      pileInBend: { cg: 1 },
-      pileInBendSinister: { ai: 1 },
-      label: { defgzi: 2, eh: 3, defdefhmo: 1, egiegi: 1, pqn: 5 }
+      pale: {yyy: 1},
+      fess: {abc: 3, abcz: 1},
+      bar: {abc: 2, abcgzi: 1, jlh: 5, bgi: 2, ach: 1},
+      gemelle: {abc: 1},
+      bend: {ccg: 2, ccc: 1},
+      bendSinister: {aai: 2, aaa: 1},
+      bendlet: {ccg: 2, ccc: 1},
+      bendletSinister: {aai: 2, aaa: 1},
+      bordure: {e: 4, jleh: 2, kenken: 1, peqpeq: 1},
+      orle: {e: 4, jleh: 1, kenken: 1, peqpeq: 1},
+      chief: {emo: 2, emoz: 1, ez: 2},
+      terrace: {e: 5, def: 1, bdf: 3},
+      mount: {e: 5, def: 1, bdf: 3},
+      point: {e: 2, def: 1, bdf: 3, acbdef: 1},
+      flaunches: {e: 3, kn: 1, beh: 3},
+      gyron: {bh: 1},
+      quarter: {e: 1},
+      canton: {e: 5, beh: 1, def: 1, bdefh: 1, kn: 1},
+      cross: {acgi: 1},
+      pall: {BCKFEILGJbdmfo: 1},
+      pallReversed: {aczac: 1},
+      chevron: {ach: 3, hhh: 1},
+      chevronReversed: {bbb: 1},
+      pile: {acdfgi: 1, acac: 1},
+      pileInBend: {cg: 1},
+      pileInBendSinister: {ai: 1},
+      label: {defgzi: 2, eh: 3, defdefhmo: 1, egiegi: 1, pqn: 5}
     },
     // charges
-    inescutcheon: { e: 4, jln: 1 },
-    mascle: { e: 15, abcdefgzi: 3, beh: 3, bdefh: 4, acegi: 1, kn: 3, joe: 2, abc: 3, jlh: 8, jleh: 1, df: 3, abcpqh: 4, pqe: 3, eknpq: 3 },
-    lionRampant: { e: 10, def: 2, abc: 2, bdefh: 1, kn: 1, jlh: 2, abcpqh: 1 },
-    lionPassant: { e: 10, def: 1, abc: 1, bdefh: 1, jlh: 1, abcpqh: 1 },
-    wolfPassant: { e: 10, def: 1, abc: 1, bdefh: 1, jlh: 1, abcpqh: 1 },
-    greyhoundСourant: { e: 10, def: 1, abc: 1, bdefh: 1, jlh: 1, abcpqh: 1 },
-    griffinRampant: { e: 10, def: 2, abc: 2, bdefh: 1, kn: 1, jlh: 2, abcpqh: 1 },
-    griffinPassant: { e: 10, def: 1, abc: 1, bdefh: 1, jlh: 1, abcpqh: 1 },
-    boarRampant: { e: 12, beh: 1, kn: 1, jln: 2 },
-    eagle: { e: 15, beh: 1, kn: 1, abc: 1, jlh: 2, def: 2, pq: 1 },
-    raven: { e: 15, beh: 1, kn: 1, jeo: 1, abc: 3, jln: 3, def: 1 },
-    wyvern: { e: 10, jln: 1 },
-    garb: { e: 1, def: 3, abc: 2, beh: 1, kn: 1, jln: 3, jleh: 1, abcpqh: 1, joe: 1, lme: 1 },
-    crown: { e: 10, abcdefgzi: 1, beh: 3, behdf: 2, acegi: 1, kn: 1, pq: 2, abc: 1, jln: 4, jleh: 1, def: 2, abcpqh: 3 },
-    hand: { e: 10, jln: 2, kn: 1, jeo: 1, abc: 2, pqe: 1 },
+    inescutcheon: {e: 4, jln: 1},
+    mascle: {e: 15, abcdefgzi: 3, beh: 3, bdefh: 4, acegi: 1, kn: 3, joe: 2, abc: 3, jlh: 8, jleh: 1, df: 3, abcpqh: 4, pqe: 3, eknpq: 3},
+    lionRampant: {e: 10, def: 2, abc: 2, bdefh: 1, kn: 1, jlh: 2, abcpqh: 1},
+    lionPassant: {e: 10, def: 1, abc: 1, bdefh: 1, jlh: 1, abcpqh: 1},
+    wolfPassant: {e: 10, def: 1, abc: 1, bdefh: 1, jlh: 1, abcpqh: 1},
+    greyhoundСourant: {e: 10, def: 1, abc: 1, bdefh: 1, jlh: 1, abcpqh: 1},
+    griffinRampant: {e: 10, def: 2, abc: 2, bdefh: 1, kn: 1, jlh: 2, abcpqh: 1},
+    griffinPassant: {e: 10, def: 1, abc: 1, bdefh: 1, jlh: 1, abcpqh: 1},
+    boarRampant: {e: 12, beh: 1, kn: 1, jln: 2},
+    eagle: {e: 15, beh: 1, kn: 1, abc: 1, jlh: 2, def: 2, pq: 1},
+    raven: {e: 15, beh: 1, kn: 1, jeo: 1, abc: 3, jln: 3, def: 1},
+    wyvern: {e: 10, jln: 1},
+    garb: {e: 1, def: 3, abc: 2, beh: 1, kn: 1, jln: 3, jleh: 1, abcpqh: 1, joe: 1, lme: 1},
+    crown: {e: 10, abcdefgzi: 1, beh: 3, behdf: 2, acegi: 1, kn: 1, pq: 2, abc: 1, jln: 4, jleh: 1, def: 2, abcpqh: 3},
+    hand: {e: 10, jln: 2, kn: 1, jeo: 1, abc: 2, pqe: 1},
     armillarySphere: {e: 1},
     tree: {e: 1},
     lymphad: {e: 1},
@@ -175,33 +369,92 @@
   };
 
   const lines = {
-    straight: 50, wavy: 8, engrailed: 4, invecked: 3, rayonne: 3, embattled: 1, raguly: 1, urdy: 1, dancetty: 1, indented: 2,
-    dentilly: 1, bevilled: 1, angled: 1, flechy: 1, barby: 1, enclavy: 1, escartely: 1, arched: 2, archedReversed: 1, nowy: 1, nowyReversed: 1,
-    embattledGhibellin: 1, embattledNotched: 1, embattledGrady: 1, dovetailedIndented: 1, dovetailed: 1,
-    potenty: 1, potentyDexter: 1, potentySinister: 1, nebuly: 2, seaWaves: 1, dragonTeeth: 1, firTrees: 1
+    straight: 50,
+    wavy: 8,
+    engrailed: 4,
+    invecked: 3,
+    rayonne: 3,
+    embattled: 1,
+    raguly: 1,
+    urdy: 1,
+    dancetty: 1,
+    indented: 2,
+    dentilly: 1,
+    bevilled: 1,
+    angled: 1,
+    flechy: 1,
+    barby: 1,
+    enclavy: 1,
+    escartely: 1,
+    arched: 2,
+    archedReversed: 1,
+    nowy: 1,
+    nowyReversed: 1,
+    embattledGhibellin: 1,
+    embattledNotched: 1,
+    embattledGrady: 1,
+    dovetailedIndented: 1,
+    dovetailed: 1,
+    potenty: 1,
+    potentyDexter: 1,
+    potentySinister: 1,
+    nebuly: 2,
+    seaWaves: 1,
+    dragonTeeth: 1,
+    firTrees: 1
   };
 
   const divisions = {
-    variants: { perPale: 5, perFess: 5, perBend: 2, perBendSinister: 1, perChevron: 1, perChevronReversed: 1, perCross: 5, perPile: 1, perSaltire: 1, gyronny: 1, chevronny: 1 },
+    variants: {perPale: 5, perFess: 5, perBend: 2, perBendSinister: 1, perChevron: 1, perChevronReversed: 1, perCross: 5, perPile: 1, perSaltire: 1, gyronny: 1, chevronny: 1},
     perPale: lines,
     perFess: lines,
     perBend: lines,
     perBendSinister: lines,
     perChevron: lines,
     perChevronReversed: lines,
-    perCross: { straight: 20, wavy: 5, engrailed: 4, invecked: 3, rayonne: 1, embattled: 1, raguly: 1, urdy: 1, indented: 2, dentilly: 1, bevilled: 1, angled: 1, embattledGhibellin: 1, embattledGrady: 1, dovetailedIndented: 1, dovetailed: 1, potenty: 1, potentyDexter: 1, potentySinister: 1, nebuly: 1 },
+    perCross: {straight: 20, wavy: 5, engrailed: 4, invecked: 3, rayonne: 1, embattled: 1, raguly: 1, urdy: 1, indented: 2, dentilly: 1, bevilled: 1, angled: 1, embattledGhibellin: 1, embattledGrady: 1, dovetailedIndented: 1, dovetailed: 1, potenty: 1, potentyDexter: 1, potentySinister: 1, nebuly: 1},
     perPile: lines
   };
 
   const ordinaries = {
     lined: {
-      pale: 7, fess: 5, bend: 3, bendSinister: 2, chief: 5, bar: 2, gemelle: 1, fessCotissed: 1, fessDoubleCotissed: 1,
-      bendlet: 2, bendletSinister: 1, terrace: 3, cross: 6, crossParted: 1, saltire: 2, saltireParted: 1
+      pale: 7,
+      fess: 5,
+      bend: 3,
+      bendSinister: 2,
+      chief: 5,
+      bar: 2,
+      gemelle: 1,
+      fessCotissed: 1,
+      fessDoubleCotissed: 1,
+      bendlet: 2,
+      bendletSinister: 1,
+      terrace: 3,
+      cross: 6,
+      crossParted: 1,
+      saltire: 2,
+      saltireParted: 1
     },
     straight: {
-      bordure: 8, orle: 4, mount: 1, point: 2, flaunches: 1, gore: 1,
-      gyron: 1, quarter: 1, canton: 2, pall: 3, pallReversed: 2, chevron: 4, chevronReversed: 3,
-      pile: 2, pileInBend: 2, pileInBendSinister: 1, piles: 1, pilesInPoint: 2, label: 1
+      bordure: 8,
+      orle: 4,
+      mount: 1,
+      point: 2,
+      flaunches: 1,
+      gore: 1,
+      gyron: 1,
+      quarter: 1,
+      canton: 2,
+      pall: 3,
+      pallReversed: 2,
+      chevron: 4,
+      chevronReversed: 3,
+      pile: 2,
+      pileInBend: 2,
+      pileInBendSinister: 1,
+      piles: 1,
+      pilesInPoint: 2,
+      label: 1
     }
   };
 
@@ -215,60 +468,61 @@
     simple: {round: 12, oval: 6, vesicaPiscis: 1, square: 1, diamond: 2, no: 0},
     fantasy: {fantasy1: 2, fantasy2: 2, fantasy3: 1, fantasy4: 1, fantasy5: 3},
     middleEarth: {noldor: 1, gondor: 1, easterling: 1, erebor: 1, ironHills: 1, urukHai: 1, moriaOrc: 1}
-  }
+  };
 
-  const generate = function(parent, kinship, dominion, type) {
+  const generate = function (parent, kinship, dominion, type) {
     if (!parent || parent === "custom") {
       parent = null;
       kinship = 0;
       dominion = 0;
     }
-    let usedPattern = null, usedTinctures = [];
+    let usedPattern = null,
+      usedTinctures = [];
 
     const t1 = P(kinship) ? parent.t1 : getTincture("field");
     if (t1.includes("-")) usedPattern = t1;
     const coa = {t1};
 
-    let charge = P(usedPattern ? .5 : .93) ? true : false; // 80% for charge
-    const linedOrdinary = charge && P(.3) || P(.5) ? parent?.ordinaries && P(kinship) ? parent.ordinaries[0].ordinary : rw(ordinaries.lined) : null;
-    const ordinary = !charge && P(.65) || P(.3) ? linedOrdinary ? linedOrdinary : rw(ordinaries.straight) : null; // 36% for ordinary
+    let charge = P(usedPattern ? 0.5 : 0.93) ? true : false; // 80% for charge
+    const linedOrdinary = (charge && P(0.3)) || P(0.5) ? (parent?.ordinaries && P(kinship) ? parent.ordinaries[0].ordinary : rw(ordinaries.lined)) : null;
+    const ordinary = (!charge && P(0.65)) || P(0.3) ? (linedOrdinary ? linedOrdinary : rw(ordinaries.straight)) : null; // 36% for ordinary
     const rareDivided = ["chief", "terrace", "chevron", "quarter", "flaunches"].includes(ordinary);
-    const divisioned = rareDivided ? P(.03) : charge && ordinary ? P(.03) : charge ? P(.3) : ordinary ? P(.7) : P(.995); // 33% for division
-    const division = divisioned ? parent?.division && P(kinship - .1) ? parent.division.division : rw(divisions.variants) : null;
-    if (charge) charge = 
-      parent?.charges && P(kinship - .1) ? parent.charges[0].charge : 
-      type && type !== "Generic" && P(.2) ? rw(charges[type]) : 
-      selectCharge();
+    const divisioned = rareDivided ? P(0.03) : charge && ordinary ? P(0.03) : charge ? P(0.3) : ordinary ? P(0.7) : P(0.995); // 33% for division
+    const division = divisioned ? (parent?.division && P(kinship - 0.1) ? parent.division.division : rw(divisions.variants)) : null;
+    if (charge) charge = parent?.charges && P(kinship - 0.1) ? parent.charges[0].charge : type && type !== "Generic" && P(0.2) ? rw(charges[type]) : selectCharge();
 
     if (division) {
-      const t = getTincture("division", usedTinctures, P(.98) ? coa.t1 : null);
+      const t = getTincture("division", usedTinctures, P(0.98) ? coa.t1 : null);
       coa.division = {division, t};
-      if (divisions[division]) coa.division.line = usedPattern || (ordinary && P(.7)) ? "straight" : rw(divisions[division]);
+      if (divisions[division]) coa.division.line = usedPattern || (ordinary && P(0.7)) ? "straight" : rw(divisions[division]);
     }
 
     if (ordinary) {
       coa.ordinaries = [{ordinary, t: getTincture("charge", usedTinctures, coa.t1)}];
-      if (linedOrdinary) coa.ordinaries[0].line = usedPattern || (division && P(.7)) ? "straight" : rw(lines);
-      if (division && !charge && !usedPattern && P(.5) && ordinary !== "bordure" && ordinary !== "orle") {
-        if (P(.8)) coa.ordinaries[0].divided = "counter"; // 40%
-        else if (P(.6)) coa.ordinaries[0].divided = "field"; // 6%
+      if (linedOrdinary) coa.ordinaries[0].line = usedPattern || (division && P(0.7)) ? "straight" : rw(lines);
+      if (division && !charge && !usedPattern && P(0.5) && ordinary !== "bordure" && ordinary !== "orle") {
+        if (P(0.8)) coa.ordinaries[0].divided = "counter";
+        // 40%
+        else if (P(0.6)) coa.ordinaries[0].divided = "field";
+        // 6%
         else coa.ordinaries[0].divided = "division"; // 4%
       }
     }
 
     if (charge) {
-      let p = "e", t = "gules";
+      let p = "e",
+        t = "gules";
       const ordinaryT = coa.ordinaries ? coa.ordinaries[0].t : null;
-      if (positions.ordinariesOn[ordinary] && P(.8)) {
+      if (positions.ordinariesOn[ordinary] && P(0.8)) {
         // place charge over ordinary (use tincture of field type)
         p = rw(positions.ordinariesOn[ordinary]);
         while (charges.natural[charge] === ordinaryT) charge = selectCharge();
-        t = !usedPattern && P(.3) ? coa.t1 : getTincture("charge", [], ordinaryT);
-      } else if (positions.ordinariesOff[ordinary] && P(.95)) {
+        t = !usedPattern && P(0.3) ? coa.t1 : getTincture("charge", [], ordinaryT);
+      } else if (positions.ordinariesOff[ordinary] && P(0.95)) {
         // place charge out of ordinary (use tincture of ordinary type)
         p = rw(positions.ordinariesOff[ordinary]);
         while (charges.natural[charge] === coa.t1) charge = selectCharge();
-        t = !usedPattern && P(.3) ? ordinaryT : getTincture("charge", usedTinctures, coa.t1);
+        t = !usedPattern && P(0.3) ? ordinaryT : getTincture("charge", usedTinctures, coa.t1);
       } else if (positions.divisions[division]) {
         // place charge in fields made by division
         p = rw(positions.divisions[division]);
@@ -289,43 +543,41 @@
       if (charges.natural[charge]) t = charges.natural[charge]; // natural tincture
       coa.charges = [{charge, t, p}];
 
-      if (p === "ABCDEFGHIKL" && P(.95)) {
+      if (p === "ABCDEFGHIKL" && P(0.95)) {
         // add central charge if charge is in bordure
         coa.charges[0].charge = rw(charges.conventional);
         const charge = selectCharge(charges.single);
         const t = getTincture("charge", usedTinctures, coa.t1);
         coa.charges.push({charge, t, p: "e"});
-      } else if (P(.8) && charge === "inescutcheon") {
+      } else if (P(0.8) && charge === "inescutcheon") {
         // add charge to inescutcheon
         const charge = selectCharge(charges.types);
         const t2 = getTincture("charge", [], t);
-        coa.charges.push({charge, t: t2, p, size:.5});
+        coa.charges.push({charge, t: t2, p, size: 0.5});
       } else if (division && !ordinary) {
         const allowCounter = !usedPattern && (!coa.line || coa.line === "straight");
 
         // dimidiation: second charge at division basic positons
-        if (P(.3) && ["perPale", "perFess"].includes(division) && coa.line === "straight") {
+        if (P(0.3) && ["perPale", "perFess"].includes(division) && coa.line === "straight") {
           coa.charges[0].divided = "field";
-          if (P(.95)) {
-            const p2 = p === "e" || P(.5) ? "e" : rw(positions.divisions[division]);
+          if (P(0.95)) {
+            const p2 = p === "e" || P(0.5) ? "e" : rw(positions.divisions[division]);
             const charge = selectCharge(charges.single);
             const t = getTincture("charge", usedTinctures, coa.division.t);
             coa.charges.push({charge, t, p: p2, divided: "division"});
           }
-        }
-        else if (allowCounter && P(.4)) coa.charges[0].divided = "counter"; // counterchanged, 40%
-        else if (["perPale", "perFess", "perBend", "perBendSinister"].includes(division) && P(.8)) { // place 2 charges in division standard positions
-          const [p1, p2] = division === "perPale" ? ["p", "q"] :
-                           division === "perFess" ? ["k", "n"] :
-                           division === "perBend" ? ["l", "m"] :
-                          ["j", "o"]; // perBendSinister
+        } else if (allowCounter && P(0.4)) coa.charges[0].divided = "counter";
+        // counterchanged, 40%
+        else if (["perPale", "perFess", "perBend", "perBendSinister"].includes(division) && P(0.8)) {
+          // place 2 charges in division standard positions
+          const [p1, p2] = division === "perPale" ? ["p", "q"] : division === "perFess" ? ["k", "n"] : division === "perBend" ? ["l", "m"] : ["j", "o"]; // perBendSinister
           coa.charges[0].p = p1;
 
           const charge = selectCharge(charges.single);
           const t = getTincture("charge", usedTinctures, coa.division.t);
           coa.charges.push({charge, t, p: p2});
-        }
-        else if (["perCross", "perSaltire"].includes(division) && P(.5)) { // place 4 charges in division standard positions
+        } else if (["perCross", "perSaltire"].includes(division) && P(0.5)) {
+          // place 4 charges in division standard positions
           const [p1, p2, p3, p4] = division === "perCross" ? ["j", "l", "m", "o"] : ["b", "d", "f", "h"];
           coa.charges[0].p = p1;
 
@@ -338,8 +590,7 @@
           const c4 = selectCharge(charges.single);
           const t4 = getTincture("charge", [], coa.t1);
           coa.charges.push({charge: c2, t: t2, p: p2}, {charge: c3, t: t3, p: p3}, {charge: c4, t: t4, p: p4});
-        }
-        else if (allowCounter && p.length > 1) coa.charges[0].divided = "counter"; // counterchanged, 40%
+        } else if (allowCounter && p.length > 1) coa.charges[0].divided = "counter"; // counterchanged, 40%
       }
 
       coa.charges.forEach(c => defineChargeAttributes(c));
@@ -351,8 +602,8 @@
         c.p = [...new Set(c.p)].join("");
 
         // define orientation
-        if (P(.02) && charges.sinister.includes(c.charge)) c.sinister = 1;
-        if (P(.02) && charges.reversed.includes(c.charge)) c.reversed = 1;
+        if (P(0.02) && charges.sinister.includes(c.charge)) c.sinister = 1;
+        if (P(0.02) && charges.reversed.includes(c.charge)) c.reversed = 1;
       }
     }
 
@@ -380,24 +631,26 @@
       if (!coa.charges) coa.charges = [];
       coa.charges.push({charge, t: t2, p: "y", size: 0.5});
 
-      coa.ordinaries ? coa.ordinaries.push(canton) : coa.ordinaries = [canton];
+      coa.ordinaries ? coa.ordinaries.push(canton) : (coa.ordinaries = [canton]);
     }
 
     function selectCharge(set) {
-      const type = set ? rw(set) : ordinary || divisioned ? rw(charges.types): rw(charges.single);
+      const type = set ? rw(set) : ordinary || divisioned ? rw(charges.types) : rw(charges.single);
       return type === "inescutcheon" ? "inescutcheon" : rw(charges[type]);
     }
 
     // select tincture: element type (field, division, charge), used field tinctures, field type to follow RoT
     function getTincture(element, fields = [], RoT) {
-      const base = RoT ? RoT.includes("-") ? RoT.split("-")[1] : RoT : null;
+      const base = RoT ? (RoT.includes("-") ? RoT.split("-")[1] : RoT) : null;
 
       let type = rw(tinctures[element]); // metals, colours, stains, patterns
       if (RoT && type !== "patterns") type = getType(base) === "metals" ? "colours" : "metals"; // follow RoT
       if (type === "metals" && fields.includes("or") && fields.includes("argent")) type = "colours"; // exclude metals overuse
       let tincture = rw(tinctures[type]);
 
-      while (tincture === base || fields.includes(tincture)) {tincture = rw(tinctures[type]);} // follow RoT
+      while (tincture === base || fields.includes(tincture)) {
+        tincture = rw(tinctures[type]);
+      } // follow RoT
 
       if (type !== "patterns" && element !== "charge") usedTinctures.push(tincture); // add field tincture
 
@@ -425,39 +678,60 @@
         if (Object.keys(tinctures.stains).includes(tincture)) return "stains";
         else return "pattern";
       }
-
     }
 
     function definePattern(pattern, element, size = "") {
-      let t1 = null, t2 = null;
-      if (P(.1)) size = "-small";
-      else if (P(.1)) size = "-smaller";
-      else if (P(.01)) size = "-big";
-      else if (P(.005)) size = "-smallest";
+      let t1 = null,
+        t2 = null;
+      if (P(0.1)) size = "-small";
+      else if (P(0.1)) size = "-smaller";
+      else if (P(0.01)) size = "-big";
+      else if (P(0.005)) size = "-smallest";
 
       // apply standard tinctures
-      if (P(.5) && ["vair", "vairInPale", "vairEnPointe"].includes(pattern)) {t1 = "azure"; t2 = "argent";}
-      else if (P(.8) && pattern === "ermine") {t1 = "argent"; t2 = "sable";}
-      else if (pattern === "pappellony") {
-        if (P(.2)) {t1 = "gules"; t2 = "or";}
-        else if (P(.2)) {t1 = "argent"; t2 = "sable";}
-        else if (P(.2)) {t1 = "azure"; t2 = "argent";}
-      }
-      else if (pattern === "masoned") {
-        if (P(.3)) {t1 = "gules"; t2 = "argent";}
-        else if (P(.3)) {t1 = "argent"; t2 = "sable";}
-        else if (P(.1)) {t1 = "or"; t2 = "sable";}
-      }
-      else if (pattern === "fretty") {
-        if (t2 === "sable" || P(.35)) {t1 = "argent"; t2 = "gules";}
-        else if (P(.25)) {t1 = "sable"; t2 = "or";}
-        else if (P(.15)) {t1 = "gules"; t2 = "argent";}
-      }
-      else if (pattern === "semy") pattern += "_of_" + selectCharge(charges.semy);
-
+      if (P(0.5) && ["vair", "vairInPale", "vairEnPointe"].includes(pattern)) {
+        t1 = "azure";
+        t2 = "argent";
+      } else if (P(0.8) && pattern === "ermine") {
+        t1 = "argent";
+        t2 = "sable";
+      } else if (pattern === "pappellony") {
+        if (P(0.2)) {
+          t1 = "gules";
+          t2 = "or";
+        } else if (P(0.2)) {
+          t1 = "argent";
+          t2 = "sable";
+        } else if (P(0.2)) {
+          t1 = "azure";
+          t2 = "argent";
+        }
+      } else if (pattern === "masoned") {
+        if (P(0.3)) {
+          t1 = "gules";
+          t2 = "argent";
+        } else if (P(0.3)) {
+          t1 = "argent";
+          t2 = "sable";
+        } else if (P(0.1)) {
+          t1 = "or";
+          t2 = "sable";
+        }
+      } else if (pattern === "fretty") {
+        if (t2 === "sable" || P(0.35)) {
+          t1 = "argent";
+          t2 = "gules";
+        } else if (P(0.25)) {
+          t1 = "sable";
+          t2 = "or";
+        } else if (P(0.15)) {
+          t1 = "gules";
+          t2 = "argent";
+        }
+      } else if (pattern === "semy") pattern += "_of_" + selectCharge(charges.semy);
 
       if (!t1 || !t2) {
-        const startWithMetal = P(.7);
+        const startWithMetal = P(0.7);
         t1 = startWithMetal ? rw(tinctures.metals) : rw(tinctures.colours);
         t2 = startWithMetal ? rw(tinctures.colours) : rw(tinctures.metals);
       }
@@ -474,28 +748,30 @@
 
     function replaceTincture(t, n) {
       const type = getType(t);
-      while (!n || n === t) {n = rw(tinctures[type]);}
+      while (!n || n === t) {
+        n = rw(tinctures[type]);
+      }
       return n;
     }
 
     function getSize(p, o = null, d = null) {
       if (p === "e" && (o === "bordure" || o === "orle")) return 1.1;
       if (p === "e") return 1.5;
-      if (p === "jln" || p === "jlh") return .7;
-      if (p === "abcpqh" || p === "ez" || p === "be") return .5;
-      if (["a", "b", "c", "d", "f", "g", "h", "i", "bh", "df"].includes(p)) return .5;
-      if (["j", "l", "m", "o", "jlmo"].includes(p) && d === "perCross") return .6;
-      if (p.length > 10) return .18; // >10 (bordure)
-      if (p.length > 7) return .3; // 8, 9, 10
-      if (p.length > 4) return .4; // 5, 6, 7
-      if (p.length > 2) return .5; // 3, 4
-      return .7; // 1, 2
+      if (p === "jln" || p === "jlh") return 0.7;
+      if (p === "abcpqh" || p === "ez" || p === "be") return 0.5;
+      if (["a", "b", "c", "d", "f", "g", "h", "i", "bh", "df"].includes(p)) return 0.5;
+      if (["j", "l", "m", "o", "jlmo"].includes(p) && d === "perCross") return 0.6;
+      if (p.length > 10) return 0.18; // >10 (bordure)
+      if (p.length > 7) return 0.3; // 8, 9, 10
+      if (p.length > 4) return 0.4; // 5, 6, 7
+      if (p.length > 2) return 0.5; // 3, 4
+      return 0.7; // 1, 2
     }
 
     return coa;
-  }
+  };
 
-  const getShield = function(culture, state) {
+  const getShield = function (culture, state) {
     const emblemShape = document.getElementById("emblemShape");
     const shapeGroup = emblemShape.selectedOptions[0]?.parentNode.label || "Diversiform";
     if (shapeGroup !== "Diversiform") return emblemShape.value;
@@ -504,11 +780,10 @@
     if (pack.cultures[culture].shield) return pack.cultures[culture].shield;
     console.error("Shield shape is not defined on culture level", pack.cultures[culture]);
     return "heater";
-  }
+  };
 
   const toString = coa => JSON.stringify(coa).replaceAll("#", "%23");
   const copy = coa => JSON.parse(JSON.stringify(coa));
 
   return {generate, toString, copy, getShield, shields};
-
-})));
\ No newline at end of file
+})();
diff --git a/modules/coa-renderer.js b/modules/coa-renderer.js
index 3a451782..f7c71bd2 100644
--- a/modules/coa-renderer.js
+++ b/modules/coa-renderer.js
@@ -1,9 +1,6 @@
-(function (global, factory) {
-  typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
-  typeof define === 'function' && define.amd ? define(factory) :
-  (global.COArenderer = factory());
-}(this, (function () {'use strict';
+"use strict";
 
+window.COArenderer = (function () {
   const colors = {
     argent: "#fafafa",
     or: "#ffe066",
@@ -15,610 +12,1388 @@
     murrey: "#85185b",
     sanguine: "#b63a3a",
     tenné: "#cc7f19"
-  }
+  };
 
   const shieldPositions = {
     // shield-specific position: [x, y] (relative to center)
     heater: {
-      a: [-43.75, -50], b: [0, -50], c: [43.75, -50],
-      d: [-43.75, 0], e: [0, 0], f: [43.75, 0],
-      g: [-32.25, 37.5], h: [0, 50], i: [32.25, 37.5],
-      y: [-50, -50], z: [0, 62.5],
-      j: [-37.5, -37.5], k: [0, -37.5], l: [37.5, -37.5],
-      m: [-30, 30], n: [0, 42.5], o: [30, 30],
-      p: [-37.5, 0], q: [37.5, 0],
-      A: [-66.2, -66.6], B: [-22, -66.6], C: [22, -66.6], D: [66.2, -66.6],
-      K: [-66.2, -20], E: [66.2, -20],
-      J: [-55.5, 26], F: [55.5, 26],
-      I: [-33, 62], G: [33, 62],
+      a: [-43.75, -50],
+      b: [0, -50],
+      c: [43.75, -50],
+      d: [-43.75, 0],
+      e: [0, 0],
+      f: [43.75, 0],
+      g: [-32.25, 37.5],
+      h: [0, 50],
+      i: [32.25, 37.5],
+      y: [-50, -50],
+      z: [0, 62.5],
+      j: [-37.5, -37.5],
+      k: [0, -37.5],
+      l: [37.5, -37.5],
+      m: [-30, 30],
+      n: [0, 42.5],
+      o: [30, 30],
+      p: [-37.5, 0],
+      q: [37.5, 0],
+      A: [-66.2, -66.6],
+      B: [-22, -66.6],
+      C: [22, -66.6],
+      D: [66.2, -66.6],
+      K: [-66.2, -20],
+      E: [66.2, -20],
+      J: [-55.5, 26],
+      F: [55.5, 26],
+      I: [-33, 62],
+      G: [33, 62],
       H: [0, 89.5]
     },
     spanish: {
-      a: [-43.75, -50], b: [0, -50], c: [43.75, -50],
-      d: [-43.75, 0], e: [0, 0], f: [43.75, 0],
-      g: [-43.75, 50], h: [0, 50], i: [43.75, 50],
-      y: [-50, -50], z: [0, 50],
-      j: [-37.5, -37.5], k: [0, -37.5], l: [37.5, -37.5],
-      m: [-37.5, 37.5], n: [0, 37.5], o: [37.5, 37.5],
-      p: [-37.5, 0], q: [37.5, 0],
-      A: [-66.2, -66.6], B: [-22, -66.6], C: [22, -66.6], D: [66.2, -66.6],
-      K: [-66.4, -20], E: [66.4, -20],
-      J: [-66.4, 26], F: [66.4, 26],
-      I: [-49, 70], G: [49, 70],
+      a: [-43.75, -50],
+      b: [0, -50],
+      c: [43.75, -50],
+      d: [-43.75, 0],
+      e: [0, 0],
+      f: [43.75, 0],
+      g: [-43.75, 50],
+      h: [0, 50],
+      i: [43.75, 50],
+      y: [-50, -50],
+      z: [0, 50],
+      j: [-37.5, -37.5],
+      k: [0, -37.5],
+      l: [37.5, -37.5],
+      m: [-37.5, 37.5],
+      n: [0, 37.5],
+      o: [37.5, 37.5],
+      p: [-37.5, 0],
+      q: [37.5, 0],
+      A: [-66.2, -66.6],
+      B: [-22, -66.6],
+      C: [22, -66.6],
+      D: [66.2, -66.6],
+      K: [-66.4, -20],
+      E: [66.4, -20],
+      J: [-66.4, 26],
+      F: [66.4, 26],
+      I: [-49, 70],
+      G: [49, 70],
       H: [0, 92]
     },
     french: {
-      a: [-43.75, -50], b: [0, -50], c: [43.75, -50],
-      d: [-43.75, 0], e: [0, 0], f: [43.75, 0],
-      g: [-43.75, 50], h: [0, 50], i: [43.75, 50],
-      y: [-50, -50], z: [0, 65],
-      j: [-37.5, -37.5], k: [0, -37.5], l: [37.5, -37.5],
-      m: [-37.5, 37.5], n: [0, 37.5], o: [37.5, 37.5],
-      p: [-37.5, 0], q: [37.5, 0],
-      A: [-66.2, -66.6], B: [-22, -66.6], C: [22, -66.6], D: [66.2, -66.6],
-      K: [-66.4, -20], E: [66.4, -20],
-      J: [-66.4, 26], F: [66.4, 26],
-      I: [-65.4, 70], G: [65.4, 70],
+      a: [-43.75, -50],
+      b: [0, -50],
+      c: [43.75, -50],
+      d: [-43.75, 0],
+      e: [0, 0],
+      f: [43.75, 0],
+      g: [-43.75, 50],
+      h: [0, 50],
+      i: [43.75, 50],
+      y: [-50, -50],
+      z: [0, 65],
+      j: [-37.5, -37.5],
+      k: [0, -37.5],
+      l: [37.5, -37.5],
+      m: [-37.5, 37.5],
+      n: [0, 37.5],
+      o: [37.5, 37.5],
+      p: [-37.5, 0],
+      q: [37.5, 0],
+      A: [-66.2, -66.6],
+      B: [-22, -66.6],
+      C: [22, -66.6],
+      D: [66.2, -66.6],
+      K: [-66.4, -20],
+      E: [66.4, -20],
+      J: [-66.4, 26],
+      F: [66.4, 26],
+      I: [-65.4, 70],
+      G: [65.4, 70],
       H: [0, 89]
     },
     horsehead: {
-      a: [-43.75, -47.5], b: [0, -50], c: [43.75, -47.5],
-      d: [-35, 0], e: [0, 0], f: [35, 0],
+      a: [-43.75, -47.5],
+      b: [0, -50],
+      c: [43.75, -47.5],
+      d: [-35, 0],
+      e: [0, 0],
+      f: [35, 0],
       h: [0, 50],
-      y: [-50, -50], z: [0, 55],
-      j: [-35, -35], k: [0, -40], l: [35, -35],
-      m: [-30, 30], n: [0, 40], o: [30, 30],
-      p: [-27.5, 0], q: [27.5, 0],
-      A: [-71, -52], B: [-24, -73], C: [24, -73], D: [71, -52],
-      K: [-62, -16], E: [62, -16],
-      J: [-39, 20], F: [39, 20],
-      I: [-33.5, 60], G: [33.5, 60],
+      y: [-50, -50],
+      z: [0, 55],
+      j: [-35, -35],
+      k: [0, -40],
+      l: [35, -35],
+      m: [-30, 30],
+      n: [0, 40],
+      o: [30, 30],
+      p: [-27.5, 0],
+      q: [27.5, 0],
+      A: [-71, -52],
+      B: [-24, -73],
+      C: [24, -73],
+      D: [71, -52],
+      K: [-62, -16],
+      E: [62, -16],
+      J: [-39, 20],
+      F: [39, 20],
+      I: [-33.5, 60],
+      G: [33.5, 60],
       H: [0, 91.5]
     },
     horsehead2: {
-      a: [-37.5, -47.5], b: [0, -50], c: [37.5, -47.5],
-      d: [-35, 0], e: [0, 0], f: [35, 0],
-      g: [-35, 47.5], h: [0, 50], i: [35, 47.5],
-      y: [-50, -50], z: [0, 55],
-      j: [-30, -30], k: [0, -40], l: [30, -30],
-      m: [-30, 30], n: [0, 40], o: [30, 30],
-      p: [-27.5, 0], q: [27.5, 0],
-      A: [-49, -39], B: [-22, -70], C: [22, -70], D: [49, -39],
-      K: [-51, -2], E: [51, -2],
-      J: [-38.5, 31], F: [38.5, 31],
-      I: [-35, 67], G: [35, 67],
+      a: [-37.5, -47.5],
+      b: [0, -50],
+      c: [37.5, -47.5],
+      d: [-35, 0],
+      e: [0, 0],
+      f: [35, 0],
+      g: [-35, 47.5],
+      h: [0, 50],
+      i: [35, 47.5],
+      y: [-50, -50],
+      z: [0, 55],
+      j: [-30, -30],
+      k: [0, -40],
+      l: [30, -30],
+      m: [-30, 30],
+      n: [0, 40],
+      o: [30, 30],
+      p: [-27.5, 0],
+      q: [27.5, 0],
+      A: [-49, -39],
+      B: [-22, -70],
+      C: [22, -70],
+      D: [49, -39],
+      K: [-51, -2],
+      E: [51, -2],
+      J: [-38.5, 31],
+      F: [38.5, 31],
+      I: [-35, 67],
+      G: [35, 67],
       H: [0, 85]
     },
     polish: {
-      a: [-35, -50], b: [0, -50], c: [35, -50],
-      d: [-40, 0], e: [0, 0], f: [40, 0],
-      g: [-37.5, 50], h: [0, 50], i: [37.5, 50],
-      y: [-50, -50], z: [0, 65],
-      j: [-27.5, -27.5], k: [0, -45], l: [27.5, -27.5],
-      m: [-27.5, 27.5], n: [0, 45], o: [27.5, 27.5],
-      p: [-32.5, 0], q: [32.5, 0],
-      A: [-48, -52], B: [-23, -80], C: [23, -80], D: [48, -52],
-      K: [-47, -10], E: [47, -10],
-      J: [-62, 32], F: [62, 32],
-      I: [-37, 68], G: [37, 68],
+      a: [-35, -50],
+      b: [0, -50],
+      c: [35, -50],
+      d: [-40, 0],
+      e: [0, 0],
+      f: [40, 0],
+      g: [-37.5, 50],
+      h: [0, 50],
+      i: [37.5, 50],
+      y: [-50, -50],
+      z: [0, 65],
+      j: [-27.5, -27.5],
+      k: [0, -45],
+      l: [27.5, -27.5],
+      m: [-27.5, 27.5],
+      n: [0, 45],
+      o: [27.5, 27.5],
+      p: [-32.5, 0],
+      q: [32.5, 0],
+      A: [-48, -52],
+      B: [-23, -80],
+      C: [23, -80],
+      D: [48, -52],
+      K: [-47, -10],
+      E: [47, -10],
+      J: [-62, 32],
+      F: [62, 32],
+      I: [-37, 68],
+      G: [37, 68],
       H: [0, 86]
     },
     hessen: {
-      a: [-43.75, -50], b: [0, -50], c: [43.75, -50],
-      d: [-43.75, 0], e: [0, 0], f: [43.75, 0],
-      g: [-43.75, 50], h: [0, 50], i: [43.75, 50],
-      y: [-50, -50], z: [0, 52.5],
-      j: [-40, -40], k: [0, -40], l: [40, -40],
-      m: [-40, 40], n: [0, 40], o: [40, 40],
-      p: [-40, 0], q: [40, 0],
-      A: [-69, -64], B: [-22, -76], C: [22, -76], D: [69, -64],
-      K: [-66.4, -20], E: [66.4, -20],
-      J: [-62, 26], F: [62, 26],
-      I: [-46, 70], G: [46, 70],
+      a: [-43.75, -50],
+      b: [0, -50],
+      c: [43.75, -50],
+      d: [-43.75, 0],
+      e: [0, 0],
+      f: [43.75, 0],
+      g: [-43.75, 50],
+      h: [0, 50],
+      i: [43.75, 50],
+      y: [-50, -50],
+      z: [0, 52.5],
+      j: [-40, -40],
+      k: [0, -40],
+      l: [40, -40],
+      m: [-40, 40],
+      n: [0, 40],
+      o: [40, 40],
+      p: [-40, 0],
+      q: [40, 0],
+      A: [-69, -64],
+      B: [-22, -76],
+      C: [22, -76],
+      D: [69, -64],
+      K: [-66.4, -20],
+      E: [66.4, -20],
+      J: [-62, 26],
+      F: [62, 26],
+      I: [-46, 70],
+      G: [46, 70],
       H: [0, 91.5]
     },
     swiss: {
-      a: [-43.75, -50], b: [0, -50], c: [43.75, -50],
-      d: [-43.75, 0], e: [0, 0], f: [43.75, 0],
-      g: [-32, 37.5], h: [0, 50], i: [32, 37.5],
-      y: [-50, -50], z: [0, 62.5],
-      j: [-37.5, -37.5], k: [0, -37.5], l: [37.5, -37.5],
-      m: [-32, 32.5], n: [0, 42.5], o: [32, 32.5],
-      p: [-37.5, 0], q: [37.5, 0],
-      A: [-66.2, -66.6], B: [-22, -66], C: [22, -66], D: [66.2, -66.6],
-      K: [-63, -20], E: [63, -20],
-      J: [-50, 26], F: [50, 26],
-      I: [-29, 62], G: [29, 62],
+      a: [-43.75, -50],
+      b: [0, -50],
+      c: [43.75, -50],
+      d: [-43.75, 0],
+      e: [0, 0],
+      f: [43.75, 0],
+      g: [-32, 37.5],
+      h: [0, 50],
+      i: [32, 37.5],
+      y: [-50, -50],
+      z: [0, 62.5],
+      j: [-37.5, -37.5],
+      k: [0, -37.5],
+      l: [37.5, -37.5],
+      m: [-32, 32.5],
+      n: [0, 42.5],
+      o: [32, 32.5],
+      p: [-37.5, 0],
+      q: [37.5, 0],
+      A: [-66.2, -66.6],
+      B: [-22, -66],
+      C: [22, -66],
+      D: [66.2, -66.6],
+      K: [-63, -20],
+      E: [63, -20],
+      J: [-50, 26],
+      F: [50, 26],
+      I: [-29, 62],
+      G: [29, 62],
       H: [0, 89.5]
     },
     boeotian: {
-      a: [-37.5, -47.5], b: [0, -47.5], c: [37.5, -47.5],
-      d: [-25, 0], e: [0, 0], f: [25, 0],
-      g: [-37.5, 47.5], h: [0, 47.5], i: [37.5, 47.5],
-      y: [-48, -48], z: [0, 60],
-      j: [-32.5, -37.5], k: [0, -45], l: [32.5, -37.5],
-      m: [-32.5, 37.5], n: [0, 45], o: [32.5, 37.5],
-      p: [-20, 0], q: [20, 0],
-      A: [-45, -55], B: [-20, -77], C: [20, -77], D: [45, -55],
-      K: [-59, -25], E: [59, -25],
-      J: [-58, 27], F: [58, 27],
-      I: [-39, 63], G: [39, 63],
+      a: [-37.5, -47.5],
+      b: [0, -47.5],
+      c: [37.5, -47.5],
+      d: [-25, 0],
+      e: [0, 0],
+      f: [25, 0],
+      g: [-37.5, 47.5],
+      h: [0, 47.5],
+      i: [37.5, 47.5],
+      y: [-48, -48],
+      z: [0, 60],
+      j: [-32.5, -37.5],
+      k: [0, -45],
+      l: [32.5, -37.5],
+      m: [-32.5, 37.5],
+      n: [0, 45],
+      o: [32.5, 37.5],
+      p: [-20, 0],
+      q: [20, 0],
+      A: [-45, -55],
+      B: [-20, -77],
+      C: [20, -77],
+      D: [45, -55],
+      K: [-59, -25],
+      E: [59, -25],
+      J: [-58, 27],
+      F: [58, 27],
+      I: [-39, 63],
+      G: [39, 63],
       H: [0, 81]
     },
     roman: {
-      a: [-40, -52.5], b: [0, -52.5], c: [40, -52.5],
-      d: [-40, 0], e: [0, 0], f: [40, 0],
-      g: [-40, 52.5], h: [0, 52.5], i: [40, 52.5],
-      y: [-42.5, -52.5], z: [0, 65],
-      j: [-30, -37.5], k: [0, -37.5], l: [30, -37.5],
-      m: [-30, 37.5], n: [0, 37.5], o: [30, 37.5],
-      p: [-30, 0], q: [30, 0],
-      A: [-51.5, -65], B: [-17, -75], C: [17, -75], D: [51.5, -65],
-      K: [-51.5, -21], E: [51.5, -21],
-      J: [-51.5, 21], F: [51.5, 21],
-      I: [-51.5, 65], G: [51.5, 65],
-      H: [-17, 75], L: [17, 75]
+      a: [-40, -52.5],
+      b: [0, -52.5],
+      c: [40, -52.5],
+      d: [-40, 0],
+      e: [0, 0],
+      f: [40, 0],
+      g: [-40, 52.5],
+      h: [0, 52.5],
+      i: [40, 52.5],
+      y: [-42.5, -52.5],
+      z: [0, 65],
+      j: [-30, -37.5],
+      k: [0, -37.5],
+      l: [30, -37.5],
+      m: [-30, 37.5],
+      n: [0, 37.5],
+      o: [30, 37.5],
+      p: [-30, 0],
+      q: [30, 0],
+      A: [-51.5, -65],
+      B: [-17, -75],
+      C: [17, -75],
+      D: [51.5, -65],
+      K: [-51.5, -21],
+      E: [51.5, -21],
+      J: [-51.5, 21],
+      F: [51.5, 21],
+      I: [-51.5, 65],
+      G: [51.5, 65],
+      H: [-17, 75],
+      L: [17, 75]
     },
     kite: {
-      b: [0, -65], e: [0, -15], h: [0, 35],
-      z: [0, 35], k: [0, -50], n: [0, 20],
-      p: [-20, -15], q: [20, -15],
-      A: [-38, -52], B: [-29, -78], C: [29, -78], D: [38, -52],
-      K: [-33, -20], E: [33, -20],
-      J: [-25, 11], F: [25, 11],
-      I: [-15, 42], G: [15, 42],
-      H: [0, 73], L: [0, -91]
+      b: [0, -65],
+      e: [0, -15],
+      h: [0, 35],
+      z: [0, 35],
+      k: [0, -50],
+      n: [0, 20],
+      p: [-20, -15],
+      q: [20, -15],
+      A: [-38, -52],
+      B: [-29, -78],
+      C: [29, -78],
+      D: [38, -52],
+      K: [-33, -20],
+      E: [33, -20],
+      J: [-25, 11],
+      F: [25, 11],
+      I: [-15, 42],
+      G: [15, 42],
+      H: [0, 73],
+      L: [0, -91]
     },
     oldFrench: {
-      a: [-43.75, -50], b: [0, -50], c: [43.75, -50],
-      d: [-43.75, 0], e: [0, 0], f: [43.75, 0],
-      g: [-37.5, 50], h: [0, 50], i: [37.5, 50],
-      y: [-50, -50], z: [0, 62.5],
-      j: [-37.5, -37.5], k: [0, -37.5], l: [37.5, -37.5],
-      m: [-37.5, 37.5], n: [0, 45], o: [37.5, 37.5],
-      p: [-37.5, 0], q: [37.5, 0],
-      A: [-66.2, -66.6], B: [-22, -66.6], C: [22, -66.6], D: [66.2, -66.6],
-      K: [-66.2, -20], E: [66.2, -20],
-      J: [-64, 26], F: [64, 26],
-      I: [-45, 62], G: [45, 62],
-      H: [0, 91],
+      a: [-43.75, -50],
+      b: [0, -50],
+      c: [43.75, -50],
+      d: [-43.75, 0],
+      e: [0, 0],
+      f: [43.75, 0],
+      g: [-37.5, 50],
+      h: [0, 50],
+      i: [37.5, 50],
+      y: [-50, -50],
+      z: [0, 62.5],
+      j: [-37.5, -37.5],
+      k: [0, -37.5],
+      l: [37.5, -37.5],
+      m: [-37.5, 37.5],
+      n: [0, 45],
+      o: [37.5, 37.5],
+      p: [-37.5, 0],
+      q: [37.5, 0],
+      A: [-66.2, -66.6],
+      B: [-22, -66.6],
+      C: [22, -66.6],
+      D: [66.2, -66.6],
+      K: [-66.2, -20],
+      E: [66.2, -20],
+      J: [-64, 26],
+      F: [64, 26],
+      I: [-45, 62],
+      G: [45, 62],
+      H: [0, 91]
     },
     renaissance: {
-      a: [-43.75, -50], b: [0, -50], c: [43.75, -50],
-      d: [-41.5, 0], e: [0, 0], f: [41.5, 0],
-      g: [-43.75, 50], h: [0, 50], i: [43.75, 50],
-      y: [-50, -50], z: [0, 62.5],
-      j: [-37.5, -37.5], k: [0, -37.5], l: [37.5, -37.5],
-      m: [-37.5, 37.5], n: [0, 37.5], o: [37.5, 37.5],
-      p: [-37.5, 0], q: [37.5, 0],
-      A: [-61, -55], B: [-23, -67], C: [23, -67], D: [61, -55],
-      K: [-55, -11], E: [55, -11],
-      J: [-65, 31], F: [65, 31],
-      I: [-45, 76], G: [45, 76],
+      a: [-43.75, -50],
+      b: [0, -50],
+      c: [43.75, -50],
+      d: [-41.5, 0],
+      e: [0, 0],
+      f: [41.5, 0],
+      g: [-43.75, 50],
+      h: [0, 50],
+      i: [43.75, 50],
+      y: [-50, -50],
+      z: [0, 62.5],
+      j: [-37.5, -37.5],
+      k: [0, -37.5],
+      l: [37.5, -37.5],
+      m: [-37.5, 37.5],
+      n: [0, 37.5],
+      o: [37.5, 37.5],
+      p: [-37.5, 0],
+      q: [37.5, 0],
+      A: [-61, -55],
+      B: [-23, -67],
+      C: [23, -67],
+      D: [61, -55],
+      K: [-55, -11],
+      E: [55, -11],
+      J: [-65, 31],
+      F: [65, 31],
+      I: [-45, 76],
+      G: [45, 76],
       H: [0, 87]
     },
     baroque: {
-      a: [-43.75, -45], b: [0, -45], c: [43.75, -45],
-      d: [-43.75, 0], e: [0, 0], f: [43.75, 0],
-      g: [-43.75, 50], h: [0, 50], i: [43.75, 50],
-      y: [-50, -50], z: [0, 60],
-      j: [-37.5, -37.5], k: [0, -37.5], l: [37.5, -37.5],
-      m: [-37.5, 37.5], n: [0, 37.5], o: [37.5, 37.5],
-      p: [-37.5, 0], q: [37.5, 0],
-      A: [-65, -54.5], B: [-22, -65], C: [22, -65], D: [65, -54.5],
-      K: [-58.5, -15], E: [58.5, -15],
-      J: [-65, 31], F: [66, 31],
-      I: [-35, 73], G: [35, 73],
+      a: [-43.75, -45],
+      b: [0, -45],
+      c: [43.75, -45],
+      d: [-43.75, 0],
+      e: [0, 0],
+      f: [43.75, 0],
+      g: [-43.75, 50],
+      h: [0, 50],
+      i: [43.75, 50],
+      y: [-50, -50],
+      z: [0, 60],
+      j: [-37.5, -37.5],
+      k: [0, -37.5],
+      l: [37.5, -37.5],
+      m: [-37.5, 37.5],
+      n: [0, 37.5],
+      o: [37.5, 37.5],
+      p: [-37.5, 0],
+      q: [37.5, 0],
+      A: [-65, -54.5],
+      B: [-22, -65],
+      C: [22, -65],
+      D: [65, -54.5],
+      K: [-58.5, -15],
+      E: [58.5, -15],
+      J: [-65, 31],
+      F: [66, 31],
+      I: [-35, 73],
+      G: [35, 73],
       H: [0, 89]
     },
     targe: {
-      a: [-43.75, -50], b: [0, -50], c: [43.75, -50],
-      d: [-43.75, 0], e: [0, 0], f: [43.75, 0],
-      g: [-43.75, 50], h: [0, 50], i: [43.75, 50],
-      y: [-50, -50], z: [0, 50],
-      j: [-40, -40], k: [0, -40], l: [40, -40],
-      m: [-40, 40], n: [0, 40], o: [40, 40],
-      p: [-32.5, 0], q: [32.5, 0],
-      A: [-66.2, -60], B: [-22, -77], C: [22, -86], D: [60, -66.6],
-      K: [-28, -20], E: [57, -20],
-      J: [-61, 26], F: [61, 26],
-      I: [-49, 63], G: [49, 59],
+      a: [-43.75, -50],
+      b: [0, -50],
+      c: [43.75, -50],
+      d: [-43.75, 0],
+      e: [0, 0],
+      f: [43.75, 0],
+      g: [-43.75, 50],
+      h: [0, 50],
+      i: [43.75, 50],
+      y: [-50, -50],
+      z: [0, 50],
+      j: [-40, -40],
+      k: [0, -40],
+      l: [40, -40],
+      m: [-40, 40],
+      n: [0, 40],
+      o: [40, 40],
+      p: [-32.5, 0],
+      q: [32.5, 0],
+      A: [-66.2, -60],
+      B: [-22, -77],
+      C: [22, -86],
+      D: [60, -66.6],
+      K: [-28, -20],
+      E: [57, -20],
+      J: [-61, 26],
+      F: [61, 26],
+      I: [-49, 63],
+      G: [49, 59],
       H: [0, 80]
     },
     targe2: {
-      a: [-43.75, -50], b: [0, -50], c: [43.75, -50],
-      d: [-40, 0], e: [0, 0], f: [40, 0],
-      g: [-43.75, 50], h: [0, 50], i: [43.75, 50],
-      y: [-50, -50], z: [0, 60],
-      j: [-37.5, -37.5], k: [0, -37.5], l: [37.5, -37.5],
-      m: [-37.5, 37.5], n: [0, 37.5], o: [37.5, 37.5],
-      p: [-32.5, 0], q: [32.5, 0],
-      A: [-55, -59], B: [-15, -59], C: [24, -79], D: [51, -58],
-      K: [-40, -14], E: [51, -14],
-      J: [-64, 26], F: [62, 26],
-      I: [-46, 66], G: [48, 67],
+      a: [-43.75, -50],
+      b: [0, -50],
+      c: [43.75, -50],
+      d: [-40, 0],
+      e: [0, 0],
+      f: [40, 0],
+      g: [-43.75, 50],
+      h: [0, 50],
+      i: [43.75, 50],
+      y: [-50, -50],
+      z: [0, 60],
+      j: [-37.5, -37.5],
+      k: [0, -37.5],
+      l: [37.5, -37.5],
+      m: [-37.5, 37.5],
+      n: [0, 37.5],
+      o: [37.5, 37.5],
+      p: [-32.5, 0],
+      q: [32.5, 0],
+      A: [-55, -59],
+      B: [-15, -59],
+      C: [24, -79],
+      D: [51, -58],
+      K: [-40, -14],
+      E: [51, -14],
+      J: [-64, 26],
+      F: [62, 26],
+      I: [-46, 66],
+      G: [48, 67],
       H: [0, 83]
     },
     pavise: {
-      a: [-40, -52.5], b: [0, -52.5], c: [40, -52.5],
-      d: [-40, 0], e: [0, 0], f: [40, 0],
-      g: [-40, 52.5], h: [0, 52.5], i: [40, 52.5],
-      y: [-42.5, -52.5], z: [0, 60],
-      j: [-30, -35], k: [0, -37.5], l: [30, -35],
-      m: [-30, 35], n: [0, 37.5], o: [30, 35],
-      p: [-30, 0], q: [30, 0],
-      A: [-57, -55], B: [-22, -74], C: [22, -74], D: [57, -55],
-      K: [-54, -11], E: [54, -11],
-      J: [-50, 36], F: [50, 36],
-      I: [-46, 81], G: [46, 81],
+      a: [-40, -52.5],
+      b: [0, -52.5],
+      c: [40, -52.5],
+      d: [-40, 0],
+      e: [0, 0],
+      f: [40, 0],
+      g: [-40, 52.5],
+      h: [0, 52.5],
+      i: [40, 52.5],
+      y: [-42.5, -52.5],
+      z: [0, 60],
+      j: [-30, -35],
+      k: [0, -37.5],
+      l: [30, -35],
+      m: [-30, 35],
+      n: [0, 37.5],
+      o: [30, 35],
+      p: [-30, 0],
+      q: [30, 0],
+      A: [-57, -55],
+      B: [-22, -74],
+      C: [22, -74],
+      D: [57, -55],
+      K: [-54, -11],
+      E: [54, -11],
+      J: [-50, 36],
+      F: [50, 36],
+      I: [-46, 81],
+      G: [46, 81],
       H: [0, 81]
     },
     wedged: {
-      a: [-43.75, -50], b: [0, -50], c: [43.75, -50],
-      d: [-43.75, 0], e: [0, 0], f: [43.75, 0],
-      g: [-32.25, 37.5], h: [0, 50], i: [32.25, 37.5],
-      y: [-50, -50], z: [0, 62.5],
-      j: [-37.5, -37.5], k: [0, -37.5], l: [37.5, -37.5],
-      m: [-32.5, 32.5], n: [0, 42.5], o: [32.5, 32.5],
-      p: [-37.5, 0], q: [37.5, 0],
-      A: [-66, -53], B: [-22, -72.5], C: [22, -72.5], D: [66, -53],
-      K: [-62.6, -13], E: [62.6, -13],
-      J: [-50, 26], F: [50, 26],
-      I: [-27, 62], G: [27, 62],
+      a: [-43.75, -50],
+      b: [0, -50],
+      c: [43.75, -50],
+      d: [-43.75, 0],
+      e: [0, 0],
+      f: [43.75, 0],
+      g: [-32.25, 37.5],
+      h: [0, 50],
+      i: [32.25, 37.5],
+      y: [-50, -50],
+      z: [0, 62.5],
+      j: [-37.5, -37.5],
+      k: [0, -37.5],
+      l: [37.5, -37.5],
+      m: [-32.5, 32.5],
+      n: [0, 42.5],
+      o: [32.5, 32.5],
+      p: [-37.5, 0],
+      q: [37.5, 0],
+      A: [-66, -53],
+      B: [-22, -72.5],
+      C: [22, -72.5],
+      D: [66, -53],
+      K: [-62.6, -13],
+      E: [62.6, -13],
+      J: [-50, 26],
+      F: [50, 26],
+      I: [-27, 62],
+      G: [27, 62],
       H: [0, 87]
     },
     flag: {
-      a: [-60, -40], b: [0, -40], c: [60, -40],
-      d: [-60, 0], e: [0, 0], f: [60, 0],
-      g: [-60, 40], h: [0, 40], i: [60, 40],
-      y: [-60, -42.5], z: [0, 40],
-      j: [-45, -30], k: [0, -30], l: [45, -30],
-      m: [-45, 30], n: [0, 30], o: [45, 30],
-      p: [-45, 0], q: [45, 0],
-      A: [-81, -51], B: [-27, -51], C: [27, -51], D: [81, -51],
-      K: [-81, -17], E: [81, -17],
-      J: [-81, 17], F: [81, 17],
-      I: [-81, 51], G: [81, 51],
-      H: [-27, 51], L: [27, 51]
+      a: [-60, -40],
+      b: [0, -40],
+      c: [60, -40],
+      d: [-60, 0],
+      e: [0, 0],
+      f: [60, 0],
+      g: [-60, 40],
+      h: [0, 40],
+      i: [60, 40],
+      y: [-60, -42.5],
+      z: [0, 40],
+      j: [-45, -30],
+      k: [0, -30],
+      l: [45, -30],
+      m: [-45, 30],
+      n: [0, 30],
+      o: [45, 30],
+      p: [-45, 0],
+      q: [45, 0],
+      A: [-81, -51],
+      B: [-27, -51],
+      C: [27, -51],
+      D: [81, -51],
+      K: [-81, -17],
+      E: [81, -17],
+      J: [-81, 17],
+      F: [81, 17],
+      I: [-81, 51],
+      G: [81, 51],
+      H: [-27, 51],
+      L: [27, 51]
     },
     pennon: {
       a: [-75, -40],
-      d: [-75, 0], e: [-25, 0], f: [25, 0],
+      d: [-75, 0],
+      e: [-25, 0],
+      f: [25, 0],
       g: [-75, 40],
       y: [-70, -42.5],
       j: [-60, -30],
       m: [-60, 30],
-      p: [-60, 0], q: [5, 0],
-      A: [-81, -48], B: [-43, -36], C: [-4.5, -24], D: [33, -12],
+      p: [-60, 0],
+      q: [5, 0],
+      A: [-81, -48],
+      B: [-43, -36],
+      C: [-4.5, -24],
+      D: [33, -12],
       E: [72, 0],
-      F: [33, 12], G: [-4.5, 24], H: [-43, 36], I: [-81, 48],
-      J: [-81, 17], K: [-81, -17]
+      F: [33, 12],
+      G: [-4.5, 24],
+      H: [-43, 36],
+      I: [-81, 48],
+      J: [-81, 17],
+      K: [-81, -17]
     },
     guidon: {
-      a: [-60, -40], b: [0, -40], c: [60, -40],
-      d: [-60, 0], e: [0, 0],
-      g: [-60, 40], h: [0, 40], i: [60, 40],
-      y: [-60, -42.5], z: [0, 40],
-      j: [-45, -30], k: [0, -30], l: [45, -30],
-      m: [-45, 30], n: [0, 30], o: [45, 30],
+      a: [-60, -40],
+      b: [0, -40],
+      c: [60, -40],
+      d: [-60, 0],
+      e: [0, 0],
+      g: [-60, 40],
+      h: [0, 40],
+      i: [60, 40],
+      y: [-60, -42.5],
+      z: [0, 40],
+      j: [-45, -30],
+      k: [0, -30],
+      l: [45, -30],
+      m: [-45, 30],
+      n: [0, 30],
+      o: [45, 30],
       p: [-45, 0],
-      A: [-81, -51], B: [-27, -51], C: [27, -51], D: [78, -51],
-      K: [-81, -17], E: [40.5, -17],
-      J: [-81, 17], F: [40.5, 17],
-      I: [-81, 51], G: [78, 51],
-      H: [-27, 51], L: [27, 51]
+      A: [-81, -51],
+      B: [-27, -51],
+      C: [27, -51],
+      D: [78, -51],
+      K: [-81, -17],
+      E: [40.5, -17],
+      J: [-81, 17],
+      F: [40.5, 17],
+      I: [-81, 51],
+      G: [78, 51],
+      H: [-27, 51],
+      L: [27, 51]
     },
     banner: {
-      a: [-50, -50], b: [0, -50], c: [50, -50],
-      d: [-50, 0], e: [0, 0], f: [50, 0],
-      g: [-50, 40], h: [0, 40], i: [50, 40],
-      y: [-50, -50], z: [0, 40],
-      j: [-37.5, -37.5], k: [0, -37.5], l: [37.5, -37.5],
-      m: [-37.5, 27.5], n: [0, 27.5], o: [37.5, 27.5],
-      p: [-37.5, 0], q: [37.5, 0],
-      A: [-66.5, -66.5], B: [-22, -66.5], C: [22, -66.5], D: [66.5, -66.5],
-      K: [-66.5, -20], E: [66.5, -20],
-      J: [-66.5, 26], F: [66.5, 26],
-      I: [-66.5, 66.5], G: [66.5, 66.5],
-      H: [-25, 75], L: [25, 75]
+      a: [-50, -50],
+      b: [0, -50],
+      c: [50, -50],
+      d: [-50, 0],
+      e: [0, 0],
+      f: [50, 0],
+      g: [-50, 40],
+      h: [0, 40],
+      i: [50, 40],
+      y: [-50, -50],
+      z: [0, 40],
+      j: [-37.5, -37.5],
+      k: [0, -37.5],
+      l: [37.5, -37.5],
+      m: [-37.5, 27.5],
+      n: [0, 27.5],
+      o: [37.5, 27.5],
+      p: [-37.5, 0],
+      q: [37.5, 0],
+      A: [-66.5, -66.5],
+      B: [-22, -66.5],
+      C: [22, -66.5],
+      D: [66.5, -66.5],
+      K: [-66.5, -20],
+      E: [66.5, -20],
+      J: [-66.5, 26],
+      F: [66.5, 26],
+      I: [-66.5, 66.5],
+      G: [66.5, 66.5],
+      H: [-25, 75],
+      L: [25, 75]
     },
     dovetail: {
-      a: [-49.75, -50], b: [0, -50], c: [49.75, -50],
-      d: [-49.75, 0], e: [0, 0], f: [49.75, 0],
-      g: [-49.75, 50], i: [49.75, 50],
-      y: [-50, -50], z: [0, 40],
-      j: [-37.5, -37.5], k: [0, -37.5], l: [37.5, -37.5],
-      m: [-37.5, 37.5], n: [0, 32.5], o: [37.5, 37.5],
-      p: [-37.5, 0], q: [37.5, 0],
-      A: [-66.5, -66.5], B: [-22, -66.5], C: [22, -66.5], D: [66.5, -66.5],
-      K: [-66.5, -16.5], E: [66.5, -16.5],
-      J: [-66.5, 34.5], F: [66.5, 34.5],
-      I: [-66.5, 84.5], G: [66.5, 84.5],
-      H: [-25, 64], L: [25, 64]
+      a: [-49.75, -50],
+      b: [0, -50],
+      c: [49.75, -50],
+      d: [-49.75, 0],
+      e: [0, 0],
+      f: [49.75, 0],
+      g: [-49.75, 50],
+      i: [49.75, 50],
+      y: [-50, -50],
+      z: [0, 40],
+      j: [-37.5, -37.5],
+      k: [0, -37.5],
+      l: [37.5, -37.5],
+      m: [-37.5, 37.5],
+      n: [0, 32.5],
+      o: [37.5, 37.5],
+      p: [-37.5, 0],
+      q: [37.5, 0],
+      A: [-66.5, -66.5],
+      B: [-22, -66.5],
+      C: [22, -66.5],
+      D: [66.5, -66.5],
+      K: [-66.5, -16.5],
+      E: [66.5, -16.5],
+      J: [-66.5, 34.5],
+      F: [66.5, 34.5],
+      I: [-66.5, 84.5],
+      G: [66.5, 84.5],
+      H: [-25, 64],
+      L: [25, 64]
     },
     gonfalon: {
-      a: [-49.75, -50], b: [0, -50], c: [49.75, -50],
-      d: [-49.75, 0], e: [0, 0], f: [49.75, 0],
-      g: [-49.75, 50], h: [0, 50], i: [49.75, 50],
-      y: [-50, -50], z: [0, 50],
-      j: [-37.5, -37.5], k: [0, -37.5], l: [37.5, -37.5],
-      m: [-37.5, 37.5], n: [0, 37.5], o: [37.5, 37.5],
-      p: [-37.5, 0], q: [37.5, 0],
-      A: [-66.5, -66.5], B: [-22, -66.5], C: [22, -66.5], D: [66.5, -66.5],
-      K: [-66.5, -20], E: [66.5, -20],
-      J: [-66.5, 26], F: [66.5, 26],
-      I: [-40, 63], G: [40, 63],
+      a: [-49.75, -50],
+      b: [0, -50],
+      c: [49.75, -50],
+      d: [-49.75, 0],
+      e: [0, 0],
+      f: [49.75, 0],
+      g: [-49.75, 50],
+      h: [0, 50],
+      i: [49.75, 50],
+      y: [-50, -50],
+      z: [0, 50],
+      j: [-37.5, -37.5],
+      k: [0, -37.5],
+      l: [37.5, -37.5],
+      m: [-37.5, 37.5],
+      n: [0, 37.5],
+      o: [37.5, 37.5],
+      p: [-37.5, 0],
+      q: [37.5, 0],
+      A: [-66.5, -66.5],
+      B: [-22, -66.5],
+      C: [22, -66.5],
+      D: [66.5, -66.5],
+      K: [-66.5, -20],
+      E: [66.5, -20],
+      J: [-66.5, 26],
+      F: [66.5, 26],
+      I: [-40, 63],
+      G: [40, 63],
       H: [0, 88]
     },
     pennant: {
-      a: [-45, -50], b: [0, -50], c: [45, -50],
-      e: [0, 0], h: [0, 50],
-      y: [-50, -50], z: [0, 50],
-      j: [-32.5, -37.5], k: [0, -37.5], l: [32.5, -37.5],
+      a: [-45, -50],
+      b: [0, -50],
+      c: [45, -50],
+      e: [0, 0],
+      h: [0, 50],
+      y: [-50, -50],
+      z: [0, 50],
+      j: [-32.5, -37.5],
+      k: [0, -37.5],
+      l: [32.5, -37.5],
       n: [0, 37.5],
-      A: [-60, -76], B: [-22, -76], C: [22, -76], D: [60, -76],
-      K: [-46, -38], E: [46, -38],
-      J: [-31, 0], F: [31, 0],
-      I: [-16, 38], G: [16, 38],
+      A: [-60, -76],
+      B: [-22, -76],
+      C: [22, -76],
+      D: [60, -76],
+      K: [-46, -38],
+      E: [46, -38],
+      J: [-31, 0],
+      F: [31, 0],
+      I: [-16, 38],
+      G: [16, 38],
       H: [0, 76]
     },
     round: {
-      a: [-40, -40], b: [0, -40], c: [40, -40],
-      d: [-40, 0], e: [0, 0], f: [40, 0],
-      g: [-40, 40], h: [0, 40], i: [40, 40],
-      y: [-48, -48], z: [0, 57.5],
-      j: [-35.5, -35.5], k: [0, -37.5], l: [35.5, -35.5],
-      m: [-35.5, 35.5], n: [0, 37.5], o: [35.5, 35.5],
-      p: [-36.5, 0], q: [36.5, 0],
-      A: [-59, -48], B: [-23, -73], C: [23, -73], D: [59, -48],
-      K: [-76, -10], E: [76, -10],
-      J: [-70, 31], F: [70, 31],
-      I: [-42, 64], G: [42, 64],
+      a: [-40, -40],
+      b: [0, -40],
+      c: [40, -40],
+      d: [-40, 0],
+      e: [0, 0],
+      f: [40, 0],
+      g: [-40, 40],
+      h: [0, 40],
+      i: [40, 40],
+      y: [-48, -48],
+      z: [0, 57.5],
+      j: [-35.5, -35.5],
+      k: [0, -37.5],
+      l: [35.5, -35.5],
+      m: [-35.5, 35.5],
+      n: [0, 37.5],
+      o: [35.5, 35.5],
+      p: [-36.5, 0],
+      q: [36.5, 0],
+      A: [-59, -48],
+      B: [-23, -73],
+      C: [23, -73],
+      D: [59, -48],
+      K: [-76, -10],
+      E: [76, -10],
+      J: [-70, 31],
+      F: [70, 31],
+      I: [-42, 64],
+      G: [42, 64],
       H: [0, 77]
     },
     oval: {
-      a: [-37.5, -50], b: [0, -50], c: [37.5, -50],
-      d: [-43, 0], e: [0, 0], f: [43, 0],
-      g: [-37.5, 50], h: [0, 50], i: [37.5, 50],
-      y: [-48, -48], z: [0, 60],
-      j: [-35.5, -37.5], k: [0, -37.5], l: [35.5, -37.5],
-      m: [-35.5, 37.5], n: [0, 50], o: [35.5, 37.5],
-      p: [-36.5, 0], q: [36.5, 0],
-      A: [-48, -48], B: [-23, -78], C: [23, -78], D: [48, -48],
-      K: [-59, -10], E: [59, -10],
-      J: [-55, 31], F: [55, 31],
-      I: [-36, 68], G: [36, 68],
+      a: [-37.5, -50],
+      b: [0, -50],
+      c: [37.5, -50],
+      d: [-43, 0],
+      e: [0, 0],
+      f: [43, 0],
+      g: [-37.5, 50],
+      h: [0, 50],
+      i: [37.5, 50],
+      y: [-48, -48],
+      z: [0, 60],
+      j: [-35.5, -37.5],
+      k: [0, -37.5],
+      l: [35.5, -37.5],
+      m: [-35.5, 37.5],
+      n: [0, 50],
+      o: [35.5, 37.5],
+      p: [-36.5, 0],
+      q: [36.5, 0],
+      A: [-48, -48],
+      B: [-23, -78],
+      C: [23, -78],
+      D: [48, -48],
+      K: [-59, -10],
+      E: [59, -10],
+      J: [-55, 31],
+      F: [55, 31],
+      I: [-36, 68],
+      G: [36, 68],
       H: [0, 85]
     },
     vesicaPiscis: {
-      a: [-32, -37], b: [0, -50], c: [32, -37],
-      d: [-32, 0], e: [0, 0], f: [32, 0],
-      g: [-32, 37], h: [0, 50], i: [32, 37],
-      y: [-50, -50], z: [0, 62],
-      j: [-27.5, -27.5], k: [0, -37], l: [27.5, -27.5],
-      m: [-27.5, 27.5], n: [0, 42], o: [27.5, 27.5],
-      p: [-27.5, 0], q: [27.5, 0],
-      A: [-45, -32], B: [-29, -63], C: [29, -63], D: [45, -32],
-      K: [-50, 0], E: [50, 0],
-      J: [-45, 32], F: [45, 32],
-      I: [-29, 63], G: [29, 63],
-      H: [0, 89], L: [0, -89]
+      a: [-32, -37],
+      b: [0, -50],
+      c: [32, -37],
+      d: [-32, 0],
+      e: [0, 0],
+      f: [32, 0],
+      g: [-32, 37],
+      h: [0, 50],
+      i: [32, 37],
+      y: [-50, -50],
+      z: [0, 62],
+      j: [-27.5, -27.5],
+      k: [0, -37],
+      l: [27.5, -27.5],
+      m: [-27.5, 27.5],
+      n: [0, 42],
+      o: [27.5, 27.5],
+      p: [-27.5, 0],
+      q: [27.5, 0],
+      A: [-45, -32],
+      B: [-29, -63],
+      C: [29, -63],
+      D: [45, -32],
+      K: [-50, 0],
+      E: [50, 0],
+      J: [-45, 32],
+      F: [45, 32],
+      I: [-29, 63],
+      G: [29, 63],
+      H: [0, 89],
+      L: [0, -89]
     },
     square: {
-      a: [-49.75, -50], b: [0, -50], c: [49.75, -50],
-      d: [-49.75, 0], e: [0, 0], f: [49.75, 0],
-      g: [-49.75, 50], h: [0, 50], i: [49.75, 50],
-      y: [-50, -50], z: [0, 50],
-      j: [-37.5, -37.5], k: [0, -37.5], l: [37.5, -37.5],
-      m: [-37.5, 37.5], n: [0, 37.5], o: [37.5, 37.5],
-      p: [-37.5, 0], q: [37.5, 0],
-      A: [-66.5, -66.5], B: [-22, -66.5], C: [22, -66.5], D: [66.5, -66.5],
-      K: [-66.5, -20], E: [66.5, -20],
-      J: [-66.5, 26], F: [66.5, 26],
-      I: [-66.5, 66.5], G: [66.5, 66.5],
-      H: [-22, 66.5], L: [22, 66.5]
+      a: [-49.75, -50],
+      b: [0, -50],
+      c: [49.75, -50],
+      d: [-49.75, 0],
+      e: [0, 0],
+      f: [49.75, 0],
+      g: [-49.75, 50],
+      h: [0, 50],
+      i: [49.75, 50],
+      y: [-50, -50],
+      z: [0, 50],
+      j: [-37.5, -37.5],
+      k: [0, -37.5],
+      l: [37.5, -37.5],
+      m: [-37.5, 37.5],
+      n: [0, 37.5],
+      o: [37.5, 37.5],
+      p: [-37.5, 0],
+      q: [37.5, 0],
+      A: [-66.5, -66.5],
+      B: [-22, -66.5],
+      C: [22, -66.5],
+      D: [66.5, -66.5],
+      K: [-66.5, -20],
+      E: [66.5, -20],
+      J: [-66.5, 26],
+      F: [66.5, 26],
+      I: [-66.5, 66.5],
+      G: [66.5, 66.5],
+      H: [-22, 66.5],
+      L: [22, 66.5]
     },
     diamond: {
-      a: [-32, -37], b: [0, -50], c: [32, -37],
-      d: [-43, 0], e: [0, 0], f: [43, 0],
-      g: [-32, 37], h: [0, 50], i: [32, 37],
-      y: [-50, -50], z: [0, 62],
-      j: [-27.5, -27.5], k: [0, -37], l: [27.5, -27.5],
-      m: [-27.5, 27.5], n: [0, 42], o: [27.5, 27.5],
-      p: [-37, 0], q: [37, 0],
-      A: [-43, -28], B: [-22, -56], C: [22, -56], D: [43, -28],
-      K: [-63, 0], E: [63, 0],
-      J: [-42, 28], F: [42, 28],
-      I: [-22, 56], G: [22, 56],
-      H: [0, 83], L: [0, -82]
+      a: [-32, -37],
+      b: [0, -50],
+      c: [32, -37],
+      d: [-43, 0],
+      e: [0, 0],
+      f: [43, 0],
+      g: [-32, 37],
+      h: [0, 50],
+      i: [32, 37],
+      y: [-50, -50],
+      z: [0, 62],
+      j: [-27.5, -27.5],
+      k: [0, -37],
+      l: [27.5, -27.5],
+      m: [-27.5, 27.5],
+      n: [0, 42],
+      o: [27.5, 27.5],
+      p: [-37, 0],
+      q: [37, 0],
+      A: [-43, -28],
+      B: [-22, -56],
+      C: [22, -56],
+      D: [43, -28],
+      K: [-63, 0],
+      E: [63, 0],
+      J: [-42, 28],
+      F: [42, 28],
+      I: [-22, 56],
+      G: [22, 56],
+      H: [0, 83],
+      L: [0, -82]
     },
     no: {
-      a: [-66.5, -66.5], b: [0, -66.5], c: [66.5, -66.5],
-      d: [-66.5, 0], e: [0, 0], f: [66.5, 0],
-      g: [-66.5, 66.5], h: [0, 66.5], i: [66.5, 66.5],
-      y: [-50, -50], z: [0, 75],
-      j: [-50, -50], k: [0, -50], l: [50, -50],
-      m: [-50, 50], n: [0, 50], o: [50, 50],
-      p: [-50, 0], q: [50, 0],
-      A: [-91.5, -91.5], B: [-30.5, -91.5], C: [30.5, -91.5], D: [91.5, -91.5],
-      K: [-91.5, -30.5], E: [91.5, -30.5],
-      J: [-91.5, 30.5], F: [91.5, 30.5],
-      I: [-91.5, 91.5], G: [91.5, 91.5],
-      H: [-30.5, 91.5], L: [30.5, 91.5]
+      a: [-66.5, -66.5],
+      b: [0, -66.5],
+      c: [66.5, -66.5],
+      d: [-66.5, 0],
+      e: [0, 0],
+      f: [66.5, 0],
+      g: [-66.5, 66.5],
+      h: [0, 66.5],
+      i: [66.5, 66.5],
+      y: [-50, -50],
+      z: [0, 75],
+      j: [-50, -50],
+      k: [0, -50],
+      l: [50, -50],
+      m: [-50, 50],
+      n: [0, 50],
+      o: [50, 50],
+      p: [-50, 0],
+      q: [50, 0],
+      A: [-91.5, -91.5],
+      B: [-30.5, -91.5],
+      C: [30.5, -91.5],
+      D: [91.5, -91.5],
+      K: [-91.5, -30.5],
+      E: [91.5, -30.5],
+      J: [-91.5, 30.5],
+      F: [91.5, 30.5],
+      I: [-91.5, 91.5],
+      G: [91.5, 91.5],
+      H: [-30.5, 91.5],
+      L: [30.5, 91.5]
     },
     fantasy1: {
-      a: [-45, -45], b: [0, -50], c: [45, -45],
-      d: [-40, 0], e: [0, 0], f: [40, 0],
-      g: [-36, 42.5], h: [0, 50], i: [36, 42.5],
-      y: [-50, -50], z: [0, 60],
-      j: [-37, -37], k: [0, -40], l: [37, -37],
-      m: [-32, 32], n: [0, 40], o: [32, 32],
-      p: [-28.5, 0], q: [28.5, 0],
-      A: [-66, -55], B: [-22, -67], C: [22, -67], D: [66, -55],
-      K: [-53, -20], E: [53, -20],
-      J: [-46, 26], F: [46, 26],
-      I: [-29, 62], G: [29, 62],
+      a: [-45, -45],
+      b: [0, -50],
+      c: [45, -45],
+      d: [-40, 0],
+      e: [0, 0],
+      f: [40, 0],
+      g: [-36, 42.5],
+      h: [0, 50],
+      i: [36, 42.5],
+      y: [-50, -50],
+      z: [0, 60],
+      j: [-37, -37],
+      k: [0, -40],
+      l: [37, -37],
+      m: [-32, 32],
+      n: [0, 40],
+      o: [32, 32],
+      p: [-28.5, 0],
+      q: [28.5, 0],
+      A: [-66, -55],
+      B: [-22, -67],
+      C: [22, -67],
+      D: [66, -55],
+      K: [-53, -20],
+      E: [53, -20],
+      J: [-46, 26],
+      F: [46, 26],
+      I: [-29, 62],
+      G: [29, 62],
       H: [0, 84]
     },
     fantasy2: {
-      a: [-45, -45], b: [0, -45], c: [45, -45],
-      d: [-35, 0], e: [0, 0], f: [35, 0],
-      g: [-36, 42.5], h: [0, 45], i: [36, 42.5],
-      y: [-50, -50], z: [0, 55],
-      j: [-32.5, -32.5], k: [0, -40], l: [32.5, -32.5],
-      m: [-30, 30], n: [0, 40], o: [30, 30],
-      p: [-27.5, 0], q: [27.5, 0],
-      A: [-58, -35], B: [-44, -67], C: [44, -67], D: [58, -35],
-      K: [-39, -5], E: [39, -5],
-      J: [-57, 26], F: [57, 26],
-      I: [-32, 58], G: [32, 58],
-      H: [0, 83], L: [0, -72]
+      a: [-45, -45],
+      b: [0, -45],
+      c: [45, -45],
+      d: [-35, 0],
+      e: [0, 0],
+      f: [35, 0],
+      g: [-36, 42.5],
+      h: [0, 45],
+      i: [36, 42.5],
+      y: [-50, -50],
+      z: [0, 55],
+      j: [-32.5, -32.5],
+      k: [0, -40],
+      l: [32.5, -32.5],
+      m: [-30, 30],
+      n: [0, 40],
+      o: [30, 30],
+      p: [-27.5, 0],
+      q: [27.5, 0],
+      A: [-58, -35],
+      B: [-44, -67],
+      C: [44, -67],
+      D: [58, -35],
+      K: [-39, -5],
+      E: [39, -5],
+      J: [-57, 26],
+      F: [57, 26],
+      I: [-32, 58],
+      G: [32, 58],
+      H: [0, 83],
+      L: [0, -72]
     },
     fantasy3: {
-      a: [-40, -45], b: [0, -50], c: [40, -45],
-      d: [-35, 0], e: [0, 0], f: [35, 0],
-      g: [-36, 42.5], h: [0, 50], i: [36, 42.5],
-      y: [-50, -50], z: [0, 55],
-      j: [-32.5, -32.5], k: [0, -40], l: [32.5, -32.5],
-      m: [-30, 30], n: [0, 40], o: [30, 30],
-      p: [-27.5, 0], q: [27.5, 0],
-      A: [-56, -42], B: [-22, -72], C: [22, -72], D: [56, -42],
-      K: [-37, -11], E: [37, -11],
-      J: [-60, 20], F: [60, 20],
-      I: [-34, 56], G: [34, 56],
+      a: [-40, -45],
+      b: [0, -50],
+      c: [40, -45],
+      d: [-35, 0],
+      e: [0, 0],
+      f: [35, 0],
+      g: [-36, 42.5],
+      h: [0, 50],
+      i: [36, 42.5],
+      y: [-50, -50],
+      z: [0, 55],
+      j: [-32.5, -32.5],
+      k: [0, -40],
+      l: [32.5, -32.5],
+      m: [-30, 30],
+      n: [0, 40],
+      o: [30, 30],
+      p: [-27.5, 0],
+      q: [27.5, 0],
+      A: [-56, -42],
+      B: [-22, -72],
+      C: [22, -72],
+      D: [56, -42],
+      K: [-37, -11],
+      E: [37, -11],
+      J: [-60, 20],
+      F: [60, 20],
+      I: [-34, 56],
+      G: [34, 56],
       H: [0, 83]
     },
     fantasy4: {
-      a: [-50, -45], b: [0, -50], c: [50, -45],
-      d: [-45, 0], e: [0, 0], f: [45, 0],
-      g: [-40, 45], h: [0, 50], i: [40, 45],
-      y: [-50, -50], z: [0, 62.5],
-      j: [-37.5, -37.5], k: [0, -45], l: [37.5, -37.5],
-      m: [-37.5, 37.5], n: [0, 45], o: [37.5, 37.5],
-      p: [-35, 0], q: [35, 0],
-      A: [-75, -56], B: [-36, -61], C: [36, -61], D: [75, -56],
-      K: [-67, -12], E: [67, -12],
-      J: [-63, 32], F: [63, 32],
-      I: [-42, 75], G: [42, 75],
-      H: [0, 91.5], L: [0, -79]
+      a: [-50, -45],
+      b: [0, -50],
+      c: [50, -45],
+      d: [-45, 0],
+      e: [0, 0],
+      f: [45, 0],
+      g: [-40, 45],
+      h: [0, 50],
+      i: [40, 45],
+      y: [-50, -50],
+      z: [0, 62.5],
+      j: [-37.5, -37.5],
+      k: [0, -45],
+      l: [37.5, -37.5],
+      m: [-37.5, 37.5],
+      n: [0, 45],
+      o: [37.5, 37.5],
+      p: [-35, 0],
+      q: [35, 0],
+      A: [-75, -56],
+      B: [-36, -61],
+      C: [36, -61],
+      D: [75, -56],
+      K: [-67, -12],
+      E: [67, -12],
+      J: [-63, 32],
+      F: [63, 32],
+      I: [-42, 75],
+      G: [42, 75],
+      H: [0, 91.5],
+      L: [0, -79]
     },
     fantasy5: {
-      a: [-45, -50], b: [0, -50], c: [45, -50],
-      d: [-40, 0], e: [0, 0], f: [40, 0],
-      g: [-30, 45], h: [0, 50], i: [30, 45],
-      y: [-50, -50], z: [0, 60],
-      j: [-37, -37], k: [0, -40], l: [37, -37],
-      m: [-32, 32], n: [0, 40], o: [32, 32],
-      p: [-28.5, 0], q: [28.5, 0],
-      A: [-61, -67], B: [-22, -76], C: [22, -76], D: [61, -67],
-      K: [-58, -25], E: [58, -25],
-      J: [-48, 20], F: [48, 20],
-      I: [-28.5, 60], G: [28.5, 60],
+      a: [-45, -50],
+      b: [0, -50],
+      c: [45, -50],
+      d: [-40, 0],
+      e: [0, 0],
+      f: [40, 0],
+      g: [-30, 45],
+      h: [0, 50],
+      i: [30, 45],
+      y: [-50, -50],
+      z: [0, 60],
+      j: [-37, -37],
+      k: [0, -40],
+      l: [37, -37],
+      m: [-32, 32],
+      n: [0, 40],
+      o: [32, 32],
+      p: [-28.5, 0],
+      q: [28.5, 0],
+      A: [-61, -67],
+      B: [-22, -76],
+      C: [22, -76],
+      D: [61, -67],
+      K: [-58, -25],
+      E: [58, -25],
+      J: [-48, 20],
+      F: [48, 20],
+      I: [-28.5, 60],
+      G: [28.5, 60],
       H: [0, 89]
     },
     noldor: {
-      b: [0, -65], e: [0, -15], h: [0, 35],
-      z: [0, 35], k: [0, -50], n: [0, 30],
-      p: [-20, -15], q: [20, -15],
-      A: [-34, -47], B: [-20, -68], C: [20, -68], D: [34, -47],
-      K: [-18, -20], E: [18, -20],
-      J: [-26, 11], F: [26, 11],
-      I: [-14, 43], G: [14, 43],
-      H: [0, 74], L: [0, -85]
+      b: [0, -65],
+      e: [0, -15],
+      h: [0, 35],
+      z: [0, 35],
+      k: [0, -50],
+      n: [0, 30],
+      p: [-20, -15],
+      q: [20, -15],
+      A: [-34, -47],
+      B: [-20, -68],
+      C: [20, -68],
+      D: [34, -47],
+      K: [-18, -20],
+      E: [18, -20],
+      J: [-26, 11],
+      F: [26, 11],
+      I: [-14, 43],
+      G: [14, 43],
+      H: [0, 74],
+      L: [0, -85]
     },
     gondor: {
-      a: [-32.5, -50], b: [0, -50], c: [32.5, -50],
-      d: [-32.5, 0], e: [0, 0], f: [32.5, 0],
-      g: [-32.5, 50], h: [0, 50], i: [32.5, 50],
-      y: [-42.5, -52.5], z: [0, 65],
-      j: [-25, -37.5], k: [0, -37.5], l: [25, -37.5],
-      m: [-25, 30], n: [0, 37.5], o: [25, 30],
-      p: [-25, 0], q: [25, 0],
-      A: [-42, -52], B: [-17, -75], C: [17, -75], D: [42, -52],
-      K: [-42, -15], E: [42, -15],
-      J: [-42, 22], F: [42, 22],
-      I: [-26, 60], G: [26, 60],
+      a: [-32.5, -50],
+      b: [0, -50],
+      c: [32.5, -50],
+      d: [-32.5, 0],
+      e: [0, 0],
+      f: [32.5, 0],
+      g: [-32.5, 50],
+      h: [0, 50],
+      i: [32.5, 50],
+      y: [-42.5, -52.5],
+      z: [0, 65],
+      j: [-25, -37.5],
+      k: [0, -37.5],
+      l: [25, -37.5],
+      m: [-25, 30],
+      n: [0, 37.5],
+      o: [25, 30],
+      p: [-25, 0],
+      q: [25, 0],
+      A: [-42, -52],
+      B: [-17, -75],
+      C: [17, -75],
+      D: [42, -52],
+      K: [-42, -15],
+      E: [42, -15],
+      J: [-42, 22],
+      F: [42, 22],
+      I: [-26, 60],
+      G: [26, 60],
       H: [0, 87]
     },
     easterling: {
-      a: [-40, -47.5], b: [0, -47.5], c: [40, -47.5],
-      d: [-40, 0], e: [0, 0], f: [40, 0],
-      g: [-40, 47.5], h: [0, 47.5], i: [40, 47.5],
-      y: [-42.5, -52.5], z: [0, 65],
-      j: [-30, -37.5], k: [0, -37.5], l: [30, -37.5],
-      m: [-30, 37.5], n: [0, 37.5], o: [30, 37.5],
-      p: [-30, 0], q: [30, 0],
-      A: [-52, -72], B: [0, -65], D: [52, -72],
-      K: [-52, -24], E: [52, -24],
-      J: [-52, 24], F: [52, 24],
-      I: [-52, 72], G: [52, 72],
+      a: [-40, -47.5],
+      b: [0, -47.5],
+      c: [40, -47.5],
+      d: [-40, 0],
+      e: [0, 0],
+      f: [40, 0],
+      g: [-40, 47.5],
+      h: [0, 47.5],
+      i: [40, 47.5],
+      y: [-42.5, -52.5],
+      z: [0, 65],
+      j: [-30, -37.5],
+      k: [0, -37.5],
+      l: [30, -37.5],
+      m: [-30, 37.5],
+      n: [0, 37.5],
+      o: [30, 37.5],
+      p: [-30, 0],
+      q: [30, 0],
+      A: [-52, -72],
+      B: [0, -65],
+      D: [52, -72],
+      K: [-52, -24],
+      E: [52, -24],
+      J: [-52, 24],
+      F: [52, 24],
+      I: [-52, 72],
+      G: [52, 72],
       H: [0, 65]
     },
     erebor: {
-      a: [-40, -40], b: [0, -55], c: [40, -40],
-      d: [-40, 0], e: [0, 0], f: [40, 0],
-      g: [-40, 40], h: [0, 55], i: [40, 40],
-      y: [-50, -50], z: [0, 50],
-      j: [-35, -35], k: [0, -45], l: [35, -35],
-      m: [-35, 35], n: [0, 45], o: [35, 35],
-      p: [-37.5, 0], q: [37.5, 0],
-      A: [-47, -46], B: [-22, -81], C: [22, -81], D: [47, -46],
-      K: [-66.5, 0], E: [66.5, 0],
-      J: [-47, 46], F: [47, 46],
-      I: [-22, 81], G: [22, 81]
+      a: [-40, -40],
+      b: [0, -55],
+      c: [40, -40],
+      d: [-40, 0],
+      e: [0, 0],
+      f: [40, 0],
+      g: [-40, 40],
+      h: [0, 55],
+      i: [40, 40],
+      y: [-50, -50],
+      z: [0, 50],
+      j: [-35, -35],
+      k: [0, -45],
+      l: [35, -35],
+      m: [-35, 35],
+      n: [0, 45],
+      o: [35, 35],
+      p: [-37.5, 0],
+      q: [37.5, 0],
+      A: [-47, -46],
+      B: [-22, -81],
+      C: [22, -81],
+      D: [47, -46],
+      K: [-66.5, 0],
+      E: [66.5, 0],
+      J: [-47, 46],
+      F: [47, 46],
+      I: [-22, 81],
+      G: [22, 81]
     },
     ironHills: {
-      a: [-43.75, -50], b: [0, -50], c: [43.75, -50],
-      d: [-43.25, 0], e: [0, 0], f: [43.25, 0],
-      g: [-42.5, 42.5], h: [0, 50], i: [42.5, 42.5],
-      y: [-50, -50], z: [0, 62.5],
-      j: [-32.5, -32.5], k: [0, -40], l: [32.5, -32.5],
-      m: [-32.5, 32.5], n: [0, 40], o: [32.5, 32.5],
-      p: [-37.5, 0], q: [37.5, 0],
-      A: [-61, -67], B: [-22, -74], C: [22, -74], D: [61, -67],
-      K: [-59, -20], E: [59, -20],
-      J: [-57, 26], F: [57, 26],
-      I: [-33, 64], G: [33, 64],
+      a: [-43.75, -50],
+      b: [0, -50],
+      c: [43.75, -50],
+      d: [-43.25, 0],
+      e: [0, 0],
+      f: [43.25, 0],
+      g: [-42.5, 42.5],
+      h: [0, 50],
+      i: [42.5, 42.5],
+      y: [-50, -50],
+      z: [0, 62.5],
+      j: [-32.5, -32.5],
+      k: [0, -40],
+      l: [32.5, -32.5],
+      m: [-32.5, 32.5],
+      n: [0, 40],
+      o: [32.5, 32.5],
+      p: [-37.5, 0],
+      q: [37.5, 0],
+      A: [-61, -67],
+      B: [-22, -74],
+      C: [22, -74],
+      D: [61, -67],
+      K: [-59, -20],
+      E: [59, -20],
+      J: [-57, 26],
+      F: [57, 26],
+      I: [-33, 64],
+      G: [33, 64],
       H: [0, 88]
     },
     urukHai: {
-      a: [-40, -45], b: [0, -45], c: [40, -45],
-      d: [-36, 0], e: [0, 0], f: [36, 0],
-      g: [-32.25, 40], h: [0, 40], i: [32.25, 40],
-      y: [-50, -50], z: [0, 40],
-      j: [-32.5, -32.5], k: [0, -37.5], l: [32.5, -32.5],
-      m: [-27.5, 27.5], n: [0, 32.5], o: [27.5, 27.5],
-      p: [-37.5, 0], q: [37.5, 0],
-      A: [-31, -79], B: [-1, -90], C: [31, -74], D: [61, -57],
-      K: [-55, -19], E: [53, -19],
-      J: [-45, 19], F: [45, 19],
-      I: [-33, 57], G: [35, 57],
-      H: [0, 57], L: [-39, -50]
+      a: [-40, -45],
+      b: [0, -45],
+      c: [40, -45],
+      d: [-36, 0],
+      e: [0, 0],
+      f: [36, 0],
+      g: [-32.25, 40],
+      h: [0, 40],
+      i: [32.25, 40],
+      y: [-50, -50],
+      z: [0, 40],
+      j: [-32.5, -32.5],
+      k: [0, -37.5],
+      l: [32.5, -32.5],
+      m: [-27.5, 27.5],
+      n: [0, 32.5],
+      o: [27.5, 27.5],
+      p: [-37.5, 0],
+      q: [37.5, 0],
+      A: [-31, -79],
+      B: [-1, -90],
+      C: [31, -74],
+      D: [61, -57],
+      K: [-55, -19],
+      E: [53, -19],
+      J: [-45, 19],
+      F: [45, 19],
+      I: [-33, 57],
+      G: [35, 57],
+      H: [0, 57],
+      L: [-39, -50]
     },
     moriaOrc: {
-      a: [-37.5, -37.5], b: [0, -37.5], c: [37.5, -37.5],
-      d: [-37.5, 0], e: [0, 0], f: [37.5, 0],
-      g: [-37.5, 37.5], h: [0, 37.5], i: [37.5, 37.5],
-      y: [-50, -50], z: [0, 40],
-      j: [-30, -30], k: [0, -30], l: [30, -30],
-      m: [-30, 30], n: [0, 30], o: [30, 30],
-      p: [-30, 0], q: [30, 0],
-      A: [-48, -48], B: [-16, -50], C: [16, -46], D: [39, -61],
-      K: [-52, -19], E: [52, -26],
-      J: [-42, 9], F: [52, 9],
-      I: [-31, 40], G: [40, 43],
+      a: [-37.5, -37.5],
+      b: [0, -37.5],
+      c: [37.5, -37.5],
+      d: [-37.5, 0],
+      e: [0, 0],
+      f: [37.5, 0],
+      g: [-37.5, 37.5],
+      h: [0, 37.5],
+      i: [37.5, 37.5],
+      y: [-50, -50],
+      z: [0, 40],
+      j: [-30, -30],
+      k: [0, -30],
+      l: [30, -30],
+      m: [-30, 30],
+      n: [0, 30],
+      o: [30, 30],
+      p: [-30, 0],
+      q: [30, 0],
+      A: [-48, -48],
+      B: [-16, -50],
+      C: [16, -46],
+      D: [39, -61],
+      K: [-52, -19],
+      E: [52, -26],
+      J: [-42, 9],
+      F: [52, 9],
+      I: [-31, 40],
+      G: [40, 43],
       H: [4, 47]
     }
-  }
+  };
 
   const shieldSize = {
-    horsehead: .9, horsehead2: .9, polish: .85, swiss: .95,
-    boeotian: .75, roman: .95, kite: .65, targe2: .9, pavise: .9, wedged: .95,
-    flag: .7, pennon: .5, guidon: .65, banner: .8, dovetail: .8, pennant: .6,
-    oval: .95, vesicaPiscis: .8, diamond: .8, no: 1.2,
-    fantasy1: .8, fantasy2: .7, fantasy3: .7, fantasy5: .9,
-    noldor: .5, gondor: .75, easterling: .8, erebor: .9, urukHai: .8, moriaOrc: .7
-  }
+    horsehead: 0.9,
+    horsehead2: 0.9,
+    polish: 0.85,
+    swiss: 0.95,
+    boeotian: 0.75,
+    roman: 0.95,
+    kite: 0.65,
+    targe2: 0.9,
+    pavise: 0.9,
+    wedged: 0.95,
+    flag: 0.7,
+    pennon: 0.5,
+    guidon: 0.65,
+    banner: 0.8,
+    dovetail: 0.8,
+    pennant: 0.6,
+    oval: 0.95,
+    vesicaPiscis: 0.8,
+    diamond: 0.8,
+    no: 1.2,
+    fantasy1: 0.8,
+    fantasy2: 0.7,
+    fantasy3: 0.7,
+    fantasy5: 0.9,
+    noldor: 0.5,
+    gondor: 0.75,
+    easterling: 0.8,
+    erebor: 0.9,
+    urukHai: 0.8,
+    moriaOrc: 0.7
+  };
 
   const shieldBox = {
     heater: "0 10 200 200",
@@ -671,7 +1446,7 @@
     ironHills: "0 5 200 200",
     urukHai: "0 0 200 200",
     moriaOrc: "0 0 200 200"
-  }
+  };
 
   const shieldPaths = {
     heater: "m25,25 h150 v50 a150,150,0,0,1,-75,125 a150,150,0,0,1,-75,-125 z",
@@ -717,7 +1492,7 @@
     ironHills: "m 30,25 60,-10 10,10 10,-10 60,10 -5,125 -65,50 -65,-50 z",
     urukHai: "M 30,60 C 40,60 60,50 60,20 l -5,-3 45,-17 75,40 -5,5 -35,155 -5,-35 H 70 v 35 z",
     moriaOrc: "M45 35c5 3 7 10 13 9h19c4-2 7-4 9-9 6 1 9 9 16 11 7-2 14 0 21 0 6-3 6-10 10-15 2-5 1-10-2-15-2-4-5-14-4-16 3 6 7 11 12 14 7 3 3 12 7 16 3 6 4 12 9 18 2 4 6 8 5 14 0 6-1 12 3 18-3 6-2 13-1 20 1 6-2 12-1 18 0 6-3 13 0 18 8 4 0 8-5 7-4 3-9 3-13 9-5 5-5 13-8 19 0 6 0 15-7 16-1 6-7 6-10 12-1-6 0-6-2-9l2-19c2-4 5-12-3-12-4-5-11-5-15 1l-13-18c-3-4-2 9-3 12 2 2-4-6-7-5-8-2-8 7-11 11-2 4-5 10-8 9 3-10 3-16 1-23-1-4 2-9-4-11 0-6 1-13-2-19-4-2-9-6-13-7V91c4-7-5-13 0-19-3-7 2-11 2-18-1-6 1-12 3-17v-1z"
-  }
+  };
 
   const lines = {
     straight: "m 0,100 v15 h 200 v -15 z",
@@ -742,10 +1517,14 @@
     embattledGrady: "m 0,95 v 20 H 200 V 95 h -2.5 v 5 h -5 v 5 h -5 v -5 h -5 v -5 h -5 v 5 h -5 v 5 h -5 v -5 h -5 v -5 h -5 v 5 h -5 v 5 h -5 v -5 h -5 v -5 h -5 v 5 h -5 v 5 h -5 v -5 h -5 v -5 h -5 v 5 h -5 v 5 h -5 v -5 h -5 v -5 h -5 v 5 h -5 v 5 h -5 v -5 h -5 v -5 h -5 v 5 h -5 v 5 h -5 v -5 h -5 v -5 h -5 v 5 h -5 v 5 h -5 v -5 h -5 v -5 h -5 v 5 h -5 v 5 h -5 v -5 h -5 v -5 h -5 v 5 h -5 v 5 h -5 v -5 h -5 v -5 z",
     dovetailed: "m 200,95 h -7 l 4,10 h -14 l 4,-10 h -14 l 4,10 h -14 l 4,-10 h -14 l 4,10 h -14 l 4,-10 h -14 l 4,10 h -14 l 4,-10 h -14 l 4,10 h -14 l 4,-10 H 93 l 4,10 H 83 L 87,95 H 73 l 4,10 H 63 L 67,95 H 53 l 4,10 H 43 L 47,95 H 33 l 4,10 H 23 L 27,95 H 13 l 4,10 H 3 L 7,95 H 0 v 20 h 200",
     dovetailedIndented: "m 200,100 -7,-5 4,10 -7,-5 -7,5 4,-10 -7,5 -7,-5 4,10 -7,-5 -7,5 4,-10 -7,5 -7,-5 4,10 -7,-5 -7,5 4,-10 -7,5 -7,-5 4,10 -7,-5 -7,5 4,-10 -7,5 -7,-5 4,10 -7,-5 -7,5 4,-10 -7,5 -7,-5 4,10 -7,-5 -7,5 4,-10 -7,5 -7,-5 4,10 -7,-5 -7,5 4,-10 -7,5 -7,-5 4,10 -7,-5 -7,5 4,-10 -7,5 -7,-5 4,10 -7,-5 -7,5 4,-10 -7,5 -7,-5 4,10 -7,-5 -7,5 4,-10 -7,5 v 15 h 200",
-    nebuly: "m 13.1,89.8 c -4.1,0 -7.3,2 -7.3,4.5 0,1.2 0.7,2.3 1.8,3.1 1.2,0.7 1.9,1.8 1.9,3 0,2.5 -3.2,4.5 -7.3,4.5 -0.5,0 -2.2,-0.2 -2.2,-0.2 V 115 h 200 v -10.1 c -3.7,-0.2 -6.7,-2.2 -6.7,-4.5 0,-1.2 0.7,-2.3 1.9,-3 1.2,-0.8 1.8,-1.9 1.8,-3.1 0,-2.5 -3.2,-4.5 -7.2,-4.5 -4.1,0 -7.3,2 -7.3,4.5 0,1.2 0.7,2.3 1.8,3.1 1.2,0.7 1.9,1.8 1.9,3 0,2.5 -3.3,4.5 -7.3,4.5 -4,0 -7.3,-2 -7.3,-4.5 0,-1.2 0.7,-2.3 1.9,-3 1.2,-0.8 1.8,-1.9 1.8,-3.1 0,-2.5 -3.2,-4.5 -7.2,-4.5 -4.1,0 -7.3,2 -7.3,4.5 0,1.2 0.7,2.3 1.8,3.1 1.2,0.7 1.9,1.8 1.9,3 -1.5,4.1 -4.2,4.4 -8.8,4.5 -4.7,-0.1 -8.7,-1.5 -8.9,-4.5 0,-1.2 0.7,-2.3 1.9,-3 1.2,-0.8 1.9,-1.9 1.9,-3.1 0,-2.5 -3.3,-4.5 -7.3,-4.5 -4.1,0 -7.3,2 -7.3,4.5 0,1.2 0.7,2.3 1.8,3.1 1.2,0.7 1.9,1.8 1.9,3 0,2.5 -3.3,4.5 -7.3,4.5 -4,0 -7.3,-2 -7.3,-4.5 0,-1.2 0.7,-2.3 1.9,-3 1.2,-0.8 1.9,-1.9 1.9,-3.1 0,-2.5 -3.3,-4.5 -7.3,-4.5 -4.1,0 -7.3,2 -7.3,4.5 0,1.2 0.7,2.3 1.8,3.1 1.2,0.7 1.9,1.8 1.9,3 0,2.5 -3.3,4.5 -7.3,4.5 -4,0 -7.3,-2 -7.3,-4.5 0,-1.2 0.7,-2.3 1.9,-3 1.2,-0.8 1.9,-1.9 1.9,-3.1 0,-2.5 -3.3,-4.5 -7.3,-4.5 -4.1,0 -7.3,2 -7.3,4.5 0,1.2 0.7,2.3 1.8,3.1 1.2,0.7 1.9,1.8 1.9,3 0,2.5 -3.3,4.5 -7.3,4.5 -4,0 -7.3,-2 -7.3,-4.5 0,-1.2 0.7,-2.3 1.9,-3 1.2,-0.8 1.9,-1.9 1.9,-3.1 0,-2.5 -3.3,-4.5 -7.3,-4.5 -4.1,0 -7.3,2 -7.3,4.5 0,1.2 0.7,2.3 1.8,3.1 1.2,0.7 1.9,1.8 1.9,3 0,2.5 -3.3,4.5 -7.3,4.5 -4,0 -7.3,-2 -7.3,-4.5 0,-1.2 0.7,-2.3 1.9,-3 1.2,-0.8 1.9,-1.9 1.9,-3.1 0,-2.5 -3.3,-4.5 -7.3,-4.5 -4.1,0 -7.3,2 -7.3,4.5 0,1.2 0.7,2.3 1.8,3.1 1.2,0.7 1.9,1.8 1.9,3 0,2.5 -3.3,4.5 -7.3,4.5 -4,0 -7.3,-2 -7.3,-4.5 0,-1.2 0.7,-2.3 1.9,-3 1.2,-0.8 1.9,-1.9 1.9,-3.1 0,-2.5 -3.3,-4.5 -7.3,-4.5 -4.1,0 -7.3,2 -7.3,4.5 0,1.2 0.7,2.3 1.8,3.1 1.2,0.7 1.9,1.8 1.9,3 0,2.5 -3.3,4.5 -7.3,4.5 -4,0 -7.3,-2 -7.3,-4.5 0,-1.2 0.7,-2.3 1.9,-3 1.2,-0.8 1.9,-1.9 1.9,-3.1 0,-2.5 -3.3,-4.5 -7.3,-4.5 z",
-    rayonne: "M0 115l-.1-6 .2.8c1.3-1 2.3-2.5 2.9-4.4.5-2 .4-3.9-.3-5.4-.7-1.5-.8-3.4-.3-5.4A9 9 0 015.5 90c-.7 1.5-.8 3.4-.3 5.4.5 2 1.7 3.6 3.1 4.6a9 9 0 013.1 4.6c.5 2 .4 3.9-.3 5.4a9 9 0 003.1-4.6c.5-2 .4-3.9-.3-5.4-.7-1.5-.8-3.4-.3-5.4.5-2 1.7-3.6 3.1-4.6-.7 1.5-.8 3.4-.3 5.4.5 2 1.7 3.6 3.1 4.6a9 9 0 013.1 4.6c.5 2 .4 3.9-.3 5.4a9 9 0 003.1-4.6c.5-2 .4-3.9-.3-5.4-.7-1.5-.8-3.4-.3-5.4.5-2 1.7-3.6 3.1-4.6-.7 1.5-.8 3.4-.3 5.4.5 2 1.7 3.6 3.1 4.6a9 9 0 013.1 4.6c.5 2 .4 3.9-.3 5.4a9 9 0 003.1-4.6c.5-2 .4-3.9-.3-5.4-.7-1.5-.8-3.4-.3-5.4.5-2 1.7-3.6 3.1-4.6-.7 1.5-.8 3.4-.3 5.4.5 2 1.7 3.6 3.1 4.6a9 9 0 013.1 4.6c.5 2 .4 3.9-.3 5.4a9 9 0 003.1-4.6c.5-2 .4-3.9-.3-5.4-.7-1.5-.8-3.4-.3-5.4.5-2 1.7-3.6 3.1-4.6-.7 1.5-.8 3.4-.3 5.4.5 2 1.7 3.6 3.1 4.6a9 9 0 013.1 4.6c.5 2 .4 3.9-.3 5.4a9 9 0 003.1-4.6c.5-2 .4-3.9-.3-5.4-.7-1.5-.8-3.4-.3-5.4.5-2 1.7-3.6 3.1-4.6-.7 1.5-.8 3.4-.3 5.4.5 2 1.7 3.6 3.1 4.6a9 9 0 013.1 4.6c.5 2 .4 3.9-.3 5.4a9 9 0 003.1-4.6c.5-2 .4-3.9-.3-5.4-.7-1.5-.8-3.4-.3-5.4.5-2 1.7-3.6 3.1-4.6-.7 1.5-.8 3.4-.3 5.4.5 2 1.7 3.6 3.1 4.6a9 9 0 013.1 4.6c.5 2 .4 3.9-.3 5.4a9 9 0 003.1-4.6c.5-2 .4-3.9-.3-5.4-.7-1.5-.8-3.4-.3-5.4.5-2 1.7-3.6 3.1-4.6-.7 1.5-.8 3.4-.3 5.4.5 2 1.7 3.6 3.1 4.6a9 9 0 013.1 4.6c.5 2 .4 3.9-.3 5.4a9 9 0 003.1-4.6c.5-2 .4-3.9-.3-5.4-.7-1.5-.8-3.4-.3-5.4.5-2 1.7-3.6 3.1-4.6-.7 1.5-.8 3.4-.3 5.4.5 2 2.1 3.1 3.1 4.6 1 1.6 2.4 3.1 2.7 4.8.3 1.7.3 3.3 0 5.2 1.3-1 2.6-2.7 3.2-4.6.5-2 .4-3.9-.3-5.4-.7-1.5-.8-3.4-.3-5.4.5-2 1.7-3.6 3.1-4.6-.7 1.5-.8 3.4-.3 5.4.5 2 1.7 3.6 3.1 4.6a9 9 0 013.1 4.6c.5 2 .4 3.9-.3 5.4a9 9 0 003.1-4.6c.5-2 .4-3.9-.3-5.4-.7-1.5-.8-3.4-.3-5.4.5-2 1.7-3.6 3.1-4.6-.7 1.5-.8 3.4-.3 5.4.5 2 1.7 3.6 3.1 4.6a9 9 0 013.1 4.6c.5 2 .4 3.9-.3 5.4a9 9 0 003.1-4.6c.5-2 .4-3.9-.3-5.4-.7-1.5-.8-3.4-.3-5.4.5-2 1.7-3.6 3.1-4.6-.7 1.5-.8 3.4-.3 5.4.5 2 1.7 3.6 3.1 4.6a9 9 0 013.1 4.6c.5 2 .4 3.9-.3 5.4a9 9 0 003.1-4.6c.5-2 .4-3.9-.3-5.4-.7-1.5-.8-3.4-.3-5.4.5-2 1.7-3.6 3.1-4.6-.7 1.5-.8 3.4-.3 5.4.5 2 1.7 3.6 3.1 4.6a9 9 0 013.1 4.6c.5 2 .4 3.9-.3 5.4a9 9 0 003.1-4.6c.5-2 .4-3.9-.3-5.4-.7-1.5-.8-3.4-.3-5.4.5-2 1.7-3.6 3.1-4.6-.7 1.5-.8 3.4-.3 5.4.5 2 1.7 3.6 3.1 4.6a9 9 0 013.1 4.6c.5 2 .4 3.9-.3 5.4a9 9 0 003.1-4.6c.5-2 .4-3.9-.3-5.4-.7-1.5-.8-3.4-.3-5.4.5-2 1.7-3.6 3.1-4.6-.7 1.5-.8 3.4-.3 5.4.5 2 1.7 3.6 3.1 4.6a9 9 0 013.1 4.6c.5 2 .4 3.9-.3 5.4a9 9 0 003.1-4.6c.5-2 .4-3.9-.3-5.4-.7-1.5-.8-3.4-.3-5.4.5-2 1.7-3.6 3.1-4.6-.7 1.5-.8 3.4-.3 5.4.5 2 1.7 3.6 3.1 4.6a9 9 0 013.1 4.6c.5 2 .4 3.9-.3 5.4a9 9 0 003.1-4.6c.5-2 .4-3.9-.3-5.4-.7-1.5-.8-3.4-.3-5.4.5-2 1.7-3.6 3.1-4.6-.7 1.5-.8 3.4-.3 5.4.5 2 1.7 3.6 3.1 4.6a9 9 0 013.1 4.6c.5 2 .4 3.9-.3 5.4a9 9 0 003.1-4.6c.5-2 .4-3.9-.3-5.4-.7-1.5-.8-3.4-.3-5.4.5-2 1.7-3.6 3.1-4.6-.7 1.5-.8 3.4-.3 5.4.75 2.79 2.72 4.08 4.45 5.82L200 115z",
-    seaWaves: "m 28.83,94.9 c -4.25,0 -7.16,3.17 -8.75,5.18 -1.59,2.01 -4.5,5.18 -8.75,5.18 -2.16,0 -3.91,-1.63 -3.91,-3.64 0,-2.01 1.44,-3.6 3.6,-3.6 0.7,0 1.36,0.17 1.93,0.48 -0.33,-2.03 -2.19,-3.56 -4.45,-3.56 -4.24,0 -6.91,3.13 -8.5,5.13 V 115 h 200 v -14.89 c -1.59,2.01 -4.5,5.18 -8.75,5.18 -2.16,0 -3.91,-1.63 -3.91,-3.64 0,-2.01 1.75,-3.64 3.91,-3.64 0.7,0 1.36,0.17 1.93,0.48 -0.34,-2.01 -2.2,-3.55 -4.46,-3.55 -4.25,0 -7.16,3.17 -8.75,5.18 -1.59,2.01 -4.5,5.18 -8.75,5.18 -2.16,0 -3.91,-1.63 -3.91,-3.64 0,-2.01 1.75,-3.64 3.91,-3.64 0.7,0 1.36,0.17 1.93,0.48 -0.34,-2.01 -2.21,-3.55 -4.46,-3.55 -4.25,0 -7.16,3.17 -8.75,5.18 -1.59,2.01 -4.5,5.18 -8.75,5.18 -2.16,0 -3.91,-1.63 -3.91,-3.64 0,-2.01 1.75,-3.64 3.91,-3.64 0.7,0 1.36,0.17 1.93,0.48 -0.34,-2.01 -2.21,-3.55 -4.46,-3.55 -4.25,0 -7.16,3.17 -8.75,5.18 -1.59,2.01 -4.5,5.18 -8.75,5.18 -2.16,0 -3.91,-1.63 -3.91,-3.64 0,-2.01 1.75,-3.64 3.91,-3.64 0.7,0 1.36,0.17 1.93,0.48 -0.34,-2.01 -2.2,-3.55 -4.46,-3.55 -4.25,0 -7.16,3.17 -8.75,5.18 -1.59,2.01 -4.5,5.18 -8.75,5.18 -2.16,0 -3.91,-1.63 -3.91,-3.64 0,-2.01 1.44,-3.6 3.6,-3.6 0.7,0 1.36,0.17 1.93,0.48 -0.34,-2.01 -2.21,-3.55 -4.46,-3.55 -4.25,0 -6.6,3.09 -8.19,5.09 -1.59,2.01 -4.5,5.18 -8.75,5.18 -2.16,0 -3.91,-1.63 -3.91,-3.64 0,-2.01 1.75,-3.64 3.91,-3.64 0.7,0 1.36,0.17 1.93,0.48 -0.34,-2.01 -2.21,-3.55 -4.46,-3.55 -4.25,0 -7.16,3.17 -8.75,5.18 -1.59,2.01 -4.5,5.18 -8.75,5.18 -2.16,0 -3.91,-1.63 -3.91,-3.64 0,-2.01 1.75,-3.64 3.91,-3.64 0.7,0 1.36,0.17 1.93,0.48 -0.34,-2.01 -2.2,-3.55 -4.46,-3.55 -4.25,0 -7.16,3.17 -8.75,5.18 -1.59,2.01 -4.5,5.18 -8.75,5.18 -2.16,0 -3.91,-1.63 -3.91,-3.64 0,-2.01 1.75,-3.64 3.91,-3.64 0.7,0 1.36,0.17 1.93,0.48 -0.34,-2.01 -2.2,-3.55 -4.46,-3.55 -4.25,0 -7.16,3.17 -8.75,5.18 -1.59,2.01 -4.5,5.18 -8.75,5.18 -2.16,0 -3.91,-1.63 -3.91,-3.64 0,-2.01 1.75,-3.64 3.91,-3.64 0.7,0 1.36,0.17 1.93,0.48 -0.34,-2.01 -2.21,-3.55 -4.46,-3.55 z",
-    dragonTeeth: "M 9.4,85 C 6.5,88.1 4.1,92.9 3,98.8 1.9,104.6 2.3,110.4 3.8,115 2.4,113.5 0,106.6 0,109.3 v 5.7 h 200 v -5.7 c -1.1,-2.4 -2,-5.1 -2.6,-8 -1.1,-5.9 -0.7,-11.6 0.8,-16.2 -2.9,3.1 -5.3,7.9 -6.4,13.8 -1.1,5.9 -0.7,11.6 0.8,16.2 -2.9,-3.1 -5.3,-7.9 -6.4,-13.8 -1.1,-5.9 -0.7,-11.6 0.8,-16.2 -2.9,3.1 -5.3,7.9 -6.4,13.8 -1.1,5.9 -0.7,11.6 0.8,16.2 -2.9,-3.1 -5.3,-7.9 -6.4,-13.8 -1.1,-5.9 -0.7,-11.6 0.8,-16.2 -2.9,3.1 -5.3,7.9 -6.4,13.8 -1.1,5.9 -0.7,11.6 0.8,16.2 -2.9,-3.1 -5.3,-7.9 -6.4,-13.8 -1.1,-5.9 -0.7,-11.6 0.8,-16.2 -2.9,3.1 -5.3,7.9 -6.4,13.8 -1.1,5.9 -0.7,11.6 0.8,16.2 -2.9,-3.1 -5.3,-7.9 -6.4,-13.8 -1.1,-5.9 -0.7,-11.6 0.8,-16.2 -2.9,3.1 -5.3,7.9 -6.4,13.8 -1.1,5.9 -0.7,11.6 0.8,16.2 -2.9,-3.1 -5.3,-7.9 -6.4,-13.8 -1.1,-5.9 -0.7,-11.6 0.8,-16.2 -2.9,3.1 -5.3,7.9 -6.4,13.8 -1.1,5.9 -0.7,11.6 0.8,16.2 -2.9,-3.1 -5.3,-7.9 -6.4,-13.8 -1.1,-5.9 -0.7,-11.6 0.8,-16.2 -2.9,3.1 -5.3,7.9 -6.4,13.8 -1.1,5.9 -0.7,11.6 0.8,16.2 -2.9,-3.1 -5.3,-7.9 -6.4,-13.8 -1.1,-5.9 -0.7,-11.6 0.8,-16.2 -2.9,3.1 -5.3,7.9 -6.4,13.8 -1.1,5.9 -0.7,11.6 0.8,16.2 -2.9,-3.1 -5.3,-7.9 -6.4,-13.8 -1.1,-5.9 -0.7,-11.6 0.8,-16.2 -2.9,3.1 -5.3,7.9 -6.4,13.8 -1.1,5.9 -0.7,11.6 0.8,16.2 -1.4,-1.5 -2.8,-3.9 -3.8,-6.1 -1.1,-2.4 -2.3,-6.1 -2.6,-7.7 -0.2,-5.9 0.2,-11.7 1.7,-16.3 -3,3.1 -5.3,7.9 -6.4,13.8 -1.1,5.8 -0.7,11.6 0.8,16.2 -2.9,-3.1 -5.3,-7.9 -6.4,-13.8 -1,-5.8 -0.7,-11.6 0.9,-16.2 -3,3.1 -5.3,7.9 -6.4,13.8 -1.1,5.8 -0.7,11.6 0.8,16.2 -2.9,-3.1 -5.3,-7.9 -6.4,-13.8 -1.1,-5.8 -0.7,-11.6 0.9,-16.2 -3,3.1 -5.3,7.9 -6.4,13.8 -1.1,5.8 -0.7,11.6 0.8,16.2 -2.9,-3.1 -5.3,-7.9 -6.4,-13.8 C 63,95.4 63.4,89.6 64.9,85 c -2.9,3.1 -5.3,7.9 -6.3,13.8 -1.1,5.8 -0.7,11.6 0.8,16.2 -3,-3.1 -5.3,-7.9 -6.4,-13.8 -1.1,-5.8 -0.7,-11.6 0.8,-16.2 -2.9,3.1 -5.3,7.9 -6.4,13.8 -1,5.8 -0.6,11.6 0.9,16.2 -3,-3.1 -5.3,-7.9 -6.4,-13.8 -1.1,-5.8 -0.7,-11.6 0.8,-16.2 -2.9,3.1 -5.3,7.9 -6.4,13.8 -1,5.8 -0.7,11.6 0.9,16.2 -3,-3.1 -5.3,-7.9 -6.4,-13.8 -1.1,-5.8 -0.7,-11.6 0.8,-16.2 -2.9,3.1 -5.3,7.9 -6.4,13.8 -1.1,5.8 -0.7,11.6 0.9,16.2 -3,-3.1 -5.3,-7.9 -6.4,-13.8 C 18.6,95.4 19,89.6 20.5,85 17.6,88.1 15.2,92.9 14.1,98.8 13,104.6 13.4,110.4 14.9,115 12,111.9 9.6,107.1 8.6,101.2 7.5,95.4 7.9,89.6 9.4,85 Z",
+    nebuly:
+      "m 13.1,89.8 c -4.1,0 -7.3,2 -7.3,4.5 0,1.2 0.7,2.3 1.8,3.1 1.2,0.7 1.9,1.8 1.9,3 0,2.5 -3.2,4.5 -7.3,4.5 -0.5,0 -2.2,-0.2 -2.2,-0.2 V 115 h 200 v -10.1 c -3.7,-0.2 -6.7,-2.2 -6.7,-4.5 0,-1.2 0.7,-2.3 1.9,-3 1.2,-0.8 1.8,-1.9 1.8,-3.1 0,-2.5 -3.2,-4.5 -7.2,-4.5 -4.1,0 -7.3,2 -7.3,4.5 0,1.2 0.7,2.3 1.8,3.1 1.2,0.7 1.9,1.8 1.9,3 0,2.5 -3.3,4.5 -7.3,4.5 -4,0 -7.3,-2 -7.3,-4.5 0,-1.2 0.7,-2.3 1.9,-3 1.2,-0.8 1.8,-1.9 1.8,-3.1 0,-2.5 -3.2,-4.5 -7.2,-4.5 -4.1,0 -7.3,2 -7.3,4.5 0,1.2 0.7,2.3 1.8,3.1 1.2,0.7 1.9,1.8 1.9,3 -1.5,4.1 -4.2,4.4 -8.8,4.5 -4.7,-0.1 -8.7,-1.5 -8.9,-4.5 0,-1.2 0.7,-2.3 1.9,-3 1.2,-0.8 1.9,-1.9 1.9,-3.1 0,-2.5 -3.3,-4.5 -7.3,-4.5 -4.1,0 -7.3,2 -7.3,4.5 0,1.2 0.7,2.3 1.8,3.1 1.2,0.7 1.9,1.8 1.9,3 0,2.5 -3.3,4.5 -7.3,4.5 -4,0 -7.3,-2 -7.3,-4.5 0,-1.2 0.7,-2.3 1.9,-3 1.2,-0.8 1.9,-1.9 1.9,-3.1 0,-2.5 -3.3,-4.5 -7.3,-4.5 -4.1,0 -7.3,2 -7.3,4.5 0,1.2 0.7,2.3 1.8,3.1 1.2,0.7 1.9,1.8 1.9,3 0,2.5 -3.3,4.5 -7.3,4.5 -4,0 -7.3,-2 -7.3,-4.5 0,-1.2 0.7,-2.3 1.9,-3 1.2,-0.8 1.9,-1.9 1.9,-3.1 0,-2.5 -3.3,-4.5 -7.3,-4.5 -4.1,0 -7.3,2 -7.3,4.5 0,1.2 0.7,2.3 1.8,3.1 1.2,0.7 1.9,1.8 1.9,3 0,2.5 -3.3,4.5 -7.3,4.5 -4,0 -7.3,-2 -7.3,-4.5 0,-1.2 0.7,-2.3 1.9,-3 1.2,-0.8 1.9,-1.9 1.9,-3.1 0,-2.5 -3.3,-4.5 -7.3,-4.5 -4.1,0 -7.3,2 -7.3,4.5 0,1.2 0.7,2.3 1.8,3.1 1.2,0.7 1.9,1.8 1.9,3 0,2.5 -3.3,4.5 -7.3,4.5 -4,0 -7.3,-2 -7.3,-4.5 0,-1.2 0.7,-2.3 1.9,-3 1.2,-0.8 1.9,-1.9 1.9,-3.1 0,-2.5 -3.3,-4.5 -7.3,-4.5 -4.1,0 -7.3,2 -7.3,4.5 0,1.2 0.7,2.3 1.8,3.1 1.2,0.7 1.9,1.8 1.9,3 0,2.5 -3.3,4.5 -7.3,4.5 -4,0 -7.3,-2 -7.3,-4.5 0,-1.2 0.7,-2.3 1.9,-3 1.2,-0.8 1.9,-1.9 1.9,-3.1 0,-2.5 -3.3,-4.5 -7.3,-4.5 -4.1,0 -7.3,2 -7.3,4.5 0,1.2 0.7,2.3 1.8,3.1 1.2,0.7 1.9,1.8 1.9,3 0,2.5 -3.3,4.5 -7.3,4.5 -4,0 -7.3,-2 -7.3,-4.5 0,-1.2 0.7,-2.3 1.9,-3 1.2,-0.8 1.9,-1.9 1.9,-3.1 0,-2.5 -3.3,-4.5 -7.3,-4.5 z",
+    rayonne:
+      "M0 115l-.1-6 .2.8c1.3-1 2.3-2.5 2.9-4.4.5-2 .4-3.9-.3-5.4-.7-1.5-.8-3.4-.3-5.4A9 9 0 015.5 90c-.7 1.5-.8 3.4-.3 5.4.5 2 1.7 3.6 3.1 4.6a9 9 0 013.1 4.6c.5 2 .4 3.9-.3 5.4a9 9 0 003.1-4.6c.5-2 .4-3.9-.3-5.4-.7-1.5-.8-3.4-.3-5.4.5-2 1.7-3.6 3.1-4.6-.7 1.5-.8 3.4-.3 5.4.5 2 1.7 3.6 3.1 4.6a9 9 0 013.1 4.6c.5 2 .4 3.9-.3 5.4a9 9 0 003.1-4.6c.5-2 .4-3.9-.3-5.4-.7-1.5-.8-3.4-.3-5.4.5-2 1.7-3.6 3.1-4.6-.7 1.5-.8 3.4-.3 5.4.5 2 1.7 3.6 3.1 4.6a9 9 0 013.1 4.6c.5 2 .4 3.9-.3 5.4a9 9 0 003.1-4.6c.5-2 .4-3.9-.3-5.4-.7-1.5-.8-3.4-.3-5.4.5-2 1.7-3.6 3.1-4.6-.7 1.5-.8 3.4-.3 5.4.5 2 1.7 3.6 3.1 4.6a9 9 0 013.1 4.6c.5 2 .4 3.9-.3 5.4a9 9 0 003.1-4.6c.5-2 .4-3.9-.3-5.4-.7-1.5-.8-3.4-.3-5.4.5-2 1.7-3.6 3.1-4.6-.7 1.5-.8 3.4-.3 5.4.5 2 1.7 3.6 3.1 4.6a9 9 0 013.1 4.6c.5 2 .4 3.9-.3 5.4a9 9 0 003.1-4.6c.5-2 .4-3.9-.3-5.4-.7-1.5-.8-3.4-.3-5.4.5-2 1.7-3.6 3.1-4.6-.7 1.5-.8 3.4-.3 5.4.5 2 1.7 3.6 3.1 4.6a9 9 0 013.1 4.6c.5 2 .4 3.9-.3 5.4a9 9 0 003.1-4.6c.5-2 .4-3.9-.3-5.4-.7-1.5-.8-3.4-.3-5.4.5-2 1.7-3.6 3.1-4.6-.7 1.5-.8 3.4-.3 5.4.5 2 1.7 3.6 3.1 4.6a9 9 0 013.1 4.6c.5 2 .4 3.9-.3 5.4a9 9 0 003.1-4.6c.5-2 .4-3.9-.3-5.4-.7-1.5-.8-3.4-.3-5.4.5-2 1.7-3.6 3.1-4.6-.7 1.5-.8 3.4-.3 5.4.5 2 1.7 3.6 3.1 4.6a9 9 0 013.1 4.6c.5 2 .4 3.9-.3 5.4a9 9 0 003.1-4.6c.5-2 .4-3.9-.3-5.4-.7-1.5-.8-3.4-.3-5.4.5-2 1.7-3.6 3.1-4.6-.7 1.5-.8 3.4-.3 5.4.5 2 2.1 3.1 3.1 4.6 1 1.6 2.4 3.1 2.7 4.8.3 1.7.3 3.3 0 5.2 1.3-1 2.6-2.7 3.2-4.6.5-2 .4-3.9-.3-5.4-.7-1.5-.8-3.4-.3-5.4.5-2 1.7-3.6 3.1-4.6-.7 1.5-.8 3.4-.3 5.4.5 2 1.7 3.6 3.1 4.6a9 9 0 013.1 4.6c.5 2 .4 3.9-.3 5.4a9 9 0 003.1-4.6c.5-2 .4-3.9-.3-5.4-.7-1.5-.8-3.4-.3-5.4.5-2 1.7-3.6 3.1-4.6-.7 1.5-.8 3.4-.3 5.4.5 2 1.7 3.6 3.1 4.6a9 9 0 013.1 4.6c.5 2 .4 3.9-.3 5.4a9 9 0 003.1-4.6c.5-2 .4-3.9-.3-5.4-.7-1.5-.8-3.4-.3-5.4.5-2 1.7-3.6 3.1-4.6-.7 1.5-.8 3.4-.3 5.4.5 2 1.7 3.6 3.1 4.6a9 9 0 013.1 4.6c.5 2 .4 3.9-.3 5.4a9 9 0 003.1-4.6c.5-2 .4-3.9-.3-5.4-.7-1.5-.8-3.4-.3-5.4.5-2 1.7-3.6 3.1-4.6-.7 1.5-.8 3.4-.3 5.4.5 2 1.7 3.6 3.1 4.6a9 9 0 013.1 4.6c.5 2 .4 3.9-.3 5.4a9 9 0 003.1-4.6c.5-2 .4-3.9-.3-5.4-.7-1.5-.8-3.4-.3-5.4.5-2 1.7-3.6 3.1-4.6-.7 1.5-.8 3.4-.3 5.4.5 2 1.7 3.6 3.1 4.6a9 9 0 013.1 4.6c.5 2 .4 3.9-.3 5.4a9 9 0 003.1-4.6c.5-2 .4-3.9-.3-5.4-.7-1.5-.8-3.4-.3-5.4.5-2 1.7-3.6 3.1-4.6-.7 1.5-.8 3.4-.3 5.4.5 2 1.7 3.6 3.1 4.6a9 9 0 013.1 4.6c.5 2 .4 3.9-.3 5.4a9 9 0 003.1-4.6c.5-2 .4-3.9-.3-5.4-.7-1.5-.8-3.4-.3-5.4.5-2 1.7-3.6 3.1-4.6-.7 1.5-.8 3.4-.3 5.4.5 2 1.7 3.6 3.1 4.6a9 9 0 013.1 4.6c.5 2 .4 3.9-.3 5.4a9 9 0 003.1-4.6c.5-2 .4-3.9-.3-5.4-.7-1.5-.8-3.4-.3-5.4.5-2 1.7-3.6 3.1-4.6-.7 1.5-.8 3.4-.3 5.4.5 2 1.7 3.6 3.1 4.6a9 9 0 013.1 4.6c.5 2 .4 3.9-.3 5.4a9 9 0 003.1-4.6c.5-2 .4-3.9-.3-5.4-.7-1.5-.8-3.4-.3-5.4.5-2 1.7-3.6 3.1-4.6-.7 1.5-.8 3.4-.3 5.4.75 2.79 2.72 4.08 4.45 5.82L200 115z",
+    seaWaves:
+      "m 28.83,94.9 c -4.25,0 -7.16,3.17 -8.75,5.18 -1.59,2.01 -4.5,5.18 -8.75,5.18 -2.16,0 -3.91,-1.63 -3.91,-3.64 0,-2.01 1.44,-3.6 3.6,-3.6 0.7,0 1.36,0.17 1.93,0.48 -0.33,-2.03 -2.19,-3.56 -4.45,-3.56 -4.24,0 -6.91,3.13 -8.5,5.13 V 115 h 200 v -14.89 c -1.59,2.01 -4.5,5.18 -8.75,5.18 -2.16,0 -3.91,-1.63 -3.91,-3.64 0,-2.01 1.75,-3.64 3.91,-3.64 0.7,0 1.36,0.17 1.93,0.48 -0.34,-2.01 -2.2,-3.55 -4.46,-3.55 -4.25,0 -7.16,3.17 -8.75,5.18 -1.59,2.01 -4.5,5.18 -8.75,5.18 -2.16,0 -3.91,-1.63 -3.91,-3.64 0,-2.01 1.75,-3.64 3.91,-3.64 0.7,0 1.36,0.17 1.93,0.48 -0.34,-2.01 -2.21,-3.55 -4.46,-3.55 -4.25,0 -7.16,3.17 -8.75,5.18 -1.59,2.01 -4.5,5.18 -8.75,5.18 -2.16,0 -3.91,-1.63 -3.91,-3.64 0,-2.01 1.75,-3.64 3.91,-3.64 0.7,0 1.36,0.17 1.93,0.48 -0.34,-2.01 -2.21,-3.55 -4.46,-3.55 -4.25,0 -7.16,3.17 -8.75,5.18 -1.59,2.01 -4.5,5.18 -8.75,5.18 -2.16,0 -3.91,-1.63 -3.91,-3.64 0,-2.01 1.75,-3.64 3.91,-3.64 0.7,0 1.36,0.17 1.93,0.48 -0.34,-2.01 -2.2,-3.55 -4.46,-3.55 -4.25,0 -7.16,3.17 -8.75,5.18 -1.59,2.01 -4.5,5.18 -8.75,5.18 -2.16,0 -3.91,-1.63 -3.91,-3.64 0,-2.01 1.44,-3.6 3.6,-3.6 0.7,0 1.36,0.17 1.93,0.48 -0.34,-2.01 -2.21,-3.55 -4.46,-3.55 -4.25,0 -6.6,3.09 -8.19,5.09 -1.59,2.01 -4.5,5.18 -8.75,5.18 -2.16,0 -3.91,-1.63 -3.91,-3.64 0,-2.01 1.75,-3.64 3.91,-3.64 0.7,0 1.36,0.17 1.93,0.48 -0.34,-2.01 -2.21,-3.55 -4.46,-3.55 -4.25,0 -7.16,3.17 -8.75,5.18 -1.59,2.01 -4.5,5.18 -8.75,5.18 -2.16,0 -3.91,-1.63 -3.91,-3.64 0,-2.01 1.75,-3.64 3.91,-3.64 0.7,0 1.36,0.17 1.93,0.48 -0.34,-2.01 -2.2,-3.55 -4.46,-3.55 -4.25,0 -7.16,3.17 -8.75,5.18 -1.59,2.01 -4.5,5.18 -8.75,5.18 -2.16,0 -3.91,-1.63 -3.91,-3.64 0,-2.01 1.75,-3.64 3.91,-3.64 0.7,0 1.36,0.17 1.93,0.48 -0.34,-2.01 -2.2,-3.55 -4.46,-3.55 -4.25,0 -7.16,3.17 -8.75,5.18 -1.59,2.01 -4.5,5.18 -8.75,5.18 -2.16,0 -3.91,-1.63 -3.91,-3.64 0,-2.01 1.75,-3.64 3.91,-3.64 0.7,0 1.36,0.17 1.93,0.48 -0.34,-2.01 -2.21,-3.55 -4.46,-3.55 z",
+    dragonTeeth:
+      "M 9.4,85 C 6.5,88.1 4.1,92.9 3,98.8 1.9,104.6 2.3,110.4 3.8,115 2.4,113.5 0,106.6 0,109.3 v 5.7 h 200 v -5.7 c -1.1,-2.4 -2,-5.1 -2.6,-8 -1.1,-5.9 -0.7,-11.6 0.8,-16.2 -2.9,3.1 -5.3,7.9 -6.4,13.8 -1.1,5.9 -0.7,11.6 0.8,16.2 -2.9,-3.1 -5.3,-7.9 -6.4,-13.8 -1.1,-5.9 -0.7,-11.6 0.8,-16.2 -2.9,3.1 -5.3,7.9 -6.4,13.8 -1.1,5.9 -0.7,11.6 0.8,16.2 -2.9,-3.1 -5.3,-7.9 -6.4,-13.8 -1.1,-5.9 -0.7,-11.6 0.8,-16.2 -2.9,3.1 -5.3,7.9 -6.4,13.8 -1.1,5.9 -0.7,11.6 0.8,16.2 -2.9,-3.1 -5.3,-7.9 -6.4,-13.8 -1.1,-5.9 -0.7,-11.6 0.8,-16.2 -2.9,3.1 -5.3,7.9 -6.4,13.8 -1.1,5.9 -0.7,11.6 0.8,16.2 -2.9,-3.1 -5.3,-7.9 -6.4,-13.8 -1.1,-5.9 -0.7,-11.6 0.8,-16.2 -2.9,3.1 -5.3,7.9 -6.4,13.8 -1.1,5.9 -0.7,11.6 0.8,16.2 -2.9,-3.1 -5.3,-7.9 -6.4,-13.8 -1.1,-5.9 -0.7,-11.6 0.8,-16.2 -2.9,3.1 -5.3,7.9 -6.4,13.8 -1.1,5.9 -0.7,11.6 0.8,16.2 -2.9,-3.1 -5.3,-7.9 -6.4,-13.8 -1.1,-5.9 -0.7,-11.6 0.8,-16.2 -2.9,3.1 -5.3,7.9 -6.4,13.8 -1.1,5.9 -0.7,11.6 0.8,16.2 -2.9,-3.1 -5.3,-7.9 -6.4,-13.8 -1.1,-5.9 -0.7,-11.6 0.8,-16.2 -2.9,3.1 -5.3,7.9 -6.4,13.8 -1.1,5.9 -0.7,11.6 0.8,16.2 -2.9,-3.1 -5.3,-7.9 -6.4,-13.8 -1.1,-5.9 -0.7,-11.6 0.8,-16.2 -2.9,3.1 -5.3,7.9 -6.4,13.8 -1.1,5.9 -0.7,11.6 0.8,16.2 -1.4,-1.5 -2.8,-3.9 -3.8,-6.1 -1.1,-2.4 -2.3,-6.1 -2.6,-7.7 -0.2,-5.9 0.2,-11.7 1.7,-16.3 -3,3.1 -5.3,7.9 -6.4,13.8 -1.1,5.8 -0.7,11.6 0.8,16.2 -2.9,-3.1 -5.3,-7.9 -6.4,-13.8 -1,-5.8 -0.7,-11.6 0.9,-16.2 -3,3.1 -5.3,7.9 -6.4,13.8 -1.1,5.8 -0.7,11.6 0.8,16.2 -2.9,-3.1 -5.3,-7.9 -6.4,-13.8 -1.1,-5.8 -0.7,-11.6 0.9,-16.2 -3,3.1 -5.3,7.9 -6.4,13.8 -1.1,5.8 -0.7,11.6 0.8,16.2 -2.9,-3.1 -5.3,-7.9 -6.4,-13.8 C 63,95.4 63.4,89.6 64.9,85 c -2.9,3.1 -5.3,7.9 -6.3,13.8 -1.1,5.8 -0.7,11.6 0.8,16.2 -3,-3.1 -5.3,-7.9 -6.4,-13.8 -1.1,-5.8 -0.7,-11.6 0.8,-16.2 -2.9,3.1 -5.3,7.9 -6.4,13.8 -1,5.8 -0.6,11.6 0.9,16.2 -3,-3.1 -5.3,-7.9 -6.4,-13.8 -1.1,-5.8 -0.7,-11.6 0.8,-16.2 -2.9,3.1 -5.3,7.9 -6.4,13.8 -1,5.8 -0.7,11.6 0.9,16.2 -3,-3.1 -5.3,-7.9 -6.4,-13.8 -1.1,-5.8 -0.7,-11.6 0.8,-16.2 -2.9,3.1 -5.3,7.9 -6.4,13.8 -1.1,5.8 -0.7,11.6 0.9,16.2 -3,-3.1 -5.3,-7.9 -6.4,-13.8 C 18.6,95.4 19,89.6 20.5,85 17.6,88.1 15.2,92.9 14.1,98.8 13,104.6 13.4,110.4 14.9,115 12,111.9 9.6,107.1 8.6,101.2 7.5,95.4 7.9,89.6 9.4,85 Z",
     firTrees: "m 3.9,90 -4,7 2,-0.5 L 0,100 v 15 h 200 v -15 l -1.9,-3.5 2,0.5 -4,-7 -4,7 2,-0.5 -4,7 2,-0.5 -4,7 -4,-7 2,0.5 -4,-7 2,0.5 -4,-7 -4,7 2,-0.5 -4,7 2,-0.5 -4,7 -4,-7 2,0.5 -4,-7 2,0.5 -4,-7 -4,7 2,-0.5 -4,7 2,-0.5 -4,7 -4,-7 2,0.5 -4,-7 2,0.5 -4.1,-7 -4,7 2,-0.5 -4,7 2,-0.5 -4,7 -4,-7 2,0.5 -4,-7 2,0.5 -4,-7 -4,7 2,-0.5 -4,7 2,-0.5 -4,7 -4,-7 2,0.5 -4,-7 2,0.5 -4,-7 -4,7 2,-0.5 -4,7 2,-0.5 -4,7 -4,-7 2,0.5 -4,-7 2,0.5 -4,-7 -4,7 2,-0.5 -4,7 2,-0.5 -4,7 -4,-7 2,0.5 -4,-7 2,0.5 -4,-7 -4,7 2,-0.5 -4,7 2,-0.5 -4,7 -4,-7 2,0.5 -4,-7 2,0.5 -4,-7 -4,7 2,-0.5 -4,7 2,-0.5 -4,7 -4,-7 2,0.5 -4,-7 2,0.5 -4.1,-7 -4,7 2,-0.5 -4,7 2,-0.5 -4,7 -4,-7 2,0.5 -4,-7 2,0.5 -4,-7 -4,7 2,-0.5 -4,7 2,-0.5 -4,7 -4,-7 2,0.5 -4,-7 2,0.5 -4,-7 -4,7 2,-0.5 -4,7 2,-0.5 -4,7 -4,-7 2,0.5 -4,-7 2,0.5 z",
     flechy: "m 0,100 h 85 l 15,-15 15,15 h 85 v 15 H 0 Z",
     barby: "m 0,100 h 85 l 15,15 15,-15 h 85 v 15 H 0 Z",
@@ -753,7 +1532,7 @@
     escartely: "m 0,100 h 85 v 15 h 30 v -15 h 85 v 15 H 0 Z",
     arched: "m 100,95 c 40,-0.2 100,20 100,20 H 0 c 0,0 60,-19.8 100,-20 z",
     archedReversed: "m 0,85 c 0,0 60,20.2 100,20 40,-0.2 100,-20 100,-20 v 30 H 0 Z"
-  }
+  };
 
   const templates = {
     // straight divisions
@@ -828,43 +1607,52 @@
     crossPartedLined: line => `<path d="${line}" transform="translate(0,-20)"/><path d="${line}" transform="rotate(180 100 100) translate(0,-20)"/><path d="${line}" transform="rotate(-90 100 100) translate(0,-20)"/><path d="${line}" transform="rotate(-270 100 100) translate(0,-20)"/>`,
     saltireLined: line => `<path d="${line}" transform="translate(0 -10) rotate(45 110 100) scale(1.1 1)"/><path d="${line}" transform="translate(-20 10) rotate(225 110 100) scale(1.1 1)"/><path d="${line}" transform="translate(-20 -10) rotate(-45 110 100) scale(1.1 1)"/><path d="${line}" transform="translate(0 10) rotate(-225 110 100) scale(1.1 1)"/>`,
     saltirePartedLined: line => `<path d="${line}" transform="translate(3 -13) rotate(45 110 100) scale(1.1 1)"/><path d="${line}" transform="translate(-23 13) rotate(225 110 100) scale(1.1 1)"/><path d="${line}" transform="translate(-23 -13) rotate(-45 110 100) scale(1.1 1)"/><path d="${line}" transform="translate(3 13) rotate(-225 110 100) scale(1.1 1)"/>`
-  }
+  };
 
   const patterns = {
-    semy: (p, c1, c2, size, chargeId) => `<pattern id="${p}" width="${size * .125}" height="${size * .125}" viewBox="0 0 200 200" stroke="#000"><rect width="200" height="200" fill="${c1}" stroke="none"/><g fill="${c2}"><use transform="translate(-100 -50)" href="#${chargeId}"/><use transform="translate(100 -50)" href="#${chargeId}"/><use transform="translate(0 50)" href="#${chargeId}"/></g></pattern>`,
-    vair: (p, c1, c2, size) => `<pattern id="${p}" width="${size * .125}" height="${size * .25}" viewBox="0 0 25 50" stroke="#000" stroke-width=".2"><rect width="25" height="25" fill="${c1}" stroke="none"/><path d="m12.5,0 l6.25,6.25 v12.5 l6.25,6.25 h-25 l6.25,-6.25 v-12.5 z" fill="${c2}"/><rect x="0" y="25" width="25" height="25" fill="${c2}" stroke="none"/><path d="m25,25 l-6.25,6.25 v12.5 l-6.25,6.25 l-6.25,-6.25 v-12.5 l-6.25,-6.25 z" fill="${c1}"/><path d="M0 50 h25" fill="none"/></pattern>`,
-    counterVair: (p, c1, c2, size) => `<pattern id="${p}" width="${size * .125}" height="${size * .25}" viewBox="0 0 25 50" stroke="#000" stroke-width=".2"><rect width="25" height="50" fill="${c2}" stroke="none"/><path d="m 12.5,0 6.25,6.25 v 12.5 L 25,25 18.75,31.25 v 12.5 L 12.5,50 6.25,43.75 V 31.25 L 0,25 6.25,18.75 V 6.25 Z" fill="${c1}"/></pattern>`,
-    vairInPale: (p, c1, c2, size) => `<pattern id="${p}" width="${size * .125}" height="${size * .125}" viewBox="0 0 25 25"><rect width="25" height="25" fill="${c1}"/><path d="m12.5,0 l6.25,6.25 v12.5 l6.25,6.25 h-25 l6.25,-6.25 v-12.5 z" fill="${c2}" stroke="#000" stroke-width=".2"/></pattern>`,
-    vairEnPointe: (p, c1, c2, size) => `<pattern id="${p}" width="${size * .125}" height="${size * .25}" viewBox="0 0 25 50"><rect width="25" height="25" fill="${c2}"/><path d="m12.5,0 l6.25,6.25 v12.5 l6.25,6.25 h-25 l6.25,-6.25 v-12.5 z" fill="${c1}"/><rect x="0" y="25" width="25" height="25" fill="${c1}" stroke-width="1" stroke="${c1}"/><path d="m12.5,25 l6.25,6.25 v12.5 l6.25,6.25 h-25 l6.25,-6.25 v-12.5 z" fill="${c2}"/></pattern>`,
-    vairAncien: (p, c1, c2, size) => `<pattern id="${p}" width="${size * .125}" height="${size * .125}" viewBox="0 0 100 100"><rect width="100" height="100" fill="${c1}"/><path fill="${c2}" stroke="none" d="m 0,90 c 10,0 25,-5 25,-40 0,-25 10,-40 25,-40 15,0 25,15 25,40 0,35 15,40 25,40 v 10 H 0 Z"/><path fill="none" stroke="#000" d="M 0,90 c 10,0 25,-5 25,-40 0,-35 15,-40 25,-40 10,0 25,5 25,40 0,35 15,40 25,40 M0,100 h100"/></pattern>`,
-    potent: (p, c1, c2, size) => `<pattern id="${p}" width="${size * .125}" height="${size * .125}" viewBox="0 0 200 200" stroke="#000"><rect width="200" height="100" fill="${c1}" stroke="none"/><rect y="100" width="200" height="100" fill="${c2}" stroke="none"/><path d="m25 50h50v-50h50v50h50v50h-150z" fill="${c2}"/><path d="m25 100v50h50v50h50v-50h50v-50z" fill="${c1}"/><path d="m0 0h200 M0 100h200" fill="none"/></pattern>`,
-    counterPotent: (p, c1, c2, size) => `<pattern id="${p}" width="${size * .125}" height="${size * .125}" viewBox="0 0 200 200" stroke="none"><rect width="200" height="200" fill="${c1}"/><path d="m25 50h50v-50h50v50h50v100h-50v50h-50v-50h-50v-50z" fill="${c2}"/><path d="m0 0h200 M0 100h200 M0 200h200"/></pattern>`,
-    potentInPale: (p, c1, c2, size) => `<pattern id="${p}" width="${size * .125}" height="${size * .0625}" viewBox="0 0 200 100" stroke-width="1"><rect width="200" height="100" fill="${c1}" stroke="none"/><path d="m25 50h50v-50h50v50h50v50h-150z" fill="${c2}" stroke="#000"/><path d="m0 0h200 M0 100h200" fill="none" stroke="#000"/></pattern>`,
-    potentEnPointe: (p, c1, c2, size) => `<pattern id="${p}" width="${size * .125}" height="${size * .125}" viewBox="0 0 200 200" stroke="none"><rect width="200" height="200" fill="${c1}"/><path d="m0 0h25v50h50v50h50v-50h50v-50h25v100h-25v50h-50v50h-50v-50h-50v-50h-25v-100" fill="${c2}"/></pattern>`,
-    ermine: (p, c1, c2, size) => `<pattern id="${p}" width="${size * .125}" height="${size * .125}" viewBox="0 0 200 200" fill="${c2}"><rect width="200" height="200" fill="${c1}"/><g stroke="none" fill="${c2}"><g transform="translate(-100 -50)"><path d="m100 81.1c-4.25 17.6-12.7 29.8-21.2 38.9 3.65-0.607 7.9-3.04 11.5-5.47-2.42 4.86-4.86 8.51-7.3 12.7 1.82-0.607 6.07-4.86 12.7-10.9 1.21 8.51 2.42 17.6 4.25 23.6 1.82-5.47 3.04-15.2 4.25-23.6 3.65 3.65 7.3 7.9 12.7 10.9l-7.9-13.3c3.65 1.82 7.9 4.86 11.5 6.07-9.11-9.11-17-21.2-20.6-38.9z"/><path d="m82.4 81.7c-0.607-0.607-6.07 2.42-9.72-4.25 7.9 6.68 15.2-7.3 21.8 1.82 1.82 4.25-6.68 10.9-12.1 2.42z"/><path d="m117 81.7c0.607-1.21 6.07 2.42 9.11-4.86-7.3 7.3-15.2-7.3-21.2 2.42-1.82 4.25 6.68 10.9 12.1 2.42z"/><path d="m101 66.5c-1.02-0.607 3.58-4.25-3.07-8.51 5.63 7.9-10.2 10.9-1.54 17.6 3.58 2.42 12.2-2.42 4.6-9.11z"/></g><g transform="translate(100 -50)"><path d="m100 81.1c-4.25 17.6-12.7 29.8-21.2 38.9 3.65-0.607 7.9-3.04 11.5-5.47-2.42 4.86-4.86 8.51-7.3 12.7 1.82-0.607 6.07-4.86 12.7-10.9 1.21 8.51 2.42 17.6 4.25 23.6 1.82-5.47 3.04-15.2 4.25-23.6 3.65 3.65 7.3 7.9 12.7 10.9l-7.9-13.3c3.65 1.82 7.9 4.86 11.5 6.07-9.11-9.11-17-21.2-20.6-38.9z"/><path d="m82.4 81.7c-0.607-0.607-6.07 2.42-9.72-4.25 7.9 6.68 15.2-7.3 21.8 1.82 1.82 4.25-6.68 10.9-12.1 2.42z"/><path d="m117 81.7c0.607-1.21 6.07 2.42 9.11-4.86-7.3 7.3-15.2-7.3-21.2 2.42-1.82 4.25 6.68 10.9 12.1 2.42z"/><path d="m101 66.5c-1.02-0.607 3.58-4.25-3.07-8.51 5.63 7.9-10.2 10.9-1.54 17.6 3.58 2.42 12.2-2.42 4.6-9.11z"/></g><g transform="translate(0 50)"><path d="m100 81.1c-4.25 17.6-12.7 29.8-21.2 38.9 3.65-0.607 7.9-3.04 11.5-5.47-2.42 4.86-4.86 8.51-7.3 12.7 1.82-0.607 6.07-4.86 12.7-10.9 1.21 8.51 2.42 17.6 4.25 23.6 1.82-5.47 3.04-15.2 4.25-23.6 3.65 3.65 7.3 7.9 12.7 10.9l-7.9-13.3c3.65 1.82 7.9 4.86 11.5 6.07-9.11-9.11-17-21.2-20.6-38.9z"/><path d="m82.4 81.7c-0.607-0.607-6.07 2.42-9.72-4.25 7.9 6.68 15.2-7.3 21.8 1.82 1.82 4.25-6.68 10.9-12.1 2.42z"/><path d="m117 81.7c0.607-1.21 6.07 2.42 9.11-4.86-7.3 7.3-15.2-7.3-21.2 2.42-1.82 4.25 6.68 10.9 12.1 2.42z"/><path d="m101 66.5c-1.02-0.607 3.58-4.25-3.07-8.51 5.63 7.9-10.2 10.9-1.54 17.6 3.58 2.42 12.2-2.42 4.6-9.11z"/></g></g></pattern>`,
-    chequy: (p, c1, c2, size) => `<pattern id="${p}" width="${size * .25}" height="${size * .25}" viewBox="0 0 50 50" fill="${c2}"><rect width="50" height="50"/><rect width="25" height="25" fill="${c1}"/><rect x="25" y="25" width="25" height="25" fill="${c1}"/></pattern>`,
-    lozengy: (p, c1, c2, size) => `<pattern id="${p}" width="${size * .125}" height="${size * .125}" viewBox="0 0 50 50"><rect width="50" height="50" fill="${c1}"/><polygon points="25,0 50,25 25,50 0,25" fill="${c2}"/></pattern>`,
-    fusily: (p, c1, c2, size) => `<pattern id="${p}" width="${size * .125}" height="${size * .25}" viewBox="0 0 50 100"><rect width="50" height="100" fill="${c2}"/><polygon points="25,0 50,50 25,100 0,50" fill="${c1}"/></pattern>`,
-    pally: (p, c1, c2, size) => `<pattern id="${p}" width="${size * .5}" height="${size * .125}" viewBox="0 0 100 25"><rect width="100" height="25" fill="${c2}"/><rect x="25" y="0" width="25" height="25" fill="${c1}"/><rect x="75" y="0" width="25" height="25" fill="${c1}"/></pattern>`,
-    barry: (p, c1, c2, size) => `<pattern id="${p}" width="${size * .125}" height="${size * .5}" viewBox="0 0 25 100"><rect width="25" height="100" fill="${c2}"/><rect x="0" y="25" width="25" height="25" fill="${c1}"/><rect x="0" y="75" width="25" height="25" fill="${c1}"/></pattern>`,
-    gemelles: (p, c1, c2, size) => `<pattern id="${p}" width="${size * .125}" height="${size * .125}" viewBox="0 0 50 50"><rect width="50" height="50" fill="${c1}"/><rect y="5" width="50" height="10" fill="${c2}"/><rect y="40" width="50" height="10" fill="${c2}"/></pattern>`,
-    bendy: (p, c1, c2, size) => `<pattern id="${p}" width="${size * .5}" height="${size * .5}" viewBox="0 0 100 100"><rect width="100" height="100" fill="${c1}"/><polygon points="0,25 75,100 25,100 0,75" fill="${c2}"/><polygon points="25,0 75,0 100,25 100,75" fill="${c2}"/></pattern>`,
-    bendySinister: (p, c1, c2, size) => `<pattern id="${p}" width="${size * .5}" height="${size * .5}" viewBox="0 0 100 100"><rect width="100" height="100" fill="${c2}"/><polygon points="0,25 25,0 75,0 0,75" fill="${c1}"/><polygon points="25,100 100,25 100,75 75,100" fill="${c1}"/></pattern>`,
-    palyBendy: (p, c1, c2, size) => `<pattern id="${p}" width="${size * .6258}" height="${size * .3576}" viewBox="0 0 175 100"><rect y="0" x="0" width="175" height="100" fill="${c2}"/><g fill="${c1}"><path d="m0 20 35 30v50l-35-30z"/><path d="m35 0 35 30v50l-35-30z"/><path d="m70 0h23l12 10v50l-35-30z"/><path d="m70 80 23 20h-23z"/><path d="m105 60 35 30v10h-35z"/><path d="m105 0h35v40l-35-30z"/><path d="m 140,40 35,30 v 30 h -23 l -12,-10z"/><path d="M 175,0 V 20 L 152,0 Z"/></g></pattern>`,
-    barryBendy: (p, c1, c2, size) => `<pattern id="${p}" width="${size * .3572}" height="${size * .6251}" viewBox="0 0 100 175"><rect width="100" height="175" fill="${c2}"/><g fill="${c1}"><path d="m20 0 30 35h50l-30-35z"/><path d="m0 35 30 35h50l-30-35z"/><path d="m0 70v23l10 12h50l-30-35z"/><path d="m80 70 20 23v-23z"/><path d="m60 105 30 35h10v-35z"/><path d="m0 105v35h40l-30-35z"/><path d="m 40,140 30,35 h 30 v -23 l -10,-12 z"/><path d="m0 175h20l-20-23z"/></g></pattern>`,
-    pappellony: (p, c1, c2, size) => `<pattern id="${p}" width="${size * .125}" height="${size * .125}" viewBox="0 0 100 100"><rect width="100" height="100" fill="${c1}"/><circle cx="0" cy="51" r="45" stroke="${c2}" fill="${c1}" stroke-width="10"/><circle cx="100" cy="51" r="45" stroke="${c2}" fill="${c1}" stroke-width="10"/><circle cx="50" cy="1" r="45" stroke="${c2}" fill="${c1}" stroke-width="10"/></pattern>`,
-    pappellony2: (p, c1, c2, size) => `<pattern id="${p}" width="${size * .125}" height="${size * .125}" viewBox="0 0 100 100" stroke="#000" stroke-width="2"><rect width="100" height="100" fill="${c1}" stroke="none"/><circle cy="50" r="49" fill="${c2}"/><circle cx="100" cy="50" r="49" fill="${c2}"/><circle cx="50" cy="0" r="49" fill="${c1}"/></pattern>`,
-    scaly: (p, c1, c2, size) => `<pattern id="${p}" width="${size * .125}" height="${size * .125}" viewBox="0 0 100 100" stroke="#000"><rect width="100" height="100" fill="${c1}" stroke="none"/><path d="M 0,84 C -40,84 -50,49 -50,49 -50,79 -27,99 0,99 27,99 50,79 50,49 50,49 40,84 0,84 Z" fill="${c2}"/><path d="M 100,84 C 60,84 50,49 50,49 c 0,30 23,50 50,50 27,0 50,-20 50,-50 0,0 -10,35 -50,35 z" fill="${c2}"/><path d="M 50,35 C 10,35 0,0 0,0 0,30 23,50 50,50 77,50 100,30 100,0 100,0 90,35 50,35 Z" fill="${c2}"/></pattern>`,
-    plumetty: (p, c1, c2, size) => `<pattern id="${p}" width="${size * .125}" height="${size * .25}" viewBox="0 0 50 100" stroke-width=".8"><rect width="50" height="100" fill="${c2}" stroke="none"/><path fill="${c1}" stroke="none" d="M 25,100 C 44,88 49.5,74 50,50 33.5,40 25,25 25,4e-7 25,25 16.5,40 0,50 0.5,74 6,88 25,100 Z"/><path fill="none" stroke="${c2}" d="m17 40c5.363 2.692 10.7 2.641 16 0m-19 7c7.448 4.105 14.78 3.894 22 0m-27 7c6-2 10.75 3.003 16 3 5.412-0.0031 10-5 16-3m-35 9c4-7 12 3 19 2 7 1 15-9 19-2m-35 6c6-2 11 3 16 3s10-5 16-3m-30 7c8 0 8 3 14 3s7-3 14-3m-25 8c7.385 4.048 14.72 3.951 22 0m-19 8c5.455 2.766 10.78 2.566 16 0m-8 6v-78"/><g fill="none" stroke="${c1}"><path d="m42 90c2.678 1.344 5.337 2.004 8 2m-11 5c3.686 2.032 7.344 3.006 10.97 3m0.0261-1.2e-4v-30"/><path d="m0 92c2.689 0.0045 5.328-0.6687 8-2m-8 10c3.709-0.0033 7.348-1.031 11-3m-11 3v-30"/><path d="m0 7c5.412-0.0031 10-5 16-3m-16 11c7 1 15-9 19-2m-19 9c5 0 10-5 16-3m-16 10c6 0 7-3 14-3m-14.02 11c3.685-0.002185 7.357-1.014 11.02-3m-11 10c2.694-0.01117 5.358-0.7036 7.996-2m-8 6v-48"/><path d="m34 4c6-2 10.75 3.003 16 3m-19 6c4-7 12 3 19 2m-16 4c6-2 11 3 16 3m-14 4c8 0 8 3 14 3m-11 5c3.641 1.996 7.383 2.985 11 3m-8 5c2.762 1.401 5.303 2.154 8.002 2.112m-0.00154 3.888v-48"/></g></pattern>`,
-    masoned: (p, c1, c2, size) => `<pattern id="${p}" width="${size * .125}" height="${size * .125}" viewBox="0 0 100 100" fill="none"><rect width="100" height="100" fill="${c1}"/><rect width="100" height="50" stroke="${c2}" stroke-width="4"/><line x1="50" y1="50" x2="50" y2="100" stroke="${c2}" stroke-width="5"/></pattern>`,
-    fretty: (p, c1, c2, size) => `<pattern id="${p}" width="${size * .2}" height="${size * .2}" viewBox="0 0 140 140" stroke="#000" stroke-width="2"><rect width="140" height="140" fill="${c1}" stroke="none"/><path d="m-15 5 150 150 20-20-150-150z" fill="${c2}"/><path d="m10 150 140-140-20-20-140 140z" fill="${c2}" stroke="none"/><path d="m0 120 20 20 120-120-20-20z" fill="none"/></pattern>`,
-    grillage: (p, c1, c2, size) => `<pattern id="${p}" width="${size * .25}" height="${size * .25}" viewBox="0 0 200 200" stroke="#000" stroke-width="2"><rect width="200" height="200" fill="${c1}" stroke="none"/><path d="m205 65v-30h-210v30z" fill="${c2}"/><path d="m65-5h-30v210h30z" fill="${c2}"/><path d="m205 165v-30h-210v30z" fill="${c2}"/><path d="m165,65h-30v140h30z" fill="${c2}"/><path d="m 165,-5h-30v40h30z" fill="${c2}"/></pattern>`,
-    chainy: (p, c1, c2, size) => `<pattern id="${p}" width="${size * .167}" height="${size * .167}" viewBox="0 0 200 200" stroke="#000" stroke-width="2"><rect x="-6.691e-6" width="200" height="200" fill="${c1}" stroke="none"/><path d="m155-5-20-20-160 160 20 20z" fill="${c2}"/><path d="m45 205 160-160 20 20-160 160z" fill="${c2}"/><path d="m45-5 20-20 160 160-20 20-160-160" fill="${c2}"/><path d="m-5 45-20 20 160 160 20-20-160-160" fill="${c2}"/></pattern>`,
-    maily: (p, c1, c2, size) => `<pattern id="${p}" width="${size * .167}" height="${size * .167}" viewBox="0 0 200 200" stroke="#000" stroke-width="1.2"><path fill="${c1}" stroke="none" d="M0 0h200v200H0z"/><g fill="${c2}"><path d="m80-2c-5.27e-4 2.403-0.1094 6.806-0.3262 9.199 5.014-1.109 10.1-1.768 15.19-2.059 0.09325-1.712 0.1401-5.426 0.1406-7.141z"/><path d="m100 5a95 95 0 0 0-95 95 95 95 0 0 0 95 95 95 95 0 0 0 95-95 95 95 0 0 0-95-95zm0 15a80 80 0 0 1 80 80 80 80 0 0 1-80 80 80 80 0 0 1-80-80 80 80 0 0 1 80-80z"/><path d="m92.8 20.33c-5.562 0.4859-11.04 1.603-16.34 3.217-7.793 25.31-27.61 45.12-52.91 52.91-5.321 1.638-10.8 2.716-16.34 3.217-2.394 0.2168-6.796 0.3256-9.199 0.3262v15c1.714-4.79e-4 5.429-0.04737 7.141-0.1406 5.109-0.2761 10.19-0.9646 15.19-2.059 36.24-7.937 64.54-36.24 72.47-72.47z"/><path d="m202 80c-2.403-5.31e-4 -6.806-0.1094-9.199-0.3262 1.109 5.014 1.768 10.1 2.059 15.19 1.712 0.09326 5.426 0.1401 7.141 0.1406z"/><path d="m179.7 92.8c-0.4859-5.562-1.603-11.04-3.217-16.34-25.31-7.793-45.12-27.61-52.91-52.91-1.638-5.321-2.716-10.8-3.217-16.34-0.2168-2.394-0.3256-6.796-0.3262-9.199h-15c4.8e-4 1.714 0.0474 5.429 0.1406 7.141 0.2761 5.109 0.9646 10.19 2.059 15.19 7.937 36.24 36.24 64.54 72.47 72.47z"/><path d="m120 202c5.3e-4 -2.403 0.1094-6.806 0.3262-9.199-5.014 1.109-10.1 1.768-15.19 2.059-0.0933 1.712-0.1402 5.426-0.1406 7.141z"/><path d="m107.2 179.7c5.562-0.4859 11.04-1.603 16.34-3.217 7.793-25.31 27.61-45.12 52.91-52.91 5.321-1.638 10.8-2.716 16.34-3.217 2.394-0.2168 6.796-0.3256 9.199-0.3262v-15c-1.714 4.7e-4 -5.429 0.0474-7.141 0.1406-5.109 0.2761-10.19 0.9646-15.19 2.059-36.24 7.937-64.54 36.24-72.47 72.47z"/><path d="m -2,120 c 2.403,5.4e-4 6.806,0.1094 9.199,0.3262 -1.109,-5.014 -1.768,-10.1 -2.059,-15.19 -1.712,-0.0933 -5.426,-0.1402 -7.141,-0.1406 z"/><path d="m 20.33,107.2 c 0.4859,5.562 1.603,11.04 3.217,16.34 25.31,7.793 45.12,27.61 52.91,52.91 1.638,5.321 2.716,10.8 3.217,16.34 0.2168,2.394 0.3256,6.796 0.3262,9.199 L 95,202 c -4.8e-4,-1.714 -0.0472,-5.44 -0.1404,-7.152 -0.2761,-5.109 -0.9646,-10.19 -2.059,-15.19 -7.937,-36.24 -36.24,-64.54 -72.47,-72.47 z"/></g></pattern>`,
-    honeycombed: (p, c1, c2, size) => `<pattern id="${p}" width="${size * .143}" height="${size * .24514}" viewBox="0 0 70 120"><rect width="70" height="120" fill="${c1}"/><path d="M 70,0 V 20 L 35,40 m 35,80 V 100 L 35,80 M 0,120 V 100 L 35,80 V 40 L 0,20 V 0" stroke="${c2}" fill="none" stroke-width="3"/></pattern>`
-  }
+    semy: (p, c1, c2, size, chargeId) => `<pattern id="${p}" width="${size * 0.125}" height="${size * 0.125}" viewBox="0 0 200 200" stroke="#000"><rect width="200" height="200" fill="${c1}" stroke="none"/><g fill="${c2}"><use transform="translate(-100 -50)" href="#${chargeId}"/><use transform="translate(100 -50)" href="#${chargeId}"/><use transform="translate(0 50)" href="#${chargeId}"/></g></pattern>`,
+    vair: (p, c1, c2, size) => `<pattern id="${p}" width="${size * 0.125}" height="${size * 0.25}" viewBox="0 0 25 50" stroke="#000" stroke-width=".2"><rect width="25" height="25" fill="${c1}" stroke="none"/><path d="m12.5,0 l6.25,6.25 v12.5 l6.25,6.25 h-25 l6.25,-6.25 v-12.5 z" fill="${c2}"/><rect x="0" y="25" width="25" height="25" fill="${c2}" stroke="none"/><path d="m25,25 l-6.25,6.25 v12.5 l-6.25,6.25 l-6.25,-6.25 v-12.5 l-6.25,-6.25 z" fill="${c1}"/><path d="M0 50 h25" fill="none"/></pattern>`,
+    counterVair: (p, c1, c2, size) => `<pattern id="${p}" width="${size * 0.125}" height="${size * 0.25}" viewBox="0 0 25 50" stroke="#000" stroke-width=".2"><rect width="25" height="50" fill="${c2}" stroke="none"/><path d="m 12.5,0 6.25,6.25 v 12.5 L 25,25 18.75,31.25 v 12.5 L 12.5,50 6.25,43.75 V 31.25 L 0,25 6.25,18.75 V 6.25 Z" fill="${c1}"/></pattern>`,
+    vairInPale: (p, c1, c2, size) => `<pattern id="${p}" width="${size * 0.125}" height="${size * 0.125}" viewBox="0 0 25 25"><rect width="25" height="25" fill="${c1}"/><path d="m12.5,0 l6.25,6.25 v12.5 l6.25,6.25 h-25 l6.25,-6.25 v-12.5 z" fill="${c2}" stroke="#000" stroke-width=".2"/></pattern>`,
+    vairEnPointe: (p, c1, c2, size) => `<pattern id="${p}" width="${size * 0.125}" height="${size * 0.25}" viewBox="0 0 25 50"><rect width="25" height="25" fill="${c2}"/><path d="m12.5,0 l6.25,6.25 v12.5 l6.25,6.25 h-25 l6.25,-6.25 v-12.5 z" fill="${c1}"/><rect x="0" y="25" width="25" height="25" fill="${c1}" stroke-width="1" stroke="${c1}"/><path d="m12.5,25 l6.25,6.25 v12.5 l6.25,6.25 h-25 l6.25,-6.25 v-12.5 z" fill="${c2}"/></pattern>`,
+    vairAncien: (p, c1, c2, size) => `<pattern id="${p}" width="${size * 0.125}" height="${size * 0.125}" viewBox="0 0 100 100"><rect width="100" height="100" fill="${c1}"/><path fill="${c2}" stroke="none" d="m 0,90 c 10,0 25,-5 25,-40 0,-25 10,-40 25,-40 15,0 25,15 25,40 0,35 15,40 25,40 v 10 H 0 Z"/><path fill="none" stroke="#000" d="M 0,90 c 10,0 25,-5 25,-40 0,-35 15,-40 25,-40 10,0 25,5 25,40 0,35 15,40 25,40 M0,100 h100"/></pattern>`,
+    potent: (p, c1, c2, size) => `<pattern id="${p}" width="${size * 0.125}" height="${size * 0.125}" viewBox="0 0 200 200" stroke="#000"><rect width="200" height="100" fill="${c1}" stroke="none"/><rect y="100" width="200" height="100" fill="${c2}" stroke="none"/><path d="m25 50h50v-50h50v50h50v50h-150z" fill="${c2}"/><path d="m25 100v50h50v50h50v-50h50v-50z" fill="${c1}"/><path d="m0 0h200 M0 100h200" fill="none"/></pattern>`,
+    counterPotent: (p, c1, c2, size) => `<pattern id="${p}" width="${size * 0.125}" height="${size * 0.125}" viewBox="0 0 200 200" stroke="none"><rect width="200" height="200" fill="${c1}"/><path d="m25 50h50v-50h50v50h50v100h-50v50h-50v-50h-50v-50z" fill="${c2}"/><path d="m0 0h200 M0 100h200 M0 200h200"/></pattern>`,
+    potentInPale: (p, c1, c2, size) => `<pattern id="${p}" width="${size * 0.125}" height="${size * 0.0625}" viewBox="0 0 200 100" stroke-width="1"><rect width="200" height="100" fill="${c1}" stroke="none"/><path d="m25 50h50v-50h50v50h50v50h-150z" fill="${c2}" stroke="#000"/><path d="m0 0h200 M0 100h200" fill="none" stroke="#000"/></pattern>`,
+    potentEnPointe: (p, c1, c2, size) => `<pattern id="${p}" width="${size * 0.125}" height="${size * 0.125}" viewBox="0 0 200 200" stroke="none"><rect width="200" height="200" fill="${c1}"/><path d="m0 0h25v50h50v50h50v-50h50v-50h25v100h-25v50h-50v50h-50v-50h-50v-50h-25v-100" fill="${c2}"/></pattern>`,
+    ermine: (p, c1, c2, size) =>
+      `<pattern id="${p}" width="${size * 0.125}" height="${
+        size * 0.125
+      }" viewBox="0 0 200 200" fill="${c2}"><rect width="200" height="200" fill="${c1}"/><g stroke="none" fill="${c2}"><g transform="translate(-100 -50)"><path d="m100 81.1c-4.25 17.6-12.7 29.8-21.2 38.9 3.65-0.607 7.9-3.04 11.5-5.47-2.42 4.86-4.86 8.51-7.3 12.7 1.82-0.607 6.07-4.86 12.7-10.9 1.21 8.51 2.42 17.6 4.25 23.6 1.82-5.47 3.04-15.2 4.25-23.6 3.65 3.65 7.3 7.9 12.7 10.9l-7.9-13.3c3.65 1.82 7.9 4.86 11.5 6.07-9.11-9.11-17-21.2-20.6-38.9z"/><path d="m82.4 81.7c-0.607-0.607-6.07 2.42-9.72-4.25 7.9 6.68 15.2-7.3 21.8 1.82 1.82 4.25-6.68 10.9-12.1 2.42z"/><path d="m117 81.7c0.607-1.21 6.07 2.42 9.11-4.86-7.3 7.3-15.2-7.3-21.2 2.42-1.82 4.25 6.68 10.9 12.1 2.42z"/><path d="m101 66.5c-1.02-0.607 3.58-4.25-3.07-8.51 5.63 7.9-10.2 10.9-1.54 17.6 3.58 2.42 12.2-2.42 4.6-9.11z"/></g><g transform="translate(100 -50)"><path d="m100 81.1c-4.25 17.6-12.7 29.8-21.2 38.9 3.65-0.607 7.9-3.04 11.5-5.47-2.42 4.86-4.86 8.51-7.3 12.7 1.82-0.607 6.07-4.86 12.7-10.9 1.21 8.51 2.42 17.6 4.25 23.6 1.82-5.47 3.04-15.2 4.25-23.6 3.65 3.65 7.3 7.9 12.7 10.9l-7.9-13.3c3.65 1.82 7.9 4.86 11.5 6.07-9.11-9.11-17-21.2-20.6-38.9z"/><path d="m82.4 81.7c-0.607-0.607-6.07 2.42-9.72-4.25 7.9 6.68 15.2-7.3 21.8 1.82 1.82 4.25-6.68 10.9-12.1 2.42z"/><path d="m117 81.7c0.607-1.21 6.07 2.42 9.11-4.86-7.3 7.3-15.2-7.3-21.2 2.42-1.82 4.25 6.68 10.9 12.1 2.42z"/><path d="m101 66.5c-1.02-0.607 3.58-4.25-3.07-8.51 5.63 7.9-10.2 10.9-1.54 17.6 3.58 2.42 12.2-2.42 4.6-9.11z"/></g><g transform="translate(0 50)"><path d="m100 81.1c-4.25 17.6-12.7 29.8-21.2 38.9 3.65-0.607 7.9-3.04 11.5-5.47-2.42 4.86-4.86 8.51-7.3 12.7 1.82-0.607 6.07-4.86 12.7-10.9 1.21 8.51 2.42 17.6 4.25 23.6 1.82-5.47 3.04-15.2 4.25-23.6 3.65 3.65 7.3 7.9 12.7 10.9l-7.9-13.3c3.65 1.82 7.9 4.86 11.5 6.07-9.11-9.11-17-21.2-20.6-38.9z"/><path d="m82.4 81.7c-0.607-0.607-6.07 2.42-9.72-4.25 7.9 6.68 15.2-7.3 21.8 1.82 1.82 4.25-6.68 10.9-12.1 2.42z"/><path d="m117 81.7c0.607-1.21 6.07 2.42 9.11-4.86-7.3 7.3-15.2-7.3-21.2 2.42-1.82 4.25 6.68 10.9 12.1 2.42z"/><path d="m101 66.5c-1.02-0.607 3.58-4.25-3.07-8.51 5.63 7.9-10.2 10.9-1.54 17.6 3.58 2.42 12.2-2.42 4.6-9.11z"/></g></g></pattern>`,
+    chequy: (p, c1, c2, size) => `<pattern id="${p}" width="${size * 0.25}" height="${size * 0.25}" viewBox="0 0 50 50" fill="${c2}"><rect width="50" height="50"/><rect width="25" height="25" fill="${c1}"/><rect x="25" y="25" width="25" height="25" fill="${c1}"/></pattern>`,
+    lozengy: (p, c1, c2, size) => `<pattern id="${p}" width="${size * 0.125}" height="${size * 0.125}" viewBox="0 0 50 50"><rect width="50" height="50" fill="${c1}"/><polygon points="25,0 50,25 25,50 0,25" fill="${c2}"/></pattern>`,
+    fusily: (p, c1, c2, size) => `<pattern id="${p}" width="${size * 0.125}" height="${size * 0.25}" viewBox="0 0 50 100"><rect width="50" height="100" fill="${c2}"/><polygon points="25,0 50,50 25,100 0,50" fill="${c1}"/></pattern>`,
+    pally: (p, c1, c2, size) => `<pattern id="${p}" width="${size * 0.5}" height="${size * 0.125}" viewBox="0 0 100 25"><rect width="100" height="25" fill="${c2}"/><rect x="25" y="0" width="25" height="25" fill="${c1}"/><rect x="75" y="0" width="25" height="25" fill="${c1}"/></pattern>`,
+    barry: (p, c1, c2, size) => `<pattern id="${p}" width="${size * 0.125}" height="${size * 0.5}" viewBox="0 0 25 100"><rect width="25" height="100" fill="${c2}"/><rect x="0" y="25" width="25" height="25" fill="${c1}"/><rect x="0" y="75" width="25" height="25" fill="${c1}"/></pattern>`,
+    gemelles: (p, c1, c2, size) => `<pattern id="${p}" width="${size * 0.125}" height="${size * 0.125}" viewBox="0 0 50 50"><rect width="50" height="50" fill="${c1}"/><rect y="5" width="50" height="10" fill="${c2}"/><rect y="40" width="50" height="10" fill="${c2}"/></pattern>`,
+    bendy: (p, c1, c2, size) => `<pattern id="${p}" width="${size * 0.5}" height="${size * 0.5}" viewBox="0 0 100 100"><rect width="100" height="100" fill="${c1}"/><polygon points="0,25 75,100 25,100 0,75" fill="${c2}"/><polygon points="25,0 75,0 100,25 100,75" fill="${c2}"/></pattern>`,
+    bendySinister: (p, c1, c2, size) => `<pattern id="${p}" width="${size * 0.5}" height="${size * 0.5}" viewBox="0 0 100 100"><rect width="100" height="100" fill="${c2}"/><polygon points="0,25 25,0 75,0 0,75" fill="${c1}"/><polygon points="25,100 100,25 100,75 75,100" fill="${c1}"/></pattern>`,
+    palyBendy: (p, c1, c2, size) => `<pattern id="${p}" width="${size * 0.6258}" height="${size * 0.3576}" viewBox="0 0 175 100"><rect y="0" x="0" width="175" height="100" fill="${c2}"/><g fill="${c1}"><path d="m0 20 35 30v50l-35-30z"/><path d="m35 0 35 30v50l-35-30z"/><path d="m70 0h23l12 10v50l-35-30z"/><path d="m70 80 23 20h-23z"/><path d="m105 60 35 30v10h-35z"/><path d="m105 0h35v40l-35-30z"/><path d="m 140,40 35,30 v 30 h -23 l -12,-10z"/><path d="M 175,0 V 20 L 152,0 Z"/></g></pattern>`,
+    barryBendy: (p, c1, c2, size) => `<pattern id="${p}" width="${size * 0.3572}" height="${size * 0.6251}" viewBox="0 0 100 175"><rect width="100" height="175" fill="${c2}"/><g fill="${c1}"><path d="m20 0 30 35h50l-30-35z"/><path d="m0 35 30 35h50l-30-35z"/><path d="m0 70v23l10 12h50l-30-35z"/><path d="m80 70 20 23v-23z"/><path d="m60 105 30 35h10v-35z"/><path d="m0 105v35h40l-30-35z"/><path d="m 40,140 30,35 h 30 v -23 l -10,-12 z"/><path d="m0 175h20l-20-23z"/></g></pattern>`,
+    pappellony: (p, c1, c2, size) => `<pattern id="${p}" width="${size * 0.125}" height="${size * 0.125}" viewBox="0 0 100 100"><rect width="100" height="100" fill="${c1}"/><circle cx="0" cy="51" r="45" stroke="${c2}" fill="${c1}" stroke-width="10"/><circle cx="100" cy="51" r="45" stroke="${c2}" fill="${c1}" stroke-width="10"/><circle cx="50" cy="1" r="45" stroke="${c2}" fill="${c1}" stroke-width="10"/></pattern>`,
+    pappellony2: (p, c1, c2, size) => `<pattern id="${p}" width="${size * 0.125}" height="${size * 0.125}" viewBox="0 0 100 100" stroke="#000" stroke-width="2"><rect width="100" height="100" fill="${c1}" stroke="none"/><circle cy="50" r="49" fill="${c2}"/><circle cx="100" cy="50" r="49" fill="${c2}"/><circle cx="50" cy="0" r="49" fill="${c1}"/></pattern>`,
+    scaly: (p, c1, c2, size) => `<pattern id="${p}" width="${size * 0.125}" height="${size * 0.125}" viewBox="0 0 100 100" stroke="#000"><rect width="100" height="100" fill="${c1}" stroke="none"/><path d="M 0,84 C -40,84 -50,49 -50,49 -50,79 -27,99 0,99 27,99 50,79 50,49 50,49 40,84 0,84 Z" fill="${c2}"/><path d="M 100,84 C 60,84 50,49 50,49 c 0,30 23,50 50,50 27,0 50,-20 50,-50 0,0 -10,35 -50,35 z" fill="${c2}"/><path d="M 50,35 C 10,35 0,0 0,0 0,30 23,50 50,50 77,50 100,30 100,0 100,0 90,35 50,35 Z" fill="${c2}"/></pattern>`,
+    plumetty: (p, c1, c2, size) =>
+      `<pattern id="${p}" width="${size * 0.125}" height="${
+        size * 0.25
+      }" viewBox="0 0 50 100" stroke-width=".8"><rect width="50" height="100" fill="${c2}" stroke="none"/><path fill="${c1}" stroke="none" d="M 25,100 C 44,88 49.5,74 50,50 33.5,40 25,25 25,4e-7 25,25 16.5,40 0,50 0.5,74 6,88 25,100 Z"/><path fill="none" stroke="${c2}" d="m17 40c5.363 2.692 10.7 2.641 16 0m-19 7c7.448 4.105 14.78 3.894 22 0m-27 7c6-2 10.75 3.003 16 3 5.412-0.0031 10-5 16-3m-35 9c4-7 12 3 19 2 7 1 15-9 19-2m-35 6c6-2 11 3 16 3s10-5 16-3m-30 7c8 0 8 3 14 3s7-3 14-3m-25 8c7.385 4.048 14.72 3.951 22 0m-19 8c5.455 2.766 10.78 2.566 16 0m-8 6v-78"/><g fill="none" stroke="${c1}"><path d="m42 90c2.678 1.344 5.337 2.004 8 2m-11 5c3.686 2.032 7.344 3.006 10.97 3m0.0261-1.2e-4v-30"/><path d="m0 92c2.689 0.0045 5.328-0.6687 8-2m-8 10c3.709-0.0033 7.348-1.031 11-3m-11 3v-30"/><path d="m0 7c5.412-0.0031 10-5 16-3m-16 11c7 1 15-9 19-2m-19 9c5 0 10-5 16-3m-16 10c6 0 7-3 14-3m-14.02 11c3.685-0.002185 7.357-1.014 11.02-3m-11 10c2.694-0.01117 5.358-0.7036 7.996-2m-8 6v-48"/><path d="m34 4c6-2 10.75 3.003 16 3m-19 6c4-7 12 3 19 2m-16 4c6-2 11 3 16 3m-14 4c8 0 8 3 14 3m-11 5c3.641 1.996 7.383 2.985 11 3m-8 5c2.762 1.401 5.303 2.154 8.002 2.112m-0.00154 3.888v-48"/></g></pattern>`,
+    masoned: (p, c1, c2, size) => `<pattern id="${p}" width="${size * 0.125}" height="${size * 0.125}" viewBox="0 0 100 100" fill="none"><rect width="100" height="100" fill="${c1}"/><rect width="100" height="50" stroke="${c2}" stroke-width="4"/><line x1="50" y1="50" x2="50" y2="100" stroke="${c2}" stroke-width="5"/></pattern>`,
+    fretty: (p, c1, c2, size) => `<pattern id="${p}" width="${size * 0.2}" height="${size * 0.2}" viewBox="0 0 140 140" stroke="#000" stroke-width="2"><rect width="140" height="140" fill="${c1}" stroke="none"/><path d="m-15 5 150 150 20-20-150-150z" fill="${c2}"/><path d="m10 150 140-140-20-20-140 140z" fill="${c2}" stroke="none"/><path d="m0 120 20 20 120-120-20-20z" fill="none"/></pattern>`,
+    grillage: (p, c1, c2, size) => `<pattern id="${p}" width="${size * 0.25}" height="${size * 0.25}" viewBox="0 0 200 200" stroke="#000" stroke-width="2"><rect width="200" height="200" fill="${c1}" stroke="none"/><path d="m205 65v-30h-210v30z" fill="${c2}"/><path d="m65-5h-30v210h30z" fill="${c2}"/><path d="m205 165v-30h-210v30z" fill="${c2}"/><path d="m165,65h-30v140h30z" fill="${c2}"/><path d="m 165,-5h-30v40h30z" fill="${c2}"/></pattern>`,
+    chainy: (p, c1, c2, size) => `<pattern id="${p}" width="${size * 0.167}" height="${size * 0.167}" viewBox="0 0 200 200" stroke="#000" stroke-width="2"><rect x="-6.691e-6" width="200" height="200" fill="${c1}" stroke="none"/><path d="m155-5-20-20-160 160 20 20z" fill="${c2}"/><path d="m45 205 160-160 20 20-160 160z" fill="${c2}"/><path d="m45-5 20-20 160 160-20 20-160-160" fill="${c2}"/><path d="m-5 45-20 20 160 160 20-20-160-160" fill="${c2}"/></pattern>`,
+    maily: (p, c1, c2, size) =>
+      `<pattern id="${p}" width="${size * 0.167}" height="${
+        size * 0.167
+      }" viewBox="0 0 200 200" stroke="#000" stroke-width="1.2"><path fill="${c1}" stroke="none" d="M0 0h200v200H0z"/><g fill="${c2}"><path d="m80-2c-5.27e-4 2.403-0.1094 6.806-0.3262 9.199 5.014-1.109 10.1-1.768 15.19-2.059 0.09325-1.712 0.1401-5.426 0.1406-7.141z"/><path d="m100 5a95 95 0 0 0-95 95 95 95 0 0 0 95 95 95 95 0 0 0 95-95 95 95 0 0 0-95-95zm0 15a80 80 0 0 1 80 80 80 80 0 0 1-80 80 80 80 0 0 1-80-80 80 80 0 0 1 80-80z"/><path d="m92.8 20.33c-5.562 0.4859-11.04 1.603-16.34 3.217-7.793 25.31-27.61 45.12-52.91 52.91-5.321 1.638-10.8 2.716-16.34 3.217-2.394 0.2168-6.796 0.3256-9.199 0.3262v15c1.714-4.79e-4 5.429-0.04737 7.141-0.1406 5.109-0.2761 10.19-0.9646 15.19-2.059 36.24-7.937 64.54-36.24 72.47-72.47z"/><path d="m202 80c-2.403-5.31e-4 -6.806-0.1094-9.199-0.3262 1.109 5.014 1.768 10.1 2.059 15.19 1.712 0.09326 5.426 0.1401 7.141 0.1406z"/><path d="m179.7 92.8c-0.4859-5.562-1.603-11.04-3.217-16.34-25.31-7.793-45.12-27.61-52.91-52.91-1.638-5.321-2.716-10.8-3.217-16.34-0.2168-2.394-0.3256-6.796-0.3262-9.199h-15c4.8e-4 1.714 0.0474 5.429 0.1406 7.141 0.2761 5.109 0.9646 10.19 2.059 15.19 7.937 36.24 36.24 64.54 72.47 72.47z"/><path d="m120 202c5.3e-4 -2.403 0.1094-6.806 0.3262-9.199-5.014 1.109-10.1 1.768-15.19 2.059-0.0933 1.712-0.1402 5.426-0.1406 7.141z"/><path d="m107.2 179.7c5.562-0.4859 11.04-1.603 16.34-3.217 7.793-25.31 27.61-45.12 52.91-52.91 5.321-1.638 10.8-2.716 16.34-3.217 2.394-0.2168 6.796-0.3256 9.199-0.3262v-15c-1.714 4.7e-4 -5.429 0.0474-7.141 0.1406-5.109 0.2761-10.19 0.9646-15.19 2.059-36.24 7.937-64.54 36.24-72.47 72.47z"/><path d="m -2,120 c 2.403,5.4e-4 6.806,0.1094 9.199,0.3262 -1.109,-5.014 -1.768,-10.1 -2.059,-15.19 -1.712,-0.0933 -5.426,-0.1402 -7.141,-0.1406 z"/><path d="m 20.33,107.2 c 0.4859,5.562 1.603,11.04 3.217,16.34 25.31,7.793 45.12,27.61 52.91,52.91 1.638,5.321 2.716,10.8 3.217,16.34 0.2168,2.394 0.3256,6.796 0.3262,9.199 L 95,202 c -4.8e-4,-1.714 -0.0472,-5.44 -0.1404,-7.152 -0.2761,-5.109 -0.9646,-10.19 -2.059,-15.19 -7.937,-36.24 -36.24,-64.54 -72.47,-72.47 z"/></g></pattern>`,
+    honeycombed: (p, c1, c2, size) => `<pattern id="${p}" width="${size * 0.143}" height="${size * 0.24514}" viewBox="0 0 70 120"><rect width="70" height="120" fill="${c1}"/><path d="M 70,0 V 20 L 35,40 m 35,80 V 100 L 35,80 M 0,120 V 100 L 35,80 V 40 L 0,20 V 0" stroke="${c2}" fill="none" stroke-width="3"/></pattern>`
+  };
 
-  const draw = async function(id, coa) {
+  const draw = async function (id, coa) {
     const {shield, division, ordinaries = [], charges = []} = coa;
 
     const ordinariesRegular = ordinaries.filter(o => !o.above);
@@ -884,7 +1672,7 @@
     const divisionGroup = division ? templateDivision() : "";
     const overlay = `<path d="${shieldPath}" fill="url(#backlight_${id})" stroke="#333"/>`;
 
-    const svg= `<svg id="${id}" width="200" height="200" viewBox="${viewBox}">
+    const svg = `<svg id="${id}" width="200" height="200" viewBox="${viewBox}">
         <defs>${shieldClip}${divisionClip}${loadedCharges}${loadedPatterns}${blacklight}</defs>
         <g clip-path="url(#${shield}_${id})">${field}${divisionGroup}${templateAboveAll()}</g>
         ${overlay}</svg>`;
@@ -936,17 +1724,20 @@
     function templateAboveAll() {
       let svg = "";
 
-      ordinariesRegular.filter(o => !o.divided)
+      ordinariesRegular
+        .filter(o => !o.divided)
         .forEach(ordinary => {
           svg += templateOrdinary(ordinary, ordinary.t);
         });
 
-      charges.filter(o => !o.divided || !division)
+      charges
+        .filter(o => !o.divided || !division)
         .forEach(charge => {
           svg += templateCharge(charge, charge.t);
         });
 
-      ordinariesAboveCharges.filter(o => !o.divided)
+      ordinariesAboveCharges
+        .filter(o => !o.divided)
         .forEach(ordinary => {
           svg += templateOrdinary(ordinary, ordinary.t);
         });
@@ -986,7 +1777,7 @@
         return `translate(${x} ${y}) scale(${scale})`;
       }
     }
-  }
+  };
 
   async function getCharges(coa, id, shieldPath) {
     let charges = coa.charges ? coa.charges.map(charge => charge.charge) : []; // add charges
@@ -1006,16 +1797,19 @@
 
   const url = PRODUCTION ? "./charges/" : "http://armoria.herokuapp.com/charges/"; // on local machine fetch files from server
   async function fetchCharge(charge, id) {
-    const fetched = fetch(url + charge + ".svg").then(res => {
+    const fetched = fetch(url + charge + ".svg")
+      .then(res => {
         if (res.ok) return res.text();
         else throw new Error("Cannot fetch charge");
-      }).then(text => {
+      })
+      .then(text => {
         const html = document.createElement("html");
         html.innerHTML = text;
         const g = html.querySelector("g");
         g.setAttribute("id", charge + "_" + id);
         return g.outerHTML;
-      }).catch(err => console.error(err));
+      })
+      .catch(err => console.error(err));
     return fetched;
   }
 
@@ -1028,24 +1822,26 @@
     if (coa.charges) coa.charges.filter(charge => isPattern(charge.t)).forEach(charge => patternsToAdd.push(charge.t)); // add charges pattern
     if (!patternsToAdd.length) return "";
 
-    return [...new Set(patternsToAdd)].map(patternString => {
-      const [pattern, t1, t2, size] = patternString.split("-");
-      const charge = semy(patternString);
-      if (charge) return patterns.semy(patternString, clr(t1), clr(t2), getSizeMod(size), charge + "_" + id);
-      return patterns[pattern](patternString, clr(t1), clr(t2), getSizeMod(size), charge);
-    }).join("");
+    return [...new Set(patternsToAdd)]
+      .map(patternString => {
+        const [pattern, t1, t2, size] = patternString.split("-");
+        const charge = semy(patternString);
+        if (charge) return patterns.semy(patternString, clr(t1), clr(t2), getSizeMod(size), charge + "_" + id);
+        return patterns[pattern](patternString, clr(t1), clr(t2), getSizeMod(size), charge);
+      })
+      .join("");
   }
 
   function getSizeMod(size) {
-    if (size === "small") return .8;
-    if (size === "smaller") return .5;
-    if (size === "smallest") return .25;
+    if (size === "small") return 0.8;
+    if (size === "smaller") return 0.5;
+    if (size === "smallest") return 0.25;
     if (size === "big") return 1.6;
     return 1;
   }
 
   function getTemplate(id, line) {
-    const linedId = id+"Lined";
+    const linedId = id + "Lined";
     if (!line || line === "straight" || !templates[linedId]) return templates[id];
     const linePath = lines[line];
     return templates[linedId](linePath);
@@ -1065,7 +1861,7 @@
   }
 
   // render coa if does not exist
-  const trigger = async function(id, coa) {
+  const trigger = async function (id, coa) {
     if (coa === "custom") {
       console.warn("Cannot render custom emblem", coa);
       return;
@@ -1075,20 +1871,19 @@
       return;
     }
     if (!document.getElementById(id)) return draw(id, coa);
-  }
+  };
 
-  const add = function(type, i, coa, x, y) {
+  const add = function (type, i, coa, x, y) {
     const id = type + "COA" + i;
-    const g = document.getElementById(type+"Emblems");
+    const g = document.getElementById(type + "Emblems");
 
     if (emblems.selectAll("use").size()) {
       const size = +g.getAttribute("font-size") || 50;
-      const use = `<use data-i="${i}" x="${x - size/2}" y="${y - size/2}" width="1em" height="1em" href="#${id}"/>`;
+      const use = `<use data-i="${i}" x="${x - size / 2}" y="${y - size / 2}" width="1em" height="1em" href="#${id}"/>`;
       g.insertAdjacentHTML("beforeend", use);
     }
     if (layerIsOn("toggleEmblems")) trigger(id, coa);
-  }
+  };
 
   return {trigger, add, shieldPaths};
-
-})));
+})();
diff --git a/modules/cultures-generator.js b/modules/cultures-generator.js
index 9ef56fe1..04a96dca 100644
--- a/modules/cultures-generator.js
+++ b/modules/cultures-generator.js
@@ -1,13 +1,10 @@
-(function (global, factory) {
-    typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
-    typeof define === 'function' && define.amd ? define(factory) :
-    (global.Cultures = factory());
-}(this, (function () {'use strict';
+"use strict";
 
+window.Cultures = (function () {
   let cells;
 
-  const generate = function() {
-    TIME && console.time('generateCultures');
+  const generate = function () {
+    TIME && console.time("generateCultures");
     cells = pack.cells;
     cells.culture = new Uint16Array(cells.i.length); // cell cultures
     let count = Math.min(+culturesInput.value, +culturesSet.selectedOptions[0].dataset.max);
@@ -17,13 +14,19 @@
       count = Math.floor(populated.length / 50);
       if (!count) {
         WARN && console.warn(`There are no populated cells. Cannot generate cultures`);
-        pack.cultures = [{name:"Wildlands", i:0, base:1, shield:"round"}];
+        pack.cultures = [{name: "Wildlands", i: 0, base: 1, shield: "round"}];
         alertMessage.innerHTML = `
           The climate is harsh and people cannot live in this world.<br>
           No cultures, states and burgs will be created.<br>
           Please consider changing climate settings in the World Configurator`;
-        $("#alert").dialog({resizable: false, title: "Extreme climate warning",
-          buttons: {Ok: function() {$(this).dialog("close");}}
+        $("#alert").dialog({
+          resizable: false,
+          title: "Extreme climate warning",
+          buttons: {
+            Ok: function () {
+              $(this).dialog("close");
+            }
+          }
         });
         return;
       } else {
@@ -32,22 +35,28 @@
           There are only ${populated.length} populated cells and it's insufficient livable area.<br>
           Only ${count} out of ${culturesInput.value} requested cultures will be generated.<br>
           Please consider changing climate settings in the World Configurator`;
-        $("#alert").dialog({resizable: false, title: "Extreme climate warning",
-          buttons: {Ok: function() {$(this).dialog("close");}}
+        $("#alert").dialog({
+          resizable: false,
+          title: "Extreme climate warning",
+          buttons: {
+            Ok: function () {
+              $(this).dialog("close");
+            }
+          }
         });
       }
     }
 
-    const cultures = pack.cultures = selectCultures(count);
+    const cultures = (pack.cultures = selectCultures(count));
     const centers = d3.quadtree();
     const colors = getColors(count);
     const emblemShape = document.getElementById("emblemShape").value;
 
     const codes = [];
-    cultures.forEach(function(c, i) {
-      const cell = c.center = placeCenter(c.sort ? c.sort : (i) => cells.s[i]);
+    cultures.forEach(function (c, i) {
+      const cell = (c.center = placeCenter(c.sort ? c.sort : i => cells.s[i]));
       centers.add(cells.p[cell]);
-      c.i = i+1;
+      c.i = i + 1;
       delete c.odd;
       delete c.sort;
       c.color = colors[i];
@@ -56,20 +65,24 @@
       c.origin = 0;
       c.code = abbreviate(c.name, codes);
       codes.push(c.code);
-      cells.culture[cell] = i+1;
+      cells.culture[cell] = i + 1;
       if (emblemShape === "random") c.shield = getRandomShield();
     });
 
     function placeCenter(v) {
-      let c, spacing = (graphWidth + graphHeight) / 2 / count;
-      const sorted = [...populated].sort((a, b) => v(b) - v(a)), max = Math.floor(sorted.length / 2);
-      do {c = sorted[biased(0, max, 5)]; spacing *= .9;}
-      while (centers.find(cells.p[c][0], cells.p[c][1], spacing) !== undefined);
+      let c,
+        spacing = (graphWidth + graphHeight) / 2 / count;
+      const sorted = [...populated].sort((a, b) => v(b) - v(a)),
+        max = Math.floor(sorted.length / 2);
+      do {
+        c = sorted[biased(0, max, 5)];
+        spacing *= 0.9;
+      } while (centers.find(cells.p[c][0], cells.p[c][1], spacing) !== undefined);
       return c;
     }
 
     // the first culture with id 0 is for wildlands
-    cultures.unshift({name:"Wildlands", i:0, base:1, origin:null, shield:"round"});
+    cultures.unshift({name: "Wildlands", i: 0, base: 1, origin: null, shield: "round"});
 
     // make sure all bases exist in nameBases
     if (!nameBases.length) {
@@ -77,7 +90,7 @@
       nameBases = Names.getNameBases();
     }
 
-    cultures.forEach(c => c.base = c.base % nameBases.length);
+    cultures.forEach(c => (c.base = c.base % nameBases.length));
 
     function selectCultures(c) {
       let def = getDefault(c);
@@ -87,11 +100,11 @@
       const count = Math.min(c, def.length);
       const cultures = [];
 
-      for (let culture, rnd, i=0; cultures.length < count && i < 200; i++) {
+      for (let culture, rnd, i = 0; cultures.length < count && i < 200; i++) {
         do {
-          rnd = rand(def.length-1);
+          rnd = rand(def.length - 1);
           culture = def[rnd];
-        } while (!P(culture.odd))
+        } while (!P(culture.odd));
         cultures.push(culture);
         def.splice(rnd, 1);
       }
@@ -100,31 +113,31 @@
 
     // set culture type based on culture center position
     function defineCultureType(i) {
-      if (cells.h[i] < 70 && [1,2,4].includes(cells.biome[i])) return "Nomadic"; // high penalty in forest biomes and near coastline
+      if (cells.h[i] < 70 && [1, 2, 4].includes(cells.biome[i])) return "Nomadic"; // high penalty in forest biomes and near coastline
       if (cells.h[i] > 50) return "Highland"; // no penalty for hills and moutains, high for other elevations
       const f = pack.features[cells.f[cells.haven[i]]]; // opposite feature
-      if (f.type === "lake" && f.cells > 5) return "Lake" // low water cross penalty and high for growth not along coastline
-      if (cells.harbor[i] && f.type !== "lake" && P(.1) || (cells.harbor[i] === 1 && P(.6)) || (pack.features[cells.f[i]].group === "isle" && P(.4))) return "Naval"; // low water cross penalty and high for non-along-coastline growth
+      if (f.type === "lake" && f.cells > 5) return "Lake"; // low water cross penalty and high for growth not along coastline
+      if ((cells.harbor[i] && f.type !== "lake" && P(0.1)) || (cells.harbor[i] === 1 && P(0.6)) || (pack.features[cells.f[i]].group === "isle" && P(0.4))) return "Naval"; // low water cross penalty and high for non-along-coastline growth
       if (cells.r[i] && cells.fl[i] > 100) return "River"; // no River cross penalty, penalty for non-River growth
-      if (cells.t[i] > 2 && [3,7,8,9,10,12].includes(cells.biome[i])) return "Hunting"; // high penalty in non-native biomes
+      if (cells.t[i] > 2 && [3, 7, 8, 9, 10, 12].includes(cells.biome[i])) return "Hunting"; // high penalty in non-native biomes
       return "Generic";
     }
 
     function defineCultureExpansionism(type) {
       let base = 1; // Generic
-      if (type === "Lake") base = .8; else
-      if (type === "Naval") base = 1.5; else
-      if (type === "River") base = .9; else
-      if (type === "Nomadic") base = 1.5; else
-      if (type === "Hunting") base = .7; else
-      if (type === "Highland") base = 1.2;
-      return rn((Math.random() * powerInput.value / 2 + 1) * base, 1);
+      if (type === "Lake") base = 0.8;
+      else if (type === "Naval") base = 1.5;
+      else if (type === "River") base = 0.9;
+      else if (type === "Nomadic") base = 1.5;
+      else if (type === "Hunting") base = 0.7;
+      else if (type === "Highland") base = 1.2;
+      return rn(((Math.random() * powerInput.value) / 2 + 1) * base, 1);
     }
 
-    TIME && console.timeEnd('generateCultures');
-  }
+    TIME && console.timeEnd("generateCultures");
+  };
 
-  const add = function(center) {
+  const add = function (center) {
     const defaultCultures = getDefault();
     let culture, base, name;
 
@@ -139,7 +152,10 @@
       name = Names.getCulture(culture, 5, 8, "");
       base = pack.cultures[culture].base;
     }
-    const code = abbreviate(name, pack.cultures.map(c => c.code));
+    const code = abbreviate(
+      name,
+      pack.cultures.map(c => c.code)
+    );
     const i = pack.cultures.length;
     const color = d3.color(d3.scaleSequential(d3.interpolateRainbow)(Math.random())).hex();
 
@@ -148,220 +164,231 @@
     const emblemShape = document.getElementById("emblemShape").value;
     if (emblemShape === "random") shield = getRandomShield();
 
-    pack.cultures.push({name, color, base, center, i, expansionism:1, type:"Generic", cells:0, area:0, rural:0, urban:0, origin:0, code, shield});
-  }
+    pack.cultures.push({name, color, base, center, i, expansionism: 1, type: "Generic", cells: 0, area: 0, rural: 0, urban: 0, origin: 0, code, shield});
+  };
 
-  const getDefault = function(count) {
+  const getDefault = function (count) {
     // generic sorting functions
-    const cells = pack.cells, s = cells.s, sMax = d3.max(s), t = cells.t, h = cells.h, temp = grid.cells.temp;
-    const n = cell => Math.ceil(s[cell] / sMax * 3) // normalized cell score
-    const td = (cell, goal) => {const d = Math.abs(temp[cells.g[cell]] - goal); return d ? d+1 : 1;} // temperature difference fee
-    const bd = (cell, biomes, fee = 4) => biomes.includes(cells.biome[cell]) ? 1 : fee; // biome difference fee
-    const sf = (cell, fee = 4) => cells.haven[cell] && pack.features[cells.f[cells.haven[cell]]].type !== "lake" ? 1 : fee; // not on sea coast fee
+    const cells = pack.cells,
+      s = cells.s,
+      sMax = d3.max(s),
+      t = cells.t,
+      h = cells.h,
+      temp = grid.cells.temp;
+    const n = cell => Math.ceil((s[cell] / sMax) * 3); // normalized cell score
+    const td = (cell, goal) => {
+      const d = Math.abs(temp[cells.g[cell]] - goal);
+      return d ? d + 1 : 1;
+    }; // temperature difference fee
+    const bd = (cell, biomes, fee = 4) => (biomes.includes(cells.biome[cell]) ? 1 : fee); // biome difference fee
+    const sf = (cell, fee = 4) => (cells.haven[cell] && pack.features[cells.f[cells.haven[cell]]].type !== "lake" ? 1 : fee); // not on sea coast fee
 
     if (culturesSet.value === "european") {
       return [
-        {name:"Shwazen", base:0, odd:1, sort: i => n(i) / td(i, 10) / bd(i, [6, 8]), shield:"swiss"},
-        {name:"Angshire", base:1, odd:1, sort: i => n(i) / td(i, 10) / sf(i), shield:"wedged"},
-        {name:"Luari", base:2, odd:1, sort: i => n(i) / td(i, 12) / bd(i, [6, 8]), shield:"french"},
-        {name:"Tallian", base:3, odd:1, sort: i => n(i) / td(i, 15), shield:"horsehead"},
-        {name:"Astellian", base:4, odd:1, sort: i => n(i) / td(i, 16), shield:"spanish"},
-        {name:"Slovan", base:5, odd:1, sort: i => n(i) / td(i, 6) * t[i], shield:"polish"},
-        {name:"Norse", base:6, odd:1, sort: i => n(i) / td(i, 5), shield:"heater"},
-        {name:"Elladan", base:7, odd:1, sort: i => n(i) / td(i, 18) * h[i], shield:"boeotian"},
-        {name:"Romian", base:8, odd:.2, sort: i => n(i) / td(i, 15) / t[i], shield:"roman"},
-        {name:"Soumi", base:9, odd:1, sort: i => n(i) / td(i, 5) / bd(i, [9]) * t[i], shield:"pavise"},
-        {name:"Portuzian", base:13, odd:1, sort: i => n(i) / td(i, 17) / sf(i), shield:"renaissance"},
-        {name:"Vengrian", base: 15, odd:1, sort: i => n(i) / td(i, 11) / bd(i, [4]) * t[i], shield:"horsehead2"},
-        {name:"Turchian", base: 16, odd:.05, sort: i => n(i) / td(i, 14), shield:"round"},
-        {name:"Euskati", base: 20, odd:.05, sort: i => n(i) / td(i, 15) * h[i], shield:"oldFrench"},
-        {name:"Keltan", base: 22, odd:.05, sort: i => n(i) / td(i, 11) / bd(i, [6, 8]) * t[i], shield:"oval"}
+        {name: "Shwazen", base: 0, odd: 1, sort: i => n(i) / td(i, 10) / bd(i, [6, 8]), shield: "swiss"},
+        {name: "Angshire", base: 1, odd: 1, sort: i => n(i) / td(i, 10) / sf(i), shield: "wedged"},
+        {name: "Luari", base: 2, odd: 1, sort: i => n(i) / td(i, 12) / bd(i, [6, 8]), shield: "french"},
+        {name: "Tallian", base: 3, odd: 1, sort: i => n(i) / td(i, 15), shield: "horsehead"},
+        {name: "Astellian", base: 4, odd: 1, sort: i => n(i) / td(i, 16), shield: "spanish"},
+        {name: "Slovan", base: 5, odd: 1, sort: i => (n(i) / td(i, 6)) * t[i], shield: "polish"},
+        {name: "Norse", base: 6, odd: 1, sort: i => n(i) / td(i, 5), shield: "heater"},
+        {name: "Elladan", base: 7, odd: 1, sort: i => (n(i) / td(i, 18)) * h[i], shield: "boeotian"},
+        {name: "Romian", base: 8, odd: 0.2, sort: i => n(i) / td(i, 15) / t[i], shield: "roman"},
+        {name: "Soumi", base: 9, odd: 1, sort: i => (n(i) / td(i, 5) / bd(i, [9])) * t[i], shield: "pavise"},
+        {name: "Portuzian", base: 13, odd: 1, sort: i => n(i) / td(i, 17) / sf(i), shield: "renaissance"},
+        {name: "Vengrian", base: 15, odd: 1, sort: i => (n(i) / td(i, 11) / bd(i, [4])) * t[i], shield: "horsehead2"},
+        {name: "Turchian", base: 16, odd: 0.05, sort: i => n(i) / td(i, 14), shield: "round"},
+        {name: "Euskati", base: 20, odd: 0.05, sort: i => (n(i) / td(i, 15)) * h[i], shield: "oldFrench"},
+        {name: "Keltan", base: 22, odd: 0.05, sort: i => (n(i) / td(i, 11) / bd(i, [6, 8])) * t[i], shield: "oval"}
       ];
     }
 
     if (culturesSet.value === "oriental") {
       return [
-        {name:"Koryo", base:10, odd:1, sort: i => n(i) / td(i, 12) / t[i], shield:"round"},
-        {name:"Hantzu", base:11, odd:1, sort: i => n(i) / td(i, 13), shield:"banner"},
-        {name:"Yamoto", base:12, odd:1, sort: i => n(i) / td(i, 15) / t[i], shield:"round"},
-        {name:"Turchian", base: 16, odd:1, sort: i => n(i) / td(i, 12), shield:"round"},
-        {name:"Berberan", base: 17, odd:.2, sort: i => n(i) / td(i, 19) / bd(i, [1, 2, 3], 7) * t[i], shield:"oval"},
-        {name:"Eurabic", base: 18, odd:1, sort: i => n(i) / td(i, 26) / bd(i, [1, 2], 7) * t[i], shield:"oval"},
-        {name:"Efratic", base: 23, odd:.1, sort: i => n(i) / td(i, 22) * t[i], shield:"round"},
-        {name:"Tehrani", base: 24, odd:1, sort: i => n(i) / td(i, 18) * h[i], shield:"round"},
-        {name:"Maui", base: 25, odd:.2, sort: i => n(i) / td(i, 24) / sf(i) / t[i], shield:"vesicaPiscis"},
-        {name:"Carnatic", base: 26, odd:.5, sort: i => n(i) / td(i, 26), shield:"round"},
-        {name:"Vietic", base: 29, odd:.8, sort: i => n(i) / td(i, 25) / bd(i, [7], 7) / t[i], shield:"banner"},
-        {name:"Guantzu", base:30, odd:.5, sort: i => n(i) / td(i, 17), shield:"banner"},
-        {name:"Ulus", base:31, odd:1, sort: i => n(i) / td(i, 5) / bd(i, [2, 4, 10], 7) * t[i], shield:"banner"}
+        {name: "Koryo", base: 10, odd: 1, sort: i => n(i) / td(i, 12) / t[i], shield: "round"},
+        {name: "Hantzu", base: 11, odd: 1, sort: i => n(i) / td(i, 13), shield: "banner"},
+        {name: "Yamoto", base: 12, odd: 1, sort: i => n(i) / td(i, 15) / t[i], shield: "round"},
+        {name: "Turchian", base: 16, odd: 1, sort: i => n(i) / td(i, 12), shield: "round"},
+        {name: "Berberan", base: 17, odd: 0.2, sort: i => (n(i) / td(i, 19) / bd(i, [1, 2, 3], 7)) * t[i], shield: "oval"},
+        {name: "Eurabic", base: 18, odd: 1, sort: i => (n(i) / td(i, 26) / bd(i, [1, 2], 7)) * t[i], shield: "oval"},
+        {name: "Efratic", base: 23, odd: 0.1, sort: i => (n(i) / td(i, 22)) * t[i], shield: "round"},
+        {name: "Tehrani", base: 24, odd: 1, sort: i => (n(i) / td(i, 18)) * h[i], shield: "round"},
+        {name: "Maui", base: 25, odd: 0.2, sort: i => n(i) / td(i, 24) / sf(i) / t[i], shield: "vesicaPiscis"},
+        {name: "Carnatic", base: 26, odd: 0.5, sort: i => n(i) / td(i, 26), shield: "round"},
+        {name: "Vietic", base: 29, odd: 0.8, sort: i => n(i) / td(i, 25) / bd(i, [7], 7) / t[i], shield: "banner"},
+        {name: "Guantzu", base: 30, odd: 0.5, sort: i => n(i) / td(i, 17), shield: "banner"},
+        {name: "Ulus", base: 31, odd: 1, sort: i => (n(i) / td(i, 5) / bd(i, [2, 4, 10], 7)) * t[i], shield: "banner"}
       ];
     }
 
     if (culturesSet.value === "english") {
       const getName = () => Names.getBase(1, 5, 9, "", 0);
       return [
-        {name:getName(), base:1, odd:1, shield:"heater"},
-        {name:getName(), base:1, odd:1, shield:"wedged"},
-        {name:getName(), base:1, odd:1, shield:"swiss"},
-        {name:getName(), base:1, odd:1, shield:"oldFrench"},
-        {name:getName(), base:1, odd:1, shield:"swiss"},
-        {name:getName(), base:1, odd:1, shield:"spanish"},
-        {name:getName(), base:1, odd:1, shield:"hessen"},
-        {name:getName(), base:1, odd:1, shield:"fantasy5"},
-        {name:getName(), base:1, odd:1, shield:"fantasy4"},
-        {name:getName(), base:1, odd:1, shield:"fantasy1"}
+        {name: getName(), base: 1, odd: 1, shield: "heater"},
+        {name: getName(), base: 1, odd: 1, shield: "wedged"},
+        {name: getName(), base: 1, odd: 1, shield: "swiss"},
+        {name: getName(), base: 1, odd: 1, shield: "oldFrench"},
+        {name: getName(), base: 1, odd: 1, shield: "swiss"},
+        {name: getName(), base: 1, odd: 1, shield: "spanish"},
+        {name: getName(), base: 1, odd: 1, shield: "hessen"},
+        {name: getName(), base: 1, odd: 1, shield: "fantasy5"},
+        {name: getName(), base: 1, odd: 1, shield: "fantasy4"},
+        {name: getName(), base: 1, odd: 1, shield: "fantasy1"}
       ];
     }
 
     if (culturesSet.value === "antique") {
       return [
-        {name:"Roman", base:8, odd:1, sort: i => n(i) / td(i, 14) / t[i], shield:"roman"}, // Roman
-        {name:"Roman", base:8, odd:1, sort: i => n(i) / td(i, 15) / sf(i), shield:"roman"}, // Roman
-        {name:"Roman", base:8, odd:1, sort: i => n(i) / td(i, 16) / sf(i), shield:"roman"}, // Roman
-        {name:"Roman", base:8, odd:1, sort: i => n(i) / td(i, 17) / t[i], shield:"roman"}, // Roman
-        {name:"Hellenic", base:7, odd:1, sort: i => n(i) / td(i, 18) / sf(i) * h[i], shield:"boeotian"}, // Greek
-        {name:"Hellenic", base:7, odd:1, sort: i => n(i) / td(i, 19) / sf(i) * h[i], shield:"boeotian"}, // Greek
-        {name:"Macedonian", base:7, odd:.5, sort: i => n(i) / td(i, 12) * h[i], shield:"round"}, // Greek
-        {name:"Celtic", base:22, odd:1, sort: i => n(i) / td(i, 11) ** .5 / bd(i, [6, 8]), shield:"round"},
-        {name:"Germanic", base:0, odd:1, sort: i => n(i) / td(i, 10) ** .5 / bd(i, [6, 8]), shield:"round"},
-        {name:"Persian", base:24, odd:.8, sort: i => n(i) / td(i, 18) * h[i], shield:"oval"}, // Iranian
-        {name:"Scythian", base:24, odd:.5, sort: i => n(i) / td(i, 11) ** .5 / bd(i, [4]), shield:"round"}, // Iranian
-        {name:"Cantabrian", base: 20, odd:.5, sort: i => n(i) / td(i, 16) * h[i], shield:"oval"}, // Basque
-        {name:"Estian", base: 9, odd:.2, sort: i => n(i) / td(i, 5) * t[i], shield:"pavise"}, // Finnic
-        {name:"Carthaginian", base: 17, odd:.3, sort: i => n(i) / td(i, 19) / sf(i), shield:"oval"}, // Berber
-        {name:"Mesopotamian", base: 23, odd:.2, sort: i => n(i) / td(i, 22) / bd(i, [1, 2, 3]), shield:"oval"} // Mesopotamian
+        {name: "Roman", base: 8, odd: 1, sort: i => n(i) / td(i, 14) / t[i], shield: "roman"}, // Roman
+        {name: "Roman", base: 8, odd: 1, sort: i => n(i) / td(i, 15) / sf(i), shield: "roman"}, // Roman
+        {name: "Roman", base: 8, odd: 1, sort: i => n(i) / td(i, 16) / sf(i), shield: "roman"}, // Roman
+        {name: "Roman", base: 8, odd: 1, sort: i => n(i) / td(i, 17) / t[i], shield: "roman"}, // Roman
+        {name: "Hellenic", base: 7, odd: 1, sort: i => (n(i) / td(i, 18) / sf(i)) * h[i], shield: "boeotian"}, // Greek
+        {name: "Hellenic", base: 7, odd: 1, sort: i => (n(i) / td(i, 19) / sf(i)) * h[i], shield: "boeotian"}, // Greek
+        {name: "Macedonian", base: 7, odd: 0.5, sort: i => (n(i) / td(i, 12)) * h[i], shield: "round"}, // Greek
+        {name: "Celtic", base: 22, odd: 1, sort: i => n(i) / td(i, 11) ** 0.5 / bd(i, [6, 8]), shield: "round"},
+        {name: "Germanic", base: 0, odd: 1, sort: i => n(i) / td(i, 10) ** 0.5 / bd(i, [6, 8]), shield: "round"},
+        {name: "Persian", base: 24, odd: 0.8, sort: i => (n(i) / td(i, 18)) * h[i], shield: "oval"}, // Iranian
+        {name: "Scythian", base: 24, odd: 0.5, sort: i => n(i) / td(i, 11) ** 0.5 / bd(i, [4]), shield: "round"}, // Iranian
+        {name: "Cantabrian", base: 20, odd: 0.5, sort: i => (n(i) / td(i, 16)) * h[i], shield: "oval"}, // Basque
+        {name: "Estian", base: 9, odd: 0.2, sort: i => (n(i) / td(i, 5)) * t[i], shield: "pavise"}, // Finnic
+        {name: "Carthaginian", base: 17, odd: 0.3, sort: i => n(i) / td(i, 19) / sf(i), shield: "oval"}, // Berber
+        {name: "Mesopotamian", base: 23, odd: 0.2, sort: i => n(i) / td(i, 22) / bd(i, [1, 2, 3]), shield: "oval"} // Mesopotamian
       ];
     }
 
     if (culturesSet.value === "highFantasy") {
       return [
         // fantasy races
-        {name:"Quenian (Elfish)", base: 33, odd:1, sort: i => n(i) / bd(i, [6,7,8,9], 10) * t[i], shield:"gondor"}, // Elves
-        {name:"Eldar (Elfish)", base: 33, odd:1, sort: i => n(i) / bd(i, [6,7,8,9], 10) * t[i], shield:"noldor"}, // Elves
-        {name:"Trow (Dark Elfish)", base: 34, odd:.9, sort: i => n(i) / bd(i, [7,8,9,12], 10) * t[i], shield:"hessen"}, // Dark Elves
-        {name:"Lothian (Dark Elfish)", base: 34, odd:.3, sort: i => n(i) / bd(i, [7,8,9,12], 10) * t[i], shield:"wedged"}, // Dark Elves
-        {name:"Dunirr (Dwarven)", base: 35, odd:1, sort: i => n(i) + h[i], shield:"ironHills"}, // Dwarfs
-        {name:"Khazadur (Dwarven)", base: 35, odd:1, sort: i => n(i) + h[i], shield:"erebor"}, // Dwarfs
-        {name:"Kobold (Goblin)", base: 36, odd:1, sort: i => t[i] - s[i], shield:"moriaOrc"}, // Goblin
-        {name:"Uruk (Orkish)", base: 37, odd:1, sort: i => h[i] * t[i], shield:"urukHai"}, // Orc
-        {name:"Ugluk (Orkish)", base: 37, odd:.5, sort: i => h[i] * t[i] / bd(i, [1,2,10,11]), shield:"moriaOrc"}, // Orc
-        {name:"Yotunn (Giants)", base: 38, odd:.7, sort: i => td(i, -10), shield:"pavise"}, // Giant
-        {name:"Rake (Drakonic)", base: 39, odd:.7, sort: i => -s[i], shield:"fantasy2"}, // Draconic
-        {name:"Arago (Arachnid)", base: 40, odd:.7, sort: i => t[i] - s[i], shield:"horsehead2"}, // Arachnid
-        {name:"Aj'Snaga (Serpents)", base: 41, odd:.7, sort: i => n(i) / bd(i, [12], 10), shield:"fantasy1"}, // Serpents
+        {name: "Quenian (Elfish)", base: 33, odd: 1, sort: i => (n(i) / bd(i, [6, 7, 8, 9], 10)) * t[i], shield: "gondor"}, // Elves
+        {name: "Eldar (Elfish)", base: 33, odd: 1, sort: i => (n(i) / bd(i, [6, 7, 8, 9], 10)) * t[i], shield: "noldor"}, // Elves
+        {name: "Trow (Dark Elfish)", base: 34, odd: 0.9, sort: i => (n(i) / bd(i, [7, 8, 9, 12], 10)) * t[i], shield: "hessen"}, // Dark Elves
+        {name: "Lothian (Dark Elfish)", base: 34, odd: 0.3, sort: i => (n(i) / bd(i, [7, 8, 9, 12], 10)) * t[i], shield: "wedged"}, // Dark Elves
+        {name: "Dunirr (Dwarven)", base: 35, odd: 1, sort: i => n(i) + h[i], shield: "ironHills"}, // Dwarfs
+        {name: "Khazadur (Dwarven)", base: 35, odd: 1, sort: i => n(i) + h[i], shield: "erebor"}, // Dwarfs
+        {name: "Kobold (Goblin)", base: 36, odd: 1, sort: i => t[i] - s[i], shield: "moriaOrc"}, // Goblin
+        {name: "Uruk (Orkish)", base: 37, odd: 1, sort: i => h[i] * t[i], shield: "urukHai"}, // Orc
+        {name: "Ugluk (Orkish)", base: 37, odd: 0.5, sort: i => (h[i] * t[i]) / bd(i, [1, 2, 10, 11]), shield: "moriaOrc"}, // Orc
+        {name: "Yotunn (Giants)", base: 38, odd: 0.7, sort: i => td(i, -10), shield: "pavise"}, // Giant
+        {name: "Rake (Drakonic)", base: 39, odd: 0.7, sort: i => -s[i], shield: "fantasy2"}, // Draconic
+        {name: "Arago (Arachnid)", base: 40, odd: 0.7, sort: i => t[i] - s[i], shield: "horsehead2"}, // Arachnid
+        {name: "Aj'Snaga (Serpents)", base: 41, odd: 0.7, sort: i => n(i) / bd(i, [12], 10), shield: "fantasy1"}, // Serpents
         // fantasy human
-        {name:"Anor (Human)", base:32, odd:1, sort: i => n(i) / td(i, 10), shield:"fantasy5"},
-        {name:"Dail (Human)", base:32, odd:1, sort: i => n(i) / td(i, 13), shield:"roman"},
-        {name:"Rohand (Human)", base:16, odd:1, sort: i => n(i) / td(i, 16), shield:"round"},
-        {name:"Dulandir (Human)", base:31, odd:1, sort: i => n(i) / td(i, 5) / bd(i, [2, 4, 10], 7) * t[i], shield:"easterling"},
+        {name: "Anor (Human)", base: 32, odd: 1, sort: i => n(i) / td(i, 10), shield: "fantasy5"},
+        {name: "Dail (Human)", base: 32, odd: 1, sort: i => n(i) / td(i, 13), shield: "roman"},
+        {name: "Rohand (Human)", base: 16, odd: 1, sort: i => n(i) / td(i, 16), shield: "round"},
+        {name: "Dulandir (Human)", base: 31, odd: 1, sort: i => (n(i) / td(i, 5) / bd(i, [2, 4, 10], 7)) * t[i], shield: "easterling"}
       ];
     }
 
     if (culturesSet.value === "darkFantasy") {
       return [
         // common real-world English
-        {name:"Angshire", base:1, odd:1, sort: i => n(i) / td(i, 10) / sf(i), shield:"heater"},
-        {name:"Enlandic", base:1, odd:1, sort: i => n(i) / td(i, 12), shield:"heater"},
-        {name:"Westen", base:1, odd:1, sort: i => n(i) / td(i, 10), shield:"heater"},
-        {name:"Nortumbic", base:1, odd:1, sort: i => n(i) / td(i, 7), shield:"heater"},
-        {name:"Mercian", base:1, odd:1, sort: i => n(i) / td(i, 9), shield:"heater"},
-        {name:"Kentian", base:1, odd:1, sort: i => n(i) / td(i, 12), shield:"heater"},
+        {name: "Angshire", base: 1, odd: 1, sort: i => n(i) / td(i, 10) / sf(i), shield: "heater"},
+        {name: "Enlandic", base: 1, odd: 1, sort: i => n(i) / td(i, 12), shield: "heater"},
+        {name: "Westen", base: 1, odd: 1, sort: i => n(i) / td(i, 10), shield: "heater"},
+        {name: "Nortumbic", base: 1, odd: 1, sort: i => n(i) / td(i, 7), shield: "heater"},
+        {name: "Mercian", base: 1, odd: 1, sort: i => n(i) / td(i, 9), shield: "heater"},
+        {name: "Kentian", base: 1, odd: 1, sort: i => n(i) / td(i, 12), shield: "heater"},
         // rare real-world western
-        {name:"Norse", base:6, odd:.7, sort: i => n(i) / td(i, 5) / sf(i), shield:"oldFrench"},
-        {name:"Schwarzen", base:0, odd:.3, sort: i => n(i) / td(i, 10) / bd(i, [6, 8]), shield:"gonfalon"},
-        {name:"Luarian", base:2, odd:.3, sort: i => n(i) / td(i, 12) / bd(i, [6, 8]), shield:"oldFrench"},
-        {name:"Hetallian", base:3, odd:.3, sort: i => n(i) / td(i, 15), shield:"oval"},
-        {name:"Astellian", base:4, odd:.3, sort: i => n(i) / td(i, 16), shield:"spanish"},
+        {name: "Norse", base: 6, odd: 0.7, sort: i => n(i) / td(i, 5) / sf(i), shield: "oldFrench"},
+        {name: "Schwarzen", base: 0, odd: 0.3, sort: i => n(i) / td(i, 10) / bd(i, [6, 8]), shield: "gonfalon"},
+        {name: "Luarian", base: 2, odd: 0.3, sort: i => n(i) / td(i, 12) / bd(i, [6, 8]), shield: "oldFrench"},
+        {name: "Hetallian", base: 3, odd: 0.3, sort: i => n(i) / td(i, 15), shield: "oval"},
+        {name: "Astellian", base: 4, odd: 0.3, sort: i => n(i) / td(i, 16), shield: "spanish"},
         // rare real-world exotic
-        {name:"Kiswaili", base:28, odd:.05, sort: i => n(i) / td(i, 29) / bd(i, [1, 3, 5, 7]), shield:"vesicaPiscis"},
-        {name:"Yoruba", base:21, odd:.05, sort: i => n(i) / td(i, 15) / bd(i, [5, 7]), shield:"vesicaPiscis"},
-        {name:"Koryo", base:10, odd:.05, sort: i => n(i) / td(i, 12) / t[i], shield:"round"},
-        {name:"Hantzu", base:11, odd:.05, sort: i => n(i) / td(i, 13), shield:"banner"},
-        {name:"Yamoto", base:12, odd:.05, sort: i => n(i) / td(i, 15) / t[i], shield:"round"},
-        {name:"Guantzu", base:30, odd:.05, sort: i => n(i) / td(i, 17), shield:"banner"},
-        {name:"Ulus", base:31, odd:.05, sort: i => n(i) / td(i, 5) / bd(i, [2, 4, 10], 7) * t[i], shield:"banner"},
-        {name:"Turan", base: 16, odd:.05, sort: i => n(i) / td(i, 12), shield:"round"},
-        {name:"Berberan", base: 17, odd:.05, sort: i => n(i) / td(i, 19) / bd(i, [1, 2, 3], 7) * t[i], shield:"round"},
-        {name:"Eurabic", base: 18, odd:.05, sort: i => n(i) / td(i, 26) / bd(i, [1, 2], 7) * t[i], shield:"round"},
-        {name:"Slovan", base:5, odd:.05, sort: i => n(i) / td(i, 6) * t[i], shield:"round"},
-        {name:"Keltan", base: 22, odd:.1, sort: i => n(i) / td(i, 11) ** .5 / bd(i, [6, 8]), shield:"vesicaPiscis"},
-        {name:"Elladan", base:7, odd:.2, sort: i => n(i) / td(i, 18) / sf(i) * h[i], shield:"boeotian"},
-        {name:"Romian", base:8, odd:.2, sort: i => n(i) / td(i, 14) / t[i], shield:"roman"},
+        {name: "Kiswaili", base: 28, odd: 0.05, sort: i => n(i) / td(i, 29) / bd(i, [1, 3, 5, 7]), shield: "vesicaPiscis"},
+        {name: "Yoruba", base: 21, odd: 0.05, sort: i => n(i) / td(i, 15) / bd(i, [5, 7]), shield: "vesicaPiscis"},
+        {name: "Koryo", base: 10, odd: 0.05, sort: i => n(i) / td(i, 12) / t[i], shield: "round"},
+        {name: "Hantzu", base: 11, odd: 0.05, sort: i => n(i) / td(i, 13), shield: "banner"},
+        {name: "Yamoto", base: 12, odd: 0.05, sort: i => n(i) / td(i, 15) / t[i], shield: "round"},
+        {name: "Guantzu", base: 30, odd: 0.05, sort: i => n(i) / td(i, 17), shield: "banner"},
+        {name: "Ulus", base: 31, odd: 0.05, sort: i => (n(i) / td(i, 5) / bd(i, [2, 4, 10], 7)) * t[i], shield: "banner"},
+        {name: "Turan", base: 16, odd: 0.05, sort: i => n(i) / td(i, 12), shield: "round"},
+        {name: "Berberan", base: 17, odd: 0.05, sort: i => (n(i) / td(i, 19) / bd(i, [1, 2, 3], 7)) * t[i], shield: "round"},
+        {name: "Eurabic", base: 18, odd: 0.05, sort: i => (n(i) / td(i, 26) / bd(i, [1, 2], 7)) * t[i], shield: "round"},
+        {name: "Slovan", base: 5, odd: 0.05, sort: i => (n(i) / td(i, 6)) * t[i], shield: "round"},
+        {name: "Keltan", base: 22, odd: 0.1, sort: i => n(i) / td(i, 11) ** 0.5 / bd(i, [6, 8]), shield: "vesicaPiscis"},
+        {name: "Elladan", base: 7, odd: 0.2, sort: i => (n(i) / td(i, 18) / sf(i)) * h[i], shield: "boeotian"},
+        {name: "Romian", base: 8, odd: 0.2, sort: i => n(i) / td(i, 14) / t[i], shield: "roman"},
         // fantasy races
-        {name:"Eldar", base: 33, odd:.5, sort: i => n(i) / bd(i, [6,7,8,9], 10) * t[i], shield:"fantasy5"}, // Elves
-        {name:"Trow", base: 34, odd:.8, sort: i => n(i) / bd(i, [7,8,9,12], 10) * t[i], shield:"hessen"}, // Dark Elves
-        {name:"Durinn", base: 35, odd:.8, sort: i => n(i) + h[i], shield:"erebor"}, // Dwarven
-        {name:"Kobblin", base: 36, odd:.8, sort: i => t[i] - s[i], shield:"moriaOrc"}, // Goblin
-        {name:"Uruk", base: 37, odd:.8, sort: i => h[i] * t[i] / bd(i, [1,2,10,11]), shield:"urukHai"}, // Orc
-        {name:"Yotunn", base: 38, odd:.8, sort: i => td(i, -10), shield:"pavise"}, // Giant
-        {name:"Drake", base: 39, odd:.9, sort: i => -s[i], shield:"fantasy2"}, // Draconic
-        {name:"Rakhnid", base: 40, odd:.9, sort: i => t[i] - s[i], shield:"horsehead2"}, // Arachnid
-        {name:"Aj'Snaga", base: 41, odd:.9, sort: i => n(i) / bd(i, [12], 10), shield:"fantasy1"}, // Serpents
-      ]
+        {name: "Eldar", base: 33, odd: 0.5, sort: i => (n(i) / bd(i, [6, 7, 8, 9], 10)) * t[i], shield: "fantasy5"}, // Elves
+        {name: "Trow", base: 34, odd: 0.8, sort: i => (n(i) / bd(i, [7, 8, 9, 12], 10)) * t[i], shield: "hessen"}, // Dark Elves
+        {name: "Durinn", base: 35, odd: 0.8, sort: i => n(i) + h[i], shield: "erebor"}, // Dwarven
+        {name: "Kobblin", base: 36, odd: 0.8, sort: i => t[i] - s[i], shield: "moriaOrc"}, // Goblin
+        {name: "Uruk", base: 37, odd: 0.8, sort: i => (h[i] * t[i]) / bd(i, [1, 2, 10, 11]), shield: "urukHai"}, // Orc
+        {name: "Yotunn", base: 38, odd: 0.8, sort: i => td(i, -10), shield: "pavise"}, // Giant
+        {name: "Drake", base: 39, odd: 0.9, sort: i => -s[i], shield: "fantasy2"}, // Draconic
+        {name: "Rakhnid", base: 40, odd: 0.9, sort: i => t[i] - s[i], shield: "horsehead2"}, // Arachnid
+        {name: "Aj'Snaga", base: 41, odd: 0.9, sort: i => n(i) / bd(i, [12], 10), shield: "fantasy1"} // Serpents
+      ];
     }
 
     if (culturesSet.value === "random") {
-      return d3.range(count).map(function() {
-        const rnd = rand(nameBases.length-1);
+      return d3.range(count).map(function () {
+        const rnd = rand(nameBases.length - 1);
         const name = Names.getBaseShort(rnd);
-        return {name, base:rnd, odd:1, shield:getRandomShield()}
+        return {name, base: rnd, odd: 1, shield: getRandomShield()};
       });
     }
 
     // all-world
     return [
-      {name:"Shwazen", base:0, odd:.7, sort: i => n(i) / td(i, 10) / bd(i, [6, 8]), shield:"hessen"},
-      {name:"Angshire", base:1, odd:1, sort: i => n(i) / td(i, 10) / sf(i), shield:"heater"},
-      {name:"Luari", base:2, odd:.6, sort: i => n(i) / td(i, 12) / bd(i, [6, 8]), shield:"oldFrench"},
-      {name:"Tallian", base:3, odd:.6, sort: i => n(i) / td(i, 15), shield:"horsehead2"},
-      {name:"Astellian", base:4, odd:.6, sort: i => n(i) / td(i, 16), shield:"spanish"},
-      {name:"Slovan", base:5, odd:.7, sort: i => n(i) / td(i, 6) * t[i], shield:"round"},
-      {name:"Norse", base:6, odd:.7, sort: i => n(i) / td(i, 5), shield:"heater"},
-      {name:"Elladan", base:7, odd:.7, sort: i => n(i) / td(i, 18) * h[i], shield:"boeotian"},
-      {name:"Romian", base:8, odd:.7, sort: i => n(i) / td(i, 15), shield:"roman"},
-      {name:"Soumi", base:9, odd:.3, sort: i => n(i) / td(i, 5) / bd(i, [9]) * t[i], shield:"pavise"},
-      {name:"Koryo", base:10, odd:.1, sort: i => n(i) / td(i, 12) / t[i], shield:"round"},
-      {name:"Hantzu", base:11, odd:.1, sort: i => n(i) / td(i, 13), shield:"banner"},
-      {name:"Yamoto", base:12, odd:.1, sort: i => n(i) / td(i, 15) / t[i], shield:"round"},
-      {name:"Portuzian", base:13, odd:.4, sort: i => n(i) / td(i, 17) / sf(i), shield:"spanish"},
-      {name:"Nawatli", base:14, odd:.1, sort: i => h[i] / td(i, 18) / bd(i, [7]), shield:"square"},
-      {name:"Vengrian", base: 15, odd:.2, sort: i => n(i) / td(i, 11) / bd(i, [4]) * t[i], shield:"wedged"},
-      {name:"Turchian", base: 16, odd:.2, sort: i => n(i) / td(i, 13), shield:"round"},
-      {name:"Berberan", base: 17, odd:.1, sort: i => n(i) / td(i, 19) / bd(i, [1, 2, 3], 7) * t[i], shield:"round"},
-      {name:"Eurabic", base: 18, odd:.2, sort: i => n(i) / td(i, 26) / bd(i, [1, 2], 7) * t[i], shield:"round"},
-      {name:"Inuk", base: 19, odd:.05, sort: i => td(i, -1) / bd(i, [10, 11]) / sf(i), shield:"square"},
-      {name:"Euskati", base: 20, odd:.05, sort: i => n(i) / td(i, 15) * h[i], shield:"spanish"},
-      {name:"Yoruba", base: 21, odd:.05, sort: i => n(i) / td(i, 15) / bd(i, [5, 7]), shield:"vesicaPiscis"},
-      {name:"Keltan", base: 22, odd:.05, sort: i => n(i) / td(i, 11) / bd(i, [6, 8]) * t[i], shield:"vesicaPiscis"},
-      {name:"Efratic", base: 23, odd:.05, sort: i => n(i) / td(i, 22) * t[i], shield:"diamond"},
-      {name:"Tehrani", base: 24, odd:.1, sort: i => n(i) / td(i, 18) * h[i], shield:"round"},
-      {name:"Maui", base: 25, odd:.05, sort: i => n(i) / td(i, 24) / sf(i) / t[i], shield:"round"},
-      {name:"Carnatic", base: 26, odd:.05, sort: i => n(i) / td(i, 26), shield:"round"},
-      {name:"Inqan", base: 27, odd:.05, sort: i => h[i] / td(i, 13), shield:"square"},
-      {name:"Kiswaili", base: 28, odd:.1, sort: i => n(i) / td(i, 29) / bd(i, [1, 3, 5, 7]), shield:"vesicaPiscis"},
-      {name:"Vietic", base: 29, odd:.1, sort: i => n(i) / td(i, 25) / bd(i, [7], 7) / t[i], shield:"banner"},
-      {name:"Guantzu", base:30, odd:.1, sort: i => n(i) / td(i, 17), shield:"banner"},
-      {name:"Ulus", base:31, odd:.1, sort: i => n(i) / td(i, 5) / bd(i, [2, 4, 10], 7) * t[i], shield:"banner"}
+      {name: "Shwazen", base: 0, odd: 0.7, sort: i => n(i) / td(i, 10) / bd(i, [6, 8]), shield: "hessen"},
+      {name: "Angshire", base: 1, odd: 1, sort: i => n(i) / td(i, 10) / sf(i), shield: "heater"},
+      {name: "Luari", base: 2, odd: 0.6, sort: i => n(i) / td(i, 12) / bd(i, [6, 8]), shield: "oldFrench"},
+      {name: "Tallian", base: 3, odd: 0.6, sort: i => n(i) / td(i, 15), shield: "horsehead2"},
+      {name: "Astellian", base: 4, odd: 0.6, sort: i => n(i) / td(i, 16), shield: "spanish"},
+      {name: "Slovan", base: 5, odd: 0.7, sort: i => (n(i) / td(i, 6)) * t[i], shield: "round"},
+      {name: "Norse", base: 6, odd: 0.7, sort: i => n(i) / td(i, 5), shield: "heater"},
+      {name: "Elladan", base: 7, odd: 0.7, sort: i => (n(i) / td(i, 18)) * h[i], shield: "boeotian"},
+      {name: "Romian", base: 8, odd: 0.7, sort: i => n(i) / td(i, 15), shield: "roman"},
+      {name: "Soumi", base: 9, odd: 0.3, sort: i => (n(i) / td(i, 5) / bd(i, [9])) * t[i], shield: "pavise"},
+      {name: "Koryo", base: 10, odd: 0.1, sort: i => n(i) / td(i, 12) / t[i], shield: "round"},
+      {name: "Hantzu", base: 11, odd: 0.1, sort: i => n(i) / td(i, 13), shield: "banner"},
+      {name: "Yamoto", base: 12, odd: 0.1, sort: i => n(i) / td(i, 15) / t[i], shield: "round"},
+      {name: "Portuzian", base: 13, odd: 0.4, sort: i => n(i) / td(i, 17) / sf(i), shield: "spanish"},
+      {name: "Nawatli", base: 14, odd: 0.1, sort: i => h[i] / td(i, 18) / bd(i, [7]), shield: "square"},
+      {name: "Vengrian", base: 15, odd: 0.2, sort: i => (n(i) / td(i, 11) / bd(i, [4])) * t[i], shield: "wedged"},
+      {name: "Turchian", base: 16, odd: 0.2, sort: i => n(i) / td(i, 13), shield: "round"},
+      {name: "Berberan", base: 17, odd: 0.1, sort: i => (n(i) / td(i, 19) / bd(i, [1, 2, 3], 7)) * t[i], shield: "round"},
+      {name: "Eurabic", base: 18, odd: 0.2, sort: i => (n(i) / td(i, 26) / bd(i, [1, 2], 7)) * t[i], shield: "round"},
+      {name: "Inuk", base: 19, odd: 0.05, sort: i => td(i, -1) / bd(i, [10, 11]) / sf(i), shield: "square"},
+      {name: "Euskati", base: 20, odd: 0.05, sort: i => (n(i) / td(i, 15)) * h[i], shield: "spanish"},
+      {name: "Yoruba", base: 21, odd: 0.05, sort: i => n(i) / td(i, 15) / bd(i, [5, 7]), shield: "vesicaPiscis"},
+      {name: "Keltan", base: 22, odd: 0.05, sort: i => (n(i) / td(i, 11) / bd(i, [6, 8])) * t[i], shield: "vesicaPiscis"},
+      {name: "Efratic", base: 23, odd: 0.05, sort: i => (n(i) / td(i, 22)) * t[i], shield: "diamond"},
+      {name: "Tehrani", base: 24, odd: 0.1, sort: i => (n(i) / td(i, 18)) * h[i], shield: "round"},
+      {name: "Maui", base: 25, odd: 0.05, sort: i => n(i) / td(i, 24) / sf(i) / t[i], shield: "round"},
+      {name: "Carnatic", base: 26, odd: 0.05, sort: i => n(i) / td(i, 26), shield: "round"},
+      {name: "Inqan", base: 27, odd: 0.05, sort: i => h[i] / td(i, 13), shield: "square"},
+      {name: "Kiswaili", base: 28, odd: 0.1, sort: i => n(i) / td(i, 29) / bd(i, [1, 3, 5, 7]), shield: "vesicaPiscis"},
+      {name: "Vietic", base: 29, odd: 0.1, sort: i => n(i) / td(i, 25) / bd(i, [7], 7) / t[i], shield: "banner"},
+      {name: "Guantzu", base: 30, odd: 0.1, sort: i => n(i) / td(i, 17), shield: "banner"},
+      {name: "Ulus", base: 31, odd: 0.1, sort: i => (n(i) / td(i, 5) / bd(i, [2, 4, 10], 7)) * t[i], shield: "banner"}
     ];
-  }
+  };
 
   // expand cultures across the map (Dijkstra-like algorithm)
-  const expand = function() {
-    TIME && console.time('expandCultures');
+  const expand = function () {
+    TIME && console.time("expandCultures");
     cells = pack.cells;
 
     const queue = new PriorityQueue({comparator: (a, b) => a.p - b.p});
-    pack.cultures.forEach(function(c) {
+    pack.cultures.forEach(function (c) {
       if (!c.i || c.removed) return;
-      queue.queue({e:c.center, p:0, c:c.i});
+      queue.queue({e: c.center, p: 0, c: c.i});
     });
 
-    const neutral = cells.i.length / 5000 * 3000 * neutralInput.value; // limit cost for culture growth
+    const neutral = (cells.i.length / 5000) * 3000 * neutralInput.value; // limit cost for culture growth
     const cost = [];
     while (queue.length) {
-      const next = queue.dequeue(), n = next.e, p = next.p, c = next.c;
+      const next = queue.dequeue(),
+        n = next.e,
+        p = next.p,
+        c = next.c;
       const type = pack.cultures[c].type;
-      cells.c[n].forEach(function(e) {
+      cells.c[n].forEach(function (e) {
         const biome = cells.biome[e];
         const biomeCost = getBiomeCost(c, biome, type);
         const biomeChangeCost = biome === cells.biome[n] ? 0 : 20; // penalty on biome change
@@ -375,13 +402,13 @@
         if (!cost[e] || totalCost < cost[e]) {
           if (cells.s[e] > 0) cells.culture[e] = c; // assign culture to populated cell
           cost[e] = totalCost;
-          queue.queue({e, p:totalCost, c});
+          queue.queue({e, p: totalCost, c});
         }
       });
     }
 
-    TIME && console.timeEnd('expandCultures');
-  }
+    TIME && console.timeEnd("expandCultures");
+  };
 
   function getBiomeCost(c, biome, type) {
     if (cells.biome[pack.cultures[c].center] === biome) return 10; // tiny penalty for native biome
@@ -391,7 +418,8 @@
   }
 
   function getHeightCost(i, h, type) {
-    const f = pack.features[cells.f[i]], a = cells.area[i];
+    const f = pack.features[cells.f[i]],
+      a = cells.area[i];
     if (type === "Lake" && f.type === "lake") return 10; // no lake crossing penalty for Lake cultures
     if (type === "Naval" && h < 20) return a * 2; // low sea/lake crossing penalty for Naval cultures
     if (type === "Nomadic" && h < 20) return a * 50; // giant sea/lake crossing penalty for Nomads
@@ -407,21 +435,20 @@
   function getRiverCost(r, i, type) {
     if (type === "River") return r ? 0 : 100; // penalty for river cultures
     if (!r) return 0; // no penalty for others if there is no river
-    return Math.min(Math.max(cells.fl[i] / 10, 20), 100) // river penalty from 20 to 100 based on flux
+    return Math.min(Math.max(cells.fl[i] / 10, 20), 100); // river penalty from 20 to 100 based on flux
   }
 
   function getTypeCost(t, type) {
     if (t === 1) return type === "Naval" || type === "Lake" ? 0 : type === "Nomadic" ? 60 : 20; // penalty for coastline
     if (t === 2) return type === "Naval" || type === "Nomadic" ? 30 : 0; // low penalty for land level 2 for Navals and nomads
-    if (t !== -1) return type === "Naval" || type === "Lake" ? 100 : 0;  // penalty for mainland for navals
+    if (t !== -1) return type === "Naval" || type === "Lake" ? 100 : 0; // penalty for mainland for navals
     return 0;
   }
 
-  const getRandomShield = function() {
+  const getRandomShield = function () {
     const type = rw(COA.shields.types);
     return rw(COA.shields[type]);
-  }
+  };
 
   return {generate, add, expand, getDefault, getRandomShield};
-
-})));
+})();
diff --git a/modules/fonts.js b/modules/fonts.js
new file mode 100644
index 00000000..fedcbd85
--- /dev/null
+++ b/modules/fonts.js
@@ -0,0 +1,141 @@
+// helper finctions to work with fonts
+
+async function addFonts(url) {
+  $("head").append('<link rel="stylesheet" type="text/css" href="' + url + '">');
+  try {
+    const resp = await fetch(url);
+    const text = await resp.text();
+    let s = document.createElement("style");
+    s.innerHTML = text;
+    document.head.appendChild(s);
+    let styleSheet = Array.prototype.filter.call(document.styleSheets, sS => sS.ownerNode === s)[0];
+    let FontRule = rule_1 => {
+      let family = rule_1.style.getPropertyValue("font-family");
+      let font = family.replace(/['"]+/g, "").replace(/ /g, "+");
+      let weight = rule_1.style.getPropertyValue("font-weight");
+      if (weight && weight !== "400") font += ":" + weight;
+      if (fonts.indexOf(font) == -1) {
+        fonts.push(font);
+        fetched++;
+      }
+    };
+    let fetched = 0;
+    for (let r of styleSheet.cssRules) {
+      FontRule(r);
+    }
+    document.head.removeChild(s);
+    return fetched;
+  } catch (err) {
+    return ERROR && console.error(err);
+  }
+}
+
+function loadUsedFonts() {
+  const fontsInUse = getFontsList(svg);
+  const fontsToLoad = fontsInUse.filter(font => !fonts.includes(font));
+  if (fontsToLoad?.length) {
+    const url = "https://fonts.googleapis.com/css?family=" + fontsToLoad.join("|");
+    addFonts(url);
+  }
+}
+
+function getFontsList(svg) {
+  const fontsInUse = [];
+
+  svg.selectAll("#labels > g").each(function () {
+    if (!this.hasChildNodes()) return;
+    const font = this.dataset.font;
+    if (font) fontsInUse.push(font);
+  });
+  if (legend?.node()?.hasChildNodes()) fontsInUse.push(legend.attr("data-font"));
+
+  return [...new Set(fontsInUse)];
+}
+
+// code from Kaiido's answer https://stackoverflow.com/questions/42402584/how-to-use-google-fonts-in-canvas-when-drawing-dom-objects-in-svg
+function GFontToDataURI(url) {
+  if (!url) return Promise.resolve();
+  return fetch(url) // first fecth the embed stylesheet page
+    .then(resp => resp.text()) // we only need the text of it
+    .then(text => {
+      let s = document.createElement("style");
+      s.innerHTML = text;
+      document.head.appendChild(s);
+      const styleSheet = Array.prototype.filter.call(document.styleSheets, sS => sS.ownerNode === s)[0];
+
+      const FontRule = rule => {
+        const src = rule.style.getPropertyValue("src");
+        const url = src ? src.split("url(")[1].split(")")[0] : "";
+        return {rule, src, url: url.substring(url.length - 1, 1)};
+      };
+      const fontProms = [];
+
+      for (const r of styleSheet.cssRules) {
+        let fR = FontRule(r);
+        if (!fR.url) continue;
+
+        fontProms.push(
+          fetch(fR.url) // fetch the actual font-file (.woff)
+            .then(resp => resp.blob())
+            .then(blob => {
+              return new Promise(resolve => {
+                let f = new FileReader();
+                f.onload = e => resolve(f.result);
+                f.readAsDataURL(blob);
+              });
+            })
+            .then(dataURL => fR.rule.cssText.replace(fR.url, dataURL))
+        );
+      }
+      document.head.removeChild(s); // clean up
+      return Promise.all(fontProms); // wait for all this has been done
+    });
+}
+
+// fetch default fonts if not done before
+function loadDefaultFonts() {
+  if (!$('link[href="fonts.css"]').length) {
+    $("head").append('<link rel="stylesheet" type="text/css" href="fonts.css">');
+    const fontsToAdd = ["Amatic+SC:700", "IM+Fell+English", "Great+Vibes", "MedievalSharp", "Metamorphous", "Nova+Script", "Uncial+Antiqua", "Underdog", "Caesar+Dressing", "Bitter", "Yellowtail", "Montez", "Shadows+Into+Light", "Fredericka+the+Great", "Orbitron", "Dancing+Script:700", "Architects+Daughter", "Kaushan+Script", "Gloria+Hallelujah", "Satisfy", "Comfortaa:700", "Cinzel"];
+    fontsToAdd.forEach(function (f) {
+      if (fonts.indexOf(f) === -1) fonts.push(f);
+    });
+    updateFontOptions();
+  }
+}
+
+function fetchFonts(url) {
+  return new Promise((resolve, reject) => {
+    if (url === "") return tip("Use a direct link to any @font-face declaration or just font name to fetch from Google Fonts");
+
+    if (url.indexOf("http") === -1) {
+      url = url.replace(url.charAt(0), url.charAt(0).toUpperCase()).split(" ").join("+");
+      url = "https://fonts.googleapis.com/css?family=" + url;
+    }
+
+    addFonts(url).then(fetched => {
+      if (fetched === undefined) return tip("Cannot fetch font for this value!", false, "error");
+      if (fetched === 0) return tip("Already in the fonts list!", false, "error");
+
+      updateFontOptions();
+      if (fetched === 1) {
+        tip("Font " + fonts[fonts.length - 1] + " is fetched");
+      } else if (fetched > 1) {
+        tip(fetched + " fonts are added to the list");
+      }
+      resolve(fetched);
+    });
+  });
+}
+
+// Update font list for Label and Burg Editors
+function updateFontOptions() {
+  styleSelectFont.innerHTML = "";
+  for (let i = 0; i < fonts.length; i++) {
+    const opt = document.createElement("option");
+    opt.value = i;
+    const font = fonts[i].split(":")[0].replace(/\+/g, " ");
+    opt.style.fontFamily = opt.innerHTML = font;
+    styleSelectFont.add(opt);
+  }
+}
diff --git a/modules/heightmap-generator.js b/modules/heightmap-generator.js
index 8e0dc42a..9d12a802 100644
--- a/modules/heightmap-generator.js
+++ b/modules/heightmap-generator.js
@@ -1,8 +1,6 @@
-(function (global, factory) {
-  typeof exports === "object" && typeof module !== "undefined" ? (module.exports = factory()) : typeof define === "function" && define.amd ? define(factory) : (global.HeightmapGenerator = factory());
-})(this, function () {
-  "use strict";
+"use strict";
 
+window.HeightmapGenerator = (function () {
   let cells, p;
 
   const generate = function () {
@@ -12,262 +10,63 @@
     cells.h = new Uint8Array(grid.points.length);
 
     const template = document.getElementById("templateInput").value;
-    switch (template) {
-      case "Volcano":
-        templateVolcano();
-        break;
-      case "High Island":
-        templateHighIsland();
-        break;
-      case "Low Island":
-        templateLowIsland();
-        break;
-      case "Continents":
-        templateContinents();
-        break;
-      case "Archipelago":
-        templateArchipelago();
-        break;
-      case "Atoll":
-        templateAtoll();
-        break;
-      case "Mediterranean":
-        templateMediterranean();
-        break;
-      case "Peninsula":
-        templatePeninsula();
-        break;
-      case "Pangea":
-        templatePangea();
-        break;
-      case "Isthmus":
-        templateIsthmus();
-        break;
-      case "Shattered":
-        templateShattered();
-        break;
+    const templateString = HeightmapTemplates[template];
+    const steps = templateString.split("\n");
+
+    if (!steps.length) throw new Error(`Heightmap template: no steps. Template: ${template}. Steps: ${steps}`);
+
+    for (const step of steps) {
+      const elements = step.trim().split(" ");
+      if (elements.length < 2) throw new Error(`Heightmap template: steps < 2. Template: ${template}. Step: ${elements}`);
+      addStep(...elements);
     }
 
     TIME && console.timeEnd("generateHeightmap");
   };
 
-  // parse template step
   function addStep(a1, a2, a3, a4, a5) {
     if (a1 === "Hill") return addHill(a2, a3, a4, a5);
     if (a1 === "Pit") return addPit(a2, a3, a4, a5);
     if (a1 === "Range") return addRange(a2, a3, a4, a5);
     if (a1 === "Trough") return addTrough(a2, a3, a4, a5);
     if (a1 === "Strait") return addStrait(a2, a3);
-    if (a1 === "Add") return modify(a3, a2, 1);
-    if (a1 === "Multiply") return modify(a3, 0, a2);
+    if (a1 === "Add") return modify(a3, +a2, 1);
+    if (a1 === "Multiply") return modify(a3, 0, +a2);
     if (a1 === "Smooth") return smooth(a2);
   }
 
-  // Heighmap Template: Volcano
-  function templateVolcano() {
-    addStep("Hill", "1", "90-100", "44-56", "40-60");
-    addStep("Multiply", 0.8, "50-100");
-    addStep("Range", "1.5", "30-55", "45-55", "40-60");
-    addStep("Smooth", 2);
-    addStep("Hill", "1.5", "25-35", "25-30", "20-75");
-    addStep("Hill", "1", "25-35", "75-80", "25-75");
-    addStep("Hill", "0.5", "20-25", "10-15", "20-25");
-  }
-
-  // Heighmap Template: High Island
-  function templateHighIsland() {
-    addStep("Hill", "1", "90-100", "65-75", "47-53");
-    addStep("Add", 5, "all");
-    addStep("Hill", "6", "20-23", "25-55", "45-55");
-    addStep("Range", "1", "40-50", "45-55", "45-55");
-    addStep("Smooth", 2);
-    addStep("Trough", "2-3", "20-30", "20-30", "20-30");
-    addStep("Trough", "2-3", "20-30", "60-80", "70-80");
-    addStep("Hill", "1", "10-15", "60-60", "50-50");
-    addStep("Hill", "1.5", "13-16", "15-20", "20-75");
-    addStep("Multiply", 0.8, "20-100");
-    addStep("Range", "1.5", "30-40", "15-85", "30-40");
-    addStep("Range", "1.5", "30-40", "15-85", "60-70");
-    addStep("Pit", "2-3", "10-15", "15-85", "20-80");
-  }
-
-  // Heighmap Template: Low Island
-  function templateLowIsland() {
-    addStep("Hill", "1", "90-99", "60-80", "45-55");
-    addStep("Hill", "4-5", "25-35", "20-65", "40-60");
-    addStep("Range", "1", "40-50", "45-55", "45-55");
-    addStep("Smooth", 3);
-    addStep("Trough", "1.5", "20-30", "15-85", "20-30");
-    addStep("Trough", "1.5", "20-30", "15-85", "70-80");
-    addStep("Hill", "1.5", "10-15", "5-15", "20-80");
-    addStep("Hill", "1", "10-15", "85-95", "70-80");
-    addStep("Pit", "3-5", "10-15", "15-85", "20-80");
-    addStep("Multiply", 0.4, "20-100");
-  }
-
-  // Heighmap Template: Continents
-  function templateContinents() {
-    addStep("Hill", "1", "80-85", "75-80", "40-60");
-    addStep("Hill", "1", "80-85", "20-25", "40-60");
-    addStep("Multiply", 0.22, "20-100");
-    addStep("Hill", "5-6", "15-20", "25-75", "20-82");
-    addStep("Range", ".8", "30-60", "5-15", "20-45");
-    addStep("Range", ".8", "30-60", "5-15", "55-80");
-    addStep("Range", "0-3", "30-60", "80-90", "20-80");
-    addStep("Trough", "3-4", "15-20", "15-85", "20-80");
-    addStep("Strait", "2", "vertical");
-    addStep("Smooth", 2);
-    addStep("Trough", "1-2", "5-10", "45-55", "45-55");
-    addStep("Pit", "3-4", "10-15", "15-85", "20-80");
-    addStep("Hill", "1", "5-10", "40-60", "40-60");
-  }
-
-  // Heighmap Template: Archipelago
-  function templateArchipelago() {
-    addStep("Add", 11, "all");
-    addStep("Range", "2-3", "40-60", "20-80", "20-80");
-    addStep("Hill", "5", "15-20", "10-90", "30-70");
-    addStep("Hill", "2", "10-15", "10-30", "20-80");
-    addStep("Hill", "2", "10-15", "60-90", "20-80");
-    addStep("Smooth", 3);
-    addStep("Trough", "10", "20-30", "5-95", "5-95");
-    addStep("Strait", "2", "vertical");
-    addStep("Strait", "2", "horizontal");
-  }
-
-  // Heighmap Template: Atoll
-  function templateAtoll() {
-    addStep("Hill", "1", "75-80", "50-60", "45-55");
-    addStep("Hill", "1.5", "30-50", "25-75", "30-70");
-    addStep("Hill", ".5", "30-50", "25-35", "30-70");
-    addStep("Smooth", 1);
-    addStep("Multiply", 0.2, "25-100");
-    addStep("Hill", ".5", "10-20", "50-55", "48-52");
-  }
-
-  // Heighmap Template: Mediterranean
-  function templateMediterranean() {
-    addStep("Range", "3-4", "30-50", "0-100", "0-10");
-    addStep("Range", "3-4", "30-50", "0-100", "90-100");
-    addStep("Hill", "5-6", "30-70", "0-100", "0-5");
-    addStep("Hill", "5-6", "30-70", "0-100", "95-100");
-    addStep("Smooth", 1);
-    addStep("Hill", "2-3", "30-70", "0-5", "20-80");
-    addStep("Hill", "2-3", "30-70", "95-100", "20-80");
-    addStep("Multiply", 0.8, "land");
-    addStep("Trough", "3-5", "40-50", "0-100", "0-10");
-    addStep("Trough", "3-5", "40-50", "0-100", "90-100");
-  }
-
-  // Heighmap Template: Peninsula
-  function templatePeninsula() {
-    addStep("Range", "2-3", "20-35", "40-50", "0-15");
-    addStep("Add", 5, "all");
-    addStep("Hill", "1", "90-100", "10-90", "0-5");
-    addStep("Add", 13, "all");
-    addStep("Hill", "3-4", "3-5", "5-95", "80-100");
-    addStep("Hill", "1-2", "3-5", "5-95", "40-60");
-    addStep("Trough", "5-6", "10-25", "5-95", "5-95");
-    addStep("Smooth", 3);
-  }
-
-  // Heighmap Template: Pangea
-  function templatePangea() {
-    addStep("Hill", "1-2", "25-40", "15-50", "0-10");
-    addStep("Hill", "1-2", "5-40", "50-85", "0-10");
-    addStep("Hill", "1-2", "25-40", "50-85", "90-100");
-    addStep("Hill", "1-2", "5-40", "15-50", "90-100");
-    addStep("Hill", "8-12", "20-40", "20-80", "48-52");
-    addStep("Smooth", 2);
-    addStep("Multiply", 0.7, "land");
-    addStep("Trough", "3-4", "25-35", "5-95", "10-20");
-    addStep("Trough", "3-4", "25-35", "5-95", "80-90");
-    addStep("Range", "5-6", "30-40", "10-90", "35-65");
-  }
-
-  // Heighmap Template: Isthmus
-  function templateIsthmus() {
-    addStep("Hill", "5-10", "15-30", "0-30", "0-20");
-    addStep("Hill", "5-10", "15-30", "10-50", "20-40");
-    addStep("Hill", "5-10", "15-30", "30-70", "40-60");
-    addStep("Hill", "5-10", "15-30", "50-90", "60-80");
-    addStep("Hill", "5-10", "15-30", "70-100", "80-100");
-    addStep("Smooth", 2);
-    addStep("Trough", "4-8", "15-30", "0-30", "0-20");
-    addStep("Trough", "4-8", "15-30", "10-50", "20-40");
-    addStep("Trough", "4-8", "15-30", "30-70", "40-60");
-    addStep("Trough", "4-8", "15-30", "50-90", "60-80");
-    addStep("Trough", "4-8", "15-30", "70-100", "80-100");
-  }
-
-  // Heighmap Template: Shattered
-  function templateShattered() {
-    addStep("Hill", "8", "35-40", "15-85", "30-70");
-    addStep("Trough", "10-20", "40-50", "5-95", "5-95");
-    addStep("Range", "5-7", "30-40", "10-90", "20-80");
-    addStep("Pit", "12-20", "30-40", "15-85", "20-80");
-  }
-
   function getBlobPower() {
-    switch (+pointsInput.dataset.cells) {
-      case 1000:
-        return 0.93;
-      case 2000:
-        return 0.95;
-      case 5000:
-        return 0.96;
-      case 10000:
-        return 0.98;
-      case 20000:
-        return 0.985;
-      case 30000:
-        return 0.987;
-      case 40000:
-        return 0.9892;
-      case 50000:
-        return 0.9911;
-      case 60000:
-        return 0.9921;
-      case 70000:
-        return 0.9934;
-      case 80000:
-        return 0.9942;
-      case 90000:
-        return 0.9946;
-      case 100000:
-        return 0.995;
-    }
+    const cells = +pointsInput.dataset.cells;
+    if (cells === 1000) return 0.93;
+    if (cells === 2000) return 0.95;
+    if (cells === 5000) return 0.96;
+    if (cells === 10000) return 0.98;
+    if (cells === 20000) return 0.985;
+    if (cells === 30000) return 0.987;
+    if (cells === 40000) return 0.9892;
+    if (cells === 50000) return 0.9911;
+    if (cells === 60000) return 0.9921;
+    if (cells === 70000) return 0.9934;
+    if (cells === 80000) return 0.9942;
+    if (cells === 90000) return 0.9946;
+    if (cells === 100000) return 0.995;
   }
 
   function getLinePower() {
-    switch (+pointsInput.dataset.cells) {
-      case 1000:
-        return 0.74;
-      case 2000:
-        return 0.75;
-      case 5000:
-        return 0.78;
-      case 10000:
-        return 0.81;
-      case 20000:
-        return 0.82;
-      case 30000:
-        return 0.83;
-      case 40000:
-        return 0.84;
-      case 50000:
-        return 0.855;
-      case 60000:
-        return 0.87;
-      case 70000:
-        return 0.885;
-      case 80000:
-        return 0.91;
-      case 90000:
-        return 0.92;
-      case 100000:
-        return 0.93;
-    }
+    const cells = +pointsInput.dataset.cells;
+    if (cells === 1000) return 0.74;
+    if (cells === 2000) return 0.75;
+    if (cells === 5000) return 0.78;
+    if (cells === 10000) return 0.81;
+    if (cells === 20000) return 0.82;
+    if (cells === 30000) return 0.83;
+    if (cells === 40000) return 0.84;
+    if (cells === 50000) return 0.855;
+    if (cells === 60000) return 0.87;
+    if (cells === 70000) return 0.885;
+    if (cells === 80000) return 0.91;
+    if (cells === 90000) return 0.92;
+    if (cells === 100000) return 0.93;
   }
 
   const addHill = function (count, height, rangeX, rangeY) {
@@ -422,7 +221,6 @@
         if (d % 6 !== 0) return;
         for (const l of d3.range(i)) {
           const min = cells.c[cur][d3.scan(cells.c[cur], (a, b) => cells.h[a] - cells.h[b])]; // downhill cell
-          //debug.append("circle").attr("cx", p[min][0]).attr("cy", p[min][1]).attr("r", 1);
           cells.h[min] = (cells.h[cur] * 2 + cells.h[min]) / 3;
           cur = min;
         }
@@ -611,4 +409,4 @@
   }
 
   return {generate, addHill, addRange, addTrough, addStrait, addPit, smooth, modify};
-});
+})();
diff --git a/modules/heightmap-templates.js b/modules/heightmap-templates.js
new file mode 100644
index 00000000..4a5860b8
--- /dev/null
+++ b/modules/heightmap-templates.js
@@ -0,0 +1,126 @@
+"use strict";
+
+window.HeightmapTemplates = (function () {
+  const volcano = `Hill 1 90-100 44-56 40-60
+    Multiply 0.8 50-100 0 0
+    Range 1.5 30-55 45-55 40-60
+    Smooth 2 0 0 0
+    Hill 1.5 25-35 25-30 20-75
+    Hill 1 25-35 75-80 25-75
+    Hill 0.5 20-25 10-15 20-25`;
+
+  const highIsland = `Hill 1 90-100 65-75 47-53
+    Add 5 all 0 0
+    Hill 6 20-23 25-55 45-55
+    Range 1 40-50 45-55 45-55
+    Smooth 2 0 0 0
+    Trough 2-3 20-30 20-30 20-30
+    Trough 2-3 20-30 60-80 70-80
+    Hill 1 10-15 60-60 50-50
+    Hill 1.5 13-16 15-20 20-75
+    Multiply 0.8 20-100 0 0
+    Range 1.5 30-40 15-85 30-40
+    Range 1.5 30-40 15-85 60-70
+    Pit 2-3 10-15 15-85 20-80`;
+
+  const lowIsland = `Hill 1 90-99 60-80 45-55
+    Hill 4-5 25-35 20-65 40-60
+    Range 1 40-50 45-55 45-55
+    Smooth 3 0 0 0
+    Trough 1.5 20-30 15-85 20-30
+    Trough 1.5 20-30 15-85 70-80
+    Hill 1.5 10-15 5-15 20-80
+    Hill 1 10-15 85-95 70-80
+    Pit 3-5 10-15 15-85 20-80
+    Multiply 0.4 20-100 0 0`;
+
+  const continents = `Hill 1 80-85 75-80 40-60
+    Hill 1 80-85 20-25 40-60
+    Multiply 0.22 20-100 0 0
+    Hill 5-6 15-20 25-75 20-82
+    Range .8 30-60 5-15 20-45
+    Range .8 30-60 5-15 55-80
+    Range 0-3 30-60 80-90 20-80
+    Trough 3-4 15-20 15-85 20-80
+    Strait 2 vertical 0 0
+    Smooth 2 0 0 0
+    Trough 1-2 5-10 45-55 45-55
+    Pit 3-4 10-15 15-85 20-80
+    Hill 1 5-10 40-60 40-60`;
+
+  const archipelago = `Add 11 all 0 0
+    Range 2-3 40-60 20-80 20-80
+    Hill 5 15-20 10-90 30-70
+    Hill 2 10-15 10-30 20-80
+    Hill 2 10-15 60-90 20-80
+    Smooth 3 0 0 0
+    Trough 10 20-30 5-95 5-95
+    Strait 2 vertical 0 0
+    Strait 2 horizontal 0 0`;
+
+  const atoll = `Add 11 all 0 0
+    Range 2-3 40-60 20-80 20-80
+    Hill 5 15-20 10-90 30-70
+    Hill 2 10-15 10-30 20-80
+    Hill 2 10-15 60-90 20-80
+    Smooth 3 0 0 0
+    Trough 10 20-30 5-95 5-95
+    Strait 2 vertical 0 0
+    Strait 2 horizontal 0 0`;
+
+  const mediterranean = `Range 3-4 30-50 0-100 0-10
+    Range 3-4 30-50 0-100 90-100
+    Hill 5-6 30-70 0-100 0-5
+    Hill 5-6 30-70 0-100 95-100
+    Smooth 1 0 0 0
+    Hill 2-3 30-70 0-5 20-80
+    Hill 2-3 30-70 95-100 20-80
+    Multiply 0.8 land 0 0
+    Trough 3-5 40-50 0-100 0-10
+    Trough 3-5 40-50 0-100 90-100`;
+
+  const peninsula = `Range 2-3 20-35 40-50 0-15
+    Add 5 all 0 0
+    Hill 1 90-100 10-90 0-5
+    Add 13 all 0 0
+    Hill 3-4 3-5 5-95 80-100
+    Hill 1-2 3-5 5-95 40-60
+    Trough 5-6 10-25 5-95 5-95
+    Smooth 3 0 0 0`;
+
+  const pangea = `Hill 1-2 25-40 15-50 0-10
+    Hill 1-2 5-40 50-85 0-10
+    Hill 1-2 25-40 50-85 90-100
+    Hill 1-2 5-40 15-50 90-100
+    Hill 8-12 20-40 20-80 48-52
+    Smooth 2 0 0 0
+    Multiply 0.7 land 0 0
+    Trough 3-4 25-35 5-95 10-20
+    Trough 3-4 25-35 5-95 80-90
+    Range 5-6 30-40 10-90 35-65`;
+
+  const isthmus = `Hill 5-10 15-30 0-30 0-20
+    Hill 5-10 15-30 10-50 20-40
+    Hill 5-10 15-30 30-70 40-60
+    Hill 5-10 15-30 50-90 60-80
+    Hill 5-10 15-30 70-100 80-100
+    Smooth 2 0 0 0
+    Trough 4-8 15-30 0-30 0-20
+    Trough 4-8 15-30 10-50 20-40
+    Trough 4-8 15-30 30-70 40-60
+    Trough 4-8 15-30 50-90 60-80
+    Trough 4-8 15-30 70-100 80-100`;
+
+  const shattered = `Hill 8 35-40 15-85 30-70
+    Trough 10-20 40-50 5-95 5-95
+    Range 5-7 30-40 10-90 20-80
+    Pit 12-20 30-40 15-85 20-80`;
+
+  const taklamakan = `Hill 1-3 20-30 30-70 30-70
+    Hill 2-4 60-85 0-5 0-100
+    Hill 2-4 60-85 95-100 0-100
+    Hill 3-4 60-85 20-80 0-5
+    Hill 3-4 60-85 20-80 95-100`;
+
+  return {volcano, highIsland, lowIsland, continents, archipelago, atoll, mediterranean, peninsula, peninsula, pangea, isthmus, shattered, taklamakan};
+})();
diff --git a/modules/lakes.js b/modules/lakes.js
index d127c2cf..093ff84f 100644
--- a/modules/lakes.js
+++ b/modules/lakes.js
@@ -1,8 +1,6 @@
-(function (global, factory) {
-  typeof exports === "object" && typeof module !== "undefined" ? (module.exports = factory()) : typeof define === "function" && define.amd ? define(factory) : (global.Lakes = factory());
-})(this, function () {
-  "use strict";
+"use strict";
 
+window.Lakes = (function () {
   const setClimateData = function (h) {
     const cells = pack.cells;
     const lakeOutCells = new Uint16Array(cells.i.length);
@@ -10,8 +8,8 @@
     pack.features.forEach(f => {
       if (f.type !== "lake") return;
 
-      // default flux: sum of precipition around lake first cell
-      f.flux = rn(d3.sum(f.shoreline.map(c => grid.cells.prec[cells.g[c]])) / 2);
+      // default flux: sum of precipitation around lake
+      f.flux = f.shoreline.reduce((acc, c) => acc + grid.cells.prec[cells.g[c]], 0);
 
       // temperature and evaporation to detect closed lakes
       f.temp = f.cells < 6 ? grid.cells.temp[cells.g[f.firstCell]] : rn(d3.mean(f.shoreline.map(c => grid.cells.temp[cells.g[c]])), 1);
@@ -96,7 +94,6 @@
       if (feature.type !== "lake") continue;
       delete feature.river;
       delete feature.enteringFlux;
-      delete feature.shoreline;
       delete feature.outCell;
       delete feature.closed;
       feature.height = rn(feature.height, 3);
@@ -140,7 +137,7 @@
     if (feature.height > 60 && feature.cells < 10 && feature.firstCell % 10 === 0) return "lava";
 
     if (!feature.inlets && !feature.outlet) {
-      if (feature.evaporation / 2 > feature.flux) return "dry";
+      if (feature.evaporation > feature.flux * 4) return "dry";
       if (feature.cells < 3 && feature.firstCell % 10 === 0) return "sinkhole";
     }
 
@@ -150,4 +147,4 @@
   }
 
   return {setClimateData, cleanupLakeData, prepareLakeData, defineGroup, generateName, getName, getShoreline};
-});
+})();
diff --git a/modules/load.js b/modules/load.js
index 4b4f1a00..17b46593 100644
--- a/modules/load.js
+++ b/modules/load.js
@@ -141,6 +141,8 @@ function parseLoadedData(data) {
       if (settings[19]) options = JSON.parse(settings[19]);
       if (settings[20]) mapName.value = settings[20];
       if (settings[21]) hideLabels.checked = +settings[21];
+      if (settings[22]) stylePreset.value = settings[22];
+      if (settings[23]) rescaleLabels.checked = settings[23];
     })();
 
     void (function parseConfiguration() {
@@ -220,6 +222,8 @@ function parseLoadedData(data) {
       burgLabels = labels.select('#burgLabels');
     })();
 
+    loadUsedFonts();
+
     void (function parseGridData() {
       grid = JSON.parse(data[6]);
       calculateVoronoi(grid, grid.points);
@@ -270,12 +274,13 @@ function parseLoadedData(data) {
       }
     })();
 
-    const notHidden = (selection) => selection.node() && selection.style('display') !== 'none';
-    const hasChildren = (selection) => selection.node()?.hasChildNodes();
-    const hasChild = (selection, selector) => selection.node()?.querySelector(selector);
-    const turnOn = (el) => document.getElementById(el).classList.remove('buttonoff');
-
     void (function restoreLayersState() {
+      // helper functions
+      const notHidden = (selection) => selection.node() && selection.style('display') !== 'none';
+      const hasChildren = (selection) => selection.node()?.hasChildNodes();
+      const hasChild = (selection, selector) => selection.node()?.querySelector(selector);
+      const turnOn = (el) => document.getElementById(el).classList.remove('buttonoff');
+
       // turn all layers off
       document
         .getElementById('mapLayers')
@@ -290,7 +295,7 @@ function parseLoadedData(data) {
       if (hasChildren(gridOverlay)) turnOn('toggleGrid');
       if (hasChildren(coordinates)) turnOn('toggleCoordinates');
       if (notHidden(compass) && hasChild(compass, 'use')) turnOn('toggleCompass');
-      if (notHidden(rivers)) turnOn('toggleRivers');
+      if (hasChildren(rivers)) turnOn('toggleRivers');
       if (notHidden(terrain) && hasChildren(terrain)) turnOn('toggleRelief');
       if (hasChildren(relig)) turnOn('toggleReligions');
       if (hasChildren(cults)) turnOn('toggleCultures');
@@ -303,7 +308,6 @@ function parseLoadedData(data) {
       if (hasChild(population, 'line')) turnOn('togglePopulation');
       if (hasChildren(ice)) turnOn('toggleIce');
       if (hasChild(prec, 'circle')) turnOn('togglePrec');
-      if (hasChildren(goods)) turnOn('toggleResources');
       if (notHidden(emblems) && hasChild(emblems, 'use')) turnOn('toggleEmblems');
       if (notHidden(labels)) turnOn('toggleLabels');
       if (notHidden(icons)) turnOn('toggleIcons');
@@ -694,7 +698,7 @@ function parseLoadedData(data) {
       }
 
       if (version < 1.63) {
-        // v.1.63 change ocean pattern opacity element
+        // v.1.63 changed ocean pattern opacity element
         const oceanPattern = document.getElementById('oceanPattern');
         if (oceanPattern) oceanPattern.removeAttribute('opacity');
         const oceanicPattern = document.getElementById('oceanicPattern');
@@ -713,6 +717,50 @@ function parseLoadedData(data) {
         defs.append('g').attr('id', 'defs-icons');
         Resources.generate();
       }
+
+      if (version < 1.64) {
+        // v.1.64 change states style
+        const opacity = regions.attr('opacity');
+        const filter = regions.attr('filter');
+        statesBody.attr('opacity', opacity).attr('filter', filter);
+        statesHalo.attr('opacity', opacity).attr('filter', 'blur(5px)');
+        regions.attr('opacity', null).attr('filter', null);
+      }
+
+      if (version < 1.65) {
+        // v 1.65 changed rivers data
+        rivers.attr('style', null); // remove style to unhide layer
+
+        for (const river of pack.rivers) {
+          const node = document.getElementById('river' + river.i);
+          if (node && !river.cells) {
+            const riverCells = new Set();
+            const length = node.getTotalLength() / 2;
+            const segments = Math.ceil(length / 6);
+            const increment = length / segments;
+            for (let i = increment * segments, c = i; i >= 0; i -= increment, c += increment) {
+              const p1 = node.getPointAtLength(i);
+              const p2 = node.getPointAtLength(c);
+              const x = (p1.x + p2.x) / 2;
+              const y = (p1.y + p2.y) / 2;
+              const cell = findCell(x, y, 6);
+              if (cell) riverCells.add(cell);
+            }
+
+            river.cells = Array.from(riverCells);
+          }
+
+          pack.cells.i.forEach((i) => {
+            if (pack.cells.r[i] && pack.cells.h[i] < 20) pack.cells.r[i] = 0;
+          });
+        }
+      }
+
+      if (version < 1.652) {
+        // remove style to unhide layers
+        rivers.attr('style', null);
+        borders.attr('style', null);
+      }
     })();
 
     void (function checkDataIntegrity() {
@@ -812,6 +860,7 @@ function parseLoadedData(data) {
     // set options
     yearInput.value = options.year;
     eraInput.value = options.era;
+    shapeRendering.value = viewbox.attr('shape-rendering') || 'geometricPrecision';
 
     if (window.restoreDefaultEvents) restoreDefaultEvents();
     focusOn(); // based on searchParams focus on point, cell or burg
diff --git a/modules/military-generator.js b/modules/military-generator.js
index bff44019..0089373d 100644
--- a/modules/military-generator.js
+++ b/modules/military-generator.js
@@ -1,8 +1,6 @@
-(function (global, factory) {
-  typeof exports === "object" && typeof module !== "undefined" ? (module.exports = factory()) : typeof define === "function" && define.amd ? define(factory) : (global.Military = factory());
-})(this, function () {
-  "use strict";
+"use strict";
 
+window.Military = (function () {
   const generate = function () {
     TIME && console.time("generateMilitaryForces");
     const cells = pack.cells,
@@ -371,4 +369,4 @@
   };
 
   return {generate, getDefaultOptions, getName, generateNote, drawRegiments, drawRegiment, moveRegiment, getTotal, getEmblem};
-});
+})();
diff --git a/modules/names-generator.js b/modules/names-generator.js
index d4a5e559..45455526 100644
--- a/modules/names-generator.js
+++ b/modules/names-generator.js
@@ -1,7 +1,6 @@
-(function (global, factory) {
-  typeof exports === "object" && typeof module !== "undefined" ? (module.exports = factory()) : typeof define === "function" && define.amd ? define(factory) : (global.Names = factory());
-})(this, function () {
-  "use strict";
+"use strict";
+
+window.Names = (function () {
   let chains = [];
 
   // calculate Markov chain for a namesbase
@@ -294,4 +293,4 @@
   };
 
   return {getBase, getCulture, getCultureShort, getBaseShort, getState, updateChain, clearChains, getNameBases, getMapName, calculateChain};
-});
+})();
diff --git a/modules/ocean-layers.js b/modules/ocean-layers.js
index 16a8ce88..f21e4722 100644
--- a/modules/ocean-layers.js
+++ b/modules/ocean-layers.js
@@ -1,8 +1,6 @@
-(function (global, factory) {
-  typeof exports === "object" && typeof module !== "undefined" ? (module.exports = factory()) : typeof define === "function" && define.amd ? define(factory) : (global.OceanLayers = factory());
-})(this, function () {
-  "use strict";
+"use strict";
 
+window.OceanLayers = (function () {
   let cells, vertices, pointsN, used;
 
   const OceanLayers = function OceanLayers() {
@@ -91,4 +89,4 @@
   }
 
   return OceanLayers;
-});
+})();
diff --git a/modules/relief-icons.js b/modules/relief-icons.js
index ea677e0f..3cb4fd84 100644
--- a/modules/relief-icons.js
+++ b/modules/relief-icons.js
@@ -1,41 +1,41 @@
-(function (global, factory) {
-    typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
-    typeof define === 'function' && define.amd ? define(factory) :
-    (global.ReliefIcons = factory());
-}(this, (function () {'use strict';
+"use strict";
 
-  const ReliefIcons = function() {
-    TIME && console.time('drawRelief');
+window.ReliefIcons = (function () {
+  const ReliefIcons = function () {
+    TIME && console.time("drawRelief");
     terrain.selectAll("*").remove();
-    const density = terrain.attr("density") || .4;
-    const size = 1.6 * (terrain.attr("size") || 1);
-    const mod = .2 * size; // size modifier;s
-    const relief = []; // t: type, c: cell, x: centerX, y: centerY, s: size;
+
     const cells = pack.cells;
+    const density = terrain.attr("density") || 0.4;
+    const size = 2 * (terrain.attr("size") || 1);
+    const mod = 0.2 * size; // size modifier
+    const relief = [];
 
     for (const i of cells.i) {
       const height = cells.h[i];
       if (height < 20) continue; // no icons on water
       if (cells.r[i]) continue; // no icons on rivers
-      const b = cells.biome[i];
-      if (height < 50 && biomesData.iconsDensity[b] === 0) continue; // no icons for this biome
-      const polygon = getPackPolygon(i);
-      const x = d3.extent(polygon, p => p[0]), y = d3.extent(polygon, p => p[1]);
-      const e = [Math.ceil(x[0]), Math.ceil(y[0]), Math.floor(x[1]), Math.floor(y[1])]; // polygon box
+      const biome = cells.biome[i];
+      if (height < 50 && biomesData.iconsDensity[biome] === 0) continue; // no icons for this biome
 
-      if (height < 50) placeBiomeIcons(i, b); else placeReliefIcons(i);
+      const polygon = getPackPolygon(i);
+      const [minX, maxX] = d3.extent(polygon, p => p[0]);
+      const [minY, maxY] = d3.extent(polygon, p => p[1]);
+
+      if (height < 50) placeBiomeIcons(i, biome);
+      else placeReliefIcons(i);
 
       function placeBiomeIcons() {
-        const iconsDensity = biomesData.iconsDensity[b] / 100;
+        const iconsDensity = biomesData.iconsDensity[biome] / 100;
         const radius = 2 / iconsDensity / density;
         if (Math.random() > iconsDensity * 10) return;
 
-        for (const [cx, cy] of poissonDiscSampler(e[0], e[1], e[2], e[3], radius)) {
+        for (const [cx, cy] of poissonDiscSampler(minX, minY, maxX, maxY, radius)) {
           if (!d3.polygonContains(polygon, [cx, cy])) continue;
-          let h = rn((4 + Math.random()) * size, 2);
-          const icon = getBiomeIcon(i, biomesData.icons[b]);
-          if (icon === "#relief-grass-1") h *= 1.3;
-          relief.push({i: icon, x: rn(cx-h, 2), y: rn(cy-h, 2), s: rn(h*2, 2)});
+          let h = (4 + Math.random()) * size;
+          const icon = getBiomeIcon(i, biomesData.icons[biome]);
+          if (icon === "#relief-grass-1") h *= 1.2;
+          relief.push({i: icon, x: rn(cx - h, 2), y: rn(cy - h, 2), s: rn(h * 2, 2)});
         }
       }
 
@@ -43,9 +43,9 @@
         const radius = 2 / density;
         const [icon, h] = getReliefIcon(i, height);
 
-        for (const [cx, cy] of poissonDiscSampler(e[0], e[1], e[2], e[3], radius)) {
+        for (const [cx, cy] of poissonDiscSampler(minX, minY, maxX, maxY, radius)) {
           if (!d3.polygonContains(polygon, [cx, cy])) continue;
-          relief.push({i: icon, x: rn(cx-h, 2), y: rn(cy-h, 2), s: rn(h*2, 2)});
+          relief.push({i: icon, x: rn(cx - h, 2), y: rn(cy - h, 2), s: rn(h * 2, 2)});
         }
       }
 
@@ -58,17 +58,16 @@
     }
 
     // sort relief icons by y+size
-    relief.sort((a, b) => (a.y + a.s) - (b.y + b.s));
+    relief.sort((a, b) => a.y + a.s - (b.y + b.s));
 
-    // append relief icons at once using pure js
     let reliefHTML = "";
     for (const r of relief) {
       reliefHTML += `<use href="${r.i}" x="${r.x}" y="${r.y}" width="${r.s}" height="${r.s}"/>`;
     }
     terrain.html(reliefHTML);
 
-    TIME && console.timeEnd('drawRelief');
-  }
+    TIME && console.timeEnd("drawRelief");
+  };
 
   function getBiomeIcon(i, b) {
     let type = b[Math.floor(Math.random() * b.length)];
@@ -78,27 +77,42 @@
   }
 
   function getVariant(type) {
-    switch(type) {
-      case "mount": return rand(2,7);
-      case "mountSnow": return rand(1,6);
-      case "hill": return rand(2,5);
-      case "conifer": return 2;
-      case "coniferSnow": return 1;
-      case "swamp": return rand(2,3);
-      case "cactus": return rand(1,3);
-      case "deadTree": return rand(1,2);
-      default: return 2;
+    switch (type) {
+      case "mount":
+        return rand(2, 7);
+      case "mountSnow":
+        return rand(1, 6);
+      case "hill":
+        return rand(2, 5);
+      case "conifer":
+        return 2;
+      case "coniferSnow":
+        return 1;
+      case "swamp":
+        return rand(2, 3);
+      case "cactus":
+        return rand(1, 3);
+      case "deadTree":
+        return rand(1, 2);
+      default:
+        return 2;
     }
   }
 
   function getOldIcon(type) {
-    switch(type) {
-      case "mountSnow": return "mount";
-      case "vulcan": return "mount";
-      case "coniferSnow": return "conifer";
-      case "cactus": return "dune";
-      case "deadTree": return "dune";
-      default: return type;
+    switch (type) {
+      case "mountSnow":
+        return "mount";
+      case "vulcan":
+        return "mount";
+      case "coniferSnow":
+        return "conifer";
+      case "cactus":
+        return "dune";
+      case "deadTree":
+        return "dune";
+      default:
+        return type;
     }
   }
 
@@ -111,5 +125,4 @@
   }
 
   return ReliefIcons;
-
-})));
\ No newline at end of file
+})();
diff --git a/modules/religions-generator.js b/modules/religions-generator.js
index 1e2535dd..f5d63573 100644
--- a/modules/religions-generator.js
+++ b/modules/religions-generator.js
@@ -1,19 +1,13 @@
-(function (global, factory) {
-    typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
-    typeof define === 'function' && define.amd ? define(factory) :
-    (global.Religions = factory());
-}(this, (function () {'use strict';
+"use strict";
 
+window.Religions = (function () {
   // name generation approach and relative chance to be selected
-  const approach = {"Number":1, "Being":3, "Adjective":5, "Color + Animal":5,
-    "Adjective + Animal":5, "Adjective + Being":5, "Adjective + Genitive":1,
-    "Color + Being":3, "Color + Genitive":3, "Being + of + Genitive":2, "Being + of the + Genitive":1,
-    "Animal + of + Genitive":1, "Adjective + Being + of + Genitive":2, "Adjective + Animal + of + Genitive":2};
+  const approach = {Number: 1, Being: 3, Adjective: 5, "Color + Animal": 5, "Adjective + Animal": 5, "Adjective + Being": 5, "Adjective + Genitive": 1, "Color + Being": 3, "Color + Genitive": 3, "Being + of + Genitive": 2, "Being + of the + Genitive": 1, "Animal + of + Genitive": 1, "Adjective + Being + of + Genitive": 2, "Adjective + Animal + of + Genitive": 2};
 
   // turn weighted array into simple array
   const approaches = [];
   for (const a in approach) {
-    for (let j=0; j < approach[a]; j++) {
+    for (let j = 0; j < approach[a]; j++) {
       approaches.push(a);
     }
   }
@@ -21,7 +15,7 @@
   const base = {
     number: ["One", "Two", "Three", "Four", "Five", "Six", "Seven", "Eight", "Nine", "Ten", "Eleven", "Twelve"],
     being: ["God", "Goddess", "Lord", "Lady", "Deity", "Creator", "Maker", "Overlord", "Ruler", "Chief", "Master", "Spirit", "Ancestor", "Father", "Forebear", "Forefather", "Mother", "Brother", "Sister", "Elder", "Numen", "Ancient", "Virgin", "Giver", "Council", "Guardian", "Reaper"],
-    animal: ["Dragon", "Wyvern", "Phoenix", "Unicorn", "Sphinx", "Centaur", "Pegasus", "Kraken", "Basilisk", "Chimera", "Cyclope", "Antelope", "Ape", "Badger", "Bear", "Beaver", "Bison", "Boar", "Buffalo", "Cat", "Cobra", "Crane", "Crocodile", "Crow", "Deer", "Dog", "Eagle", "Elk", "Fox", "Goat", "Goose", "Hare", "Hawk", "Heron", "Horse", "Hyena", "Ibis", "Jackal", "Jaguar", "Lark", "Leopard", "Lion", "Mantis", "Marten", "Moose", "Mule", "Narwhal", "Owl", "Panther", "Rat", "Raven", "Rook", "Scorpion", "Shark", "Sheep", "Snake", "Spider", "Swan", "Tiger", "Turtle", "Viper", "Vulture", "Walrus", "Wolf", "Wolverine", "Worm",  "Camel", "Falcon", "Hound", "Ox", "Serpent"],
+    animal: ["Dragon", "Wyvern", "Phoenix", "Unicorn", "Sphinx", "Centaur", "Pegasus", "Kraken", "Basilisk", "Chimera", "Cyclope", "Antelope", "Ape", "Badger", "Bear", "Beaver", "Bison", "Boar", "Buffalo", "Cat", "Cobra", "Crane", "Crocodile", "Crow", "Deer", "Dog", "Eagle", "Elk", "Fox", "Goat", "Goose", "Hare", "Hawk", "Heron", "Horse", "Hyena", "Ibis", "Jackal", "Jaguar", "Lark", "Leopard", "Lion", "Mantis", "Marten", "Moose", "Mule", "Narwhal", "Owl", "Panther", "Rat", "Raven", "Rook", "Scorpion", "Shark", "Sheep", "Snake", "Spider", "Swan", "Tiger", "Turtle", "Viper", "Vulture", "Walrus", "Wolf", "Wolverine", "Worm", "Camel", "Falcon", "Hound", "Ox", "Serpent"],
     adjective: ["New", "Good", "High", "Old", "Great", "Big", "Young", "Major", "Strong", "Happy", "Last", "Main", "Huge", "Far", "Beautiful", "Wild", "Fair", "Prime", "Crazy", "Ancient", "Proud", "Secret", "Lucky", "Sad", "Silent", "Latter", "Severe", "Fat", "Holy", "Pure", "Aggressive", "Honest", "Giant", "Mad", "Pregnant", "Distant", "Lost", "Broken", "Blind", "Friendly", "Unknown", "Sleeping", "Slumbering", "Loud", "Hungry", "Wise", "Worried", "Sacred", "Magical", "Superior", "Patient", "Dead", "Deadly", "Peaceful", "Grateful", "Frozen", "Evil", "Scary", "Burning", "Divine", "Bloody", "Dying", "Waking", "Brutal", "Unhappy", "Calm", "Cruel", "Favorable", "Blond", "Explicit", "Disturbing", "Devastating", "Brave", "Sunny", "Troubled", "Flying", "Sustainable", "Marine", "Fatal", "Inherent", "Selected", "Naval", "Cheerful", "Almighty", "Benevolent", "Eternal", "Immutable", "Infallible"],
     genitive: ["Day", "Life", "Death", "Night", "Home", "Fog", "Snow", "Winter", "Summer", "Cold", "Springs", "Gates", "Nature", "Thunder", "Lightning", "War", "Ice", "Frost", "Fire", "Doom", "Fate", "Pain", "Heaven", "Justice", "Light", "Love", "Time", "Victory"],
     theGenitive: ["World", "Word", "South", "West", "North", "East", "Sun", "Moon", "Peak", "Fall", "Dawn", "Eclipse", "Abyss", "Blood", "Tree", "Earth", "Harvest", "Rainbow", "Sea", "Sky", "Stars", "Storm", "Underworld", "Wild"],
@@ -29,64 +23,70 @@
   };
 
   const forms = {
-    Folk:{"Shamanism":2, "Animism":2, "Ancestor worship":1, "Polytheism":2},
-    Organized:{"Polytheism":5, "Dualism":1, "Monotheism":4, "Non-theism":1},
-    Cult:{"Cult":1, "Dark Cult":1},
-    Heresy:{"Heresy":1}
+    Folk: {Shamanism: 2, Animism: 2, "Ancestor worship": 1, Polytheism: 2},
+    Organized: {Polytheism: 5, Dualism: 1, Monotheism: 4, "Non-theism": 1},
+    Cult: {Cult: 1, "Dark Cult": 1},
+    Heresy: {Heresy: 1}
   };
 
-  const methods = {"Random + type":3, "Random + ism":1, "Supreme + ism":5, "Faith of + Supreme":5, "Place + ism":1, "Culture + ism":2, "Place + ian + type":6, "Culture + type":4};
+  const methods = {"Random + type": 3, "Random + ism": 1, "Supreme + ism": 5, "Faith of + Supreme": 5, "Place + ism": 1, "Culture + ism": 2, "Place + ian + type": 6, "Culture + type": 4};
 
   const types = {
-    "Shamanism":{"Beliefs":3, "Shamanism":2, "Spirits":1},
-    "Animism":{"Spirits":1, "Beliefs":1},
-    "Ancestor worship":{"Beliefs":1, "Forefathers":2, "Ancestors":2},
-    "Polytheism":{"Deities":3, "Faith":1, "Gods":1, "Pantheon":1},
+    Shamanism: {Beliefs: 3, Shamanism: 2, Spirits: 1},
+    Animism: {Spirits: 1, Beliefs: 1},
+    "Ancestor worship": {Beliefs: 1, Forefathers: 2, Ancestors: 2},
+    Polytheism: {Deities: 3, Faith: 1, Gods: 1, Pantheon: 1},
 
-    "Dualism":{"Religion":3, "Faith":1, "Cult":1},
-    "Monotheism":{"Religion":1, "Church":1},
-    "Non-theism":{"Beliefs":3, "Spirits":1},
+    Dualism: {Religion: 3, Faith: 1, Cult: 1},
+    Monotheism: {Religion: 1, Church: 1},
+    "Non-theism": {Beliefs: 3, Spirits: 1},
 
-    "Cult":{"Cult":4, "Sect":4, "Worship":1, "Orden":1, "Coterie":1, "Arcanum":1},
-    "Dark Cult":{"Cult":2, "Sect":2, "Occultism":1, "Idols":1, "Coven":1, "Circle":1, "Blasphemy":1},
+    Cult: {Cult: 4, Sect: 4, Worship: 1, Orden: 1, Coterie: 1, Arcanum: 1},
+    "Dark Cult": {Cult: 2, Sect: 2, Occultism: 1, Idols: 1, Coven: 1, Circle: 1, Blasphemy: 1},
 
-    "Heresy":{"Heresy":3, "Sect":2, "Schism":1, "Dissenters":1, "Circle":1, "Brotherhood":1, "Society":1, "Iconoclasm":1, "Dissent":1, "Apostates":1}
+    Heresy: {Heresy: 3, Sect: 2, Schism: 1, Dissenters: 1, Circle: 1, Brotherhood: 1, Society: 1, Iconoclasm: 1, Dissent: 1, Apostates: 1}
   };
 
-  const generate = function() {
-    TIME && console.time('generateReligions');
-    const cells = pack.cells, states = pack.states, cultures = pack.cultures;
-    const religions = pack.religions = [];
+  const generate = function () {
+    TIME && console.time("generateReligions");
+    const cells = pack.cells,
+      states = pack.states,
+      cultures = pack.cultures;
+    const religions = (pack.religions = []);
     cells.religion = new Uint16Array(cells.culture); // cell religion; initially based on culture
 
     // add folk religions
     pack.cultures.forEach(c => {
-      if (!c.i) {religions.push({i: 0, name: "No religion"}); return;}
-      if (c.removed) {religions.push({i: c.i, name: "Extinct religion for "+c.name, color:getMixedColor(c.color, .1, 0), removed:true}); return;}
+      if (!c.i) {
+        religions.push({i: 0, name: "No religion"});
+        return;
+      }
+      if (c.removed) {
+        religions.push({i: c.i, name: "Extinct religion for " + c.name, color: getMixedColor(c.color, 0.1, 0), removed: true});
+        return;
+      }
       const form = rw(forms.Folk);
       const name = c.name + " " + rw(types[form]);
       const deity = form === "Animism" ? null : getDeityName(c.i);
-      const color = getMixedColor(c.color, .1, 0); // `url(#hatch${rand(8,13)})`;
-      religions.push({i: c.i, name, color, culture: c.i, type:"Folk", form, deity, center: c.center, origin:0});
+      const color = getMixedColor(c.color, 0.1, 0); // `url(#hatch${rand(8,13)})`;
+      religions.push({i: c.i, name, color, culture: c.i, type: "Folk", form, deity, center: c.center, origin: 0});
     });
 
     if (religionsInput.value == 0 || pack.cultures.length < 2) {
-      religions.filter(r => r.i).forEach(r => r.code = abbreviate(r.name));
+      religions.filter(r => r.i).forEach(r => (r.code = abbreviate(r.name)));
       return;
     }
 
     const burgs = pack.burgs.filter(b => b.i && !b.removed);
-    const sorted = burgs.length > +religionsInput.value
-      ? burgs.sort((a, b) => b.population - a.population).map(b => b.cell)
-      : cells.i.filter(i => cells.s[i] > 2).sort((a, b) => cells.s[b] - cells.s[a]);
+    const sorted = burgs.length > +religionsInput.value ? burgs.sort((a, b) => b.population - a.population).map(b => b.cell) : cells.i.filter(i => cells.s[i] > 2).sort((a, b) => cells.s[b] - cells.s[a]);
     const religionsTree = d3.quadtree();
     const spacing = (graphWidth + graphHeight) / 6 / religionsInput.value; // base min distance between towns
-    const cultsCount = Math.floor(rand(10, 40) / 100 * religionsInput.value);
+    const cultsCount = Math.floor((rand(10, 40) / 100) * religionsInput.value);
     const count = +religionsInput.value - cultsCount + religions.length;
 
     // generate organized religions
-    for (let i=0; religions.length < count && i < 1000; i++) {
-      let center = sorted[biased(0, sorted.length-1, 5)]; // religion center
+    for (let i = 0; religions.length < count && i < 1000; i++) {
+      let center = sorted[biased(0, sorted.length - 1, 5)]; // religion center
       const form = rw(forms.Organized);
       const state = cells.state[center];
       const culture = cells.culture[center];
@@ -96,34 +96,36 @@
       if (expansion === "state" && !state) expansion = "global";
       if (expansion === "culture" && !culture) expansion = "global";
 
-      if (expansion === "state" && Math.random() > .5) center = states[state].center;
-      if (expansion === "culture" && Math.random() > .5) center = cultures[culture].center;
+      if (expansion === "state" && Math.random() > 0.5) center = states[state].center;
+      if (expansion === "culture" && Math.random() > 0.5) center = cultures[culture].center;
 
       if (!cells.burg[center] && cells.c[center].some(c => cells.burg[c])) center = cells.c[center].find(c => cells.burg[c]);
-      const x = cells.p[center][0], y = cells.p[center][1];
+      const x = cells.p[center][0],
+        y = cells.p[center][1];
 
-      const s = spacing * gauss(1, .3, .2, 2, 2); // randomize to make the placement not uniform
+      const s = spacing * gauss(1, 0.3, 0.2, 2, 2); // randomize to make the placement not uniform
       if (religionsTree.find(x, y, s) !== undefined) continue; // to close to existing religion
 
       // add "Old" to name of the folk religion on this culture
       const folk = religions.find(r => r.culture === culture && r.type === "Folk");
-      if (folk && expansion === "culture" && folk.name.slice(0,3) !== "Old") folk.name = "Old " + folk.name;
+      if (folk && expansion === "culture" && folk.name.slice(0, 3) !== "Old") folk.name = "Old " + folk.name;
       const origin = folk ? folk.i : 0;
 
       const expansionism = rand(3, 8);
-      const color = getMixedColor(religions[origin].color, .3, 0); // `url(#hatch${rand(0,5)})`;
-      religions.push({i: religions.length, name, color, culture, type:"Organized", form, deity, expansion, expansionism, center, origin});
+      const color = getMixedColor(religions[origin].color, 0.3, 0); // `url(#hatch${rand(0,5)})`;
+      religions.push({i: religions.length, name, color, culture, type: "Organized", form, deity, expansion, expansionism, center, origin});
       religionsTree.add([x, y]);
     }
 
     // generate cults
-    for (let i=0; religions.length < count + cultsCount && i < 1000; i++) {
+    for (let i = 0; religions.length < count + cultsCount && i < 1000; i++) {
       const form = rw(forms.Cult);
-      let center = sorted[biased(0, sorted.length-1, 1)]; // religion center
+      let center = sorted[biased(0, sorted.length - 1, 1)]; // religion center
       if (!cells.burg[center] && cells.c[center].some(c => cells.burg[c])) center = cells.c[center].find(c => cells.burg[c]);
-      const x = cells.p[center][0], y = cells.p[center][1];
+      const x = cells.p[center][0],
+        y = cells.p[center][1];
 
-      const s = spacing * gauss(2, .3, 1, 3, 2); // randomize to make the placement not uniform
+      const s = spacing * gauss(2, 0.3, 1, 3, 2); // randomize to make the placement not uniform
       if (religionsTree.find(x, y, s) !== undefined) continue; // to close to existing religion
 
       const culture = cells.culture[center];
@@ -131,9 +133,9 @@
       const origin = folk ? folk.i : 0;
       const deity = getDeityName(culture);
       const name = getCultName(form, center);
-      const expansionism = gauss(1.1, .5, 0, 5);
-      const color = getMixedColor(cultures[culture].color, .5, 0); // "url(#hatch7)";
-      religions.push({i: religions.length, name, color, culture, type:"Cult", form, deity, expansion:"global", expansionism, center, origin});
+      const expansionism = gauss(1.1, 0.5, 0, 5);
+      const color = getMixedColor(cultures[culture].color, 0.5, 0); // "url(#hatch7)";
+      religions.push({i: religions.length, name, color, culture, type: "Cult", form, deity, expansion: "global", expansionism, center, origin});
       religionsTree.add([x, y]);
       //debug.append("circle").attr("cx", x).attr("cy", y).attr("r", 2).attr("fill", "red");
     }
@@ -141,72 +143,90 @@
     expandReligions();
 
     // generate heresies
-    religions.filter(r => r.type === "Organized").forEach(r => {
-      if (r.expansionism < 3) return;
-      const count = gauss(0, 1, 0, 3);
-      for (let i=0; i < count; i++) {
-        let center = ra(cells.i.filter(i => cells.religion[i] === r.i && cells.c[i].some(c => cells.religion[c] !== r.i)));
-        if (!center) continue;
-        if (!cells.burg[center] && cells.c[center].some(c => cells.burg[c])) center = cells.c[center].find(c => cells.burg[c]);
-        const x = cells.p[center][0], y = cells.p[center][1];
-        if (religionsTree.find(x, y, spacing / 10) !== undefined) continue; // to close to other
+    religions
+      .filter(r => r.type === "Organized")
+      .forEach(r => {
+        if (r.expansionism < 3) return;
+        const count = gauss(0, 1, 0, 3);
+        for (let i = 0; i < count; i++) {
+          let center = ra(cells.i.filter(i => cells.religion[i] === r.i && cells.c[i].some(c => cells.religion[c] !== r.i)));
+          if (!center) continue;
+          if (!cells.burg[center] && cells.c[center].some(c => cells.burg[c])) center = cells.c[center].find(c => cells.burg[c]);
+          const x = cells.p[center][0],
+            y = cells.p[center][1];
+          if (religionsTree.find(x, y, spacing / 10) !== undefined) continue; // to close to other
 
-        const culture = cells.culture[center];
-        const name = getCultName("Heresy", center);
-        const expansionism = gauss(1.2, .5, 0, 5);
-        const color = getMixedColor(r.color, .4, .2); // "url(#hatch6)";
-        religions.push({i: religions.length, name, color, culture, type:"Heresy", form:r.form, deity: r.deity, expansion:"global", expansionism, center, origin:r.i});
-        religionsTree.add([x, y]);
-        //debug.append("circle").attr("cx", x).attr("cy", y).attr("r", 2).attr("fill", "green");
-      }
-    });
+          const culture = cells.culture[center];
+          const name = getCultName("Heresy", center);
+          const expansionism = gauss(1.2, 0.5, 0, 5);
+          const color = getMixedColor(r.color, 0.4, 0.2); // "url(#hatch6)";
+          religions.push({i: religions.length, name, color, culture, type: "Heresy", form: r.form, deity: r.deity, expansion: "global", expansionism, center, origin: r.i});
+          religionsTree.add([x, y]);
+          //debug.append("circle").attr("cx", x).attr("cy", y).attr("r", 2).attr("fill", "green");
+        }
+      });
 
     expandHeresies();
     checkCenters();
 
-    TIME && console.timeEnd('generateReligions');
-  }
+    TIME && console.timeEnd("generateReligions");
+  };
 
-  const add = function(center) {
-    const cells = pack.cells, religions = pack.religions;
+  const add = function (center) {
+    const cells = pack.cells,
+      religions = pack.religions;
     const r = cells.religion[center];
     const i = religions.length;
     const culture = cells.culture[center];
-    const color = getMixedColor(religions[r].color, .3, 0);
+    const color = getMixedColor(religions[r].color, 0.3, 0);
 
-    const type = religions[r].type === "Organized" ? rw({Organized:4, Cult:1, Heresy:2}) : rw({Organized:5, Cult:2});
+    const type = religions[r].type === "Organized" ? rw({Organized: 4, Cult: 1, Heresy: 2}) : rw({Organized: 5, Cult: 2});
     const form = rw(forms[type]);
     const deity = type === "Heresy" ? religions[r].deity : form === "Non-theism" ? null : getDeityName(culture);
 
     let name, expansion;
-    if (type === "Organized") [name, expansion] = getReligionName(form, deity, center)
-    else {name = getCultName(form, center); expansion = "global";}
+    if (type === "Organized") [name, expansion] = getReligionName(form, deity, center);
+    else {
+      name = getCultName(form, center);
+      expansion = "global";
+    }
     const formName = type === "Heresy" ? religions[r].form : form;
-    const code = abbreviate(name, religions.map(r => r.code));
-    religions.push({i, name, color, culture, type, form:formName, deity, expansion, expansionism:0, center, cells:0, area:0, rural:0, urban:0, origin:r, code});
+    const code = abbreviate(
+      name,
+      religions.map(r => r.code)
+    );
+    religions.push({i, name, color, culture, type, form: formName, deity, expansion, expansionism: 0, center, cells: 0, area: 0, rural: 0, urban: 0, origin: r, code});
     cells.religion[center] = i;
-  }
+  };
 
   // growth algorithm to assign cells to religions
-  const expandReligions = function() {
-    const cells = pack.cells, religions = pack.religions;
+  const expandReligions = function () {
+    const cells = pack.cells,
+      religions = pack.religions;
     const queue = new PriorityQueue({comparator: (a, b) => a.p - b.p});
     const cost = [];
 
-    religions.filter(r => r.type === "Organized" || r.type === "Cult").forEach(r => {
-      cells.religion[r.center] = r.i;
-      queue.queue({e:r.center, p:0, r:r.i, s: cells.state[r.center], c:r.culture});
-      cost[r.center] = 1;
-    });
+    religions
+      .filter(r => r.type === "Organized" || r.type === "Cult")
+      .forEach(r => {
+        cells.religion[r.center] = r.i;
+        queue.queue({e: r.center, p: 0, r: r.i, s: cells.state[r.center], c: r.culture});
+        cost[r.center] = 1;
+      });
 
-    const neutral = cells.i.length / 5000 * 200 * gauss(1, .3, .2, 2, 2) * neutralInput.value; // limit cost for organized religions growth
+    const neutral = (cells.i.length / 5000) * 200 * gauss(1, 0.3, 0.2, 2, 2) * neutralInput.value; // limit cost for organized religions growth
     const popCost = d3.max(cells.pop) / 3; // enougth population to spered religion without penalty
 
     while (queue.length) {
-      const next = queue.dequeue(), n = next.e, p = next.p, r = next.r, c = next.c, s = next.s;
+      const next = queue.dequeue(),
+        n = next.e,
+        p = next.p,
+        r = next.r,
+        c = next.c,
+        s = next.s;
       const expansion = religions[r].expansion;
 
-      cells.c[n].forEach(function(e) {
+      cells.c[n].forEach(function (e) {
         if (expansion === "culture" && c !== cells.culture[e]) return;
         if (expansion === "state" && s !== cells.state[e]) return;
 
@@ -215,88 +235,101 @@
         const biomeCost = cells.road[e] ? 1 : biomesData.cost[cells.biome[e]];
         const populationCost = Math.max(rn(popCost - cells.pop[e]), 0);
         const heightCost = Math.max(cells.h[e], 20) - 20;
-        const waterCost = cells.h[e] < 20 ? cells.road[e] ? 50 : 1000 : 0;
+        const waterCost = cells.h[e] < 20 ? (cells.road[e] ? 50 : 1000) : 0;
         const totalCost = p + (cultureCost + stateCost + biomeCost + populationCost + heightCost + waterCost) / religions[r].expansionism;
         if (totalCost > neutral) return;
 
         if (!cost[e] || totalCost < cost[e]) {
           if (cells.h[e] >= 20 && cells.culture[e]) cells.religion[e] = r; // assign religion to cell
           cost[e] = totalCost;
-          queue.queue({e, p:totalCost, r, c, s});
+          queue.queue({e, p: totalCost, r, c, s});
         }
       });
     }
-  }
+  };
 
   // growth algorithm to assign cells to heresies
-  const expandHeresies = function() {
-    const cells = pack.cells, religions = pack.religions;
+  const expandHeresies = function () {
+    const cells = pack.cells,
+      religions = pack.religions;
     const queue = new PriorityQueue({comparator: (a, b) => a.p - b.p});
     const cost = [];
 
-    religions.filter(r => r.type === "Heresy").forEach(r => {
-      const b = cells.religion[r.center]; // "base" religion id
-      cells.religion[r.center] = r.i; // heresy id
-      queue.queue({e:r.center, p:0, r:r.i, b});
-      cost[r.center] = 1;
-    });
+    religions
+      .filter(r => r.type === "Heresy")
+      .forEach(r => {
+        const b = cells.religion[r.center]; // "base" religion id
+        cells.religion[r.center] = r.i; // heresy id
+        queue.queue({e: r.center, p: 0, r: r.i, b});
+        cost[r.center] = 1;
+      });
 
-    const neutral = cells.i.length / 5000 * 500 * neutralInput.value; // limit cost for heresies growth
+    const neutral = (cells.i.length / 5000) * 500 * neutralInput.value; // limit cost for heresies growth
 
     while (queue.length) {
-      const next = queue.dequeue(), n = next.e, p = next.p, r = next.r, b = next.b;
+      const next = queue.dequeue(),
+        n = next.e,
+        p = next.p,
+        r = next.r,
+        b = next.b;
 
-      cells.c[n].forEach(function(e) {
+      cells.c[n].forEach(function (e) {
         const religionCost = cells.religion[e] === b ? 0 : 2000;
         const biomeCost = cells.road[e] ? 0 : biomesData.cost[cells.biome[e]];
         const heightCost = Math.max(cells.h[e], 20) - 20;
-        const waterCost = cells.h[e] < 20 ? cells.road[e] ? 50 : 1000 : 0;
-        const totalCost = p + (religionCost + biomeCost + heightCost + waterCost) / Math.max(religions[r].expansionism, .1);
+        const waterCost = cells.h[e] < 20 ? (cells.road[e] ? 50 : 1000) : 0;
+        const totalCost = p + (religionCost + biomeCost + heightCost + waterCost) / Math.max(religions[r].expansionism, 0.1);
 
         if (totalCost > neutral) return;
 
         if (!cost[e] || totalCost < cost[e]) {
           if (cells.h[e] >= 20 && cells.culture[e]) cells.religion[e] = r; // assign religion to cell
           cost[e] = totalCost;
-          queue.queue({e, p:totalCost, r});
+          queue.queue({e, p: totalCost, r});
         }
       });
     }
-  }
+  };
 
   function checkCenters() {
-    const cells = pack.cells, religions = pack.religions;
+    const cells = pack.cells,
+      religions = pack.religions;
 
     const codes = religions.map(r => r.code);
-    religions.filter(r => r.i).forEach(r => {
-      r.code = abbreviate(r.name, codes);
+    religions
+      .filter(r => r.i)
+      .forEach(r => {
+        r.code = abbreviate(r.name, codes);
 
-      // move religion center if it's not within religion area after expansion
-      if (cells.religion[r.center] === r.i) return; // in area
-      const religCells = cells.i.filter(i => cells.religion[i] === r.i);
-      if (!religCells.length) return; // extinct religion
-      r.center = religCells.sort((a,b) => b.pop - a.pop)[0];
-    });
+        // move religion center if it's not within religion area after expansion
+        if (cells.religion[r.center] === r.i) return; // in area
+        const religCells = cells.i.filter(i => cells.religion[i] === r.i);
+        if (!religCells.length) return; // extinct religion
+        r.center = religCells.sort((a, b) => b.pop - a.pop)[0];
+      });
   }
 
   function updateCultures() {
-    TIME && console.time('updateCulturesForReligions');
-    pack.religions = pack.religions.map( (religion, index) => {
-      if(index === 0) {
+    TIME && console.time("updateCulturesForReligions");
+    pack.religions = pack.religions.map((religion, index) => {
+      if (index === 0) {
         return religion;
       }
       return {...religion, culture: pack.cells.culture[religion.center]};
     });
-    TIME && console.timeEnd('updateCulturesForReligions');
+    TIME && console.timeEnd("updateCulturesForReligions");
   }
 
   // get supreme deity name
-  const getDeityName = function(culture) {
-    if (culture === undefined) {ERROR && console.error("Please define a culture"); return;}
+  const getDeityName = function (culture) {
+    if (culture === undefined) {
+      ERROR && console.error("Please define a culture");
+      return;
+    }
     const meaning = generateMeaning();
-    const cultureName = Names.getCulture(culture, null, null, "", .8);
+    const cultureName = Names.getCulture(culture, null, null, "", 0.8);
     return cultureName + ", The " + meaning;
-  }
+  };
 
   function generateMeaning() {
     const a = ra(approaches); // select generation approach
@@ -318,21 +351,29 @@
 
   function getReligionName(form, deity, center) {
     const cells = pack.cells;
-    const random = function() {return Names.getCulture(cells.culture[center], null, null, "", 0);}
-    const type = function() {return rw(types[form]);}
-    const supreme = function() {return deity.split(/[ ,]+/)[0];}
-    const place = function(adj) {
+    const random = function () {
+      return Names.getCulture(cells.culture[center], null, null, "", 0);
+    };
+    const type = function () {
+      return rw(types[form]);
+    };
+    const supreme = function () {
+      return deity.split(/[ ,]+/)[0];
+    };
+    const place = function (adj) {
       const base = cells.burg[center] ? pack.burgs[cells.burg[center]].name : pack.states[cells.state[center]].name;
       let name = trimVowels(base.split(/[ ,]+/)[0]);
       return adj ? getAdjective(name) : name;
-    }
-    const culture = function() {return pack.cultures[cells.culture[center]].name;}
+    };
+    const culture = function () {
+      return pack.cultures[cells.culture[center]].name;
+    };
 
     const m = rw(methods);
     if (m === "Random + type") return [random() + " " + type(), "global"];
     if (m === "Random + ism") return [trimVowels(random()) + "ism", "global"];
     if (m === "Supreme + ism" && deity) return [trimVowels(supreme()) + "ism", "global"];
-    if (m === "Faith of + Supreme" && deity) return [ra(['Faith', 'Way', 'Path', 'Word', 'Witnesses']) + " of " + supreme(), "global"];
+    if (m === "Faith of + Supreme" && deity) return [ra(["Faith", "Way", "Path", "Word", "Witnesses"]) + " of " + supreme(), "global"];
     if (m === "Place + ism") return [place() + "ism", "state"];
     if (m === "Culture + ism") return [trimVowels(culture()) + "ism", "culture"];
     if (m === "Place + ian + type") return [place("adj") + " " + type(), "state"];
@@ -342,14 +383,19 @@
 
   function getCultName(form, center) {
     const cells = pack.cells;
-    const type = function() {return rw(types[form]);}
-    const random = function() {return trimVowels(Names.getCulture(cells.culture[center], null, null, "", 0).split(/[ ,]+/)[0]);}
-    const burg = function() {return trimVowels(pack.burgs[cells.burg[center]].name.split(/[ ,]+/)[0]);}
+    const type = function () {
+      return rw(types[form]);
+    };
+    const random = function () {
+      return trimVowels(Names.getCulture(cells.culture[center], null, null, "", 0).split(/[ ,]+/)[0]);
+    };
+    const burg = function () {
+      return trimVowels(pack.burgs[cells.burg[center]].name.split(/[ ,]+/)[0]);
+    };
     if (cells.burg[center]) return burg() + "ian " + type();
-    if (Math.random() > .5) return random() + "ian " + type();
+    if (Math.random() > 0.5) return random() + "ian " + type();
     return type() + " of the " + generateMeaning();
-  };
+  }
 
   return {generate, add, getDeityName, expandReligions, updateCultures};
-
-})));
+})();
diff --git a/modules/river-generator.js b/modules/river-generator.js
index f1f35900..f090616a 100644
--- a/modules/river-generator.js
+++ b/modules/river-generator.js
@@ -1,15 +1,18 @@
-(function (global, factory) {
-  typeof exports === "object" && typeof module !== "undefined" ? (module.exports = factory()) : typeof define === "function" && define.amd ? define(factory) : (global.Rivers = factory());
-})(this, function () {
-  "use strict";
+"use strict";
 
+window.Rivers = (function () {
   const generate = function (allowErosion = true) {
     TIME && console.time("generateRivers");
     Math.random = aleaPRNG(seed);
     const {cells, features} = pack;
-    const p = cells.p;
 
-    const riversData = []; // rivers data
+    const riversData = {}; // rivers data
+    const riverParents = {};
+    const addCellToRiver = function (cell, river) {
+      if (!riversData[river]) riversData[river] = [cell];
+      else riversData[river].push(cell);
+    };
+
     cells.fl = new Uint16Array(cells.i.length); // water flux array
     cells.r = new Uint16Array(cells.i.length); // rivers array
     cells.conf = new Uint8Array(cells.i.length); // confluences array
@@ -20,6 +23,7 @@
     resolveDepressions(h);
     drainWater();
     defineRivers();
+    calculateConfluenceFlux();
     Lakes.cleanupLakeData();
 
     if (allowErosion) cells.h = Uint8Array.from(h); // apply changed heights as basic one
@@ -28,99 +32,98 @@
 
     function drainWater() {
       const MIN_FLUX_TO_FORM_RIVER = 30;
+      const prec = grid.cells.prec;
       const land = cells.i.filter(i => h[i] >= 20).sort((a, b) => h[b] - h[a]);
       const lakeOutCells = Lakes.setClimateData(h);
 
-      // const flow = cells.i.length < 65535 ? new Uint16Array(cells.i.length) : new Uint32Array(cells.i.length);
-      // flow[i] = min;
-      // debug.append("path").attr("class", "arrow").attr("d", `M${cells.p[i][0]},${cells.p[i][1]}L${cells.p[min][0]},${cells.p[min][1]}`);
-
       land.forEach(function (i) {
-        cells.fl[i] += grid.cells.prec[cells.g[i]]; // flux from precipitation
-        const [x, y] = p[i];
+        cells.fl[i] += prec[cells.g[i]]; // add flux from precipitation
 
         // create lake outlet if lake is not in deep depression and flux > evaporation
         const lakes = lakeOutCells[i] ? features.filter(feature => i === feature.outCell && feature.flux > feature.evaporation) : [];
         for (const lake of lakes) {
           const lakeCell = cells.c[i].find(c => h[c] < 20 && cells.f[c] === lake.i);
-
           cells.fl[lakeCell] += Math.max(lake.flux - lake.evaporation, 0); // not evaporated lake water drains to outlet
 
           // allow chain lakes to retain identity
           if (cells.r[lakeCell] !== lake.river) {
             const sameRiver = cells.c[lakeCell].some(c => cells.r[c] === lake.river);
+
             if (sameRiver) {
               cells.r[lakeCell] = lake.river;
-              riversData.push({river: lake.river, cell: lakeCell, x: p[lakeCell][0], y: p[lakeCell][1], flux: cells.fl[lakeCell]});
+              addCellToRiver(lakeCell, lake.river);
             } else {
               cells.r[lakeCell] = riverNext;
-              riversData.push({river: riverNext, cell: lakeCell, x: p[lakeCell][0], y: p[lakeCell][1], flux: cells.fl[lakeCell]});
+              addCellToRiver(lakeCell, riverNext);
               riverNext++;
             }
           }
 
           lake.outlet = cells.r[lakeCell];
-          flowDown(i, cells.fl[i], cells.fl[lakeCell], lake.outlet);
+          flowDown(i, cells.fl[lakeCell], lake.outlet);
         }
 
         // assign all tributary rivers to outlet basin
-        for (let outlet = lakes[0]?.outlet, l = 0; l < lakes.length; l++) {
-          lakes[l].inlets?.forEach(fork => (riversData.find(r => r.river === fork).parent = outlet));
+        const outlet = lakes[0]?.outlet;
+        for (const lake of lakes) {
+          if (!Array.isArray(lake.inlets)) continue;
+          for (const inlet of lake.inlets) {
+            riverParents[inlet] = outlet;
+          }
         }
 
         // near-border cell: pour water out of the screen
-        if (cells.b[i] && cells.r[i]) {
-          let to = [];
-          const min = Math.min(y, graphHeight - y, x, graphWidth - x);
-          if (min === y) to = [x, 0];
-          else if (min === graphHeight - y) to = [x, graphHeight];
-          else if (min === x) to = [0, y];
-          else if (min === graphWidth - x) to = [graphWidth, y];
-          riversData.push({river: cells.r[i], cell: i, x: to[0], y: to[1], flux: cells.fl[i]});
-          return;
-        }
+        if (cells.b[i] && cells.r[i]) return addCellToRiver(-1, cells.r[i]);
 
         // downhill cell (make sure it's not in the source lake)
-        const filtered = lakeOutCells[i] ? cells.c[i].filter(c => !lakes.map(lake => lake.i).includes(cells.f[c])) : cells.c[i];
-        const min = filtered.sort((a, b) => h[a] - h[b])[0];
+        let min = null;
+        if (lakeOutCells[i]) {
+          const filtered = cells.c[i].filter(c => !lakes.map(lake => lake.i).includes(cells.f[c]));
+          min = filtered.sort((a, b) => h[a] - h[b])[0];
+        } else if (cells.haven[i]) {
+          min = cells.haven[i];
+        } else {
+          min = cells.c[i].sort((a, b) => h[a] - h[b])[0];
+        }
 
         // cells is depressed
         if (h[i] <= h[min]) return;
 
         if (cells.fl[i] < MIN_FLUX_TO_FORM_RIVER) {
+          // flux is too small to operate as a river
           if (h[min] >= 20) cells.fl[min] += cells.fl[i];
-          return; // flux is too small to operate as river
+          return;
         }
 
         // proclaim a new river
         if (!cells.r[i]) {
           cells.r[i] = riverNext;
-          riversData.push({river: riverNext, cell: i, x, y, flux: cells.fl[i]});
+          addCellToRiver(i, riverNext);
           riverNext++;
         }
 
-        flowDown(min, cells.fl[min], cells.fl[i], cells.r[i], i);
+        flowDown(min, cells.fl[i], cells.r[i]);
       });
     }
 
-    function flowDown(toCell, toFlux, fromFlux, river, fromCell = 0) {
-      if (cells.r[toCell]) {
+    function flowDown(toCell, fromFlux, river) {
+      const toFlux = cells.fl[toCell] - cells.conf[toCell];
+      const toRiver = cells.r[toCell];
+
+      if (toRiver) {
         // downhill cell already has river assigned
-        if (toFlux < fromFlux) {
-          cells.conf[toCell] = cells.fl[toCell]; // mark confluence
-          if (h[toCell] >= 20) riversData.find(r => r.river === cells.r[toCell]).parent = river; // min river is a tributary of current river
+        if (fromFlux > toFlux) {
+          cells.conf[toCell] += cells.fl[toCell]; // mark confluence
+          if (h[toCell] >= 20) riverParents[toRiver] = river; // min river is a tributary of current river
           cells.r[toCell] = river; // re-assign river if downhill part has less flux
         } else {
           cells.conf[toCell] += fromFlux; // mark confluence
-          if (h[toCell] >= 20) riversData.find(r => r.river === river).parent = cells.r[toCell]; // current river is a tributary of min river
+          if (h[toCell] >= 20) riverParents[river] = toRiver; // current river is a tributary of min river
         }
       } else cells.r[toCell] = river; // assign the river to the downhill cell
 
       if (h[toCell] < 20) {
         // pour water to the water body
-        const haven = fromCell ? cells.haven[fromCell] : toCell;
-        riversData.push({river, cell: haven, x: p[toCell][0], y: p[toCell][1], flux: fromFlux});
-
         const waterBody = features[cells.f[toCell]];
         if (waterBody.type === "lake") {
           if (!waterBody.river || fromFlux > waterBody.enteringFlux) {
@@ -128,58 +131,69 @@
             waterBody.enteringFlux = fromFlux;
           }
           waterBody.flux = waterBody.flux + fromFlux;
-          waterBody.inlets ? waterBody.inlets.push(river) : (waterBody.inlets = [river]);
+          if (!waterBody.inlets) waterBody.inlets = [river];
+          else waterBody.inlets.push(river);
         }
       } else {
         // propagate flux and add next river segment
         cells.fl[toCell] += fromFlux;
-        riversData.push({river, cell: toCell, x: p[toCell][0], y: p[toCell][1], flux: fromFlux});
       }
+
+      addCellToRiver(toCell, river);
     }
 
     function defineRivers() {
-      cells.r = new Uint16Array(cells.i.length); // re-initiate rivers array
-      pack.rivers = []; // rivers data
-      const riverPaths = [];
+      // re-initialize rivers and confluence arrays
+      cells.r = new Uint16Array(cells.i.length);
+      cells.conf = new Uint16Array(cells.i.length);
+      pack.rivers = [];
 
-      for (let r = 1; r <= riverNext; r++) {
-        const riverSegments = riversData.filter(d => d.river === r);
-        if (riverSegments.length < 3) continue;
+      for (const key in riversData) {
+        const riverCells = riversData[key];
+        if (riverCells.length < 3) continue; // exclude tiny rivers
 
-        for (const segment of riverSegments) {
-          const i = segment.cell;
-          if (cells.r[i]) continue;
-          if (cells.h[i] < 20) continue;
-          cells.r[i] = r;
+        const riverId = +key;
+        for (const cell of riverCells) {
+          if (cell < 0 || cells.h[cell] < 20) continue;
+
+          // mark real confluences and assign river to cells
+          if (cells.r[cell]) cells.conf[cell] = 1;
+          else cells.r[cell] = riverId;
         }
 
-        const source = riverSegments[0].cell;
-        const mouth = riverSegments[riverSegments.length - 2].cell;
+        const source = riverCells[0];
+        const mouth = riverCells[riverCells.length - 2];
+        const parent = riverParents[key] || 0;
 
-        const widthFactor = rn(0.8 + Math.random() * 0.4, 1); // river width modifier [.8, 1.2]
-        const sourceWidth = cells.h[source] >= 20 ? 0.1 : rn(Math.min(Math.max((cells.fl[source] / 500) ** 0.4, 0.5), 1.7), 2);
+        const widthFactor = !parent || parent === riverId ? 1.2 : 1;
+        const meanderedPoints = addMeandering(riverCells);
+        const discharge = cells.fl[mouth]; // m3 in second
+        const length = rn(getApproximateLength(meanderedPoints), 2);
+        const width = getWidth(getOffset(discharge, meanderedPoints.length, widthFactor, 0));
 
-        const riverMeandered = addMeandering(riverSegments, sourceWidth * 10, 0.5);
-        const [path, length, offset] = getPath(riverMeandered, widthFactor, sourceWidth);
-        riverPaths.push([path, r]);
-
-        const parent = riverSegments[0].parent || 0;
-        const width = rn(offset ** 2, 2); // mounth width in km
-        const discharge = last(riverSegments).flux; // in m3/s
-        pack.rivers.push({i: r, source, mouth, discharge, length, width, widthFactor, sourceWidth, parent});
+        pack.rivers.push({i: riverId, source, mouth, discharge, length, width, widthFactor, sourceWidth: 0, parent, cells: riverCells});
       }
+    }
 
-      // draw rivers
-      rivers.html(riverPaths.map(d => `<path id="river${d[1]}" d="${d[0]}"/>`).join(""));
+    function calculateConfluenceFlux() {
+      for (const i of cells.i) {
+        if (!cells.conf[i]) continue;
+
+        const sortedInflux = cells.c[i]
+          .filter(c => cells.r[c] && h[c] > h[i])
+          .map(c => cells.fl[c])
+          .sort((a, b) => b - a);
+        cells.conf[i] = sortedInflux.reduce((acc, flux, index) => (index ? acc + flux : acc), 0);
+      }
     }
   };
 
   // add distance to water value to land cells to make map less depressed
   const alterHeights = () => {
-    const cells = pack.cells;
-    return Array.from(cells.h).map((h, i) => {
-      if (h < 20 || cells.t[i] < 1) return h;
-      return h + cells.t[i] / 100 + d3.mean(cells.c[i].map(c => cells.t[c])) / 10000;
+    const {h, c, t} = pack.cells;
+    return Array.from(h).map((h, i) => {
+      if (h < 20 || t[i] < 1) return h;
+      return h + t[i] / 100 + d3.mean(c[i].map(c => t[c])) / 10000;
     });
   };
 
@@ -242,118 +256,132 @@
     depressions && WARN && console.warn(`Unresolved depressions: ${depressions}. Edit heightmap to fix`);
   };
 
-  // add more river points on 1/3 and 2/3 of length
-  const addMeandering = function (segments, width = 1, meandering = 0.5) {
-    const riverMeandered = []; // to store enhanced segments
+  // add points at 1/3 and 2/3 of a line between adjacents river cells
+  const addMeandering = function (riverCells, riverPoints = null, meandering = 0.5) {
+    const {fl, conf, h} = pack.cells;
+    const meandered = [];
+    const lastStep = riverCells.length - 1;
+    const points = getRiverPoints(riverCells, riverPoints);
+    let step = h[riverCells[0]] < 20 ? 1 : 10;
 
-    for (let s = 0; s < segments.length; s++, width++) {
-      const sX = segments[s].x,
-        sY = segments[s].y; // segment start coordinates
-      const c = pack.cells.conf[segments[s].cell] || 0; // if segment is river confluence
-      riverMeandered.push([sX, sY, c]);
+    let fluxPrev = 0;
+    const getFlux = (step, flux) => (step === lastStep ? fluxPrev : flux);
 
-      if (s + 1 === segments.length) break; // do not meander last segment
+    for (let i = 0; i <= lastStep; i++, step++) {
+      const cell = riverCells[i];
+      const isLastCell = i === lastStep;
 
-      const eX = segments[s + 1].x,
-        eY = segments[s + 1].y; // segment end coordinates
-      const angle = Math.atan2(eY - sY, eX - sX);
-      const sin = Math.sin(angle),
-        cos = Math.cos(angle);
+      const [x1, y1] = points[i];
+      const flux1 = getFlux(i, fl[cell]);
+      fluxPrev = flux1;
 
-      const meander = meandering + 1 / width + Math.random() * Math.max(meandering - width / 100, 0);
-      const dist2 = (eX - sX) ** 2 + (eY - sY) ** 2; // square distance between segment start and end
+      meandered.push([x1, y1, flux1]);
+      if (isLastCell) break;
 
-      if (width < 10 && (dist2 > 64 || (dist2 > 36 && segments.length < 6))) {
+      const nextCell = riverCells[i + 1];
+      const [x2, y2] = points[i + 1];
+
+      if (nextCell === -1) {
+        meandered.push([x2, y2, fluxPrev]);
+        break;
+      }
+
+      const dist2 = (x2 - x1) ** 2 + (y2 - y1) ** 2; // square distance between cells
+      if (dist2 <= 25 && riverCells.length >= 6) continue;
+
+      const flux2 = getFlux(i + 1, fl[nextCell]);
+      const keepInitialFlux = conf[nextCell] || flux1 === flux2;
+
+      const meander = meandering + 1 / step + Math.max(meandering - step / 100, 0);
+      const angle = Math.atan2(y2 - y1, x2 - x1);
+      const sinMeander = Math.sin(angle) * meander;
+      const cosMeander = Math.cos(angle) * meander;
+
+      if (step < 10 && (dist2 > 64 || (dist2 > 36 && riverCells.length < 5))) {
         // if dist2 is big or river is small add extra points at 1/3 and 2/3 of segment
-        const p1x = (sX * 2 + eX) / 3 + -sin * meander;
-        const p1y = (sY * 2 + eY) / 3 + cos * meander;
-        const p2x = (sX + eX * 2) / 3 + sin * meander;
-        const p2y = (sY + eY * 2) / 3 + cos * meander;
-        riverMeandered.push([p1x, p1y], [p2x, p2y]);
-      } else if (dist2 > 25 || segments.length < 6) {
+        const p1x = (x1 * 2 + x2) / 3 + -sinMeander;
+        const p1y = (y1 * 2 + y2) / 3 + cosMeander;
+        const p2x = (x1 + x2 * 2) / 3 + sinMeander / 2;
+        const p2y = (y1 + y2 * 2) / 3 - cosMeander / 2;
+        const [p1fl, p2fl] = keepInitialFlux ? [flux1, flux1] : [(flux1 * 2 + flux2) / 3, (flux1 + flux2 * 2) / 3];
+        meandered.push([p1x, p1y, p1fl], [p2x, p2y, p2fl]);
+      } else if (dist2 > 25 || riverCells.length < 6) {
         // if dist is medium or river is small add 1 extra middlepoint
-        const p1x = (sX + eX) / 2 + -sin * meander;
-        const p1y = (sY + eY) / 2 + cos * meander;
-        riverMeandered.push([p1x, p1y]);
+        const p1x = (x1 + x2) / 2 + -sinMeander;
+        const p1y = (y1 + y2) / 2 + cosMeander;
+        const p1fl = keepInitialFlux ? flux1 : (flux1 + flux2) / 2;
+        meandered.push([p1x, p1y, p1fl]);
       }
     }
 
-    return riverMeandered;
+    return meandered;
   };
 
-  const getPath = function (points, widthFactor = 1, sourceWidth = 0.1) {
-    let offset,
-      extraOffset = sourceWidth; // starting river width (to make river source visible)
-    const riverLength = points.reduce((s, v, i, p) => s + (i ? Math.hypot(v[0] - p[i - 1][0], v[1] - p[i - 1][1]) : 0), 0); // summ of segments length
-    const widening = 1000 + riverLength * 30;
-    const riverPointsLeft = [],
-      riverPointsRight = []; // store points on both sides to build a valid polygon
-    const last = points.length - 1;
-    const factor = riverLength / points.length;
+  const getRiverPoints = (riverCells, riverPoints) => {
+    const {p} = pack.cells;
+    return riverCells.map((cell, i) => {
+      if (riverPoints && riverPoints[i]) return riverPoints[i];
+      if (cell === -1) return getBorderPoint(riverCells[i - 1]);
+      return p[cell];
+    });
+  };
 
-    // first point
-    let x = points[0][0],
-      y = points[0][1],
-      c;
-    let angle = Math.atan2(y - points[1][1], x - points[1][0]);
-    let sin = Math.sin(angle),
-      cos = Math.cos(angle);
-    let xLeft = x + -sin * extraOffset,
-      yLeft = y + cos * extraOffset;
-    riverPointsLeft.push([xLeft, yLeft]);
-    let xRight = x + sin * extraOffset,
-      yRight = y + -cos * extraOffset;
-    riverPointsRight.unshift([xRight, yRight]);
+  const getBorderPoint = i => {
+    const [x, y] = pack.cells.p[i];
+    const min = Math.min(y, graphHeight - y, x, graphWidth - x);
+    if (min === y) return [x, 0];
+    else if (min === graphHeight - y) return [x, graphHeight];
+    else if (min === x) return [0, y];
+    return [graphWidth, y];
+  };
 
-    // middle points
-    for (let p = 1; p < last; p++) {
-      (x = points[p][0]), (y = points[p][1]), (c = points[p][2] || 0);
-      const xPrev = points[p - 1][0],
-        yPrev = points[p - 1][1];
-      const xNext = points[p + 1][0],
-        yNext = points[p + 1][1];
-      angle = Math.atan2(yPrev - yNext, xPrev - xNext);
-      (sin = Math.sin(angle)), (cos = Math.cos(angle));
-      offset = (Math.atan(Math.pow(p * factor, 2) / widening) / 2) * widthFactor + extraOffset;
-      const confOffset = Math.atan((c * 5) / widening);
-      extraOffset += confOffset;
-      (xLeft = x + -sin * offset), (yLeft = y + cos * (offset + confOffset));
-      riverPointsLeft.push([xLeft, yLeft]);
-      (xRight = x + sin * offset), (yRight = y + -cos * offset);
-      riverPointsRight.unshift([xRight, yRight]);
+  const FLUX_FACTOR = 500;
+  const MAX_FLUX_WIDTH = 2;
+  const LENGTH_FACTOR = 200;
+  const STEP_WIDTH = 1 / LENGTH_FACTOR;
+  const LENGTH_PROGRESSION = [1, 1, 2, 3, 5, 8, 13, 21, 34].map(n => n / LENGTH_FACTOR);
+  const MAX_PROGRESSION = last(LENGTH_PROGRESSION);
+
+  const getOffset = (flux, pointNumber, widthFactor = 1, startingWidth = 0) => {
+    const fluxWidth = Math.min(flux ** 0.9 / FLUX_FACTOR, MAX_FLUX_WIDTH);
+    const lengthWidth = pointNumber * STEP_WIDTH + (LENGTH_PROGRESSION[pointNumber] || MAX_PROGRESSION);
+    return widthFactor * (lengthWidth + fluxWidth) + startingWidth;
+  };
+
+  // build polygon from a list of points and calculated offset (width)
+  const getRiverPath = function (points, widthFactor = 1, startingWidth = 0) {
+    const riverPointsLeft = [];
+    const riverPointsRight = [];
+
+    for (let p = 0; p < points.length; p++) {
+      const [x0, y0] = points[p - 1] || points[p];
+      const [x1, y1, flux] = points[p];
+      const [x2, y2] = points[p + 1] || points[p];
+
+      const offset = getOffset(flux, p, widthFactor, startingWidth);
+      const angle = Math.atan2(y0 - y2, x0 - x2);
+      const sinOffset = Math.sin(angle) * offset;
+      const cosOffset = Math.cos(angle) * offset;
+
+      riverPointsLeft.push([x1 - sinOffset, y1 + cosOffset]);
+      riverPointsRight.push([x1 + sinOffset, y1 - cosOffset]);
     }
 
-    // end point
-    (x = points[last][0]), (y = points[last][1]), (c = points[last][2]);
-    if (c) extraOffset += Math.atan((c * 10) / widening); // add extra width on river confluence
-    angle = Math.atan2(points[last - 1][1] - y, points[last - 1][0] - x);
-    (sin = Math.sin(angle)), (cos = Math.cos(angle));
-    (xLeft = x + -sin * offset), (yLeft = y + cos * offset);
-    riverPointsLeft.push([xLeft, yLeft]);
-    (xRight = x + sin * offset), (yRight = y + -cos * offset);
-    riverPointsRight.unshift([xRight, yRight]);
-
-    // generate polygon path and return
-    lineGen.curve(d3.curveCatmullRom.alpha(0.1));
-    const right = lineGen(riverPointsRight);
+    const right = lineGen(riverPointsRight.reverse());
     let left = lineGen(riverPointsLeft);
     left = left.substring(left.indexOf("C"));
-    return [round(right + left, 2), rn(riverLength, 2), offset];
+
+    return round(right + left, 1);
   };
 
   const specify = function () {
     const rivers = pack.rivers;
     if (!rivers.length) return;
-    Math.random = aleaPRNG(seed);
-    const thresholdElement = Math.ceil(rivers.length * 0.15);
-    const smallLength = rivers.map(r => r.length || 0).sort((a, b) => a - b)[thresholdElement];
-    const smallType = {Creek: 9, River: 3, Brook: 3, Stream: 1}; // weighted small river types
 
-    for (const r of rivers) {
-      r.basin = getBasin(r.i);
-      r.name = getName(r.mouth);
-      const small = r.length < smallLength;
-      r.type = r.parent && !(r.i % 6) ? (small ? "Branch" : "Fork") : small ? rw(smallType) : "River";
+    for (const river of rivers) {
+      river.basin = getBasin(river.i);
+      river.name = getName(river.mouth);
+      river.type = getType(river);
     }
   };
 
@@ -361,6 +389,36 @@
     return Names.getCulture(pack.cells.culture[cell]);
   };
 
+  // weighted arrays of river type names
+  const riverTypes = {
+    main: {
+      big: {River: 1},
+      small: {Creek: 9, River: 3, Brook: 3, Stream: 1}
+    },
+    fork: {
+      big: {Fork: 1},
+      small: {Branch: 1}
+    }
+  };
+
+  let smallLength = null;
+  const getType = function ({i, length, parent}) {
+    if (smallLength === null) {
+      const threshold = Math.ceil(pack.rivers.length * 0.15);
+      smallLength = pack.rivers.map(r => r.length || 0).sort((a, b) => a - b)[threshold];
+    }
+
+    const isSmall = length < smallLength;
+    const isFork = each(3)(i) && parent && parent !== i;
+    return rw(riverTypes[isFork ? "fork" : "main"][isSmall ? "small" : "big"]);
+  };
+
+  const getApproximateLength = points => points.reduce((s, v, i, p) => s + (i ? Math.hypot(v[0] - p[i - 1][0], v[1] - p[i - 1][1]) : 0), 0);
+
+  // Real mouth width examples: Amazon 6000m, Volga 6000m, Dniepr 3000m, Mississippi 1300m, Themes 900m,
+  // Danube 800m, Daugava 600m, Neva 500m, Nile 450m, Don 400m, Wisla 300m, Pripyat 150m, Bug 140m, Muchavets 40m
+  const getWidth = offset => rn((offset / 1.5) ** 1.8, 2); // mouth width in km
+
   // remove river and all its tributaries
   const remove = function (id) {
     const cells = pack.cells;
@@ -381,5 +439,5 @@
     return getBasin(parent);
   };
 
-  return {generate, alterHeights, resolveDepressions, addMeandering, getPath, specify, getName, getBasin, remove};
-});
+  return {generate, alterHeights, resolveDepressions, addMeandering, getRiverPath, specify, getName, getType, getBasin, getWidth, getOffset, getApproximateLength, getRiverPoints, remove};
+})();
diff --git a/modules/routes-generator.js b/modules/routes-generator.js
index bd43ed36..e7a909cb 100644
--- a/modules/routes-generator.js
+++ b/modules/routes-generator.js
@@ -1,24 +1,20 @@
-(function (global, factory) {
-  typeof exports === "object" && typeof module !== "undefined" ? (module.exports = factory()) : typeof define === "function" && define.amd ? define(factory) : (global.Routes = factory());
-})(this, function () {
-  "use strict";
-
+window.Routes = (function () {
   const getRoads = function () {
     TIME && console.time("generateMainRoads");
     const cells = pack.cells;
     const burgs = pack.burgs.filter(b => b.i && !b.removed);
-    const capitals = burgs.filter(b => b.capital);
+    const capitals = burgs.filter(b => b.capital).sort((a, b) => a.population - b.population);
 
     if (capitals.length < 2) return []; // not enough capitals to build main roads
     const paths = []; // array to store path segments
 
     for (const b of capitals) {
-      const connect = capitals.filter(c => c.i > b.i && c.feature === b.feature);
-      if (!connect.length) continue;
-      const farthest = d3.scan(connect, (a, c) => (c.y - b.y) ** 2 + (c.x - b.x) ** 2 - ((a.y - b.y) ** 2 + (a.x - b.x) ** 2));
-      const [from, exit] = findLandPath(b.cell, connect[farthest].cell, null);
-      const segments = restorePath(b.cell, exit, "main", from);
-      segments.forEach(s => paths.push(s));
+      const connect = capitals.filter(c => c.feature === b.feature && c !== b);
+      for (const t of connect) {
+        const [from, exit] = findLandPath(b.cell, t.cell, true);
+        const segments = restorePath(b.cell, exit, "main", from);
+        segments.forEach(s => paths.push(s));
+      }
     }
 
     cells.i.forEach(i => (cells.s[i] += cells.road[i] / 2)); // add roads to suitability score
@@ -41,11 +37,12 @@
       isle.forEach(function (b, i) {
         let path = [];
         if (!i) {
-          // build trail from the first burg on island to the farthest one on the same island
+          // build trail from the first burg on island
+          // to the farthest one on the same island or the closest road
           const farthest = d3.scan(isle, (a, c) => (c.y - b.y) ** 2 + (c.x - b.x) ** 2 - ((a.y - b.y) ** 2 + (a.x - b.x) ** 2));
           const to = isle[farthest].cell;
           if (cells.road[to]) return;
-          const [from, exit] = findLandPath(b.cell, to, null);
+          const [from, exit] = findLandPath(b.cell, to, true);
           path = restorePath(b.cell, exit, "small", from);
         } else {
           // build trail from all other burgs to the closest road on the same island
@@ -176,6 +173,7 @@
         if (cells.h[c] < 20) continue; // ignore water cells
         const stateChangeCost = cells.state && cells.state[c] !== cells.state[n] ? 400 : 0; // trails tend to lay within the same state
         const habitability = biomesData.habitability[cells.biome[c]];
+        if (!habitability) continue; // avoid inhabitable cells (eg. lava, glacier)
         const habitedCost = habitability ? Math.max(100 - habitability, 0) : 400; // routes tend to lay within populated areas
         const heightChangeCost = Math.abs(cells.h[c] - cells.h[n]) * 10; // routes tend to avoid elevation changes
         const heightCost = cells.h[c] > 80 ? cells.h[c] : 0; // routes tend to avoid mountainous areas
@@ -198,7 +196,7 @@
     let segment = [],
       current = end,
       prev = end;
-    const score = type === "main" ? 5 : 1; // to incrade road score at cell
+    const score = type === "main" ? 5 : 1; // to increase road score at cell
 
     if (type === "ocean" || !cells.road[prev]) segment.push(end);
     if (!cells.road[prev]) cells.road[prev] = score;
@@ -268,4 +266,4 @@
     }
     return [from, exit, false];
   }
-});
+})();
diff --git a/modules/save.js b/modules/save.js
index efb88374..e5ddc1f5 100644
--- a/modules/save.js
+++ b/modules/save.js
@@ -74,7 +74,7 @@ async function saveJPEG() {
 async function saveTiles() {
   return new Promise(async (resolve, reject) => {
     // download schema
-    const urlSchema = await getMapURL('tiles', 'schema');
+    const urlSchema = await getMapURL('tiles', {debug: true});
     const zip = new JSZip();
 
     const canvas = document.createElement('canvas');
@@ -138,20 +138,26 @@ async function saveTiles() {
 }
 
 // parse map svg to object url
-async function getMapURL(type, subtype) {
+async function getMapURL(type, options = {}) {
+  const {debug = false, globe = false, noLabels = false, noWater = false} = options;
   const cloneEl = document.getElementById('map').cloneNode(true); // clone svg
   cloneEl.id = 'fantasyMap';
   document.body.appendChild(cloneEl);
   const clone = d3.select(cloneEl);
-  if (subtype !== 'schema') clone.select('#debug').remove();
+  if (!debug) clone.select('#debug').remove();
 
   const cloneDefs = cloneEl.getElementsByTagName('defs')[0];
   const svgDefs = document.getElementById('defElements');
 
   const isFirefox = navigator.userAgent.toLowerCase().indexOf('firefox') > -1;
   if (isFirefox && type === 'mesh') clone.select('#oceanPattern').remove();
-  if (subtype === 'globe') clone.select('#scaleBar').remove();
-  if (subtype === 'noWater') {
+  if (globe) clone.select('#scaleBar').remove();
+  if (noLabels) {
+    clone.select('#labels #states').remove();
+    clone.select('#labels #burgLabels').remove();
+    clone.select('#icons #burgIcons').remove();
+  }
+  if (noWater) {
     clone.select('#oceanBase').attr('opacity', 0);
     clone.select('#oceanPattern').attr('opacity', 0);
   }
@@ -275,8 +281,16 @@ async function getMapURL(type, subtype) {
     });
   }
 
-  const fontStyle = await GFontToDataURI(getFontsToLoad(clone)); // load non-standard fonts
-  if (fontStyle) clone.select('defs').append('style').text(fontStyle.join('\n')); // add font to style
+  // load non-standard fonts
+  const usedFonts = getFontsList(clone);
+  const webSafe = ['Georgia', 'Times+New+Roman', 'Comic+Sans+MS', 'Lucida+Sans+Unicode', 'Courier+New', 'Verdana', 'Arial', 'Impact'];
+  const fontsToLoad = usedFonts.filter((font) => !webSafe.includes(font));
+  if (fontsToLoad.length) {
+    const url = 'https://fonts.googleapis.com/css?family=' + fontsToLoad.join('|');
+    const fontStyle = await GFontToDataURI(url);
+    if (fontStyle) clone.select('defs').append('style').text(fontStyle.join('\n'));
+  }
+
   clone.remove();
 
   const serialized = `<?xml version="1.0" encoding="UTF-8" standalone="no"?>` + new XMLSerializer().serializeToString(cloneEl);
@@ -357,63 +371,6 @@ function inlineStyle(clone) {
   emptyG.remove();
 }
 
-// get non-standard fonts used for labels to fetch them from web
-function getFontsToLoad(clone) {
-  const webSafe = ['Georgia', 'Times+New+Roman', 'Comic+Sans+MS', 'Lucida+Sans+Unicode', 'Courier+New', 'Verdana', 'Arial', 'Impact']; // fonts to not fetch
-
-  const fontsInUse = new Set(); // to store fonts currently in use
-  clone.selectAll('#labels > g').each(function () {
-    if (!this.hasChildNodes()) return;
-    const font = this.dataset.font;
-    if (!font || webSafe.includes(font)) return;
-    fontsInUse.add(font);
-  });
-  const legendFont = legend.attr('data-font');
-  if (legend.node().hasChildNodes() && !webSafe.includes(legendFont)) fontsInUse.add(legendFont);
-  const fonts = [...fontsInUse];
-  return fonts.length ? 'https://fonts.googleapis.com/css?family=' + fonts.join('|') : null;
-}
-
-// code from Kaiido's answer https://stackoverflow.com/questions/42402584/how-to-use-google-fonts-in-canvas-when-drawing-dom-objects-in-svg
-function GFontToDataURI(url) {
-  if (!url) return Promise.resolve();
-  return fetch(url) // first fecth the embed stylesheet page
-    .then((resp) => resp.text()) // we only need the text of it
-    .then((text) => {
-      let s = document.createElement('style');
-      s.innerHTML = text;
-      document.head.appendChild(s);
-      const styleSheet = Array.prototype.filter.call(document.styleSheets, (sS) => sS.ownerNode === s)[0];
-
-      const FontRule = (rule) => {
-        const src = rule.style.getPropertyValue('src');
-        const url = src ? src.split('url(')[1].split(')')[0] : '';
-        return {rule, src, url: url.substring(url.length - 1, 1)};
-      };
-      const fontProms = [];
-
-      for (const r of styleSheet.cssRules) {
-        let fR = FontRule(r);
-        if (!fR.url) continue;
-
-        fontProms.push(
-          fetch(fR.url) // fetch the actual font-file (.woff)
-            .then((resp) => resp.blob())
-            .then((blob) => {
-              return new Promise((resolve) => {
-                let f = new FileReader();
-                f.onload = (e) => resolve(f.result);
-                f.readAsDataURL(blob);
-              });
-            })
-            .then((dataURL) => fR.rule.cssText.replace(fR.url, dataURL))
-        );
-      }
-      document.head.removeChild(s); // clean up
-      return Promise.all(fontProms); // wait for all this has been done
-    });
-}
-
 // prepare map data for saving
 function getMapData() {
   TIME && console.time('createMapDataBlob');
@@ -445,7 +402,9 @@ function getMapData() {
       precOutput.value,
       JSON.stringify(options),
       mapName.value,
-      +hideLabels.checked
+      +hideLabels.checked,
+      stylePreset.value,
+      +rescaleLabels.checked
     ].join('|');
     const coords = JSON.stringify(mapCoordinates);
     const biomes = [biomesData.color, biomesData.habitability, biomesData.name].join('|');
@@ -667,10 +626,7 @@ function getRiverPoints(node) {
 }
 
 async function quickSave() {
-  if (customization) {
-    tip('Map cannot be saved when edit mode is active, please exit the mode and retry', false, 'error');
-    return;
-  }
+  if (customization) return tip('Map cannot be saved when edit mode is active, please exit the mode and retry', false, 'error');
   const blob = await getMapData();
   if (blob) ldb.set('lastMap', blob); // auto-save map
   tip('Map is saved to browser memory. Please also save as .map file to secure progress', true, 'success', 2000);
diff --git a/modules/ui/3d.js b/modules/ui/3d.js
index e43f4879..b3fb4ce5 100644
--- a/modules/ui/3d.js
+++ b/modules/ui/3d.js
@@ -1,361 +1,582 @@
-(function (global, factory) {
-  typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
-  typeof define === 'function' && define.amd ? define(factory) :
-  (global.ThreeD = factory());
-}(this, (function () {'use strict';
+"use strict";
 
-// set default options
-const options = {scale: 50, lightness: .7, shadow: .5, sun: {x: 100, y: 600, z: 1000}, rotateMesh: 0, rotateGlobe: .5,
-  skyColor: "#9ecef5", waterColor: "#466eab", extendedWater: 0, resolution: 2};
+window.ThreeD = (function () {
+  // set default options
+  const options = {scale: 50, lightness: 0.7, shadow: 0.5, sun: {x: 100, y: 600, z: 1000}, rotateMesh: 0, rotateGlobe: 0.5, skyColor: "#9ecef5", waterColor: "#466eab", extendedWater: 0, labels3d: 0, resolution: 2};
 
-// set variables
-let Renderer, scene, camera, controls, animationFrame, material, texture,
-  geometry, mesh, ambientLight, spotLight, waterPlane, waterMaterial, waterMesh,
-  objexporter;
+  // set variables
+  let Renderer, scene, camera, controls, animationFrame, material, texture, geometry, mesh, ambientLight, spotLight, waterPlane, waterMaterial, waterMesh, raycaster;
 
-// initiate 3d scene
-const create = async function(canvas, type = "viewMesh") {
-  options.isOn = true;
-  options.isGlobe = type === "viewGlobe";
-  return options.isGlobe ? newGlobe(canvas) : newMesh(canvas);
-}
+  const drawCtx = document.createElement("canvas").getContext("2d");
+  const drawSVG = document.createElementNS("http://www.w3.org/2000/svg", "svg");
+  document.body.appendChild(drawSVG);
 
-// redraw 3d scene
-const redraw = function() {
-  scene.remove(mesh);
-  Renderer.setSize(Renderer.domElement.width, Renderer.domElement.height);
-  if (options.isGlobe) updateGlobeTexure();
-  else createMesh(graphWidth, graphHeight, grid.cellsX, grid.cellsY);
-  render();
-}
+  let labels = [];
+  let icons = [];
+  let lines = [];
 
-// update 3d texture
-const update = function() {
-  if (options.isGlobe) updateGlobeTexure(); else update3dTexture();
-}
+  // initiate 3d scene
+  const create = async function (canvas, type = "viewMesh") {
+    options.isOn = true;
+    options.isGlobe = type === "viewGlobe";
+    return options.isGlobe ? newGlobe(canvas) : newMesh(canvas);
+  };
 
-// try to clean the memory as much as possible
-const stop = function() {
-  cancelAnimationFrame(animationFrame);
-  texture.dispose();
-  geometry.dispose();
-  material.dispose();
-  if (waterPlane) waterPlane.dispose();
-  if (waterMaterial) waterMaterial.dispose();
+  // redraw 3d scene
+  const redraw = function () {
+    deleteLabels();
+    scene.remove(mesh);
+    Renderer.setSize(Renderer.domElement.width, Renderer.domElement.height);
+    if (options.isGlobe) updateGlobeTexure();
+    else createMesh(graphWidth, graphHeight, grid.cellsX, grid.cellsY);
+    render();
+  };
 
-  Renderer.renderLists.dispose(); // is it required?
-  Renderer.dispose();
-  scene.remove(mesh);
-  scene.remove(spotLight);
-  scene.remove(ambientLight);
-  scene.remove(waterMesh);
+  // update 3d texture
+  const update = function () {
+    if (options.isGlobe) updateGlobeTexure();
+    else update3dTexture();
+  };
 
-  // not sure it's required
-  Renderer = undefined;
-  scene = undefined;
-  controls = undefined;
-  camera = undefined;
-  material = undefined;
-  texture = undefined;
-  geometry = undefined;
-  mesh = undefined;
+  // try to clean the memory as much as possible
+  const stop = function () {
+    cancelAnimationFrame(animationFrame);
+    texture.dispose();
+    geometry.dispose();
+    material.dispose();
+    if (waterPlane) waterPlane.dispose();
+    if (waterMaterial) waterMaterial.dispose();
+    deleteLabels();
 
-  ThreeD.options.isOn = false;
-}
-
-const setScale = function(scale) {
-  options.scale = scale;
-  geometry.vertices.forEach((v, i) => v.z = getMeshHeight(i));
-  geometry.verticesNeedUpdate = true;
-  geometry.computeVertexNormals();
-  render();
-  geometry.verticesNeedUpdate = false;
-}
-
-const setLightness = function(intensity) {
-  options.lightness = intensity;
-  ambientLight.intensity = intensity;
-  render();
-}
-
-const setSun = function(x, y, z) {
-  options.sun = {x, y, z};
-  spotLight.position.set(x, y, z);
-  render();
-}
-
-const setRotation = function(speed) {
-  cancelAnimationFrame(animationFrame);
-  if (options.isGlobe) options.rotateGlobe = speed; else options.rotateMesh = speed;
-  controls.autoRotateSpeed = speed;
-  controls.autoRotate = Boolean(controls.autoRotateSpeed);
-  if (controls.autoRotate) animate();
-}
-
-const toggleSky = function() {
-  if (options.extendedWater) {
-    scene.background = null;
-    scene.fog = null;
+    Renderer.renderLists.dispose();
+    Renderer.dispose();
+    scene.remove(mesh);
+    scene.remove(spotLight);
+    scene.remove(ambientLight);
     scene.remove(waterMesh);
-  } else extendWater(graphWidth, graphHeight);
 
-  options.extendedWater = !options.extendedWater;
-  redraw();
-}
+    Renderer = undefined;
+    scene = undefined;
+    controls = undefined;
+    camera = undefined;
+    material = undefined;
+    texture = undefined;
+    geometry = undefined;
+    mesh = undefined;
 
-const setColors = function(sky, water) {
-  options.skyColor = sky;
-  scene.background = scene.fog.color = new THREE.Color(sky);
-  options.waterColor = water;
-  waterMaterial.color = new THREE.Color(water);
-  render();
-}
+    ThreeD.options.isOn = false;
+  };
 
-const setResolution = function(resolution) {
-  options.resolution = resolution;
-  update();
-}
+  const setScale = function (scale) {
+    options.scale = scale;
+    geometry.vertices.forEach((v, i) => (v.z = getMeshHeight(i)));
+    geometry.verticesNeedUpdate = true;
+    geometry.computeVertexNormals();
+    geometry.verticesNeedUpdate = false;
 
-// download screenshot
-const saveScreenshot = async function() {
-  const URL = Renderer.domElement.toDataURL("image/jpeg");
-  const link = document.createElement("a");
-  link.download = getFileName() + ".jpeg";
-  link.href = URL;
-  link.click();
-  tip(`Screenshot is saved. Open "Downloads" screen (CTRL + J) to check`, true, "success", 7000);
-  window.setTimeout(() => window.URL.revokeObjectURL(URL), 5000);
-}
+    redraw();
+  };
 
-const saveOBJ = async function() {
-  downloadFile(await getOBJ(), getFileName() + ".obj", "text/plain;charset=UTF-8");
-}
+  const setLightness = function (intensity) {
+    options.lightness = intensity;
+    ambientLight.intensity = intensity;
+    render();
+  };
 
-// start 3d view and heightmap edit preview
-async function newMesh(canvas) {
-  const loaded = await loadTHREE();
-  if (!loaded) {tip("Cannot load 3d library", false, "error", 4000); return false};
+  const setSun = function (x, y, z) {
+    options.sun = {x, y, z};
+    spotLight.position.set(x, y, z);
+    render();
+  };
 
-  scene = new THREE.Scene();
+  const setRotation = function (speed) {
+    if (options.isGlobe) options.rotateGlobe = speed;
+    else options.rotateMesh = speed;
+    controls.autoRotateSpeed = speed;
 
-  // light
-  ambientLight = new THREE.AmbientLight(0xcccccc, options.lightness);
-  scene.add(ambientLight);
-  spotLight = new THREE.SpotLight(0xcccccc, .8, 2000, .8, 0, 0);
-  spotLight.position.set(options.sun.x, options.sun.y, options.sun.z);
-  spotLight.castShadow = true;
-  scene.add(spotLight);
-  //scene.add(new THREE.SpotLightHelper(spotLight));
+    const startAnimation = !controls.autoRotate && Boolean(speed);
+    const endAnimation = controls.autoRotate && !Boolean(speed);
 
-  // Rendered
-  Renderer = new THREE.WebGLRenderer({canvas, antialias: true, preserveDrawingBuffer: true});
-  Renderer.setSize(canvas.width, canvas.height);
-  Renderer.shadowMap.enabled = true;
-  if (options.extendedWater) extendWater(graphWidth, graphHeight);
-  createMesh(graphWidth, graphHeight, grid.cellsX, grid.cellsY);
+    controls.autoRotate = Boolean(speed);
 
-  // camera
-  camera = new THREE.PerspectiveCamera(70, canvas.width / canvas.height, .1, 2000);
-  camera.position.set(0, rn(svgWidth/3.5), 500);
+    if (startAnimation) animate();
+    if (endAnimation) cancelAnimationFrame(animationFrame);
+  };
 
-  // controls
-  controls = await OrbitControls(camera, canvas);
-  controls.enableKeys = false;
-  controls.minDistance = 10;
-  controls.maxDistance = 1000;
-  controls.maxPolarAngle = Math.PI/2;
-  controls.autoRotate = Boolean(options.rotateMesh);
-  controls.autoRotateSpeed = options.rotateMesh;
-  if (controls.autoRotate) animate();
-  controls.addEventListener("change", render);
+  const toggleSky = function () {
+    if (options.extendedWater) {
+      scene.background = null;
+      scene.fog = null;
+      scene.remove(waterMesh);
+    } else extendWater(graphWidth, graphHeight);
 
-  return true;
-}
+    options.extendedWater = !options.extendedWater;
+    redraw();
+  };
 
-// create a mesh from pixel data
-async function createMesh(width, height, segmentsX, segmentsY) {
-  const url = await getMapURL("mesh", options.extendedWater ? "noWater" : null);
-  window.setTimeout(() => window.URL.revokeObjectURL(url), 3000);
-  if (texture) texture.dispose();
-  texture = new THREE.TextureLoader().load(url, render);
-  texture.needsUpdate = true;
+  const toggleLabels = function () {
+    options.labels3d = !options.labels3d;
 
-  if (material) material.dispose();
-  material = new THREE.MeshLambertMaterial();
-  material.map = texture;
-  material.transparent = true;
+    if (options.labels3d) {
+      createLabels().then(() => update());
+    } else {
+      deleteLabels();
+      update();
+    }
+  };
 
-  if (geometry) geometry.dispose();
-  geometry = new THREE.PlaneGeometry(width, height, segmentsX-1, segmentsY-1);
-  geometry.vertices.forEach((v, i) => v.z = getMeshHeight(i));
-  geometry.computeVertexNormals();
+  const setColors = function (sky, water) {
+    options.skyColor = sky;
+    scene.background = scene.fog.color = new THREE.Color(sky);
+    options.waterColor = water;
+    waterMaterial.color = new THREE.Color(water);
+    render();
+  };
 
-  if (mesh) scene.remove(mesh);
-  mesh = new THREE.Mesh(geometry, material);
-  mesh.rotation.x = -Math.PI/2;
-  mesh.castShadow = true;
-  mesh.receiveShadow = true;
-  scene.add(mesh);
-}
+  const setResolution = function (resolution) {
+    options.resolution = resolution;
+    update();
+  };
 
-function getMeshHeight(i) {
-  const h = grid.cells.h[i];
-  return h < 20 ? 0 : (h - 18) / 82 * options.scale;
-}
+  // download screenshot
+  const saveScreenshot = async function () {
+    const URL = Renderer.domElement.toDataURL("image/jpeg");
+    const link = document.createElement("a");
+    link.download = getFileName() + ".jpeg";
+    link.href = URL;
+    link.click();
+    tip(`Screenshot is saved. Open "Downloads" screen (CTRL + J) to check`, true, "success", 7000);
+    window.setTimeout(() => window.URL.revokeObjectURL(URL), 5000);
+  };
 
-function extendWater(width, height) {
-  scene.background = new THREE.Color(options.skyColor);
+  const saveOBJ = async function () {
+    downloadFile(await getOBJ(), getFileName() + ".obj", "text/plain;charset=UTF-8");
+  };
 
-  waterPlane = new THREE.PlaneGeometry(width * 10, height * 10, 1);
-  waterMaterial = new THREE.MeshBasicMaterial({color: options.waterColor});
-  scene.fog = new THREE.Fog(scene.background, 500, 3000);
+  // start 3d view and heightmap edit preview
+  async function newMesh(canvas) {
+    const loaded = await loadTHREE();
+    if (!loaded) {
+      tip("Cannot load 3d library", false, "error", 4000);
+      return false;
+    }
 
-  waterMesh = new THREE.Mesh(waterPlane, waterMaterial);
-  waterMesh.rotation.x = -Math.PI / 2;
-  waterMesh.position.y -= 3;
-  scene.add(waterMesh);
-}
+    scene = new THREE.Scene();
 
-async function update3dTexture() {
-  if (texture) texture.dispose();
-  const url = await getMapURL("mesh");
-  window.setTimeout(() => window.URL.revokeObjectURL(url), 3000);
-  texture = new THREE.TextureLoader().load(url, render);
-  material.map = texture;
-}
+    // light
+    ambientLight = new THREE.AmbientLight(0xcccccc, options.lightness);
+    scene.add(ambientLight);
+    spotLight = new THREE.SpotLight(0xcccccc, 0.8, 2000, 0.8, 0, 0);
+    spotLight.position.set(options.sun.x, options.sun.y, options.sun.z);
+    spotLight.castShadow = true;
+    scene.add(spotLight);
+    //scene.add(new THREE.SpotLightHelper(spotLight));
 
-async function newGlobe(canvas) {
-  const loaded = await loadTHREE();
-  if (!loaded) {tip("Cannot load 3d library", false, "error", 4000); return false};
+    // Rendered
+    Renderer = new THREE.WebGLRenderer({canvas, antialias: true, preserveDrawingBuffer: true});
+    Renderer.setSize(canvas.width, canvas.height);
+    Renderer.shadowMap.enabled = true;
+    if (options.extendedWater) extendWater(graphWidth, graphHeight);
+    createMesh(graphWidth, graphHeight, grid.cellsX, grid.cellsY);
 
-  // scene
-  scene = new THREE.Scene();
-  scene.background = new THREE.TextureLoader().load("https://i0.wp.com/azgaar.files.wordpress.com/2019/10/stars-1.png", render);
+    // camera
+    camera = new THREE.PerspectiveCamera(70, canvas.width / canvas.height, 0.1, 2000);
+    camera.position.set(0, rn(svgWidth / 3.5), 500);
 
-  // Renderer
-  Renderer = new THREE.WebGLRenderer({canvas, antialias: true, preserveDrawingBuffer: true});
-  Renderer.setSize(canvas.width, canvas.height);
+    // controls
+    controls = await OrbitControls(camera, canvas);
+    controls.enableKeys = false;
+    controls.minDistance = 10;
+    controls.maxDistance = 1000;
+    controls.maxPolarAngle = Math.PI / 2;
+    controls.autoRotate = Boolean(options.rotateMesh);
+    controls.autoRotateSpeed = options.rotateMesh;
+    if (controls.autoRotate) animate();
 
-  // material
-  if (material) material.dispose();
-  material = new THREE.MeshBasicMaterial();
-  updateGlobeTexure(true);
+    controls.addEventListener("change", render);
 
-  // camera
- camera = new THREE.PerspectiveCamera(45, canvas.width / canvas.height, 0.1, 1000).translateZ(5);
-
-  // controls
-  controls = await OrbitControls(camera, Renderer.domElement);
-  controls.enableKeys = false;
-  controls.minDistance = 1.8;
-  controls.maxDistance = 10;
-  controls.autoRotate = Boolean(options.rotateGlobe);
-  controls.autoRotateSpeed = options.rotateGlobe;
-  controls.addEventListener("change", render);
-
-  return true;
-}
-
-async function updateGlobeTexure(addMesh) {
-  const world = mapCoordinates.latT > 179; // define if map covers whole world
-
-  // texture size
-  const scale = options.resolution;
-  const height = 512 * scale;
-  const width = 1024 * scale;
-
-  // calculate map size and offset position
-  const mapHeight = rn(mapCoordinates.latT / 180 * height);
-  const mapWidth = world ? mapHeight * 2 : rn(graphWidth / graphHeight * mapHeight);
-  const dy = world ? 0 : (90 - mapCoordinates.latN) / 180 * height;
-  const dx = world ? 0 : mapWidth / 4;
-
-  // draw map on canvas
-  const ctx = document.createElement("canvas").getContext("2d");
-  ctx.canvas.width = width;
-  ctx.canvas.height = height;
-
-  // add cloud texture if map does not cover all the globe
-  if (!world) {
-    const img = new Image;
-    img.onload = function() {ctx.drawImage(img, 0, 0, width, height)};
-    img.src = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAIAAAACACAYAAADDPmHLAAAgAElEQVR4Xl2d669lV5Xd73XZrodtiPIhf3dLUT5F+dCJSCstpaNASFqdINGkH3TiThoCpMFAMAZssA3Gr7JdLt/M3xjzt/cujinuvefss/Z6zMeYY8619u0ffeXrd//sn3755qWH92/uv/DCzfPP37t58YXnb3i98PzzN88999z8vHfz8P58du/62b2b29vbm3vz+XPP3eb3T598fnM73/v86dP5fz7r+7y++OIu7Xxx1598L+/P3/O/m7l0vvdF3nsy3//8c9q4mXs+lz7dzUW898lnT25efvQgbTw3bdPXTz59cvPh409z38effJZ2+P2jTz69efJk2pm2ufaLL764+Wz6+Mmnn9085t9c+8HHj9Me/aGv9OPp9PX+i8/P1+bveeOVlx7evPTg/vTj+ZtXuHb69OLMFddw/48+/jT94p6fTR8ZN/dhvrjm0896z4x12qbNJ59/Pu8/yZzRBnOQMWVe5prb56YfT4/5py/0j7l4+OILeZ+5efjgxWnradrKPKbtp9v+52nr6Yybz55O/z6cvnIf5vjjGf/tV77+rbsXp8Evv/zo5oXpyIszSG7Ev+luJo6BPJob0VGEop8zqTNpzBivuQMDTEfpxAyMzsx40wYLyMTx9wvzs5Pd+/A9OoqQ8Ovd3XQ4bd7MPe9lAKwik1bBnImdBaAPXP/ZvM+Ecx3CwKQy2E7E07RLY/7+0eNPcs2HHz3ORLww46Mt+pexzdX35r27aY+5eTD/GPeXXn6YhY9Q7uJy//Z/BHfv1371PQSL9xEOhfqTz0YYpk8uHNfTHvN177l7s8ijVDO3/B0lWaGhrQcXRcz8zTUIFf1m/Aj5Oe4uPP1jbJ9FSEcJZr7oH3N1+7W/fPWODx8i4blBJYrX/Rk4Ddo5/uamdAwJRFPo/P0RjAjM3Azp532+xzXciA48nRs7wQgSg4lQMIC5FwtYQanWt73zc9vhOr5LGwrRFyMwaDqLynVo90exCExA788CMJH04+OxDFxDW/TTz+hLLBPzPv1gThgr4+eNRw8f3Hx5rAH3pq9Pdkx83oUeCxhL0/FXiRjbk/ydxdgFUkjRQgS6Qtdx8ZO5u7cKwu+1qihEx43VYmwVNJUp3Y7w8zZrg/WJhdn3EULm5cOPP4mC337z1e+PoNfkIfV0hgHR8GG+53cWJdp3jw6shqxk0UEGwPXHZM71CJLWQpPP3wjMMdFo9izE55mwsRbz9/2R8kxIhKzvP/l8fjKZM8m8Tz/jqmZkn84EMygWF43GtD8eLcskrGbSDguuNmIFGHeEACFBELa/LzIH86/WDpcwwrvKgTVAEZgP5girWWHu5B9ub/6gL2gn/Ysm70WYa4Sl/WU8zHmFnvZfZC3mvVqQWkk1HMGjP6yR68M1WRv7i+DP37UonUPeqPYjjKP90wc6ffs33/lhbBUXxr+MBUAC88VtSKl1MR9hLRCS+Y8JxBzHxESjavpijuYGLC5WpQLUgdCxByvJLDyD4rvxcXOdi8uC0G5NG1pcE0c/sVZejzah8TF10za/s9AOnM8z4esiFILgASYCwVrrQfsusLjA+XkwC6Pv5Sf+l37hFpjhWMAIRl0AM8EY+F3BZawIBOYYQeD9lx48qCWdxWf+GQe/xwXOPfk+a4Fy0XaVoviH8TLluG7dKFJP3/mMdhT8CO1cxX0x/xnfd370szvN7R/6dy74fICIk6800ih+kyFqgqopM9AxOfzOwvIZEyVYq48fa7ILWFNXl4EQCxQFnhkokziD5z06ziC4Lu5kBc1BZdFXaJl4zLyfOXksONdwXyaG6+qiahpj+aI9M4H3FgutNWRxmCvGzuQLUBGQgrfRuOlXfD1zMFYLgYo12rFzX+4R/z/9Y7KwiMypyoH/xyLHsi7Wiivbha/F6jxqqZ1r+i6Ij1WfNuICd5z0tQpQxbt97edvHhYAk8WbCIIgRtOTG9CbaCk+r7+jWV9gfneAtFFNj2JFm1mFq2Z0gQukEhXMzyLVuh0GIK7wfRatYLADEEDyXsFdzV6lvdYEgaFfWKH6XNpgcUBp7R+o3QgjvjpWpOY9CxuLVYv4wgDSADM0bk2/LsDxcu1ng0dcJIErP1mE+ucTtMXyblRBG1rKKMm6Xecpioq6r1AAABk3rwhEQPZYDzDKfMa88nfdxRlxef+47Z/96u07wzMa07/YETRHv6MvSug3LdI4GnX8jkRP707EX8cYIZjrA/gyeRvusPgJNSstsQZPMamGmAs2NzzEXKIdmNBqf01jhHC1SknnbzUcS4XJy4KvqxGgIjwuNu1HSNZCcI+GqTXJRjOYfkNi/awLjmapybStW/xiLalzTNvel7YQJCar7qc4jPsJnFkXhK4LzXwWUGJlAuYYHMK681wLVRyhEgWcrgXm/UdYtF+/+94dnU6ItkjVATs5CkUBIoi0/j3athOqf0VgGAyTmEGtAGiWuEeRLP2dqGMGzABA8fH/fDadq/+t5RD5o8X0Ib5zrleqQdIutr6WRSD21twxYPqGwNIG31eLiSL4Wy3lnsUQNbtRkAWCdO6VRw8PngBhRagT5u3iMzfgAnmJAtCJ03FdFxfAdY8nIsG1PBoepqHl4CnA2wJyFIR+sbD3X8QFCTZrpWL1FsdwH65jThlDrUj7rhtAEQpwB++NII8A/D62zpg/IrPSqd/l7ysJpNkV3FQLG+eWFKowYaIEUgF2Fw5BsxTXsGatpFJDHqJxJkJhatg1izRCwCwI8BQeFp7wjsUI1litiK8NJ1EM4di4Tjzi/RAiFlh3E/cX69MwksXQ9yuk6Z8oexdAs8t3wSHG5w3B6q60LuVORqgmvARMh+MYgdDaSLLRV4TKsFmr7FhjtXDfG6LGwqxFiRUIiKybBZQLEG/feOvduADjXReuE9nQqGCkfp0J0DLEAsyAwmgN+DNeRqLK1BXBBzPMQl/DPwGNPhCJp9P45HAIB96opDMA43kGJOnEvRAK+oR214oVkT/tKgdp04dghxEqQ0bBb11P3Z+hWr6/LlHLeGUlGUsWBSBGH5Y70b/Sx4bBN2HcHANtHoJAP2MRyyq+NLH9w9FyJiKgcLGU2KfIvu5XK8U9jpA0lmr6NG2xNmAAXiiiob3KjKAk9HxrXEAaxmTsIgRxru9jcQVm5+QwqQU0MWPQnOtfmA2JIhEowiB1m9AtwLCUMMJVM/t8wxwWd317sMO+6IeLF+1BvglvF4ccfg4sEFaw5lGNZ7CSUQGGsVgTgy/ncUQA078IyGppWLO4gmITBY9JTtsr4Jhp7nei8nIQjAnlAHxqomU1FVbGTj8aCVTJggsgiAB++G15mAXopY93HHMPw0ZDQC0XfTqo/QsoDNDmfr97/6O7an/j1zBaIlVMB1owEwIlqglVgvmM65E2eW0mCB8Eb27HSyHXV2YhmMz5W75BIIWpDqW7YZ+WyXg9IGj9bEz/hjPMvPSmDF2Ys3mfsehXAUylowGFxQe+WHTRNh1Vq9XiKAKTOWNDwMQo+mijpAh3Fr5xO0ImBR33Ag7YyOIJBNbMYVG7eZaCPLkI3CltEIFAwjX0Ky5BkMKgwszGQjeCkuGsEpdMktjSBTS/Mxjg9x8gABAETUDI5oWcCWfcqKlUZ1EtE8FiJVya/5icJGoWFCrBxvPw14ZT8W3z35X94nq5ctkzOsx9WTQxB2Yyrmn9pouOqVRrxQqxYhfELM3c+LxJGzQbnoPv02YncjEI41/XUk0rzayQBBTGYjL+M0ehZkoHh/QBW6x1oP9MPmOCsTRso1+l3GviMdEqDUFSlYocyElGaW0appYQKiiP4V/iqCFnMUQFiDGS3Ev/P/jocSxlowCN5hk6pKltwAkxXmYwhoBM0MfLwMUcTQeQ2qD8uY7FkwgKlz6dZjAsvABTlI4FYBBFsAVgCJ+oncly0kMgzQ3KEiKtXWBNdQRpesOCB4PMOHFZqDij1aoJ3Hg3GotALIbB1X00i5WxAvgWKHJPxg24df5qtjfEW8ERv9QpkJ1rdAE2kNkUICMYAYJQzoMN/DtZyYk+dKWHgMgLzHzST3AQ842VuLKyYS4h8BJu1uKjmLfvjQXQR7DYyTxFS5nYsxHNyuMJIyrRp3l5lk5N+9V4zRKsVn5HuitQhCBNP1fwotkApE16HPHzYpFqCmnQglGurwnv4gtMzagpWNdsGQJ5b/oAM3cyhhW2hnBYumdJKfpN9g5tzT3Wr7OUn4zmy3lcUXv1zzgfFq6xOsImLpKOlsABCMoLJCeAhk5f+B7rg4BAReNaX5q5o7MIdHDZKmkFrbw/1vHgRADVCyBJ+5tHiAD89vcf3qGl9FhNVzsaH9cNxAwudy6d2ht38jSTaiodbsYQ31q/j/SK9kkv8/mXJvyhvWYRK3ACO9oia0VH6ROxMuY6iHrRvoxffXWFo1rfVCl5fNpPWLl5BiyAQks/JZHEL1K5asooyaGtKAB9Na1Kkor0dhe2/YfllO9gjoi9rXFIdBOLVJRulCQ1jULjmxlwWcZyL8wBuInPsA4PJlpAoBWaRgNlaFkzcyPwDAJdLWiUb9Pct+/87v3UA4BmuVCkKqctDlC6MFuYPYgTKdMUN6yfO6nTWpEV0AOoNKu2LmIGxO9qQRZ10TsDMmPGwpgBjF9cLUwsjPAxoUsBN+Rsepa5xozzas6hmmBKVF5erWxOYvHAZaGCGcgbjHUKSE2UMgBvAbIKwH2Yx3IXnZ9ELliOGYNzFEoY8BdX2XxJ8i4rxM1DkOuo0L40aWgsZ4p2SKztHBolZG3o+/Iu9CtrsrURUbydD1nGRgFDumEBOhFLkWfFSsIY52cG5wVbFz+9ufRy0aWDBV1y5tKWXB9TtiBL8x1UOgtlhJDJyzUlbFj0gMsZXGPiLiJajivAxx0VREuw0EYTR6BhrEb9rdSywIjrFConDi3TpAt6aUuzzYLZH4FdFnaFvKa37Giim2lEJk7hkY7Wat5fypsx6a9P4qfjJcooS9haAax1rMDiKBnc0M80PP9i+qe/rEv4gPj9GTORznI+cSm4gF/+5rd3NN7ij/oTO0FDDFYgVrPbAofGtquxLFwo4ko9nZYUoknNFF9usqjpy6RWx1xaeiUWkdAxfDpTycS0oFdAwJkWTcy7wEyLEIC5LkU0rfWosJb0wVrQ1jVLR/8YR6OPMyxFq3EfRkPlChotZfGX+MkAg7pLyWLVuBYsUYBbKyMyL3G12Gv7kjmiNmDmKWniMdsoTMDcCAB4QKDrehmBmPRqKNpkkcyhhB/3iwV54613BgSWggx9CgAkVl0OXn8brVxtF8HKatWUFcSFZgynULPdNGkJEb7P5OlDJXqCepMfqH9EE0XbWB3bN2lUa7C5grQPUCtRhMSL/AWJsWixNo0quA/VPAqmoJd2zahpjqVucSXco9RyybFcM995nBRzBVtLqmVR+HRRZu+66F3kxPmrmbznvDEefH2TT5ahda2aQynFy2cHkbcRSDAKbhmwnEirIb7ha7gd5vynv/h1ogA+1Gfxs4Op3+KnoRh8e2NczF1NdbWpjFMA5UpczU19WzNt+PWGOVnruB2SHHDsDXl4WzPuJIm0afcgiTCfx4SfMW/8ca5rFvMM7yxybf1B+P+YzfppuQX73tR4F5Txod2a8pJCW/20ripWJXNRzTpj9Ao1nWLuTKY5v/2w9ygj27lhHm8TKpcmLn/f5JmuQcBbLNbCWuco8502S0zJJG4kGmXP/P/o9TfvLD6QYzaEc/GZKGvo5N0bi7e4gt/RVKSQaqEr6EAAghkWCKlZJT3wxQU3+MyrPxWdx8rg1+fz4Io1lS5UrAaRyLKCTGTMLWh9XVsiB6zbgir5AtOlLkLNZd2gWTTawN3RLvMh/ql76r2YfK2hbBzd0v1Za2gonazj3Esri8tEYLGChHnFMM/H1CNI1CJKDRM92b/yKdZiNvIQ7KZKecNPQCOCpfAcUQ8KRz2A/iAoctOHIUHw6esKDlZsJoiqH6SZRb1m2KxsSe48WIC0a3P1JSlIypyEk9Wvaoz31lyxFPyOcFWTa8Z4lbFEwlsz0OKPZwsvg3wzQXVH0fhlzPCnAWuEqEHRxQSCWd0T37lGACiC4LChbxNMkj24T/IEFtUYrlbwzXO0tCvauovG75JBMnZRJhQFADhziXAwxwJncweZE4RwrTF9UXkTli/tbhZQhYo7fP3NdxIFmPV7ebSxA+7k8qXHnzbNqiazmISDqS27pFhF9nznWldPWxApTobVLiZnwhcwQWvDTIvyN5pvmBW+HvO6oCqLue6oiwBIKxYQxFH8yWLwsuLZeLgT2ZwFgFGLxnwaYgUvkOuYf8TUxRqGkriFLixiyfj4LSZ8q6sVLHL28AMpaKGNxUkCb2sACCPJCobwmbVAKGQG5QzcF4FCICSsBS4tAHiFMu5z+4QFYN4oALEyS7x0+6u3f3dnSpEGIBcwHY0oCEOaRtXECYKUMoRCPiDAZxA6f2uy9K3G6s1SnRNsPkHNK1ddLnxhQhxxNp0sTtHfimydRO5RRq6VMnUfWLFW+JYvL/iyKEJrohUQf8hiOqHc/9NB8anzI+RjcgFa4SsqBPISdLw0Lui/uYbPqAtcX3OExPO+UVF8/jRS4SuWIvyjHYRJt+rGnSjnAMSSbKfGd510ZYSizS3UypeRNSEWsuztIYJM+boIDEAwo59DsuWa3YVyLXem4aZsW+OmORcMoW2mjVl0zBe+sAJw7ifgHhaLoC0MIAI4pWJMvH77cBML0tBMJk1qVLNMn4xMyvB1MgKaZhL19bwvQmedCqrG+gAApw2QvlR1iCNCrHU57vIx+mlCR59MeNxQUjBdUNuUuLUW3LNCt8UhMxY0nf7h93Wr3FuORTaVORNjhavZ8rNUBm20JLlkbYOM5O1vfvv7YACzaQWHDZWeKa7IYO92w0XLpfLCvy+qziAgLzaJI7pmEEYRahwdUNsbb5dD0E8ymU6K39Etca2RhP1QY8OobUhmCEqb3enT4hDdyjVCWOXM2NPWxvdaANk7rQpjxCpYCsa8lQouDjHEpF2tYMx0WERCsKZzdVe6HM09ph8BYLEx88kNXNjBWEn4ls2l4LaDycYiFxjfjslvqGjRCkqdCG9DxWR/f/f+h3EBIF2raRM/rklzjxoD4bpuvSrDpLbHdWyK07y6pp2O6kIKBq0JHKSbcLAxPBMsqlVbzCUIyGpSB5us08VF0G9TpaZWTb/iR62WUavrpyd23yIWcUdT4Z0srUhp75p3hBh35zzQrpFRKPQZF+YeDaRNLVmKXIjFIYvWihbc7saPaQdh6pavmmvKw/ic916eCCD1DFy3eMCcDe/hBlQu+mOa3oolBUuiywyrNQLJBmbz4vgoAA36X2TbunsRuiHQUfgB+Aq6rhktSbPmdb93AqMWQnQRziwi76AxvY469zH5mwE7wN/0B/OvdZEMOvjvAuD000k1GjgHTazf7V0nqi9/ng2Yl314rVCqoEVYpr/SrNYf1CU1wxdyK9rXTTFHRJDxjNAsTX7gmR3zkfdPKrlziKCV5Zt/s/iAwGzCWS6fMWr+GbMmHhxRkq0FNVqf8grNM5Sh3SLRWO3lY8gFYLrcTdOw7uyuO0sK+lqNiybwD0m3Q/6smarZK5lRZpFOqtkxiTPaaM0SMggC8W6sAO5nrQWDSj3bCo/boNA6fLN7GZhQ0X0wTVicap71CQgRmuFOIcbJmM6YHwBcRg8wHF5/w0feCwaacUdIEnItqzj3yJyAgcAYEcgtcZvrWkRT/87EJ3KZ95PlW9zi7xGAjaIe3kcAAICtNwh22hwAwudGHu6deohVSJSJ9wSW/W7DZdovQVQXe/vuex+kLPyjTz65VPy0s1oBJtmbTAFJB8QF8zr2ws3vpmEbt567iNU6g18mKLVy404AUoYptBeUixleLcw91vyJNyoEIOhWJ7lQCcE2Jm+k0Nx42camvCNMGyrF1C+Jo6nvovY6eXQRuLSw7yfUZByLBSwaSS3CjB9/LLcQ4LgxvzkOK5fVcsw9i4b2Rwi2gKXVwGcyiHi/GKAuVC7GaippYCwqysecsvCllsu4Ms6s0Wj+3e8/NN9dyWEGAtLgnzFj8977bKUe7fhw9tMXL5QAYVDsonWSGUzsx0wsWsQgiM0tvRYRc1EEb6qIWHDpTTlxQZjbpdUgrdPh55eoysItAEXA6DN9wDQfW7rWh0by9/5B9glzT7Ovee5EfRE/LMLnuwHMy+Sh7+FEcAMLxFIzCIFFiLhp8roRXWr7F1c17VGexbwR/xOrM5+1ZhVchLELWDOuNSgLW7whiAdPcC4CY2L96FOIqdQTPpex0C+UIAr7znvv3wXYber1Wt3KjbkJ77FQHw6pIhWMZHNTWSkmm6QFUqW5NrtnvC6jlguw0Ew6mjoDKFlzZtDURHkDBi+d6wLGjM777ugxaZSF3zwF1/J398nVzxoxNItXd5XxLPYxdC1mQPNaYMIrKB8hWAXgPeaO5FKBZTeZxNzDE8T8Y9nK1zPpbg/TcjU337CPeUAg+AkGwBIIjrlxw8FawLCIuJysRcFmMVZxHDc2+2gyqa7a3Uvjrt8cIsgJNNVpKGaDqaBZhAkbFkC3jZukKAfeYgw6KgFjNEDvkp4k3APtLounjzYu7eLWBckA9u/6dDQA0371zQyWdrPThagDILRSFi2b/prtZExMgtlJBMuUrxW96xka2UyfE2UQlk4XEEwmWAvEOLBwTCrVS/rXFrk2T6IQGPIhMNxLEArZw+JjLdH+ZEan3S+99CgLfs2a6sLEUQo4VrSFIJuj2MiMvqamISCzboO+WU6WbKA8ALSp0p8agEHIyfsvALyiX/nwll51N2vYprmRWcDEncvfdwNpGUbWpkLQtLEZMkmnbHVeAZMriPqtcFxj7JrkkkemXj1hxJo4aWEZS/sUcLrmsGHv+PQIVyOGFqtW49zXmETK+nzurQDFzS1jmj4hlEvQNNFVC9PTU9DWaqGkmPF/6F+SQnNvLUL28M33dAO02yip0ZoWVoV1nuRx5CoYB/9JKcey/ej1X4UJdCIsW2KdWHwKKPlSKEvuMK+PZ7CeQkEpePemNx0ZinIxwaHN84vkjaiegZrZM3wiweReQ75rLTtCU8BVjapG1PRlr19i6m6sDNhaDTWeD51NPzebKFnUiTtPD5FdjKYsFa0bcyz0wbi7Can6eSMAlMFQTEyQ+pU1y0YdzJ/gsia+CJ0x55CIeQ8+oBxB3UBCOat7IJ0mPDYUtY7B6ESAiuYbpha7dO+mVvH2u6+9HgGQBjaEYnIYgCxdLUPNJT7Osq0uoke2VCOQNN4TrYvIyy5W400Imar1fqdpLeC5pjvFJ1oIhUL2TithTI2Q4C6sCyQZE5+Y/jWNClbgZeGkC21EU7Oz5e8rLIlgtiKY/qHRMf0L/FSoWryiB7QfrkUttTiFuTj2HO7in9YAKhjrOsCQotCt24ibW2vTcK6Kyf832liOhvlewWtNQ625r6zpt7/7oxGGmidRLxdYxWuaU6kmq25VbfIFSBOmH61c0y4Yq8Wo+UubK4EBMqj1hlsCGYHLSRZ1Tz7N6Ftpo2nrJpxK1nRIxS7NF6A1Zh+b8bPgokIQgZsJkeSp+yk3z/35vbtsV1AAfZn4on0tpiEuXQj1ML/0dLIqD4tfEqxRRtF5Q12trXSvm2EDCpME6nE0VE6bzEo2dMdLn81+MgdyA93E0jmRDDNdTlY2WGevzxExBTakQ0sHM5NBrpAtKzUxYUs2CLqyzWkpTcuSaFjUGmBIh6ctiyESlqx55fP6eI9oKQBs3F9KVu2NFm1YRozN4GnbgymuppqBJ27eo94EtdW2giA6da0ViL8OE1p5iuZZpQQeIWJZxo1+EfpVqBuClbiyavg8b6iCUlxRn925ZT51V+X6G6fr/+knAvilOb0tKeE9U8H51C0LMKM8EbYzF4HwFv+cu7d6c+spZw7+6n//4whAaU1QK9qtdhmrGmNqvlOzF5dQNxGkuiizAKuaYPx65hgmqzYTZwVStHb+hSzZyCJmfxpgQsz/y85JdxqTy/AdtOZOgBtI0GaZtu7nKxtWTqLuCi3L5k+s4LyPRh0Vt/G5q6nRmPa3UVHdZqje+Y9dUUx2NI25YVyGjIDURBul2i0WNVpi0XMUXcBfM6XgAf6BA/g84fW0mwgm4V9JqGYpS16Zno4QZ/9gFUUQKGnEvXQht6/+4Cd3ItacGxdgVNOFiWoD5tbr05pt2z36aymMHtTgpB+R9kW6mv8c0YJvnnZbiVzTbP4hhSQIAIchrLaIQ0S+uoMmo9xBW7OORTLc0memDmDDNydKt2U6tqa6eXV+p/4eKcZC1f012uAa5snMHnS0Jr4nb9UVISxS30faexqRkaO9+vIWsVqmfZ5C1g0hsoRauKOsDaXJvyj+EcpKaDEGXazRUF0bG1lqjbJmr37/J8kG8oEAzJQpf4Na44M3+cGE4yrk+KO9EbmaaC72wEneZhCaYsJMs2Tck0HxbbSj7qQLysvypQDHaTP3zKiqhfHdi/h570DUcR01sd0AeRa4ih+aFm1j9F3rZaUOnxgqVqs4CYU9ALWSFsauLZ85KvET1xg3Ue2TL6i5Lw2bxM5yJc2PPBsNUARi8kYWkBJwbpD8wtzDY/RSCBMoVZyFYF4pdD5jjgN8Z0ym08VGmct/+OHPRgCWxgTNYh7XCsQysKj75aaAa/bxaT14oWFPTgVZqeR6j5szLWnH9MdxC/Nf49iaY0kPFqUFkgU8wQ9gkAViqfid6xtVFPRJAmUTqkAxVqigjsk++YBnN2JwjxJWZQyNiFxUPjcL2gigCbNggtUq/YO++MQPJMOwdg31TIHXylYI+V1g7PlDTYj1/WbyPEBy5my+x9xoiRPmrhI7R6n6wbXhLhIpFBA+w2Cybj/82S/voHnNyevbRY0OKFZgGjsA4C42nXZ7/CEAACAASURBVNNEulOIiWMAkhqYSbyiZp+ON7nUcq0CrtbnCSBDwABGp62mVOtyOuiGVRasgpLNmSN46TOWKGzb6cLUecYiyIwVWjOKPcD1KMgmiPhZuryHYDE34IDrIsjQ6Z5CcGHaN2430knOH0HYkM46AnFP6yr2qDpcxIxXDFBr2k2khrrJZGLKUdp11Y5PjsB5dLdzFbrzGAGgAZmsxouWPFeCPA1EM3weuVbwAXoux12sUB5gDysKi3ZaB66lY4aXmMYkkOb6DrQuoBPUfLYWwPDMe3JdJiWVMd0YmVLq+U/AKsA77rkWTdbQjFrDybozs6D8rjWAL7CIRFOvj0/UFPzR7JsZSdlJgCTaHrJm7oN7q4DWBVaYt/87F2KSANZpm7bkDCyNM7/vNYJp9xYw125Y4ftxsbtOHdeWhQfQzOJl1++82SQG7GA1LtvDhnUyDKsgFAym2heRm3+kgZlBUXpCwwWDSaHynWxYqMRqks2AsbCt4FkWkNRtEcb0qRObE0LWDTHgJp9Gc3N4NH6yrsH0axfU6uKydmk/3P5J8RodSE27NdtxfvyYgpmC5GKSVkXFv08/rTOgr6G5qWdk/ItrpLRF51oGmc9wACSCJp9BnxmnTCnzLKaQxOpYW+ARnGOUMnMYbDCvgvgSb4Le4q6+Qk3/v1/9JtlAETYLdT1syeICLIQIWRDRworznD1NZtivdKg3P+oKkkHrMXMhjg4f3uPXy3Z1Z5GVRrEA6/uDeiMMxt21Nk4G30sIF43Z3cEbKZTV3JKtDZkEeiaWDFdpv8ma3ofF4L4pgl303v0BrfiNy9v8gSFAs25nbUEtWq1Lij/21G8zc4tvD6qX+5itjO9eIHfNBib5FgB9Jse4RxnQJt+MZLgm+APcFQHdaI9k0Me74RE0zouFLPffNOZ7H3ycTFd8IdU221v4AEmVgI61HEQBboTgczeCGhezYHTSjGAPQ2jIk7Nx10IgJGiEO3Na3t36hFojs457WPVqHwDs4YOesgUOkQtnQwuLHPoWs7tA8kT8LfEWNAnyVBmEAMGUBCqDWgDsuf22acq27dXSdFNHk0v0i/4Vg3BoNGFsI5Ju8KiVMfpiwQS+VAlZdV1rd4bbJqdkYD3cm3UV2zSC2r2NP/jpL8IEmom77mFnpaUvsRJn0WGTKEyEu4euZEQ3f57nB7hfvgHcWRal3wzwm0lM+dMmPUruVGsw2fyMO7lIb7FKARPWQVN/5NTTbk1iw7Mav7q8llIHIG2fPFfgCjYNHa1p7P7G80xiJ1MQSPspRkWZ9t4JC4lq1sxb0CHnETMeYZQb2PMENkdznQTdanIVLCRjj2DumQJxzVsnsPNiaG0anf50Hsad/o/v/TizwiJgJjX/Xaia3IQ980sihZ1IzGGLRSrhEkHHQROLXh0U7WV3bXL1G/bl4Qsz+HDTPcDQPLU0L4Ns2y2G6CHVfZndkoplvz0TIRHE72im4NR0LD9l8RL7t5P5yTy4wFq6JrPKRWBB+J1+m/TiPTOULLphG4JlAQhtlrlsOVfHem70RF5Yl1qOPfUsuYnz5BQ+MXPINYbBWlL3DoRcg+yZexrtOBbZVCOf27/7P6+FCDKTVTZr9wWsHzFR0uQDdW7V5Ry1Rky+PldtKeDA3DVty/u0n9Qp3ALgY91N0W0RLtckCsCsLYDUJKtRrH7AT6IFz/vfypdMSkkkNFVevSFSF13WTkQPsLOCxx045swVvrJm3d0rF1KrtP7fHcZLZh2h32q8TGtwSWL4Ri6lfiW+qgyyda2zaL9lThu5NGFVXqRcihYAQQiptS6hTGHVpcKSuKYZwczJWAByAUmE7MJIHChFfIFooAu/R6hMQywMcTEpzoY7rbIR9ef0iRwKVXeA72OPYbT1cDkdTBIfFD2g5cuUFX1vAckMMuBukhtBtUvaiJytWfBeBUYNn3KayIaFAkZ4Cc/twSLpG+kDEUkiobkPC3mmeD+bR8x8MrUQU8OY8xSKc5hSlAHzWn9e4a9AN6GTugDIsw0D+Rzzzzi4d84+mr6Cgehv92I2uvC0TxWNsalICkt4gAhCE0zikILwglkFTcaX73Bg1u1f/O13IgAIiuRAZGbtbOLjNbcFdl1QKVIlVOnkWibCDZksqibWrWXZPLGIOBM2gzb+h+Z0YlooUi9XIFlpD0u4BIhEVLQVYd2JZjy0LfPmGBkPE2LOPs/vWW1uSVb34fNKxIJihLjCUpT3p40WYNTiQA9j7ULO0Nu1oJ4myiLK1BkVuZOaa02fWxDimGTzaJc+lB2s5ifiSi/P8xRqgStUtJFIZOshUAj2XPClgPx1g/PMoL+/YxLiowjBBCI7kdbledPcAHZt954bnmj2gkjnmlLAnSClsJWznLLV+N4UaxNH9dc9IaumVYtSDrsPcMjO4WmbuJ82zF9o6hh8CBCA14agQdeJHvqEDvP51ig6k/T95YcPMwcKmKAv2GjdyGLJCtxGE2dR62CIPfncw7JZdEPfhJjL6MnwBczNvwLgE+0nvFvQG22f75JPEeGj9cxnGMkI6pJwWEiEn9ATyxDXVwt1KPMq8e2//2/fvjOuT/oVnzQTED8RLeAmpQ3dGuX7XfzKoXGzO3DzwKX15XTA0mvCJkEcApJMGUTKFon0EIMeuWbbWdwNkSyPUpMEbPTBccgc1ue22scCkGzkpKRtVlFh0DfnHjOZV7BZGrjuL5XT83fGC7kyP03IQCEzdvvQ+57nJRWodfs4GODRbPowUUV7f+g6nGOGbpjX7fkjwHsyaWsv68vFNBa2SmwFfy33YG4F5UpoTC7gX3/tLxNHxW9i6qZxihFT/bJmp/4LMzaPWpt9AcSWMU/TOwFhs041lyJcJJtad0vOspNn3YgUKNgjj6Qj5NtQpoWlBUxMspRry8jqV1956UEmn364qymaDWu2DKL7/YhM3D3LOJksAB0CrCk1mwi/ICHFIkqLe75BMdICKgTc8G36ioUymcZC5/zA5S5aiNLvIjzU59edzRnMo8UJR/NZw7viCg6b6BmJcAUoooW74hmE1dwEwlLAbSldN/OKSUxIJTeDK4HI+uOvffN4apiJH0kHJtfJj8ZsfUAyWfjcRZhIUHfz9Oa8isCJbc8dv4BGF1SpRxCKjPcpGRvGMWHXPQZMSKtmlknLTp/m0+mGWnrilJpPPpTLkNnj3lK59sPJZ7xMuoUpCoAlc13gWiirhwNMN5TtvLRgo4td8qr1jWXtLDiJ0iyL11C6aF2N3+nNfIa8Snq+9DMLL8qPK4vy+jykc92C+7c4xG1hfi/C/8dfHQEI4mxRhhw6fxunRlP25kn2TCcbDm1p96JNRmAcy3eyYAKXuZ4Fi2T/gQAJGKEoEzvHAtRsG9PTlvF3qFSqWpaTuJZjNzVdokoAyuRQsVMmsiybQAtwJHGSzGSikE5gwBluaomjCNpGPWb3juzpWBWu189yrxMMQ0QN2ud0VOZgBlnw24od9/ix0FfOPxrNXK01KPZqVS9zXRdUK9azk8tV6GIVfMYKuH4mxU4kBKuLAHAHK0m5iJegRXMX0mcnks9D52YwXVT5+Gak9iTt+UwE2yRT/WfDFp9zV78Z8mQHdpRMIfmLI9wkaRxs5s2+MwnXNO4xcWEB92FR8eN7ZlEm89xJG1+Lxdh+BXzFLTYUbXvtqwmco7Y/lmbnYNlH+Q35jCzX/K9KM/OyP7WmLHyUZ9uhHwizeyc9wt/kF9eVw9gHZKFgWfpGCvn+Fu7Iw5x7NppUy73/5Z99IyCwSLSmu+FXSQUWJZUmQaFPs0cwYd28wuCxAnvDI9PEAu81LfhoBW6LQmpl8v0NWYzX+Yo162oW2u4Bx3EL4zOTHctE12wW+e8Dn3ZDaPmG81QOU7gIkBx7WM2Y9DG7myixZsEzfkr1NhTNgkTQqpUhuRJtuLex1T5N9vRgR8miRDLzPvdu+roFGzJ1VwYz5FfmrJhKKxr3NOP2PbeiKbyGn63lqBAISvkdoVTBEagIz7/4d3+eK4988WpBQjMmmKFvOMcXPONeEAggRLrFA4IYvldzxySVN7hmrnQlkhgPiL9zbaMPvp8YnvAw5qvki75Snyo1nczc+F3r/Nvv5jiYkBZxVtA90sVUqZPVVGuPpWGREgLvJJ51dJt3GAkQE6nV9K8HWpe2bhhWy1AdOR9f0zk/T0GJG9zoS6vLd3xCGtdrOTX9WcD0rzgnCrGhaUm0glWFMEq3Ltlq6tt//if/eZ4d3DgyWr9aho8NOl0NTloWHMDj19JwD4fsaxko4ttZKEkGd6GYKGJALJSUZ8DILpR17+CAlnSdsSwbI3AB1cZOZvtaEFU+odpenNDCjBBW6yND4hDC7SSby6fNlrht2nraTUHFTnjZ0w40v8Zalv2Tg0j17VwTSxUwOCeb77k+tYTFHY7XELtMZsveUjSCAqylaJ6lp7WdD+msz88ZwGp5TVHeZ+7jrgZvdF72qNh4n7K4YUtzKMbmWBAAOlDfSkXN/fxeHxhGOp1jgpTIDGYnwHRwzMumdUMtc7bf0rGat0okeelJPC2Ak6M/Chtyxz4ylRfxtc/SlWPQyiQiYAI3pjcXcVqe0s5EH4BA8QKTVHPuNvfzOcCMUWYu+fR5xeQS7kXbRgDmGvYQ1jE09CNyaBJoD8CGDSUMxH0gZBBJEc7y+f5r+Hyeysa1f8hedlHPcjgjGEk6+igGixtgrWbcHmnHWMsBZKEPgcn3/ugrX89h0cbzpiibGWuoYUmTpU5oXJhByIQUhi4Nii/FUuxB0pr+mEOLGtfMm7emzsAMoO9JIoUbn+8yOFktz73FKpi+tXACLXehWC0WLNvZZ4FayFlA6DmDvAcfwD14v4WsjqUcgMRPhHcW3UnUbci46c+xYO7nQ2AFlsyJrF4jrmKiI+Sb3vn8gORGNr5vWfpuxVtMw8L5QAgKdQy5udY2Pp+2ad9zHOMiV1iZB1Pnt//qP3wj2UAkDxCIatOQhyrojzS/LdA8H9IUWjfhVbWj5qim2E2btJHESuLggknr7bmlOYh+7zTvCGaInz3tynBRc13QeYZVpn0LmqqhEkDhCYjXl8ASQdf1LfpPH2uKkZ6kivezCMBqqnkFLotGrwvkS8mMblmap3tbH1HLVZOdRUQz10oYCTnPUtEVOAtjfXbRKQDyMTk8erGa0Zng2HqIRBikndfFxsL/2//yVykLZ3IFULJt0ooMzCPRmeSQEchK3Eb5g6DpTFYXxPp/BlrX0rw8YQ2mkc4GQUfC+9QxIwdNpSyadYJ5Wjf33AqctWaH4HGvImX9aZEuL/P+pnN5zwnLxs2xHvdfaD2eiyRmMVphcY2YWMea91qZmu4WsJhFTF/AKSGGuvJRMkI1MNRGX4y7D9aSYDqLaMO2LgmXKHGBYY/PrY8/6PO0WROfMDl32rqJdb0l+w7wdnP7p3/xN3csaOvYWzWDAHAzdseIGpuCLJWZwoj5W45fYeB25gSujJbxp3UFTrCTQjsmaJhgpd9DjrLoM9nXQ49wT7qu0LOAGhdvNUEgZfpZYTRcali6dX9aJrR0gWbi6W3LCl6tjIDTuTQ3wT1SaVwlj3XQLGdhNqQ8CmPWvVnMobDRvhlXAaspXbBLchOQcfP9znVZRgko8zoRsh2P3InWJqL4J3/+11Nxf1ai2MmGDkWpvJoM6f66HpvaUzhadcJ+tR63honXrMl78x4WQG08H0bVHbiWltGxnG41QLRSfJ6Hw/3BBMmWxUSfRZ8iWjGELoLp76nhM0FzPULcGLrgMRMAQCNBtIkeTXCjkF1CUPqCKAQP3FBiq0g7PH/moQCwjGqjlWuVcsz5dJ3+ZREDUMfysBdwzwWiX82d1IqKt3hDcBrTjsVMO+UxFG6u47s4ZcaJVW/9QauPrn2ONfuzb/zd9KshU+zXWgekRY07pH3u4p4AJZTv6BNDaogm1YBpG8m1xIsJ6LP5GnrxasFEtzWlXYRoF8hUMf3hAVBxGZvL1teJvrNcay2ie53vAlkWaUkfwNCR1Mn9zrOFjSTyzVXjAL0NOXdY+b7RTkPTkws5E0RlOytoJ/HVRTo3pJqsQcAVSmN+7tHH8p5ugfYtxevil9vgd1PPFvZ07N1wIztaSxH25ub2P37zf97VVPZUKU2wZVc53XrP0mNCZZAYhE/dCLiZSbA2wBIzEfSZGCoxwaLip6OR4IcN4wAngEzjYyAln5meFUtUAJblmmsiYEu6WHWTFOhFMzWtblWLtUlkgIT0//rIl9LXvLrzt3IQ3UCzSgx0AbffXOu5hRIyuFCtCff2eLYsZOag2lhTvUmiJY9UJIQAS8EacL+CdY+wK3iValfzz1C3WKxZzlrSnIU0965cr4J8dQSgXPl5irdSGAQcNaqP0dencpjJiLYtHbvIP49JXytim55xX+uwmzemGxnUJlqYjLB2y27pguib26W5KRQrzXt4NPcKwQFvsf3U9eSUkqBsz8Vxws7Tuw7Lt6qtBbDOQLhE3xCQLDb3iZAYz7ckzITMsXcR7VtASj/1/xWYmm8tpsUhf1gPwSJ6/Kusp8xjo4jG9xJsCe9mraS0i7NkWCvO1mQEHwACA1qYxGXfNCWpbJnPmsNn7Rb1hqvusW2YLXLOWhH2q2eAIZEahvGgw5jgEQABIZ9ZptyHMpaU0TzpQ4kaXtlDk+k+AzJjRnsmra4Fk7Sd9PKMB0bO842YbEglhKehZ9kxcYvhMBOaSGeFOtnGNdsydQlRl+TJXoNpx022LWk7cxHMW0DiAr4DDGd+5qzjpbpPK1biLQ/HOiKwc3u6rtMIIWTaXGlRDe8D6msB6oKKWXZjzs5z1vXr//3vczaDKBL1ddPBge7nF5kkTwmJ7ylIjgRSSOLxbDXPPsiwjGKF4nweHl9X691WzvfiS7fN+tWygvWrNWsSVPRbX6dZNR0bFwbXjoXY+ytAtOv+OS1cn1dY/HGWwXWTaQ9kOAVF/3nM2Qq827nyHaOkJWDcql7NL/PnIZING3ssfELClI+fRZ4qRbKpYK4FkLWE535M5liugwiOWZeJVEgDlBPGd6y3//Xb372jM6VuTw6+dXjn7h2zdGidqdci4MkWLoKWkQvaXTN3JDxY/P2HcBQE5bJMsr6zQKXn9OfY+XUz1iuaV2i1T08ab159j6Sb5lx8fXDaW+oZQY6mYfFiHvuKu9p+WLXU9+rqfOnDWQjk6jgMGssU+ryVVeZD+B5L6f7BDrfAWALsWjiSHUMXHIKZ10LXKjX3UUzQmozwGGCndSvulDabe4S7813W4ADR9O2br34/60VqsQi8cXiBSG/GPLWQ84wC3EFUmF3Jy0OZ82erfDwJSyRvThzzSLsSK80zgA8aIfhQyKZKNys4nXAZBHL2N1JPQiaAcR+SGEzT6hraPbDC3Msik5JK8W3djDl3MGY3FGM0Icl280c4BKKI/a5oXOTPjVjAVir1dyIgFzG3m/+0qJaQmQtpJVJBcn25OGvD8F3kJroqBMFwG+HwPhELuQm5mExtLM64gHErYBWBZg6JYhDUmrHIHlki+6bE0ggTFPA1N+bYWDqINAVkTSeM843Dzf2LLwqsimRrmhvaWCJl51Plsv7KRTyva6hTzRR4ncUloUbTz/L2CLQbTplkLY0Vu5hbrI0RjBZL8oXxK6jSwlbu5kCtiFndUnxurNb5xFHGYqk5k06/DElbMXQv+y5pQzLIglPuC8ZK8ofi2bhQeALOKOq+zEQKUOvzvgmnIH+Sc8nB9IyjgxTD/W34nb4jAAfxEI1vB+PfmMSdAE8La+hnLqDD5ztMdqnkovuAR5iq5bprTbZufc18NbqERQFLC0wa29aOlBuoVQrKX1SfyQywOU/Fiiugc5H4tuE9tQBXc27xhhFOXVTHYzSQUHYtExMt/as5Ku+wu5HnQi3QmeGrcNJfLZduwtR1sNC0o2uw3q81jZWwni7aeyGsHuBxzW9Y0ykzyBpwT9tvbqPKyovPszfQxmK6NnUo2aBA8IUPPp7z70JDNiIoPdxIARAFX2A1i3hCba8ZdgcLa9PzBErjXg6OBOjFa1bIEqrMf0ygrGStUxBjrtNalQM4F72m+KyoUfL5jhNe09yFVyC4p5pvm9yPCMenqmrKIxzBGJ8fz0xsdrSxvf0W4ScfjyDt2CtoHU8s1loIt7cZmdgn+lWgWs7CndRY2zC1m2fR5SRhlixmowgEqW3s1va//od/zCz6zDk+FEkrKbyHmeSQBCauJEpJhVMDSmHGfG/YWGXsotfcd7HpuIkQPjde57p7WyrFYsUy7feToUzOvRra8/LOrWq6kx43Vx8dM85iL0DUvMeHRwZLivBdq40Am4Lf04qcJWdNCVvttFwIlmmth1vdS041PWvq1fpAKd5YvwWN3Cv1B9N4/Pf2qzV/Teg4twd4nfdN/mTuI0S1fiHTNgN7Rkq1NG6OpT+3f8tJoTOhfAAGyPEjAUo9hp3fc3zMmkU6kvq79ZtggJ6oWZeRNOsIRwiildZg7Z2kpJfpJQNEgi8om4EiDNYfaGF0SZnQje97bYGmodsxQeu+euJJ71Xk34czxufz+DcEOxm71j76nL4mVFqpYx1fKqNTA1HNE0iK5BGuPui55l6TD32dE0nX5LL38MjIRYM798lZhFc4H2pBv3nPI2bLk3SzqNZQrU6N/7pjaxBCkW+hbYW/aXIEQDwUF2Bci0Z48LPaw0BlxVqkuMfG7O6UCA6SNP8Vkbb+L1z2Lnri2PlbUiIh4GpqzHjF9jDDBx+/7xNeuYiGeCWEzt2y7g/QtDfFvGlrBGDrCWNKYyE887+TToHJAyYrC3CGrAm3iOkhhTC9W98Y17PcRHiFmScSXnlIBkKKxbpsd2ecHgSZEHCp9+ORugFy+xTTnZOrG2b8Cb/j4s7nHLkeWgLnvQWpG3JeMF2Eikhiw+IcFBmTtmSJ2koJleaZhrgBj0RhMeUBzkUsIufv6/Yxbnb10dUoTF21sp+e29AgfHo0bMmYkCJU/64AJLpA68dNmBmLpSFUpf+A07VOTqzhqkfOchGLr8soLtjzdjJRzEBmYbXs3P9X7sJDnZotdPE1u3nQ81jE1AdO2/XBVRLuFTCLeV4QKyao72+BbQ+fLr7yUOq8jwKu9vbhlbWmWnCrrlIPiaDPZ9cQXGazQLXh4O33fvxGHh0bHn7ryA17BFBStKkKprp2Fy2DnoH1FLFahlN7K2kFL+1oIVs1XaKJv/VJDbM6WZHUncBzMc6ngz2/5+B2cn0sfMXqeERNVGBp0Fihaj0FGprA+PxN/gigIgLzXa7pc4nOXVAV2/lv+RFrJ6z2QYtbytbjXU2Ete2GYC3+OPdMIEiSOgoE7ssdybrJrse5Xe1KGF2V2MwhfS1xFlNwuN6QYal6HrfxkzkjSK2xuNI4XjJDsMd1H1JcuQ1jYxJ/LjV5ZPcwdzPg5sWbRCqhVM3i1YqhftZF4xG0LaQoAdQsGQskaeJOIz6HNkW4aF8XFlS8k+mYgmuwWolYLhnAFbAQL9QdLCdBW/pX+lYf3zDPyIP7HEfP75jKAlazEQCewcxg6KeYStzAeLFgxRr77GLCWcw7JBnKtOye46Bfujexjqye4WXCuumPnL9JIRVY6p17vzR7ExHl29d+/uZYgA4OzYl8ozXhAIqS0RwWBIkU/Ilay5u3fr0mZo9v346ooWfFTjFFKdUCSjX+uCYaWFKFSmOxSdPImNhue85+PgAfoWL8+nLwC/yIbHpse81kgFxi6N7TUKnur6BV5q2haC2WCw5wDLHIv/SxuQn5CcAkAguAzClgmPzFAlbu0Fc3Z9AHn32QOZ/Par57/F6JJustyt1fK6Bzgvgm5XSdCEUUMeFlY/5TcLZWE4yyQn/74zfeihLif6h0aejVAQraLDbwmUKdJI8pKRvlhpGCkVa6nBs5lk5lMeZa2s4OpP2eWsBkKs2d3AKrcgU9Vydoexk0rveQStqUu+9CN96NH537olHh5/c6eoHW5nvrK/kwViTC++zefKnxCM18h36kTmL9enx8FrTWJCd5zU+SQLTZI2irWLE6sRb7ZFPmGnezRR2e05TNLJnLRlXBX4MP5Px78NSG1Vt3GGHfOQ6htZbX8LkCvULLd3/2q7eDATwDIEUDO3hBD9qgKeLbMk5OMJPrw5VjDTYmjZ8Tqe+Cmn9nEvlcra2p74Lw8jO3UVULexSNJ4Q0etgq5LUCCoFnGB7ubdrMGL0+CG7r/INlun3biERXwAK4xQuzT9imwEpSXUvpWRwslGRQLVbP/2kSrE/8jIVbAVCZwg8s+DUE5m8ETVcnyjf8NEQOc3shsPqsxzJ/tW7lTFAAZrl1A7OyPD7egsyDJpzv1F/UH9Kw7iGhyZISRnKYRnAAVsDiktKaxQHu4LEszHj3ZO1GQ7K7pnvuWOxYiEhwK2tbFNKDJK8MG9ce1mfv6TN/bd9t09GOtW66vZ572NoFxuP5Ar3OeH/3Sa6AZrIbAgTQIpCGVsww3H+OgEFDEQiKaxfgZk5XKBACdyE1fXymdxtteUr5eYg11ydCC/htVHFgFhqIoDdLSI4hdDMWB2Wbe6cuYT7TDd2+/uY7cwlFhku7Lqgx0SA4qiZ1wPpU96R1LlpEoa+tqbSM+tRqRL/vd8BFsgVvYgEWw3wC36QCpwcz1adKDV/5hwK2Pe52SRuZMYmW5PUxe/OfflGtlzA6snvE0dwbN5E+WnF0Puc3wJBJnX4xgFTn4N7W78vG8XfKzNb0shjRPjQSwBwreUYXeSz9tEtfeso51xYzhTJeF5S5EWRjtQOIqzTdOFIcd+ZRml4PQUSfEfJf/PrdeW5g6+dDOzKALSDkRh66xGf6fkGXZIvMHgNKNhGAsRPGYPP8gY3hLflmHwGWhEm0hLnlZZqqfbTpdIj3csDyaq+LIvhiZrFYnnVUwToFIpTv5i5S9xBNeXYjOV/TnAAAGcpJREFUqg+gjBaumQ/jt9ZBv52+xKR3AmMFdqz8aZxvGJhI5nKYg6Euc2zN5HUrWiqhdt5pL9T7Lm6iqtz3PF3NnU7yAQp03BPWetdDF9r6wDraVBS/MQJgeAAIrBHJPRYVNyOYzsTP1qyH3Qsrtbt5p6MKghPupJXtk1jpBF8zV7oLEy/eq9raZw/EzCEMWKGN2xWYRCTbp2M7FxKwfYpwjABHo2DTdkAKkBbMBAvjELVzT0rKq+W1CA1Puz3dSIIPeT8Tvdqex79taMYtu7F0tX8aVnA8AJp+qlwBrJm3/iuT2nSy8T9/mwrGUgh07attlK1tZbYKyPSEI3jr3ffy+HjKjIIFNrdsDJ/F2veY0BYhnOcK1h+XZ+ef2S3905F6XJQsDazPc2AIV+vXm750nx+/X3fdKgg+ZeRICc8Ee1ZOSRl3MJ+nhiWNugki6hpoi5BNs9+Ey+7kXdDEe9l2tWAwAI7M4fzrCeUVbIGhO3l5/+E+7s38iY/AaXLoPDpHfiAuYd3xcVbzCpVPcaF/eSjGrIXMX7W/oW6rqss6NgqoghbYNz1cN7CnqAAC9Rs0kqPhiUU3flTL9ctF7WamGiqZCYsfXT9n4Wb8HWZrpViT3071NM98b02pqdlowqLXtL8hW1AvGhYzXtDWfpf7r+CuiZt+XgVNYbGmIRYH9xA7U2tWa1B/bNatfrahrCSUJ3xoCUJjTytF15texu2tr8d6nGf2tdyugte5YUzyLs4918hLxChPG5aPMXfR6k1y8RmP9e3ikmvodjXZwxwcBZZCeBLG97Pbd373fs4I4pWHIW2yg8nUdycKGISfxQrA2nx2Z+rYxHGaqjkoYRC77R6ZqJXGa24b/2clkeGQwmDoQ9+OoosZRIomwRag3fmJ1MNR8Ddm0JO1cqQNbm36WFDbWUQAWglct1JrUX4iJnXNNn9Xg85EVcmehnYt2zJC2ONug/ab88AahAKm3eXw1fAK22ltGiXU7doPNLzmu2czJOu65JKU+3nwU120ex1UILkF2ubwiiacagGSb5mJu0NykmjYOJiQL4BqAVP8/WoKHVST+EmHEgdffVpQcwfP5LqdK8ibgWcdTnTKiN3iJDpXYnURDKDhWjVRapQFE6By7H1BZDUWAJuQcAtXIueFBvklKe4dQxYNZnE1RdzDzyZxGj2wsDmvaK7rU77rRpo/OS1Z8wC1VrrGCDJ4JX1uWfpV+MvHFDBr4bi/UUMioRWo0vU9ONPnHxLJYcFlAhPtXHCHD60ybxGSaCbs7oM5+89nBtJJtIYYUrOa9CgJl7UUphIjsvNiX5tn+zkJWIvw4EGt51asnrFzgkKu+WCfuk3zah0DZMH1vyJyCRUWWWn3HGME9rBO686MVBTiJKG2T2KC0MKJp+vONJHYBJ4I9mAWUlOL8EH0sPCvjEbRf14KLtKtT4cPICfgU8Zq4jcqwnItte7YDL1tQ0Uxzs/5BVn4uhg+1wLQh0ZCPSrO3dwBpVsYcj1iN2uJUk/6NodE8SUmEu33BE0PYIxWJXbEtzS2jDRvaBckDDCimGN+p3EWrgi5mkv7JyFhAUrNXplD+mPNYFGvKJnf0/kdPL7U1GgxwJY7bTjbeLwUqtpw8BQMGrCVlEXdQTNzZ7wfawBzt8LCgrYaqdW6tB83ADFFdIIux/c2pyKqp91saY+lqdkNhtpoxPYFoUX8zQzqbmnbMFEAyvQbqh+YagXv6gJUNqyRhalZi3XFiXRG03NYNH+Q6aM6uKFSHwjhadoKAB3SZxoCOXkyeFzDe8bESVDgAxOGNFlRDS5zGA1alspJiAQLArEEmwfotZ1Qzb+1AwhwJ7rlZ6n6WWHhPYQ7IeNm+BynMX3OKVqwqeuxlo+fzFEqfhZ8IRjUKwSRLz6q8FjriPQvN7ATL6g22RaLtsRVhA4XmVC3+wuSTl76WyvDvEfIIzAV6CMamr8l6rTYFdZ9GhrRwipX3C4gMBIxjbSm7zyN2kOXec+JiVma/zh52owa3z8LLjoBBSw14ak3PExv3ZvRxgmGlsnaAVmC5b2t6EH641OL6NYN1MJkX2E+6yTyh8USfK/VM2se12ynfXxuopfG+zKNLGYtWYs/DPfk+rVuSWDVDOQ6K4pcAM895vut8dvEzuZdZAS3iT0ydgmy6ZvgTVY2QrYuUusTpZr3ehTOuRNZnqBM5pkvUJgmF/DblIRZnMiXBYR9QshJTsiAGXNi6sh9p6BjzSDXty5uzM6YSGrikFJr1rpoffLGGXefB1MbemGaBUjm4kMMYb4RkrnfSeP2WqOIoOHR9pyZg0taaxH3luv49hZhbr+5toAQ874nhs79FGR5gOKatluKtiEn7fUBGbWQouyT2exV9t1kFXPNfKFs1jcachtK19X44Mju+TdETsaVOQmgBAN1r8JR8xd3t+6UiGX63VRzybwIAFKbUCMosjtaXFC5ASXOJE183iJjt2ZpSnnfzR4i6wx+hauHShewFPS5XdrnDC0FuqES14otSot2AZl7E1nuYJJ46gHMG+fPhXylNHBjfbWT39ESOXUnryeT1tcXi7CwHVfH18W+8h0ewsDcaBUFfvrd8vlrpXYODQdNSnleobLV2oniroa4NfvMi0KDhT2err7uoZxAcUmA4/IxiZrmPVzm7du4AMK/lSAPaki2bP476Mks1Rnzx/ytj46fGs2Jb4rGeSq2k9RtTlgKBUx/ncKF1Zi4H/zetNFt42dGUrNZf19NCpGxgsV3ee/60Eu1QYCmdhpaeeAV44xQrMBRLWPhSejsBYlhN9f1mVXji7k2zyk+AaG4SsXxGUu1YKoDLrInijRHUECMABDe1XzXFfCifyacxDm2L+CLaiDwu/C1O81QRvEGF4U23tD49pe/+W0EgMH1SNjzpE6LCDW7MnLGzvwUmSP9dFZgqC+sb21ShXEfTyjdBdTMc/+As/WhugwmB79Mx/lQ9xSNosFp37CN/h35/21f4T4PYJKf6PfU1jJmxQIJP0nnJs7v076ktsU1apenqDTv0SiBPjB+THuqiJZ0aZ/drtaaARdegYlCLJPpvAesznfNn+RxPPNfLC7COfeV9k2Yu9qeOd/7STRxHdERwpBy9TfeemdAYEu5ou0rbdHYoOW6B58RwO85e29RfczScvhW6jB4awuy925zCdX6biox8dKHVBXY0dm6mGc3WMZMr3ZGaxfJcm+ENg9cZvHDtlGpU0aQe/GzEYXgrPWGJoI4t5/r+yDIsTgbruZUkl1U2gYI8jeT37Zq8XKc3vzHpkv+Y7xyESG71iJa3cu9DCUbVnpQZF2aNHv881oevmuhK9+hFEyWMRVTcx8EROUqW1jQR38z74vlivX2kTmzLpMOBgOw7Wl29oIFADaEUUH2jVsZrCjT9xBSpdeQT65cCWbhBGGGYz6hi0lkwVqzV7+oW6nGNBT13gcryUDwgWsS3buv9mMU1JYO2lr6fc7PCI9WSlRv7sNJl2+nj1bvMDfHHv9McEMx3nNOmEdjdsaDa8nZQghW7f4RtkVxtuhFwOa8GcbRbh+zU1wmwKYp2clYLIg2/HzWy1KWBaMb1jYC2mceIlzrvscCvJvZTHFmpKO7RliNIvLGjXLL10HE/ywXbrKEz1N3ngmoQKXdI7xsbM57mjRr+INGc4MmeXixSDJcJkkEZKlaxozPf4IiND4JoPluvsdTvmMqG346voR3+1Bn7pO+JGyk9qCkj1aDn8yENf/RoplErEe4/hXIfGHaACiGK5n3jdNZbIRdJlJ6V7ZTfoL7ekxOLBmLNuBVi5k6AsY3Y8lDOtZqioVcJ4XPKKV7On3oR0F3LO/rb76dMNB0pkmGmGGsQcKlZzdYSpI4OM2QgInZalq00umRsS6gRJImj84XmLQkTIE4Cz4qoIalMa0hSjzqpdJOP+k/ViEVTntMC+siV+8ppSVTSlP3s5JLkiw+29cQlBmX94gZBhvkRNDzvAHu032F5fJrjdpmWNSwljV1sRazmKWYK3hursmRdWuyJXgObID2r9BlHdYVudDMacLhGU/p3lqiWt6WjDci2SeT8Oxgz96XemUgEjSCikpYJYgDpS0qDIO34ZKkDfeVHYxCzxs5XWwf1hDNWs0OENsO1sxVEHgluiA8XcyR8wQZ2IK3hEf4P763IFFtZhJ7Zk9xQV1ET9G48ul/eBzO83P8vTQvglHANZO62EfLENC7NHDK1xfNWwltSCxHIppvhq8uj/dop5nJVu+Aj8zqcX9BLwtbS3puwBGYug2MhSeC8cwgXaHm37Xg3q1JGPV88x3qAS68+8abAsBqW6XXAkYG3vCjZlYpdnLjj9Z6XIWpz7OvC9DvudgeYSbNS9s9rcOa/oaQFqrEXVxQ7uE2ELYx5z4USgAaa7NVNoZ1+nF9r4SYGstJ5TKDZAEzcWvaKxx7Dg88wWYSw1jygMuE1uKkJoFirlcAmD9DWinzFNWu9Top6+hChMPNuzkrYP6zYsrwG0E1FDUE5rvWcyqUcR/7VNfbd9/74I6bUnh5Rf5Ki2nXmLcQIk2ZitjjMmbA2dW7rJtHo4nE5QC6W3ePgl2TV0ZuHwI9I2D3TlOY3LFmynx/eXTcVYso66bq23M0+gokffI0z+YD6oubbu1zC2uh+tSukxmsq3vpUZ/gaRTAdT1lZOsVF0sE9CY5tNvL50JT4LoBT1mjk8bmLBJRxcGyrqCQgb2i9eCytTwlllpmn6N46l83VXxW+UqqXXkSBkq71znN4ZGk8d/74KMUhGhCjT0NxVpcWHMR4mV+ssU5hRBw4AwsA6+VUAhYP+nV0I6EHlvAEYAWJFp/rw+OmcwJWucjZnQ7vJ+nZ3QUaW/noNdP23EXu00NF9CTT/Y84BU46w40n1etSIp1rseMMg44+JZPq73n1qviAT4TP1VB0OyAwPlpCOxcHien7XWye3VxRfvJVcxPx5iFJ4u4bgIh8vpC086/bGztRcF0dhKBE8Ag9Gm5g1LqFf7bufEdvpWXVTWCOVOXntnPRINk8Yt5UOISP73pSchIzPgTAfA5NmoibWcX7AqQPjJ7CkeQOAOH8Sk4+rOPplahIKwbOaSGJafcwmYlUARjro0gbFTA4BWemO59pKpuiXMN8xzhyWPAMSSBs5MX8BlT3m1gCKjgtRTx8Pa7Q5g5oR3Grv9m/lr72Ke0EsUwJvrG/HtaS5Yxlo09k63HwEo7J8eJbPRg2gCjWOjRyMhqJrBD+QsEJVnNjczixqGCUx+2z/ONBZgvc7H+k85ISnShOfiIg5srSQkbL6+UfOFS1vQkbbuarnTXLDWcaa1/O6xZrOZWgnnPx9ZJJacfAMCYxt2FHKBUS4U/rUadZ+s07VreX0wQtxbUXBchmeXzErIzCUHffXhZgx2b5d5W3QQbHZVC+wDpaVsQnJgqrvY8jja1ARu9SBdrtXxQhMKTqGsX73Cbq+/2gfHwe55puMAxIDZCxFa1nkUotgsPgDblVK7174Y+0p36tYZe9alKk8SHgmFGLsZpEXp9d5F9Y9yacWNbaWLDuLO0u6OT5szuXhIYCM8yZfq2a5xtkWufaFIa1VBWS3FFxsbk9Cl7+7KIU+mzPpa2Ze2qCPXhWoC4iDXVPvKuO4aKL7xXw7DudEKgmB/jfq0tfSjy93yAfconPMUqpgqZQ7mci+0D68H3ZSG1lvRRHkOly9FyhIExL6D2DK4aYW1cNHzDHW5csqjVPQLBq/bLDZhfcPGrrfvEjpksiZfsi99DIYr4GwqaqDFtLGnUn/VxRhAO8hpJ0A8fQsFAcXMsRnbfyjmsNhehF3tES8a9Ncw9Y3yUhIlL7L4nl/Je5mRBcU11d/xadh3BJO8/YzZz6PcOvLUg1QIW5iFHwy2lLQubjSSr1T2v+czahsJfy8SaOddxS7ibeYFJEOwm+rYO87Wfv3XnTla146rx8f875TGdSOgF7DFAXycdWQKCCuN+p8KV0GUllg6W2OnZNg6StsLLxzSWsw4TidBtxUzA5vyOMHTrVIs26X+TOt2hxPsMFE3JySXzhyePOWGMr0UUTRmzOIw/lbMT3WCGoXtbm1i//E9eeXTs9skxbGuNGgJu+nX64MRL5kgyySQKQHWLJYS2PC8HRGx+Ykkqx2SkUN5g6h62RK37FfsEsuAALPX0B9DONa0u6gZbXXx2B19pTzlrLpDsYNFd3FgJkiRrLWSxjlh63YO+u6RLY+j43VnI+rTiggjKslNxBfM3vpCJB8jlCHcWBySctgsMGVATWCWZjtei/kMoiauT7OkJZhXAhp0uqAdhqMFnW/v0j/Xbxt2JDlabuFbSi366aUNApnCLNYKX1pfXGnl+UgtSYtk2gdV9DuYCSmPL8oUTIUcw/xkRhdiJFetJ5jled14KtbuUj4MkENyfcD7AfMlTvEP4QGXuF2P+Y3E9W+fkuiUwNPulfRvHJ36dgeTmAV0bvjHIWAcPQ2h9fOL9rdlDqlPQuWff5e5r7jLhq/FBujuB7oiRBWMyuBHmtJXBZB276NY86GdD147WSIlbF1CwVwG+pmjRKJ6KLpUcs7ruw8SYUQbz55kL13mtBhabODe6GZA/faE+M/szSJiNsB9PBMOF7YHT5kmuwNL2xC4HfzN96Ylu5Fdab3j743EBNfn1ZXRS0NQtX01T5vdMaV+egUfBoqdY5yeLwoRC9a7GJYGxIEY8EYCY2LxmK1kv0rbzd4HbPqp1UbwchBNtkWYszfrM8N/bplodd7BEUxNDHTwT3zTruAbA3ro3rV01u3F/D3foyNF8QmDei4uZt00eJbu3wI45M1owa9qxblHm4gX7a1hLqNdH2Gzugy3im9qWBu8c11VkCx0KjFnHPGotl9GtYJSzYJ0JbRW+sLU/+Okv8txAB5u4F9PDYk5nTfEySfpgTSX1fjXvXUwR9zWsSup1haJEySY+wui10wnbKEkndNusVazJJkQMiwwXdy0y8bTv/oUerNS4OYIR4qrWJphjI4juu+8E8+qid+uWewZdQNrvQVJbUDnXvczzC3bHL99nHqJtG4LRP2Nt/XrB4Pnw7FidabvZvR4bE8A7feXprB1TMZK5Dy0I9wxQBiMk5Cs2iwID4oO33Mw7nyTUrhB8+eVHabsE0nzvez/+eZJB1PQHPeJnt8GwSCzSmjcWJUzfvN9ETbNcJo5auRKPctCecgTVjIZQDiiTlElrCbrbuzvAJXnmc17hFuZFpw1ZY7n22iR/1loY79OPZAd3EvWxjz8d4mWZxbBxCEnA4zCR43Ycm31Pv4N7lveYiWTDqrF09ixsVKSVaL/O7F8XpVYkeGh+0j5jKBY5AXIWfvqjgPb5wQXKmve4xLUmDWM7j3UjxRbRcNZuXaa/e89gl+++9nqSQXbmeNxJvnjGspoYGstu4fmJOcn5fAx2zZSxLoOFjLBosdvDZPCa8SvXvgdRzgJz8kXPvW9ZVcDSAWxaU+jA6uP78pg6N7TwnucVZm/cTl76vtXIWACKYK5tshIIWh5kvdFLwyiPe6uw4wIijJmDhoymlVlZD9sMsXVofcNA2uM+qX1c5SqX0QigGGWsk3xHAPJ5NnA2fc5N0g6/uU4b//Pd8DrhAiJux6EaDTsLoI1Qbv/+Bz/dM4J8BGypTokPO+mmDvfl1aScj4z1cELZPyZCdi2LOF3xoCT9qdIs+2fat0xi+n6YM0mibPyITzvPBmzYWE33gCXaNBegJhr6MC0eiGW1DYtJmy0bP5MrR4l7qoR79h8vtciUNa7DJ4YqnFfOXpegVfWcQTOsFmsU0RfZW8oVEIqArKtNSdlaJCMQPq/FaIEr/4yurPXQ8rb/+wyDb/2v/3tnSCdZoQ8h3Im/n3/G+6ZKuRbThxXQ5Aj66n+Wpt0wMOcDodFZ2frIUM1sZd6nWSO1onljfzEGi9Ki1YaCFmPyN4dY50x8/Odlb1zKn9GqmMQNFddsNtJ4cvP+hx9nwRPnr8bIZsb17djBRiSJvjQ+lHP5vUb81HDXHb4nodWHM5wHX2LOFaRUMq11oo/p7yof/U0YPO8hdNnZEzKphTZGYEQgKpR1jWVym0JGEVI3MeuRqqAFyUd01kfGVN1SRJgwockH4/0QRRshhCmc61sTYHxfXyMhwgJFCpG0jd8zQSvFkYB91fc9W4KezuLPLz6N9mXwzLpJTXMtE52EUcBRHwoteo6fX61qnnwOlgIHXDJvdEf/Sd9pq0fXNu/PRHez58NoqOFhhHndUeZx+2k0ESYU4mrNMu0SObltOzPPos+8upcxuGizp1wX94xVoj/x57W8hqdapWNfYHIe54HeiezmHj7KRswW4P/Vb76apcK0Amw4NDmHMYVM6ELDhB0U4jTUcqlKNaZPxGzI6JFzfM573T7deNpQTSm2DKok0LnPLZsWEKpghZZeWeQgKm/7HIzQxI/bwJnI5NYX/aOYLCp+NeHmoms1hA/VYPro9xqlPBfmL2zaZvFChsWP9iSzCn8tXvL/lx06ml+F1xpGz1E0LR7XOv3AQqA5VaateeCXzHuFsBZ7y9szCf0/5k8r2nk+j/FhPhVCLjepdvtv/tO37nxwMSYfC8Cg9W00zfsBMKBKIoHdDy/jZAjZTBtx7LM5fvcNWh8Q1LrIlbGliGFBEL+X0u2BVUzKuSu4k5zFCudezTBk8iBLIgrTz1olFp0J6jUtFXsCRRwqtUTVgaYXKHE9YAk398pLD7tDGTIlxI97INrHFG6G3GpGkxfvs/FDbr/lYY0EYuVIjEV7Gt2I2l08izsWDq0r6JmDwV+On80k4Ky1Ptl2vuBRs5/cyNZT9PeeIvb/Ac44T/YFP/OUAAAAAElFTkSuQmCC";
+    return true;
   }
 
-  // fill canvas segment with map texture
-  const img2 = new Image;
-  img2.onload = function() {
-    ctx.drawImage(img2, dx, dy, mapWidth, mapHeight);
+  function textureToSprite(texture, width, height) {
+    const map = new THREE.TextureLoader().load(texture);
+    map.anisotropy = Renderer.getMaxAnisotropy();
+    const material = new THREE.SpriteMaterial({map});
+
+    const sprite = new THREE.Sprite(material);
+    sprite.scale.set(width, height, 1);
+    sprite.renderOrder = 1;
+    return sprite;
+  }
+
+  async function createTextLabel({text, font, size, color, quality}) {
+    drawCtx.font = `${size * quality}px ${font}`;
+    drawCtx.canvas.width = drawCtx.measureText(text).width;
+    drawCtx.canvas.height = size * quality * 1.25; // 25% margin as text can overflow the font size
+    drawCtx.clearRect(0, 0, drawCtx.canvas.width, drawCtx.canvas.height);
+
+    drawCtx.font = `${size * quality}px ${font}`;
+    drawCtx.fillStyle = color;
+    drawCtx.fillText(text, 0, size * quality);
+
+    return textureToSprite(drawCtx.canvas.toDataURL(), drawCtx.canvas.width / quality, drawCtx.canvas.height / quality);
+  }
+
+  function get3dCoords(baseX, baseY) {
+    const x = baseX - graphWidth / 2;
+    const z = baseY - graphHeight / 2;
+
+    raycaster.ray.origin.x = x;
+    raycaster.ray.origin.z = z;
+    const y = raycaster.intersectObject(mesh)[0].point.y;
+    return [x, y, z];
+  }
+
+  async function createLabels() {
+    raycaster = new THREE.Raycaster();
+    raycaster.set(new THREE.Vector3(0, 1000, 0), new THREE.Vector3(0, -1, 0));
+
+    const states = viewbox.select("#labels #states");
+    const cities = burgLabels.select("#cities");
+    const towns = burgLabels.select("#towns");
+    const city_icons = burgIcons.select("#cities");
+    const town_icons = burgIcons.select("#towns");
+
+    const stateOptions = {
+      font: states.attr("font-family"),
+      size: +states.attr("data-size"),
+      color: states.attr("fill"),
+      elevation: 20,
+      quality: 20
+    };
+
+    const cityOptions = {
+      font: cities.attr("font-family"),
+      size: +cities.attr("data-size"),
+      color: cities.attr("fill"),
+      elevation: 10,
+      quality: 20,
+      iconSize: 1,
+      iconColor: "#666",
+      line: 10 - cities.attr("data-size") / 2
+    };
+
+    const townOptions = {
+      font: towns.attr("font-family"),
+      size: +towns.attr("data-size"),
+      color: towns.attr("fill"),
+      elevation: 5,
+      quality: 30,
+      iconSize: 0.5,
+      iconColor: "#666",
+      line: 5 - towns.attr("data-size") / 2
+    };
+
+    const city_icon_material = new THREE.MeshPhongMaterial({color: cityOptions.iconColor});
+    const town_icon_material = new THREE.MeshPhongMaterial({color: townOptions.iconColor});
+    const city_icon_geometry = new THREE.CylinderGeometry(cityOptions.iconSize * 2, cityOptions.iconSize * 2, cityOptions.iconSize, 16, 1);
+    const town_icon_geometry = new THREE.CylinderGeometry(townOptions.iconSize * 2, townOptions.iconSize * 2, townOptions.iconSize, 16, 1);
+    const line_material = new THREE.LineBasicMaterial({color: cityOptions.iconColor});
+
+    // burg labels
+    for (let i = 1; i < pack.burgs.length; i++) {
+      const burg = pack.burgs[i];
+      if (burg.removed) continue;
+
+      const isCity = burg.capital;
+      const [x, y, z] = get3dCoords(burg.x, burg.y);
+      const options = isCity ? cityOptions : townOptions;
+
+      if (layerIsOn("toggleLabels")) {
+        const burgSprite = await createTextLabel({text: burg.name, ...options});
+
+        burgSprite.position.set(x, y + options.elevation, z);
+        burgSprite.size = options.size;
+
+        labels.push(burgSprite);
+        scene.add(burgSprite);
+      }
+
+      // icons
+      if (layerIsOn("toggleIcons")) {
+        const geometry = isCity ? city_icon_geometry : town_icon_geometry;
+        const material = isCity ? city_icon_material : town_icon_material;
+        const iconMesh = new THREE.Mesh(geometry, material);
+        iconMesh.position.set(x, y, z);
+
+        icons.push(iconMesh);
+        scene.add(iconMesh);
+
+        const points = [new THREE.Vector3(x, y, z), new THREE.Vector3(x, y + options.line, z)];
+        const line_geometry = new THREE.BufferGeometry().setFromPoints(points);
+        const line = new THREE.Line(line_geometry, line_material);
+
+        lines.push(line);
+        scene.add(line);
+      }
+    }
+
+    // state labels
+    if (layerIsOn("toggleLabels")) {
+      for (let i = 1; i < pack.states.length; i++) {
+        const state = pack.states[i];
+        if (state.removed) continue;
+
+        const [x, y, z] = get3dCoords(state.pole[0], state.pole[1]);
+        const text = states.select("#stateLabel" + state.i)?.text() || state.name;
+        const stateSprite = await createTextLabel({text, ...stateOptions});
+
+        stateSprite.position.set(x, y + stateOptions.elevation, z);
+        stateSprite.size = stateOptions.size;
+
+        labels.push(stateSprite);
+        scene.add(stateSprite);
+      }
+    }
+
+    // apply visibility setting
+    doWorkOnRender();
+  }
+
+  function deleteLabels() {
+    raycaster = undefined;
+
+    for (const mesh of labels) {
+      scene.remove(mesh);
+      mesh.material.map.dispose();
+      mesh.material.dispose();
+      mesh.geometry.dispose();
+    }
+    labels = [];
+
+    for (const mesh of icons) {
+      scene.remove(mesh);
+      mesh.material.dispose();
+      mesh.geometry.dispose();
+    }
+    icons = [];
+
+    for (const line of lines) {
+      scene.remove(line);
+      line.material.dispose();
+      line.geometry.dispose();
+    }
+    lines = [];
+  }
+
+  // create a mesh from pixel data
+  async function createMesh(width, height, segmentsX, segmentsY) {
+    const mapOptions = {
+      noLabels: options.labels3d,
+      noWater: options.extendedWater
+    };
+    const url = await getMapURL("mesh", mapOptions);
+    window.setTimeout(() => window.URL.revokeObjectURL(url), 5000);
+
     if (texture) texture.dispose();
-    texture = new THREE.CanvasTexture(ctx.canvas, render);
+    texture = new THREE.TextureLoader().load(url, render);
+    texture.needsUpdate = true;
+
+    if (material) material.dispose();
+    material = new THREE.MeshLambertMaterial();
     material.map = texture;
-    if (addMesh) addGlobe3dMesh();
-  };
-  img2.src = await getMapURL("mesh", "globe");;
-}
+    material.transparent = true;
 
-async function getOBJ() {
-  objexporter = await OBJExporter();
+    if (geometry) geometry.dispose();
+    geometry = new THREE.PlaneGeometry(width, height, segmentsX - 1, segmentsY - 1);
+    geometry.vertices.forEach((v, i) => (v.z = getMeshHeight(i)));
+    geometry.computeVertexNormals();
 
-  const data = await objexporter.parse(mesh);
-  return data;
-}
+    if (mesh) scene.remove(mesh);
+    mesh = new THREE.Mesh(geometry, material);
+    mesh.rotation.x = -Math.PI / 2;
+    mesh.castShadow = true;
+    mesh.receiveShadow = true;
+    scene.add(mesh);
 
-function addGlobe3dMesh() {
-  geometry = new THREE.SphereBufferGeometry(1, 64, 64);
-  mesh = new THREE.Mesh(geometry, material);
-  scene.add(mesh);
-  if (controls.autoRotate) animate(); else render();
-}
+    if (options.labels3d) {
+      render();
+      await createLabels();
+    }
+  }
 
-// render 3d scene and camera, do only on controls change
-function render() {
-  Renderer.render(scene,camera);
-}
+  function getMeshHeight(i) {
+    const h = grid.cells.h[i];
+    return h < 20 ? 0 : ((h - 18) / 82) * options.scale;
+  }
 
-// animate 3d scene and camera
-function animate() {
-  animationFrame = requestAnimationFrame(animate);
-  controls.update();
-  Renderer.render(scene, camera);
-}
+  function extendWater(width, height) {
+    scene.background = new THREE.Color(options.skyColor);
 
-function loadTHREE() {
-  if (window.THREE) return Promise.resolve(true);
+    waterPlane = new THREE.PlaneGeometry(width * 10, height * 10, 1);
+    waterMaterial = new THREE.MeshBasicMaterial({color: options.waterColor});
+    scene.fog = new THREE.Fog(scene.background, 500, 3000);
 
-  return new Promise(resolve => {
-    const script = document.createElement('script');
-    script.src = "libs/three.min.js"
-    document.head.append(script);
-    script.onload = () => resolve(true);
-    script.onerror = () => resolve(false);
-  });
-}
+    waterMesh = new THREE.Mesh(waterPlane, waterMaterial);
+    waterMesh.rotation.x = -Math.PI / 2;
+    waterMesh.position.y -= 3;
+    scene.add(waterMesh);
+  }
 
-function OrbitControls(camera, domElement) {
-  if (THREE.OrbitControls) return new THREE.OrbitControls(camera, domElement);
+  async function update3dTexture() {
+    if (texture) texture.dispose();
+    const mapOptions = {
+      noLabels: options.labels3d,
+      noWater: options.extendedWater
+    };
+    const url = await getMapURL("mesh", mapOptions);
+    window.setTimeout(() => window.URL.revokeObjectURL(url), 4000);
+    texture = new THREE.TextureLoader().load(url, render);
+    material.map = texture;
+  }
 
-  return new Promise(resolve => {
-    const script = document.createElement('script');
-    script.src = "libs/orbitControls.min.js"
-    document.head.append(script);
-    script.onload = () => resolve(new THREE.OrbitControls(camera, domElement));
-    script.onerror = () => resolve(false);
-  });
-}
+  async function newGlobe(canvas) {
+    const loaded = await loadTHREE();
+    if (!loaded) {
+      tip("Cannot load 3d library", false, "error", 4000);
+      return false;
+    }
 
-function OBJExporter() {
-  if (THREE.OBJExporter) return new THREE.OBJExporter();
+    // scene
+    scene = new THREE.Scene();
+    scene.background = new THREE.TextureLoader().load("https://i0.wp.com/azgaar.files.wordpress.com/2019/10/stars-1.png", render);
 
-  return new Promise(resolve => {
-    const script = document.createElement('script');
-    script.src = "libs/objexporter.min.js"
-    document.head.append(script);
-    script.onload = () => resolve(new THREE.OBJExporter());
-    script.onerror = () => resolve(false);
-  });
-}
+    // Renderer
+    Renderer = new THREE.WebGLRenderer({canvas, antialias: true, preserveDrawingBuffer: true});
+    Renderer.setSize(canvas.width, canvas.height);
 
-return {create, redraw, update, stop, options, setScale, setLightness, setSun, setRotation, toggleSky, setResolution, setColors, saveScreenshot, saveOBJ};
+    // material
+    if (material) material.dispose();
+    material = new THREE.MeshBasicMaterial();
+    updateGlobeTexure(true);
 
-})));
+    // camera
+    camera = new THREE.PerspectiveCamera(45, canvas.width / canvas.height, 0.1, 1000).translateZ(5);
+
+    // controls
+    controls = await OrbitControls(camera, Renderer.domElement);
+    controls.enableKeys = false;
+    controls.minDistance = 1.8;
+    controls.maxDistance = 10;
+    controls.autoRotate = Boolean(options.rotateGlobe);
+    controls.autoRotateSpeed = options.rotateGlobe;
+    controls.addEventListener("change", render);
+
+    return true;
+  }
+
+  async function updateGlobeTexure(addMesh) {
+    const world = mapCoordinates.latT > 179; // define if map covers whole world
+
+    // texture size
+    const scale = options.resolution;
+    const height = 512 * scale;
+    const width = 1024 * scale;
+
+    // calculate map size and offset position
+    const mapHeight = rn((mapCoordinates.latT / 180) * height);
+    const mapWidth = world ? mapHeight * 2 : rn((graphWidth / graphHeight) * mapHeight);
+    const dy = world ? 0 : ((90 - mapCoordinates.latN) / 180) * height;
+    const dx = world ? 0 : mapWidth / 4;
+
+    // draw map on canvas
+    const ctx = document.createElement("canvas").getContext("2d");
+    ctx.canvas.width = width;
+    ctx.canvas.height = height;
+
+    // add cloud texture if map does not cover all the globe
+    if (!world) {
+      const img = new Image();
+      img.onload = function () {
+        ctx.drawImage(img, 0, 0, width, height);
+      };
+      img.src =
+        "data:image/png;base64,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";
+    }
+
+    // fill canvas segment with map texture
+    const img2 = new Image();
+    img2.onload = function () {
+      ctx.drawImage(img2, dx, dy, mapWidth, mapHeight);
+      if (texture) texture.dispose();
+      texture = new THREE.CanvasTexture(ctx.canvas, render);
+      material.map = texture;
+      if (addMesh) addGlobe3dMesh();
+    };
+    img2.src = await getMapURL("mesh", {globe: true});
+  }
+
+  async function getOBJ() {
+    const objexporter = await OBJExporter();
+    const data = await objexporter.parse(mesh);
+    return data;
+  }
+
+  function addGlobe3dMesh() {
+    geometry = new THREE.SphereBufferGeometry(1, 64, 64);
+    mesh = new THREE.Mesh(geometry, material);
+    scene.add(mesh);
+    if (controls.autoRotate) animate();
+    else render();
+  }
+
+  // render 3d scene and camera, do only on controls change
+  const renderThrottled = throttle(doWorkOnRender, 200);
+  function render() {
+    Renderer.render(scene, camera);
+    renderThrottled();
+  }
+
+  function doWorkOnRender() {
+    for (const [i, label] of labels.entries()) {
+      const dist = label.position.distanceTo(camera.position);
+      const isVisible = dist < 100 * label.size && dist > label.size * 6;
+      label.visible = isVisible;
+      if (lines[i]) lines[i].visible = isVisible;
+    }
+  }
+
+  // animate 3d scene and camera
+  function animate() {
+    animationFrame = requestAnimationFrame(animate);
+    controls.update();
+  }
+
+  function loadTHREE() {
+    if (window.THREE) return Promise.resolve(true);
+
+    return new Promise(resolve => {
+      const script = document.createElement("script");
+      script.src = "libs/three.min.js";
+      document.head.append(script);
+      script.onload = () => resolve(true);
+      script.onerror = () => resolve(false);
+    });
+  }
+
+  function OrbitControls(camera, domElement) {
+    if (THREE.OrbitControls) return new THREE.OrbitControls(camera, domElement);
+
+    return new Promise(resolve => {
+      const script = document.createElement("script");
+      script.src = "libs/orbitControls.min.js";
+      document.head.append(script);
+      script.onload = () => resolve(new THREE.OrbitControls(camera, domElement));
+      script.onerror = () => resolve(false);
+    });
+  }
+
+  function OBJExporter() {
+    if (THREE.OBJExporter) return new THREE.OBJExporter();
+
+    return new Promise(resolve => {
+      const script = document.createElement("script");
+      script.src = "libs/objexporter.min.js";
+      document.head.append(script);
+      script.onload = () => resolve(new THREE.OBJExporter());
+      script.onerror = () => resolve(false);
+    });
+  }
+
+  return {create, redraw, update, stop, options, setScale, setLightness, setSun, setRotation, toggleLabels, toggleSky, setResolution, setColors, saveScreenshot, saveOBJ};
+})();
diff --git a/modules/ui/editors.js b/modules/ui/editors.js
index ff211005..7785c0b6 100644
--- a/modules/ui/editors.js
+++ b/modules/ui/editors.js
@@ -14,14 +14,14 @@ function restoreDefaultEvents() {
 function clicked() {
   const el = d3.event.target;
   if (!el || !el.parentElement || !el.parentElement.parentElement) return;
-  const parent = el.parentElement,
-    grand = parent.parentElement,
-    great = grand.parentElement;
+  const parent = el.parentElement;
+  const grand = parent.parentElement;
+  const great = grand.parentElement;
   const p = d3.mouse(this);
   const i = findCell(p[0], p[1]);
 
   if (grand.id === 'emblems') editEmblem();
-  else if (parent.id === 'rivers') editRiver();
+  else if (parent.id === 'rivers') editRiver(el.id);
   else if (grand.id === 'routes') editRoute();
   else if (el.tagName === 'tspan' && grand.parentNode.parentNode.id === 'labels') editLabel();
   else if (grand.id === 'burgLabels') editBurg();
@@ -118,33 +118,6 @@ function applySorting(headers) {
     .forEach((line) => list.appendChild(line));
 }
 
-function confirmationDialog(options) {
-  const {
-    title = 'Confirm action',
-    message = 'Are you sure you want to continue? <br>The action cannot be reverted',
-    cancel = 'Cancel',
-    confirm = 'Continue',
-    onCancel = () => {},
-    onConfirm = () => {}
-  } = options;
-
-  alertMessage.innerHTML = message;
-  $('#alert').dialog({
-    resizable: false,
-    title,
-    buttons: {
-      [confirm]: function () {
-        onConfirm();
-        $(this).dialog('close');
-      },
-      [cancel]: function () {
-        onCancel();
-        $(this).dialog('close');
-      }
-    }
-  });
-}
-
 function addBurg(point) {
   const cells = pack.cells;
   const x = rn(point[0], 2),
@@ -405,15 +378,14 @@ function clearLegend() {
 }
 
 // draw color (fill) picker
-function createPicker(hatching) {
-  const COLORS_IN_ROW = 14;
+function createPicker() {
   const pos = () => tip('Drag to change the picker position');
   const cl = () => tip('Click to close the picker');
-  const closePicker = () => container.remove();
+  const closePicker = () => contaiter.style('display', 'none');
 
-  const container = d3.select('body').append('svg').attr('id', 'pickerContainer').attr('width', '100%').attr('height', '100%');
-  container.append('rect').attr('width', '100%').attr('height', '100%').attr('opacity', 0).on('mousemove', cl).on('click', closePicker);
-  const picker = container
+  const contaiter = d3.select('body').append('svg').attr('id', 'pickerContainer').attr('width', '100%').attr('height', '100%');
+  contaiter.append('rect').attr('x', 0).attr('y', 0).attr('width', '100%').attr('height', '100%').attr('opacity', 0.2).on('mousemove', cl).on('click', closePicker);
+  const picker = contaiter
     .append('g')
     .attr('id', 'picker')
     .call(
@@ -469,7 +441,11 @@ function createPicker(hatching) {
   spaces.selectAll('input').on('change', changePickerSpace);
 
   const colors = picker.append('g').attr('id', 'pickerColors').attr('stroke', '#333333');
-  const clr = d3.range(COLORS_IN_ROW).map((i) => d3.hsl((i / COLORS_IN_ROW) * 360, 0.7, 0.7).hex());
+  const hatches = picker.append('g').attr('id', 'pickerHatches').attr('stroke', '#333333');
+  const hatching = d3.selectAll('g#hatching > pattern');
+  const number = hatching.size();
+
+  const clr = d3.range(number).map((i) => d3.hsl((i / number) * 360, 0.7, 0.7).hex());
   clr.forEach(function (d, i) {
     colors
       .append('rect')
@@ -481,28 +457,26 @@ function createPicker(hatching) {
       .attr('width', 16)
       .attr('height', 16);
   });
+
+  hatching.each(function (d, i) {
+    hatches
+      .append('rect')
+      .attr('id', 'picker_' + this.id)
+      .attr('fill', 'url(#' + this.id + ')')
+      .attr('x', i * 22 + 4)
+      .attr('y', 61)
+      .attr('width', 16)
+      .attr('height', 16);
+  });
+
   colors
     .selectAll('rect')
     .on('click', pickerFillClicked)
     .on('mousemove', () => tip('Click to fill with the color'));
-
-  if (hatching) {
-    const hatches = picker.append('g').attr('id', 'pickerHatches').attr('stroke', '#333333');
-    d3.selectAll('g#hatching > pattern').each(function (d, i) {
-      hatches
-        .append('rect')
-        .attr('id', 'picker_' + this.id)
-        .attr('fill', 'url(#' + this.id + ')')
-        .attr('x', i * 22 + 4)
-        .attr('y', 61)
-        .attr('width', 16)
-        .attr('height', 16);
-    });
-    hatches
-      .selectAll('rect')
-      .on('click', pickerFillClicked)
-      .on('mousemove', () => tip('Click to fill with the hatching'));
-  }
+  hatches
+    .selectAll('rect')
+    .on('click', pickerFillClicked)
+    .on('mousemove', () => tip('Click to fill with the hatching'));
 
   // append box
   const bbox = picker.node().getBBox();
@@ -973,6 +947,7 @@ function selectIcon(initial, callback) {
 
 // Calls the refresh for all currently open editors
 function refreshAllEditors() {
+  TIME && console.time('refreshAllEditors');
   if (document.getElementById('culturesEditorRefresh').offsetParent) culturesEditorRefresh.click();
   if (document.getElementById('biomesEditorRefresh').offsetParent) biomesEditorRefresh.click();
   if (document.getElementById('diplomacyEditorRefresh').offsetParent) diplomacyEditorRefresh.click();
@@ -980,5 +955,5 @@ function refreshAllEditors() {
   if (document.getElementById('religionsEditorRefresh').offsetParent) religionsEditorRefresh.click();
   if (document.getElementById('statesEditorRefresh').offsetParent) statesEditorRefresh.click();
   if (document.getElementById('zonesEditorRefresh').offsetParent) zonesEditorRefresh.click();
-  if (document.getElementById('resourcesEditorRefresh').offsetParent) resourcesEditorRefresh.click();
+  TIME && console.timeEnd('refreshAllEditors');
 }
diff --git a/modules/ui/general.js b/modules/ui/general.js
index b649feb0..d636d290 100644
--- a/modules/ui/general.js
+++ b/modules/ui/general.js
@@ -22,7 +22,7 @@ document.getElementById('exitCustomization').addEventListener('mousemove', showD
 /**
  * @param {string} tip Tooltip text
  * @param {boolean} main Show above other tooltips
- * @param {string} type Message type (color): error, warn, success
+ * @param {string} type Message type (color): error / warn / success
  * @param {number} time Timeout to auto hide, ms
  */
 function tip(tip = 'Tip is undefined', main, type, time) {
@@ -96,10 +96,7 @@ function showMapTooltip(point, e, i, g) {
   const land = pack.cells.h[i] >= 20;
 
   // specific elements
-  if (group === 'armies') {
-    tip(e.target.parentNode.dataset.name + '. Click to edit');
-    return;
-  }
+  if (group === 'armies') return tip(e.target.parentNode.dataset.name + '. Click to edit');
 
   if (group === 'emblems' && e.target.tagName === 'use') {
     const parent = e.target.parentNode;
@@ -130,14 +127,11 @@ function showMapTooltip(point, e, i, g) {
     if (riversOverview.offsetParent) highlightEditorLine(riversOverview, river, 5000);
     return;
   }
-  if (group === 'routes') {
-    tip('Click to edit the Route');
-    return;
-  }
-  if (group === 'terrain') {
-    tip('Click to edit the Relief Icon');
-    return;
-  }
+
+  if (group === 'routes') return tip('Click to edit the Route');
+
+  if (group === 'terrain') return tip('Click to edit the Relief Icon');
+
   if (subgroup === 'burgLabels' || subgroup === 'burgIcons') {
     const burg = +path[path.length - 10].dataset.id;
     const b = pack.burgs[burg];
@@ -146,50 +140,25 @@ function showMapTooltip(point, e, i, g) {
     if (burgsOverview.offsetParent) highlightEditorLine(burgsOverview, burg, 5000);
     return;
   }
-  if (group === 'labels') {
-    tip('Click to edit the Label');
-    return;
-  }
-  if (group === 'markers') {
-    tip('Click to edit the Marker');
-    return;
-  }
+  if (group === 'labels') return tip('Click to edit the Label');
+
+  if (group === 'markers') return tip('Click to edit the Marker');
+
   if (group === 'ruler') {
     const tag = e.target.tagName;
     const className = e.target.getAttribute('class');
-    if (tag === 'circle' && className === 'edge') {
-      tip('Drag to adjust. Hold Ctrl and drag to add a point. Click to remove the point');
-      return;
-    }
-    if (tag === 'circle' && className === 'control') {
-      tip('Drag to adjust. Hold Shifta and drag to keep axial direction. Click to remove the point');
-      return;
-    }
-    if (tag === 'circle') {
-      tip('Drag to adjust the measurer');
-      return;
-    }
-    if (tag === 'polyline') {
-      tip('Click on drag to add a control point');
-      return;
-    }
-    if (tag === 'path') {
-      tip('Drag to move the measurer');
-      return;
-    }
-    if (tag === 'text') {
-      tip('Drag to move, click to remove the measurer');
-      return;
-    }
-  }
-  if (subgroup === 'burgIcons') {
-    tip('Click to edit the Burg');
-    return;
-  }
-  if (subgroup === 'burgLabels') {
-    tip('Click to edit the Burg');
-    return;
+    if (tag === 'circle' && className === 'edge') return tip('Drag to adjust. Hold Ctrl and drag to add a point. Click to remove the point');
+    if (tag === 'circle' && className === 'control') return tip('Drag to adjust. Hold Shift and drag to keep axial direction. Click to remove the point');
+    if (tag === 'circle') return tip('Drag to adjust the measurer');
+    if (tag === 'polyline') return tip('Click on drag to add a control point');
+    if (tag === 'path') return tip('Drag to move the measurer');
+    if (tag === 'text') return tip('Drag to move, click to remove the measurer');
   }
+
+  if (subgroup === 'burgIcons') return tip('Click to edit the Burg');
+
+  if (subgroup === 'burgLabels') return tip('Click to edit the Burg');
+
   if (group === 'lakes' && !land) {
     const lakeId = +e.target.dataset.f;
     const name = pack.features[lakeId]?.name;
@@ -197,20 +166,16 @@ function showMapTooltip(point, e, i, g) {
     tip(`${fullName} lake. Click to edit`);
     return;
   }
-  if (group === 'coastline') {
-    tip('Click to edit the coastline');
-    return;
-  }
+  if (group === 'coastline') return tip('Click to edit the coastline');
+
   if (group === 'zones') {
     const zone = path[path.length - 8];
     tip(zone.dataset.description);
     if (zonesEditor.offsetParent) highlightEditorLine(zonesEditor, zone.id, 5000);
     return;
   }
-  if (group === 'ice') {
-    tip('Click to edit the Ice');
-    return;
-  }
+
+  if (group === 'ice') return tip('Click to edit the Ice');
 
   // covering elements
   if (layerIsOn('togglePrec') && land) tip('Annual Precipitation: ' + getFriendlyPrecipitation(i));
diff --git a/modules/ui/heightmap-editor.js b/modules/ui/heightmap-editor.js
index 5bf72f7b..6f04dbf0 100644
--- a/modules/ui/heightmap-editor.js
+++ b/modules/ui/heightmap-editor.js
@@ -1,4 +1,3 @@
-// heightmap-editor module. To be added to window as for now
 'use strict';
 
 function editHeightmap() {
@@ -134,15 +133,8 @@ function editHeightmap() {
 
   // Exit customization mode
   function finalizeHeightmap() {
-    if (viewbox.select('#heights').selectAll('*').size() < 200) {
-      tip('Insufficient land area! There should be at least 200 land cells to finalize the heightmap', null, 'error');
-      return;
-    }
-
-    if (document.getElementById('imageConverter').offsetParent) {
-      tip('Please exit the Image Conversion mode first', null, 'error');
-      return;
-    }
+    if (viewbox.select('#heights').selectAll('*').size() < 200) return tip('Insufficient land area! There should be at least 200 land cells to finalize the heightmap', null, 'error');
+    if (document.getElementById('imageConverter').offsetParent) return tip('Please exit the Image Conversion mode first', null, 'error');
 
     delete window.edits; // remove global variable
     redo.disabled = templateRedo.disabled = true;
@@ -207,6 +199,7 @@ function editHeightmap() {
       }
     }
 
+    drawRivers();
     Lakes.defineGroup();
     defineBiomes();
 
@@ -586,6 +579,7 @@ function editHeightmap() {
       document.getElementById('brushesSliders').style.display = 'none';
     }
 
+    const dragBrushThrottled = throttle(dragBrush, 100);
     function toggleBrushMode(e) {
       if (e.target.classList.contains('pressed')) {
         exitBrushMode();
@@ -594,7 +588,7 @@ function editHeightmap() {
       exitBrushMode();
       document.getElementById('brushesSliders').style.display = 'block';
       e.target.classList.add('pressed');
-      viewbox.style('cursor', 'crosshair').call(d3.drag().on('start', dragBrush));
+      viewbox.style('cursor', 'crosshair').call(d3.drag().on('start', dragBrushThrottled));
     }
 
     function dragBrush() {
@@ -842,118 +836,15 @@ function editHeightmap() {
       body.setAttribute('data-changed', 0);
       body.innerHTML = '';
 
-      if (template === 'templateVolcano') {
-        addStep('Hill', '1', '90-100', '44-56', '40-60');
-        addStep('Multiply', 0.8, '50-100');
-        addStep('Range', '1.5', '30-55', '45-55', '40-60');
-        addStep('Smooth', 2);
-        addStep('Hill', '1.5', '25-35', '25-30', '20-75');
-        addStep('Hill', '1', '25-35', '75-80', '25-75');
-        addStep('Hill', '0.5', '20-25', '10-15', '20-25');
-      } else if (template === 'templateHighIsland') {
-        addStep('Hill', '1', '90-100', '65-75', '47-53');
-        addStep('Add', 5, 'all');
-        addStep('Hill', '6', '20-23', '25-55', '45-55');
-        addStep('Range', '1', '40-50', '45-55', '45-55');
-        addStep('Smooth', 2);
-        addStep('Trough', '2-3', '20-30', '20-30', '20-30');
-        addStep('Trough', '2-3', '20-30', '60-80', '70-80');
-        addStep('Hill', '1', '10-15', '60-60', '50-50');
-        addStep('Hill', '1.5', '13-16', '15-20', '20-75');
-        addStep('Multiply', 0.8, '20-100');
-        addStep('Range', '1.5', '30-40', '15-85', '30-40');
-        addStep('Range', '1.5', '30-40', '15-85', '60-70');
-        addStep('Pit', '2-3', '10-15', '15-85', '20-80');
-      } else if (template === 'templateLowIsland') {
-        addStep('Hill', '1', '90-99', '60-80', '45-55');
-        addStep('Hill', '4-5', '25-35', '20-65', '40-60');
-        addStep('Range', '1', '40-50', '45-55', '45-55');
-        addStep('Smooth', 3);
-        addStep('Trough', '1.5', '20-30', '15-85', '20-30');
-        addStep('Trough', '1.5', '20-30', '15-85', '70-80');
-        addStep('Hill', '1.5', '10-15', '5-15', '20-80');
-        addStep('Hill', '1', '10-15', '85-95', '70-80');
-        addStep('Pit', '3-5', '10-15', '15-85', '20-80');
-        addStep('Multiply', 0.4, '20-100');
-      } else if (template === 'templateContinents') {
-        addStep('Hill', '1', '80-85', '75-80', '40-60');
-        addStep('Hill', '1', '80-85', '20-25', '40-60');
-        addStep('Multiply', 0.22, '20-100');
-        addStep('Hill', '5-6', '15-20', '25-75', '20-82');
-        addStep('Range', '.8', '30-60', '5-15', '20-45');
-        addStep('Range', '.8', '30-60', '5-15', '55-80');
-        addStep('Range', '0-3', '30-60', '80-90', '20-80');
-        addStep('Trough', '3-4', '15-20', '15-85', '20-80');
-        addStep('Strait', '2', 'vertical');
-        addStep('Smooth', 2);
-        addStep('Trough', '1-2', '5-10', '45-55', '45-55');
-        addStep('Pit', '3-4', '10-15', '15-85', '20-80');
-        addStep('Hill', '1', '5-10', '40-60', '40-60');
-      } else if (template === 'templateArchipelago') {
-        addStep('Add', 11, 'all');
-        addStep('Range', '2-3', '40-60', '20-80', '20-80');
-        addStep('Hill', '5', '15-20', '10-90', '30-70');
-        addStep('Hill', '2', '10-15', '10-30', '20-80');
-        addStep('Hill', '2', '10-15', '60-90', '20-80');
-        addStep('Smooth', 3);
-        addStep('Trough', '10', '20-30', '5-95', '5-95');
-        addStep('Strait', '2', 'vertical');
-        addStep('Strait', '2', 'horizontal');
-      } else if (template === 'templateAtoll') {
-        addStep('Hill', '1', '75-80', '50-60', '45-55');
-        addStep('Hill', '1.5', '30-50', '25-75', '30-70');
-        addStep('Hill', '.5', '30-50', '25-35', '30-70');
-        addStep('Smooth', 1);
-        addStep('Multiply', 0.2, '25-100');
-        addStep('Hill', '.5', '10-20', '50-55', '48-52');
-      } else if (template === 'templateMediterranean') {
-        addStep('Range', '3-4', '30-50', '0-100', '0-10');
-        addStep('Range', '3-4', '30-50', '0-100', '90-100');
-        addStep('Hill', '5-6', '30-70', '0-100', '0-5');
-        addStep('Hill', '5-6', '30-70', '0-100', '95-100');
-        addStep('Smooth', 1);
-        addStep('Hill', '2-3', '30-70', '0-5', '20-80');
-        addStep('Hill', '2-3', '30-70', '95-100', '20-80');
-        addStep('Multiply', 0.8, 'land');
-        addStep('Trough', '3-5', '40-50', '0-100', '0-10');
-        addStep('Trough', '3-5', '40-50', '0-100', '90-100');
-      } else if (template === 'templatePeninsula') {
-        addStep('Range', '2-3', '20-35', '40-50', '0-15');
-        addStep('Add', 5, 'all');
-        addStep('Hill', '1', '90-100', '10-90', '0-5');
-        addStep('Add', 13, 'all');
-        addStep('Hill', '3-4', '3-5', '5-95', '80-100');
-        addStep('Hill', '1-2', '3-5', '5-95', '40-60');
-        addStep('Trough', '5-6', '10-25', '5-95', '5-95');
-        addStep('Smooth', 3);
-      } else if (template === 'templatePangea') {
-        addStep('Hill', '1-2', '25-40', '15-50', '0-10');
-        addStep('Hill', '1-2', '5-40', '50-85', '0-10');
-        addStep('Hill', '1-2', '25-40', '50-85', '90-100');
-        addStep('Hill', '1-2', '5-40', '15-50', '90-100');
-        addStep('Hill', '8-12', '20-40', '20-80', '48-52');
-        addStep('Smooth', 2);
-        addStep('Multiply', 0.7, 'land');
-        addStep('Trough', '3-4', '25-35', '5-95', '10-20');
-        addStep('Trough', '3-4', '25-35', '5-95', '80-90');
-        addStep('Range', '5-6', '30-40', '10-90', '35-65');
-      } else if (template === 'templateIsthmus') {
-        addStep('Hill', '5-10', '15-30', '0-30', '0-20');
-        addStep('Hill', '5-10', '15-30', '10-50', '20-40');
-        addStep('Hill', '5-10', '15-30', '30-70', '40-60');
-        addStep('Hill', '5-10', '15-30', '50-90', '60-80');
-        addStep('Hill', '5-10', '15-30', '70-100', '80-100');
-        addStep('Smooth', 2);
-        addStep('Trough', '4-8', '15-30', '0-30', '0-20');
-        addStep('Trough', '4-8', '15-30', '10-50', '20-40');
-        addStep('Trough', '4-8', '15-30', '30-70', '40-60');
-        addStep('Trough', '4-8', '15-30', '50-90', '60-80');
-        addStep('Trough', '4-8', '15-30', '70-100', '80-100');
-      } else if (template === 'templateShattered') {
-        addStep('Hill', '8', '35-40', '15-85', '30-70');
-        addStep('Trough', '10-20', '40-50', '5-95', '5-95');
-        addStep('Range', '5-7', '30-40', '10-90', '20-80');
-        addStep('Pit', '12-20', '30-40', '15-85', '20-80');
+      const templateString = HeightmapTemplates[template];
+      if (!templateString) return;
+
+      const steps = templateString.split('\n');
+      if (!steps.length) return tip(`Heightmap template: no steps defined`, false, 'error');
+
+      for (const step of steps) {
+        const elements = step.trim().split(' ');
+        addStep(...elements);
       }
     }
 
@@ -1119,6 +1010,10 @@ function editHeightmap() {
       const reader = new FileReader();
 
       const img = new Image();
+      img.id = 'imageToConvert';
+      img.style.display = 'none';
+      document.body.appendChild(img);
+
       img.onload = function () {
         const ctx = document.getElementById('canvas').getContext('2d');
         ctx.drawImage(img, 0, 0, graphWidth, graphHeight);
@@ -1311,10 +1206,7 @@ function editHeightmap() {
     }
 
     function applyConversion() {
-      if (colorsAssigned.childElementCount < 3) {
-        tip('Please do the assignment first', false, 'error');
-        return;
-      }
+      if (colorsAssigned.childElementCount < 3) return tip('Please do the assignment first', false, 'error');
 
       viewbox
         .select('#heights')
@@ -1340,6 +1232,9 @@ function editHeightmap() {
       const canvas = document.getElementById('canvas');
       if (canvas) canvas.remove();
 
+      const image = document.getElementById('imageToConvert');
+      if (image) image.remove();
+
       d3.select('#imageConverter').selectAll('div.color-div').remove();
       colorsAssigned.style.display = 'none';
       colorsUnassigned.style.display = 'none';
diff --git a/modules/ui/layers.js b/modules/ui/layers.js
index cfc5485b..635ee838 100644
--- a/modules/ui/layers.js
+++ b/modules/ui/layers.js
@@ -123,9 +123,10 @@ function restoreLayers() {
   if (layerIsOn('toggleIce')) drawIce();
   if (layerIsOn('toggleEmblems')) drawEmblems();
 
-  // states are getting rendered each time, if it's not required than layers should be hidden
-  if (!layerIsOn('toggleBorders')) $('#borders').fadeOut();
-  if (!layerIsOn('toggleStates')) regions.style('display', 'none').selectAll('path').remove();
+  // some layers are rendered each time, remove them if they are not on
+  if (!layerIsOn('toggleBorders')) borders.selectAll('path').remove();
+  if (!layerIsOn('toggleStates')) regions.selectAll('path').remove();
+  if (!layerIsOn('toggleRivers')) rivers.selectAll('*').remove();
 }
 
 function toggleHeight(event) {
@@ -876,35 +877,80 @@ function toggleStates(event) {
   }
 }
 
-// draw states
 function drawStates() {
   TIME && console.time('drawStates');
   regions.selectAll('path').remove();
 
-  const cells = pack.cells,
-    vertices = pack.vertices,
-    states = pack.states,
-    n = cells.i.length;
+  const {cells, vertices, features} = pack;
+  const states = pack.states;
+  const n = cells.i.length;
+
   const used = new Uint8Array(cells.i.length);
   const vArray = new Array(states.length); // store vertices array
-  const body = new Array(states.length).fill(''); // store path around each state
-  const gap = new Array(states.length).fill(''); // store path along water for each state to fill the gaps
+  const body = new Array(states.length).fill(''); // path around each state
+  const gap = new Array(states.length).fill(''); // path along water for each state to fill the gaps
+  const halo = new Array(states.length).fill(''); // path around states, but not lakes
+
+  const getStringPoint = (v) => vertices.p[v[0]].join(',');
+
+  // define inner-state lakes to omit on border render
+  const innerLakes = features.map((feature) => {
+    if (feature.type !== 'lake') return false;
+    if (!feature.shoreline) Lakes.getShoreline(feature);
+
+    const states = feature.shoreline.map((i) => cells.state[i]);
+    return new Set(states).size > 1 ? false : true;
+  });
 
   for (const i of cells.i) {
     if (!cells.state[i] || used[i]) continue;
-    const s = cells.state[i];
-    const onborder = cells.c[i].some((n) => cells.state[n] !== s);
+    const state = cells.state[i];
+
+    const onborder = cells.c[i].some((n) => cells.state[n] !== state);
     if (!onborder) continue;
 
-    const borderWith = cells.c[i].map((c) => cells.state[c]).find((n) => n !== s);
+    const borderWith = cells.c[i].map((c) => cells.state[c]).find((n) => n !== state);
     const vertex = cells.v[i].find((v) => vertices.c[v].some((i) => cells.state[i] === borderWith));
-    const chain = connectVertices(vertex, s, borderWith);
-    if (chain.length < 3) continue;
-    const points = chain.map((v) => vertices.p[v[0]]);
-    if (!vArray[s]) vArray[s] = [];
-    vArray[s].push(points);
-    body[s] += 'M' + points.join('L');
-    gap[s] += 'M' + vertices.p[chain[0][0]] + chain.reduce((r, v, i, d) => (!i ? r : !v[2] ? r + 'L' + vertices.p[v[0]] : d[i + 1] && !d[i + 1][2] ? r + 'M' + vertices.p[v[0]] : r), '');
+    const chain = connectVertices(vertex, state);
+
+    const noInnerLakes = chain.filter((v) => v[1] !== 'innerLake');
+    if (noInnerLakes.length < 3) continue;
+
+    // get path around the state
+    if (!vArray[state]) vArray[state] = [];
+    const points = noInnerLakes.map((v) => vertices.p[v[0]]);
+    vArray[state].push(points);
+    body[state] += 'M' + points.join('L');
+
+    // connect path for halo
+    let discontinued = true;
+    halo[state] += noInnerLakes
+      .map((v) => {
+        if (v[1] === 'border') {
+          discontinued = true;
+          return '';
+        }
+
+        const operation = discontinued ? 'M' : 'L';
+        discontinued = false;
+        return `${operation}${getStringPoint(v)}`;
+      })
+      .join('');
+
+    // connect gaps between state and water into a single path
+    discontinued = true;
+    gap[state] += chain
+      .map((v) => {
+        if (v[1] === 'land') {
+          discontinued = true;
+          return '';
+        }
+
+        const operation = discontinued ? 'M' : 'L';
+        discontinued = false;
+        return `${operation}${getStringPoint(v)}`;
+      })
+      .join('');
   }
 
   // find state visual center
@@ -913,13 +959,14 @@ function drawStates() {
     states[i].pole = polylabel(sorted, 1.0); // pole of inaccessibility
   });
 
-  const bodyData = body.map((p, i) => [p.length > 10 ? p : null, i, states[i].color]).filter((d) => d[0]);
-  const gapData = gap.map((p, i) => [p.length > 10 ? p : null, i, states[i].color]).filter((d) => d[0]);
+  const bodyData = body.map((p, s) => [p.length > 10 ? p : null, s, states[s].color]).filter((d) => d[0]);
+  const gapData = gap.map((p, s) => [p.length > 10 ? p : null, s, states[s].color]).filter((d) => d[0]);
+  const haloData = halo.map((p, s) => [p.length > 10 ? p : null, s, states[s].color]).filter((d) => d[0]);
 
   const bodyString = bodyData.map((d) => `<path id="state${d[1]}" d="${d[0]}" fill="${d[2]}" stroke="none"/>`).join('');
   const gapString = gapData.map((d) => `<path id="state-gap${d[1]}" d="${d[0]}" fill="none" stroke="${d[2]}"/>`).join('');
   const clipString = bodyData.map((d) => `<clipPath id="state-clip${d[1]}"><use href="#state${d[1]}"/></clipPath>`).join('');
-  const haloString = bodyData
+  const haloString = haloData
     .map((d) => `<path id="state-border${d[1]}" d="${d[0]}" clip-path="url(#state-clip${d[1]})" stroke="${d3.color(d[2]) ? d3.color(d[2]).darker().hex() : '#666666'}"/>`)
     .join('');
 
@@ -928,57 +975,77 @@ function drawStates() {
   statesHalo.html(haloString);
 
   // connect vertices to chain
-  function connectVertices(start, t, state) {
+  function connectVertices(start, state) {
     const chain = []; // vertices chain to form a path
-    let land = vertices.c[start].some((c) => cells.h[c] >= 20 && cells.state[c] !== t);
-    function check(i) {
-      state = cells.state[i];
-      land = cells.h[i] >= 20;
-    }
+    const getType = (c) => {
+      const borderCell = c.find((i) => cells.b[i]);
+      if (borderCell) return 'border';
+
+      const waterCell = c.find((i) => cells.h[i] < 20);
+      if (!waterCell) return 'land';
+      if (innerLakes[cells.f[waterCell]]) return 'innerLake';
+      return features[cells.f[waterCell]].type;
+    };
 
     for (let i = 0, current = start; i === 0 || (current !== start && i < 20000); i++) {
-      const prev = chain[chain.length - 1] ? chain[chain.length - 1][0] : -1; // previous vertex in chain
-      chain.push([current, state, land]); // add current vertex to sequence
+      const prev = chain.length ? chain[chain.length - 1][0] : -1; // previous vertex in chain
+
       const c = vertices.c[current]; // cells adjacent to vertex
-      c.filter((c) => cells.state[c] === t).forEach((c) => (used[c] = 1));
-      const c0 = c[0] >= n || cells.state[c[0]] !== t;
-      const c1 = c[1] >= n || cells.state[c[1]] !== t;
-      const c2 = c[2] >= n || cells.state[c[2]] !== t;
+      chain.push([current, getType(c)]); // add current vertex to sequence
+
+      c.filter((c) => cells.state[c] === state).forEach((c) => (used[c] = 1));
+      const c0 = c[0] >= n || cells.state[c[0]] !== state;
+      const c1 = c[1] >= n || cells.state[c[1]] !== state;
+      const c2 = c[2] >= n || cells.state[c[2]] !== state;
+
       const v = vertices.v[current]; // neighboring vertices
-      if (v[0] !== prev && c0 !== c1) {
-        current = v[0];
-        check(c0 ? c[0] : c[1]);
-      } else if (v[1] !== prev && c1 !== c2) {
-        current = v[1];
-        check(c1 ? c[1] : c[2]);
-      } else if (v[2] !== prev && c0 !== c2) {
-        current = v[2];
-        check(c2 ? c[2] : c[0]);
-      }
-      if (current === chain[chain.length - 1][0]) {
+
+      if (v[0] !== prev && c0 !== c1) current = v[0];
+      else if (v[1] !== prev && c1 !== c2) current = v[1];
+      else if (v[2] !== prev && c0 !== c2) current = v[2];
+
+      if (current === prev) {
         ERROR && console.error('Next vertex is not found');
         break;
       }
     }
-    chain.push([start, state, land]); // add starting vertex to sequence to close the path
+
+    if (chain.length) chain.push(chain[0]);
     return chain;
   }
+
   invokeActiveZooming();
   TIME && console.timeEnd('drawStates');
 }
 
+function toggleBorders(event) {
+  if (!layerIsOn('toggleBorders')) {
+    turnButtonOn('toggleBorders');
+    drawBorders();
+    if (event && isCtrlClick(event)) editStyle('borders');
+  } else {
+    if (event && isCtrlClick(event)) {
+      editStyle('borders');
+      return;
+    }
+    turnButtonOff('toggleBorders');
+    borders.selectAll('path').remove();
+  }
+}
+
 // draw state and province borders
 function drawBorders() {
   TIME && console.time('drawBorders');
   borders.selectAll('path').remove();
 
-  const cells = pack.cells,
-    vertices = pack.vertices,
-    n = cells.i.length;
-  const sPath = [],
-    pPath = [];
-  const sUsed = new Array(pack.states.length).fill('').map((a) => []);
-  const pUsed = new Array(pack.provinces.length).fill('').map((a) => []);
+  const {cells, vertices} = pack;
+  const n = cells.i.length;
+
+  const sPath = [];
+  const pPath = [];
+
+  const sUsed = new Array(pack.states.length).fill('').map((_) => []);
+  const pUsed = new Array(pack.provinces.length).fill('').map((_) => []);
 
   for (let i = 0; i < cells.i.length; i++) {
     if (!cells.state[i]) continue;
@@ -1070,21 +1137,6 @@ function drawBorders() {
   TIME && console.timeEnd('drawBorders');
 }
 
-function toggleBorders(event) {
-  if (!layerIsOn('toggleBorders')) {
-    turnButtonOn('toggleBorders');
-    $('#borders').fadeIn();
-    if (event && isCtrlClick(event)) editStyle('borders');
-  } else {
-    if (event && isCtrlClick(event)) {
-      editStyle('borders');
-      return;
-    }
-    turnButtonOff('toggleBorders');
-    $('#borders').fadeOut();
-  }
-}
-
 function toggleProvinces(event) {
   if (!layerIsOn('toggleProvinces')) {
     turnButtonOn('toggleProvinces');
@@ -1396,18 +1448,30 @@ function toggleTexture(event) {
 function toggleRivers(event) {
   if (!layerIsOn('toggleRivers')) {
     turnButtonOn('toggleRivers');
-    $('#rivers').fadeIn();
+    drawRivers();
     if (event && isCtrlClick(event)) editStyle('rivers');
   } else {
-    if (event && isCtrlClick(event)) {
-      editStyle('rivers');
-      return;
-    }
-    $('#rivers').fadeOut();
+    if (event && isCtrlClick(event)) return editStyle('rivers');
+    rivers.selectAll('*').remove();
     turnButtonOff('toggleRivers');
   }
 }
 
+function drawRivers() {
+  TIME && console.time('drawRivers');
+  const {addMeandering, getRiverPath} = Rivers;
+  lineGen.curve(d3.curveCatmullRom.alpha(0.1));
+  const riverPaths = pack.rivers.map((river) => {
+    const meanderedPoints = addMeandering(river.cells, river.points);
+    const widthFactor = river.widthFactor || 1;
+    const startingWidth = river.sourceWidth || 0;
+    const path = getRiverPath(meanderedPoints, widthFactor, startingWidth);
+    return `<path id="river${river.i}" d="${path}"/>`;
+  });
+  rivers.html(riverPaths.join(''));
+  TIME && console.timeEnd('drawRivers');
+}
+
 function toggleRoutes(event) {
   if (!layerIsOn('toggleRoutes')) {
     turnButtonOn('toggleRoutes');
@@ -1558,21 +1622,21 @@ function drawEmblems() {
   const getStateEmblemsSize = () => {
     const startSize = Math.min(Math.max((graphHeight + graphWidth) / 40, 10), 100);
     const statesMod = 1 + validStates.length / 100 - (15 - validStates.length) / 200; // states number modifier
-    const sizeMod = +document.getElementById('styleEmblemsStateSizeInput').value || 1;
+    const sizeMod = +document.getElementById('emblemsStateSizeInput').value || 1;
     return rn((startSize / statesMod) * sizeMod); // target size ~50px on 1536x754 map with 15 states
   };
 
   const getProvinceEmblemsSize = () => {
     const startSize = Math.min(Math.max((graphHeight + graphWidth) / 100, 5), 70);
     const provincesMod = 1 + validProvinces.length / 1000 - (115 - validProvinces.length) / 1000; // states number modifier
-    const sizeMod = +document.getElementById('styleEmblemsProvinceSizeInput').value || 1;
+    const sizeMod = +document.getElementById('emblemsProvinceSizeInput').value || 1;
     return rn((startSize / provincesMod) * sizeMod); // target size ~20px on 1536x754 map with 115 provinces
   };
 
   const getBurgEmblemSize = () => {
     const startSize = Math.min(Math.max((graphHeight + graphWidth) / 185, 2), 50);
     const burgsMod = 1 + validBurgs.length / 1000 - (450 - validBurgs.length) / 1000; // states number modifier
-    const sizeMod = +document.getElementById('styleEmblemsBurgSizeInput').value || 1;
+    const sizeMod = +document.getElementById('emblemsBurgSizeInput').value || 1;
     return rn((startSize / burgsMod) * sizeMod); // target size ~8.5px on 1536x754 map with 450 burgs
   };
 
diff --git a/modules/ui/options.js b/modules/ui/options.js
index 9c0bd71e..d0263dfe 100644
--- a/modules/ui/options.js
+++ b/modules/ui/options.js
@@ -98,7 +98,8 @@ function showSupporters() {
     PlayByMail.Net,Brad Wardell,Lance Saba,Egoensis,Brea Richards,Tiber,Chris Bloom,Maxim Lowe,Aquelion,Page One Project,Spencer Morris,Paul Ingram,
     Dust Bunny,Adrian Wright,Eric Alexander Cartaya,GameNight,Thomas Mortensen Hansen,Zklaus,Drinarius,Ed Wright,Lon Varnadore,Crys Cain,Heaven N Lee,
     Jeffrey Henning,Lazer Elf,Jordan Bellah,Alex Beard,Kass Frisson,Petro Lombaard,Emanuel Pietri,Rox,PinkEvil,Gavin Madrigal,Martin Lorber,Prince of Morgoth,
-    Jaryd Armstrong,Andrew Pirkola,ThyHolyDevil,Gary Smith,Tyshaun Wise,Ethan Cook,Jon Stroman,Nobody679,良义 金,Chris Gray`;
+    Jaryd Armstrong,Andrew Pirkola,ThyHolyDevil,Gary Smith,Tyshaun Wise,Ethan Cook,Jon Stroman,Nobody679,良义 金,Chris Gray,Phoenix Boatwright,Mackenzie,
+    "Milo Cohen,Jason Matthew Wuerfel,Rasmus Legêne,Andrew Hines,Wexxler,Espen Sæverud,Binks,Dominick Ormsby,Linn Browning,Václav Švec,Alan Buehne,George J.Lekkas"`;
 
   const array = supporters
     .replace(/(?:\r\n|\r|\n)/g, '')
@@ -157,6 +158,7 @@ optionsContent.addEventListener('change', function (event) {
   if (id === 'zoomExtentMin' || id === 'zoomExtentMax') changeZoomExtent(value);
   else if (id === 'optionsSeed') generateMapWithSeed();
   else if (id === 'uiSizeInput' || id === 'uiSizeOutput') changeUIsize(value);
+  if (id === 'shapeRendering') viewbox.attr('shape-rendering', value);
   else if (id === 'yearInput') changeYear();
   else if (id === 'eraInput') changeEra();
 });
@@ -494,6 +496,9 @@ function applyStoredOptions() {
   const height = +params.get('height');
   if (width) mapWidthInput.value = width;
   if (height) mapHeightInput.value = height;
+
+  // set shape rendering
+  viewbox.attr('shape-rendering', shapeRendering.value);
 }
 
 // randomize options if randomization is allowed (not locked or options='default')
@@ -537,17 +542,18 @@ function randomizeOptions() {
 // select heightmap template pseudo-randomly
 function randomizeHeightmapTemplate() {
   const templates = {
-    Volcano: 3,
-    'High Island': 22,
-    'Low Island': 9,
-    Continents: 20,
-    Archipelago: 25,
-    Mediterranean: 3,
-    Peninsula: 3,
-    Pangea: 5,
-    Isthmus: 2,
-    Atoll: 1,
-    Shattered: 7
+    volcano: 3,
+    highIsland: 22,
+    lowIsland: 9,
+    continents: 19,
+    archipelago: 23,
+    mediterranean: 5,
+    peninsula: 3,
+    pangea: 5,
+    isthmus: 2,
+    atoll: 1,
+    shattered: 7,
+    taklamakan: 1
   };
   document.getElementById('templateInput').value = rw(templates);
 }
@@ -773,6 +779,12 @@ document
   .forEach((el) => el.addEventListener('input', updateTilesOptions));
 
 function updateTilesOptions() {
+  if (this?.tagName === 'INPUT') {
+    const {nextElementSibling: next, previousElementSibling: prev} = this;
+    if (next?.tagName === 'INPUT') next.value = this.value;
+    if (prev?.tagName === 'INPUT') prev.value = this.value;
+  }
+
   const tileSize = document.getElementById('tileSize');
   const tilesX = +document.getElementById('tileColsOutput').value;
   const tilesY = +document.getElementById('tileRowsOutput').value;
@@ -908,6 +920,7 @@ function toggle3dOptions() {
   document.getElementById('options3dMeshRotationNumber').addEventListener('change', changeRotation);
   document.getElementById('options3dGlobeRotationRange').addEventListener('input', changeRotation);
   document.getElementById('options3dGlobeRotationNumber').addEventListener('change', changeRotation);
+  document.getElementById('options3dMeshLabels3d').addEventListener('change', toggleLabels3d);
   document.getElementById('options3dMeshSkyMode').addEventListener('change', toggleSkyMode);
   document.getElementById('options3dMeshSky').addEventListener('input', changeColors);
   document.getElementById('options3dMeshWater').addEventListener('input', changeColors);
@@ -924,6 +937,7 @@ function toggle3dOptions() {
     options3dSunZ.value = ThreeD.options.sun.z;
     options3dMeshRotationRange.value = options3dMeshRotationNumber.value = ThreeD.options.rotateMesh;
     options3dGlobeRotationRange.value = options3dGlobeRotationNumber.value = ThreeD.options.rotateGlobe;
+    options3dMeshLabels3d.value = ThreeD.options.labels3d;
     options3dMeshSkyMode.value = ThreeD.options.extendedWater;
     options3dColorSection.style.display = ThreeD.options.extendedWater ? 'block' : 'none';
     options3dMeshSky.value = ThreeD.options.skyColor;
@@ -954,6 +968,10 @@ function toggle3dOptions() {
     ThreeD.setRotation(speed);
   }
 
+  function toggleLabels3d() {
+    ThreeD.toggleLabels();
+  }
+
   function toggleSkyMode() {
     const hide = ThreeD.options.extendedWater;
     options3dColorSection.style.display = hide ? 'none' : 'block';
diff --git a/modules/ui/relief-editor.js b/modules/ui/relief-editor.js
index 594ea710..65d304b0 100644
--- a/modules/ui/relief-editor.js
+++ b/modules/ui/relief-editor.js
@@ -81,6 +81,7 @@ function editReliefIcon() {
     reliefSpacingDiv.style.display = 'none';
     reliefIconsSeletionAny.style.display = 'none';
 
+    removeCircle();
     updateReliefSizeInput();
     restoreDefaultEvents();
     clearMainTip();
@@ -115,10 +116,7 @@ function editReliefIcon() {
 
   function dragToAdd() {
     const pressed = reliefIconsDiv.querySelector('svg.pressed');
-    if (!pressed) {
-      tip('Please select an icon', false, error);
-      return;
-    }
+    if (!pressed) return tip('Please select an icon', false, error);
 
     const type = pressed.dataset.type;
     const r = +reliefRadiusNumber.value;
@@ -188,10 +186,7 @@ function editReliefIcon() {
 
   function dragToRemove() {
     const pressed = reliefIconsDiv.querySelector('svg.pressed');
-    if (!pressed) {
-      tip('Please select an icon', false, error);
-      return;
-    }
+    if (!pressed) return tip('Please select an icon', false, error);
 
     const r = +reliefRadiusNumber.value;
     const type = pressed.dataset.type;
@@ -256,12 +251,32 @@ function editReliefIcon() {
   }
 
   function removeIcon() {
-    const message = 'Are you sure you want to remove the relief icon? <br>This action cannot be reverted';
-    const onConfirm = () => {
-      elSelected.remove();
-      $('#reliefEditor').dialog('close');
-    };
-    confirmationDialog({title: 'Remove relief icon', message, confirm: 'Remove', onConfirm});
+    let selection = null;
+    const pressed = reliefTools.querySelector('button.pressed');
+    if (pressed.id === 'reliefIndividual') {
+      alertMessage.innerHTML = `Are you sure you want to remove the icon?`;
+      selection = elSelected;
+    } else {
+      const type = reliefIconsDiv.querySelector('svg.pressed')?.dataset.type;
+      selection = type ? terrain.selectAll("use[href='" + type + "']") : terrain.selectAll('use');
+      const size = selection.size();
+      alertMessage.innerHTML = type ? `Are you sure you want to remove all ${type} icons (${size})?` : `Are you sure you want to remove all icons (${size})?`;
+    }
+
+    $('#alert').dialog({
+      resizable: false,
+      title: 'Remove relief icons',
+      buttons: {
+        Remove: function () {
+          if (selection) selection.remove();
+          $(this).dialog('close');
+          $('#reliefEditor').dialog('close');
+        },
+        Cancel: function () {
+          $(this).dialog('close');
+        }
+      }
+    });
   }
 
   function closeReliefEditor() {
diff --git a/modules/ui/rivers-creator.js b/modules/ui/rivers-creator.js
new file mode 100644
index 00000000..0a2d62c6
--- /dev/null
+++ b/modules/ui/rivers-creator.js
@@ -0,0 +1,125 @@
+"use strict";
+function createRiver() {
+  if (customization) return;
+  closeDialogs();
+  if (!layerIsOn("toggleRivers")) toggleRivers();
+
+  document.getElementById("toggleCells").dataset.forced = +!layerIsOn("toggleCells");
+  if (!layerIsOn("toggleCells")) toggleCells();
+
+  tip("Click to add river point, click again to remove", true);
+  debug.append("g").attr("id", "controlCells");
+  viewbox.style("cursor", "crosshair").on("click", onCellClick);
+
+  createRiver.cells = [];
+  const body = document.getElementById("riverCreatorBody");
+
+  $("#riverCreator").dialog({
+    title: "Create River",
+    resizable: false,
+    position: {my: "left top", at: "left+10 top+10", of: "#map"},
+    close: closeRiverCreator
+  });
+
+  if (modules.createRiver) return;
+  modules.createRiver = true;
+
+  // add listeners
+  document.getElementById("riverCreatorComplete").addEventListener("click", addRiver);
+  document.getElementById("riverCreatorCancel").addEventListener("click", () => $("#riverCreator").dialog("close"));
+  body.addEventListener("click", function (ev) {
+    const el = ev.target;
+    const cl = el.classList;
+    const cell = +el.parentNode.dataset.cell;
+    if (cl.contains("editFlux")) pack.cells.fl[cell] = +el.value;
+    else if (cl.contains("icon-trash-empty")) removeCell(cell);
+  });
+
+  function onCellClick() {
+    const cell = findCell(...d3.mouse(this));
+
+    if (createRiver.cells.includes(cell)) removeCell(cell);
+    else addCell(cell);
+  }
+
+  function addCell(cell) {
+    createRiver.cells.push(cell);
+    drawCells(createRiver.cells);
+
+    const flux = pack.cells.fl[cell];
+    const line = `<div class="editorLine" data-cell="${cell}">
+      <span>Cell ${cell}</span>
+      <span data-tip="Set flux affects river width" style="margin-left: 0.4em">Flux</span>
+      <input type="number" min=0 value="${flux}" class="editFlux" style="width: 5em"/>
+      <span data-tip="Remove the cell" class="icon-trash-empty pointer"></span>
+    </div>`;
+    body.innerHTML += line;
+  }
+
+  function removeCell(cell) {
+    createRiver.cells = createRiver.cells.filter(c => c !== cell);
+    drawCells(createRiver.cells);
+    body.querySelector(`div[data-cell='${cell}']`)?.remove();
+  }
+
+  function drawCells(cells) {
+    debug
+      .select("#controlCells")
+      .selectAll(`polygon`)
+      .data(cells)
+      .join("polygon")
+      .attr("points", d => getPackPolygon(d))
+      .attr("class", "current");
+  }
+
+  function addRiver() {
+    const {rivers, cells} = pack;
+    const {addMeandering, getApproximateLength, getWidth, getOffset, getName, getRiverPath, getBasin} = Rivers;
+
+    const riverCells = createRiver.cells;
+    if (riverCells.length < 2) return tip("Add at least 2 cells", false, "error");
+
+    const riverId = rivers.length ? last(rivers).i + 1 : 1;
+    const parent = cells.r[last(riverCells)] || riverId;
+
+    riverCells.forEach(cell => {
+      if (!cells.r[cell]) cells.r[cell] = riverId;
+    });
+
+    const source = riverCells[0];
+    const mouth = parent === riverId ? last(riverCells) : riverCells[riverCells.length - 2];
+    const sourceWidth = 0.05;
+    const widthFactor = 1.2;
+
+    const meanderedPoints = addMeandering(riverCells);
+
+    const discharge = cells.fl[mouth]; // m3 in second
+    const length = getApproximateLength(meanderedPoints);
+    const width = getWidth(getOffset(discharge, meanderedPoints.length, widthFactor, sourceWidth));
+    const name = getName(mouth);
+    const basin = getBasin(parent);
+
+    rivers.push({i: riverId, source, mouth, discharge, length, width, widthFactor, sourceWidth, parent, cells: riverCells, basin, name, type: "River"});
+
+    // render river
+    lineGen.curve(d3.curveCatmullRom.alpha(0.1));
+    viewbox
+      .select("#rivers")
+      .append("path")
+      .attr("id", "river" + riverId)
+      .attr("d", getRiverPath(meanderedPoints, widthFactor, sourceWidth));
+
+    editRiver(riverId);
+  }
+
+  function closeRiverCreator() {
+    body.innerHTML = "";
+    debug.select("#controlCells").remove();
+    restoreDefaultEvents();
+    clearMainTip();
+
+    const forced = +document.getElementById("toggleCells").dataset.forced;
+    document.getElementById("toggleCells").dataset.forced = 0;
+    if (forced && layerIsOn("toggleCells")) toggleCells();
+  }
+}
diff --git a/modules/ui/rivers-editor.js b/modules/ui/rivers-editor.js
index 5eb1de5d..4fd0431a 100644
--- a/modules/ui/rivers-editor.js
+++ b/modules/ui/rivers-editor.js
@@ -1,21 +1,31 @@
 'use strict';
 function editRiver(id) {
   if (customization) return;
-  if (elSelected && d3.event && d3.event.target.id === elSelected.attr('id')) return;
+  if (elSelected && id === elSelected.attr('id')) return;
   closeDialogs('.stable');
   if (!layerIsOn('toggleRivers')) toggleRivers();
 
-  const node = id ? document.getElementById(id) : d3.event.target;
-  elSelected = d3.select(node).on('click', addInterimControlPoint);
-  viewbox.on('touchmove mousemove', showEditorTips);
-  debug.append('g').attr('id', 'controlPoints').attr('transform', elSelected.attr('transform'));
+  document.getElementById('toggleCells').dataset.forced = +!layerIsOn('toggleCells');
+  if (!layerIsOn('toggleCells')) toggleCells();
+
+  elSelected = d3.select('#' + id);
+
+  tip('Drag control points to change the river course. For major changes please create a new river instead', true);
+  debug.append('g').attr('id', 'controlCells');
+  debug.append('g').attr('id', 'controlPoints');
+
   updateRiverData();
-  drawControlPoints(node);
+
+  const river = getRiver();
+  const {cells, points} = river;
+  const riverPoints = Rivers.getRiverPoints(cells, points);
+  drawControlPoints(riverPoints, cells);
+  drawCells(cells, 'current');
 
   $('#riverEditor').dialog({
     title: 'Edit River',
     resizable: false,
-    position: {my: 'center top+80', at: 'top', of: node, collision: 'fit'},
+    position: {my: 'left top', at: 'left+10 top+10', of: '#map'},
     close: closeRiverEditor
   });
 
@@ -23,27 +33,19 @@ function editRiver(id) {
   modules.editRiver = true;
 
   // add listeners
+  document.getElementById('riverCreateSelectingCells').addEventListener('click', createRiver);
+  document.getElementById('riverEditStyle').addEventListener('click', () => editStyle('rivers'));
+  document.getElementById('riverElevationProfile').addEventListener('click', showElevationProfile);
+  document.getElementById('riverLegend').addEventListener('click', editRiverLegend);
+  document.getElementById('riverRemove').addEventListener('click', removeRiver);
   document.getElementById('riverName').addEventListener('input', changeName);
   document.getElementById('riverType').addEventListener('input', changeType);
   document.getElementById('riverNameCulture').addEventListener('click', generateNameCulture);
   document.getElementById('riverNameRandom').addEventListener('click', generateNameRandom);
   document.getElementById('riverMainstem').addEventListener('change', changeParent);
-
   document.getElementById('riverSourceWidth').addEventListener('input', changeSourceWidth);
   document.getElementById('riverWidthFactor').addEventListener('input', changeWidthFactor);
 
-  document.getElementById('riverNew').addEventListener('click', toggleRiverCreationMode);
-  document.getElementById('riverEditStyle').addEventListener('click', () => editStyle('rivers'));
-  document.getElementById('riverElevationProfile').addEventListener('click', showElevationProfile);
-  document.getElementById('riverLegend').addEventListener('click', editRiverLegend);
-  document.getElementById('riverRemove').addEventListener('click', removeRiver);
-
-  function showEditorTips() {
-    showMainTip();
-    if (d3.event.target.parentNode.id === elSelected.attr('id')) tip('Drag to move, click to add a control point');
-    else if (d3.event.target.parentNode.id === 'controlPoints') tip('Drag to move, click to delete the control point');
-  }
-
   function getRiver() {
     const riverId = +elSelected.attr('id').slice(5);
     const river = pack.rivers.find((r) => r.i === riverId);
@@ -67,87 +69,107 @@ function editRiver(id) {
     document.getElementById('riverBasin').value = pack.rivers.find((river) => river.i === r.basin).name;
 
     document.getElementById('riverDischarge').value = r.discharge + ' m³/s';
-    r.length = elSelected.node().getTotalLength() / 2;
-    const length = rn(r.length * distanceScaleInput.value) + ' ' + distanceUnitInput.value;
-    document.getElementById('riverLength').value = length;
-    const width = rn(r.width * distanceScaleInput.value, 3) + ' ' + distanceUnitInput.value;
-    document.getElementById('riverWidth').value = width;
-
     document.getElementById('riverSourceWidth').value = r.sourceWidth;
     document.getElementById('riverWidthFactor').value = r.widthFactor;
+
+    updateRiverLength(r);
+    updateRiverWidth(r);
   }
 
-  function drawControlPoints(node) {
-    const length = getRiver().length;
-    const segments = Math.ceil(length / 4);
-    const increment = rn((length / segments) * 1e5);
-    for (let i = increment * segments, c = i; i >= 0; i -= increment, c += increment) {
-      const p1 = node.getPointAtLength(i / 1e5);
-      const p2 = node.getPointAtLength(c / 1e5);
-      addControlPoint([(p1.x + p2.x) / 2, (p1.y + p2.y) / 2]);
-    }
+  function updateRiverLength(river) {
+    river.length = rn(elSelected.node().getTotalLength() / 2, 2);
+    const lengthUI = `${rn(river.length * distanceScaleInput.value)} ${distanceUnitInput.value}`;
+    document.getElementById('riverLength').value = lengthUI;
   }
 
-  function addControlPoint(point, before = null) {
-    debug.select('#controlPoints').insert('circle', before).attr('cx', point[0]).attr('cy', point[1]).attr('r', 0.6).call(d3.drag().on('drag', dragControlPoint)).on('click', clickControlPoint);
+  function updateRiverWidth(river) {
+    const {addMeandering, getWidth, getOffset} = Rivers;
+    const {cells, discharge, widthFactor, sourceWidth} = river;
+    const meanderedPoints = addMeandering(cells);
+    river.width = getWidth(getOffset(discharge, meanderedPoints.length, widthFactor, sourceWidth));
+
+    const width = `${rn(river.width * distanceScaleInput.value, 3)} ${distanceUnitInput.value}`;
+    document.getElementById('riverWidth').value = width;
   }
 
-  function dragControlPoint() {
-    this.setAttribute('cx', d3.event.x);
-    this.setAttribute('cy', d3.event.y);
-    redrawRiver();
-  }
-
-  function redrawRiver() {
-    const points = [];
+  function drawControlPoints(points, cells) {
     debug
       .select('#controlPoints')
       .selectAll('circle')
-      .each(function () {
-        points.push([+this.getAttribute('cx'), +this.getAttribute('cy')]);
-      });
+      .data(points)
+      .enter()
+      .append('circle')
+      .attr('cx', (d) => d[0])
+      .attr('cy', (d) => d[1])
+      .attr('r', 0.6)
+      .attr('data-cell', (d, i) => cells[i])
+      .attr('data-i', (d, i) => i)
+      .call(d3.drag().on('start', dragControlPoint));
+  }
 
-    if (points.length < 2) return;
-    if (points.length === 2) {
-      const p0 = points[0],
-        p1 = points[1];
-      const angle = Math.atan2(p1[1] - p0[1], p1[0] - p0[0]);
-      const sin = Math.sin(angle),
-        cos = Math.cos(angle);
-      elSelected.attr('d', `M${p0[0]},${p0[1]} L${p1[0]},${p1[1]} l${-sin / 2},${cos / 2} Z`);
-      return;
-    }
+  function drawCells(cells, type) {
+    debug
+      .select('#controlCells')
+      .selectAll(`polygon.${type}`)
+      .data(cells.filter((i) => pack.cells.i[i]))
+      .join('polygon')
+      .attr('points', (d) => getPackPolygon(d))
+      .attr('class', type);
+  }
 
-    const widthFactor = +document.getElementById('riverWidthFactor').value;
-    const sourceWidth = +document.getElementById('riverSourceWidth').value;
-    const [path, length, offset] = Rivers.getPath(points, widthFactor, sourceWidth);
+  function dragControlPoint() {
+    const {i, r, fl} = pack.cells;
+    const river = getRiver();
+
+    const initCell = +this.dataset.cell;
+    const index = +this.dataset.i;
+
+    let movedToCell = null;
+
+    d3.event.on('drag', function () {
+      const {x, y} = d3.event;
+      const currentCell = findCell(x, y);
+
+      movedToCell = initCell !== currentCell ? currentCell : null;
+
+      this.setAttribute('cx', x);
+      this.setAttribute('cy', y);
+      this.__data__ = [rn(x, 1), rn(y, 1)];
+      redrawRiver();
+    });
+
+    d3.event.on('end', () => {
+      if (movedToCell) {
+        this.dataset.cell = movedToCell;
+        river.cells[index] = movedToCell;
+        drawCells(river.cells, 'current');
+
+        if (!r[movedToCell]) {
+          // swap river data
+          r[initCell] = 0;
+          r[movedToCell] = river.i;
+          const sourceFlux = fl[initCell];
+          fl[initCell] = fl[movedToCell];
+          fl[movedToCell] = sourceFlux;
+        }
+      }
+    });
+  }
+
+  function redrawRiver() {
+    const river = getRiver();
+    river.points = debug.selectAll('#controlPoints > *').data();
+    const {cells, widthFactor, sourceWidth} = river;
+    const meanderedPoints = Rivers.addMeandering(cells, river.points);
+
+    lineGen.curve(d3.curveCatmullRom.alpha(0.1));
+    const path = Rivers.getRiverPath(meanderedPoints, widthFactor, sourceWidth);
     elSelected.attr('d', path);
 
-    const r = getRiver();
-    if (r) {
-      r.width = rn(offset ** 2, 2);
-      r.length = length;
-      updateRiverData();
-    }
-
+    updateRiverLength(river);
     if (modules.elevation) showEPForRiver(elSelected.node());
   }
 
-  function clickControlPoint() {
-    this.remove();
-    redrawRiver();
-  }
-
-  function addInterimControlPoint() {
-    const point = d3.mouse(this);
-    const controls = document.getElementById('controlPoints').querySelectorAll('circle');
-    const points = Array.from(controls).map((circle) => [+circle.getAttribute('cx'), +circle.getAttribute('cy')]);
-    const index = getSegmentId(points, point, 2);
-    addControlPoint(point, ':nth-child(' + (index + 1) + ')');
-
-    redrawRiver();
-  }
-
   function changeName() {
     getRiver().name = this.value;
   }
@@ -174,12 +196,16 @@ function editRiver(id) {
   }
 
   function changeSourceWidth() {
-    getRiver().sourceWidth = +this.value;
+    const river = getRiver();
+    river.sourceWidth = +this.value;
+    updateRiverWidth(river);
     redrawRiver();
   }
 
   function changeWidthFactor() {
-    getRiver().widthFactor = +this.value;
+    const river = getRiver();
+    river.widthFactor = +this.value;
+    updateRiverWidth(river);
     redrawRiver();
   }
 
@@ -194,81 +220,35 @@ function editRiver(id) {
     editNotes(id, river.name + ' ' + river.type);
   }
 
-  function toggleRiverCreationMode() {
-    if (document.getElementById('riverNew').classList.contains('pressed')) exitRiverCreationMode();
-    else {
-      document.getElementById('riverNew').classList.add('pressed');
-      tip('Click on map to add control points', true, 'warn');
-      viewbox.on('click', addPointOnClick).style('cursor', 'crosshair');
-      elSelected.on('click', null);
-    }
-  }
-
-  function addPointOnClick() {
-    if (!elSelected.attr('data-new')) {
-      debug.select('#controlPoints').selectAll('circle').remove();
-      const id = getNextId('river');
-      elSelected = d3.select(elSelected.node().parentNode).append('path').attr('id', id).attr('data-new', 1);
-    }
-
-    // add control point
-    const point = d3.mouse(this);
-    addControlPoint([point[0], point[1]]);
-    redrawRiver();
-  }
-
-  function exitRiverCreationMode() {
-    riverNew.classList.remove('pressed');
-    clearMainTip();
-    viewbox.on('click', clicked).style('cursor', 'default');
-    elSelected.on('click', addInterimControlPoint);
-
-    if (!elSelected.attr('data-new')) return; // no need to create a new river
-    elSelected.attr('data-new', null);
-
-    // add a river
-    const r = +elSelected.attr('id').slice(5);
-    const node = elSelected.node(),
-      length = node.getTotalLength() / 2;
-
-    const cells = [];
-    const segments = Math.ceil(length / 4),
-      increment = rn((length / segments) * 1e5);
-    for (let i = increment * segments, c = i; i >= 0; i -= increment, c += increment) {
-      const p = node.getPointAtLength(i / 1e5);
-      const cell = findCell(p.x, p.y);
-      if (!pack.cells.r[cell]) pack.cells.r[cell] = r;
-      cells.push(cell);
-    }
-
-    const source = cells[0],
-      mouth = last(cells);
-    const name = Rivers.getName(mouth);
-    const smallLength = pack.rivers.map((r) => r.length || 0).sort((a, b) => a - b)[Math.ceil(pack.rivers.length * 0.15)];
-    const type = length < smallLength ? rw({Creek: 9, River: 3, Brook: 3, Stream: 1}) : 'River';
-
-    const discharge = rn(cells.length * 20 * Math.random());
-    const widthFactor = +document.getElementById('riverWidthFactor').value;
-    const sourceWidth = +document.getElementById('riverSourceWidth').value;
-
-    pack.rivers.push({i: r, source, mouth, discharge, length, width: sourceWidth, widthFactor, sourceWidth, parent: 0, name, type, basin: r});
-  }
-
   function removeRiver() {
-    const message = 'Are you sure you want to remove the river? <br>All tributaries will be auto-removed';
-    const onConfirm = () => {
-      const river = +elSelected.attr('id').slice(5);
-      Rivers.remove(river);
-      elSelected.remove(); // if river if missed in pack.rivers
-      $('#riverEditor').dialog('close');
-    };
-    confirmationDialog({title: 'Remove river', message, confirm: 'Remove', onConfirm});
+    alertMessage.innerHTML = 'Are you sure you want to remove the river and all its tributaries';
+    $('#alert').dialog({
+      resizable: false,
+      width: '22em',
+      title: 'Remove river and tributaries',
+      buttons: {
+        Remove: function () {
+          $(this).dialog('close');
+          const river = +elSelected.attr('id').slice(5);
+          Rivers.remove(river);
+          elSelected.remove();
+          $('#riverEditor').dialog('close');
+        },
+        Cancel: function () {
+          $(this).dialog('close');
+        }
+      }
+    });
   }
 
   function closeRiverEditor() {
-    exitRiverCreationMode();
-    elSelected.on('click', null);
     debug.select('#controlPoints').remove();
+    debug.select('#controlCells').remove();
     unselect();
+    clearMainTip();
+
+    const forced = +document.getElementById('toggleCells').dataset.forced;
+    document.getElementById('toggleCells').dataset.forced = 0;
+    if (forced && layerIsOn('toggleCells')) toggleCells();
   }
 }
diff --git a/modules/ui/rivers-overview.js b/modules/ui/rivers-overview.js
index 3ad9d13b..fb549851 100644
--- a/modules/ui/rivers-overview.js
+++ b/modules/ui/rivers-overview.js
@@ -21,6 +21,7 @@ function overviewRivers() {
   // add listeners
   document.getElementById('riversOverviewRefresh').addEventListener('click', riversOverviewAddLines);
   document.getElementById('addNewRiver').addEventListener('click', toggleAddRiver);
+  document.getElementById('riverCreateNew').addEventListener('click', createRiver);
   document.getElementById('riversBasinHighlight').addEventListener('click', toggleBasinsHightlight);
   document.getElementById('riversExport').addEventListener('click', downloadRiversData);
   document.getElementById('riversRemoveAll').addEventListener('click', triggerAllRiversRemove);
@@ -129,27 +130,53 @@ function overviewRivers() {
   }
 
   function openRiverEditor() {
-    editRiver('river' + this.parentNode.dataset.id);
+    const id = 'river' + this.parentNode.dataset.id;
+    editRiver(id);
   }
 
   function triggerRiverRemove() {
     const river = +this.parentNode.dataset.id;
+    alertMessage.innerHTML = `Are you sure you want to remove the river? 
+      All tributaries will be auto-removed`;
 
-    const message = 'Are you sure you want to remove the river? <br>All tributaries will be auto-removed';
-    const onConfirm = () => {
-      Rivers.remove(river);
-      riversOverviewAddLines();
-    };
-    confirmationDialog({title: 'Remove river', message, confirm: 'Remove', onConfirm});
+    $('#alert').dialog({
+      resizable: false,
+      width: '22em',
+      title: 'Remove river',
+      buttons: {
+        Remove: function () {
+          Rivers.remove(river);
+          riversOverviewAddLines();
+          $(this).dialog('close');
+        },
+        Cancel: function () {
+          $(this).dialog('close');
+        }
+      }
+    });
   }
 
   function triggerAllRiversRemove() {
-    const message = 'Are you sure you want to remove all rivers? <br>This action cannot be reverted';
-    const onConfirm = () => {
-      pack.rivers = [];
-      rivers.selectAll('*').remove();
-      riversOverviewAddLines();
-    };
-    confirmationDialog({title: 'Remove all rivers', message, confirm: 'Remove', onConfirm});
+    alertMessage.innerHTML = `Are you sure you want to remove all rivers?`;
+    $('#alert').dialog({
+      resizable: false,
+      title: 'Remove all rivers',
+      buttons: {
+        Remove: function () {
+          $(this).dialog('close');
+          removeAllRivers();
+        },
+        Cancel: function () {
+          $(this).dialog('close');
+        }
+      }
+    });
+  }
+
+  function removeAllRivers() {
+    pack.rivers = [];
+    pack.cells.r = new Uint16Array(pack.cells.i.length);
+    rivers.selectAll('*').remove();
+    riversOverviewAddLines();
   }
 }
diff --git a/modules/ui/states-editor.js b/modules/ui/states-editor.js
index 839ebe1e..0b4ec248 100644
--- a/modules/ui/states-editor.js
+++ b/modules/ui/states-editor.js
@@ -849,18 +849,21 @@ function editStates() {
   }
 
   function adjustProvinces(affectedProvinces) {
-    const cells = pack.cells,
-      provinces = pack.provinces,
-      states = pack.states;
+    const {cells, provinces, states} = pack;
     const form = {Zone: 1, Area: 1, Territory: 2, Province: 1};
 
+<<<<<<< HEAD
     affectedProvinces.forEach((p) => {
       // do nothing if neutral lands are captured
       if (!p) return;
+=======
+    affectedProvinces.forEach(p => {
+      if (!p) return; // do nothing if neutral lands are captured
+      const old = provinces[p].state;
+>>>>>>> 597f9ae038fbcc149315df9b1618e64744fb929d
 
       // remove province from state provinces list
-      const old = provinces[p].state;
-      if (states[old].provinces.includes(p)) states[old].provinces.splice(states[old].provinces.indexOf(p), 1);
+      if (states[old]?.provinces?.includes(p)) states[old].provinces.splice(states[old].provinces.indexOf(p), 1);
 
       // find states owning at least 1 province cell
       const provCells = cells.i.filter((i) => cells.province[i] === p);
@@ -871,8 +874,13 @@ function editStates() {
       if (owner) {
         const name = provinces[p].name;
 
+<<<<<<< HEAD
         // if province is historical part of abouther state province, unite with old province
         const part = states[owner].provinces.find((n) => name.includes(provinces[n].name));
+=======
+        // if province is a historical part of another state's province, unite with old province
+        const part = states[owner].provinces.find(n => name.includes(provinces[n].name));
+>>>>>>> 597f9ae038fbcc149315df9b1618e64744fb929d
         if (part) {
           provinces[p].removed = true;
           provCells.filter((i) => cells.state[i] === owner).forEach((i) => (cells.province[i] = part));
diff --git a/modules/ui/style.js b/modules/ui/style.js
index 38c6b637..b9b3e32b 100644
--- a/modules/ui/style.js
+++ b/modules/ui/style.js
@@ -1,6 +1,21 @@
 // UI module to control the style
 'use strict';
 
+// add available filters to lists
+void (function addFilters() {
+  const filters = Array.from(document.getElementById("filters").querySelectorAll("filter"));
+  const emptyOption = '<option value="" selected>None</option>';
+  const options = filters.map(filter => {
+    const id = filter.getAttribute("id");
+    const name = filter.getAttribute("name");
+    return `<option value="url(#${id})">${name}</option>`;
+  });
+  const allOptions = emptyOption + options.join("");
+
+  document.getElementById("styleFilterInput").innerHTML = allOptions;
+  document.getElementById("styleStatesBodyFilter").innerHTML = allOptions;
+})();
+
 // store some style inputs as options
 styleElements.addEventListener('change', function (ev) {
   if (ev.target.dataset.stored) lock(ev.target.dataset.stored);
@@ -28,34 +43,29 @@ function selectStyleElement() {
   const sel = styleElementSelect.value;
   let el = d3.select('#' + sel);
 
-  styleElements.querySelectorAll('tbody').forEach((e) => (e.style.display = 'none')); // hide all sections
-  const off = sel !== 'ocean' && (el.style('display') === 'none' || !el.selectAll('*').size()); // check if layer is off
-  if (off) {
-    styleIsOff.style.display = 'block';
-    setTimeout(() => (styleIsOff.style.display = 'none'), 1500);
-  }
+  styleElements.querySelectorAll("tbody").forEach(e => (e.style.display = "none")); // hide all sections
+
+  // show alert line if layer is not visible
+  const isLayerOff = sel !== "ocean" && (el.style("display") === "none" || !el.selectAll("*").size());
+  styleIsOff.style.display = isLayerOff ? "block" : "none";
 
   // active group element
   const group = styleGroupSelect.value;
-  if (['routes', 'labels', 'coastline', 'lakes', 'anchors', 'burgIcons', 'borders'].includes(sel)) {
-    el = d3
-      .select('#' + sel)
-      .select('g#' + group)
-      .size()
-      ? d3.select('#' + sel).select('g#' + group)
-      : d3.select('#' + sel).select('g');
+  if (["routes", "labels", "coastline", "lakes", "anchors", "burgIcons", "borders"].includes(sel)) {
+    const gEl = group && el.select("#" + group);
+    el = group && gEl.size() ? gEl : el.select("g");
   }
 
-  if (sel !== 'landmass' && sel !== 'legend') {
-    // opacity
-    if (sel !== 'ocean') {
-      styleOpacity.style.display = 'block';
-      styleOpacityInput.value = styleOpacityOutput.value = el.attr('opacity') || 1;
-    }
+  // opacity
+  if (!["landmass", "ocean", "regions", "legend"].includes(sel)) {
+    styleOpacity.style.display = "block";
+    styleOpacityInput.value = styleOpacityOutput.value = el.attr("opacity") || 1;
+  }
 
-    // filter
-    styleFilter.style.display = 'block';
-    styleFilterInput.value = el.attr('filter') || '';
+  // filter
+  if (!["landmass", "legend", "regions"].includes(sel)) {
+    styleFilter.style.display = "block";
+    styleFilterInput.value = el.attr("filter") || "";
   }
 
   // fill
@@ -86,16 +96,15 @@ function selectStyleElement() {
   }
 
   // show specific sections
-  if (sel === 'texture') styleTexture.style.display = 'block';
-  if ((sel === 'routes', 'labels' || sel == 'anchors' || sel == 'burgIcons', 'coastline', 'lakes', 'borders')) styleGroup.style.display = 'block';
+  if (sel === "texture") styleTexture.style.display = "block";
 
-  if (sel === 'terrs') {
-    styleHeightmap.style.display = 'block';
-    styleHeightmapScheme.value = terrs.attr('scheme');
-    styleHeightmapTerracingInput.value = styleHeightmapTerracingOutput.value = terrs.attr('terracing');
-    styleHeightmapSkipInput.value = styleHeightmapSkipOutput.value = terrs.attr('skip');
-    styleHeightmapSimplificationInput.value = styleHeightmapSimplificationOutput.value = terrs.attr('relax');
-    styleHeightmapCurve.value = terrs.attr('curve');
+  if (sel === "terrs") {
+    styleHeightmap.style.display = "block";
+    styleHeightmapScheme.value = terrs.attr("scheme");
+    styleHeightmapTerracingInput.value = styleHeightmapTerracingOutput.value = terrs.attr("terracing");
+    styleHeightmapSkipInput.value = styleHeightmapSkipOutput.value = terrs.attr("skip");
+    styleHeightmapSimplificationInput.value = styleHeightmapSimplificationOutput.value = terrs.attr("relax");
+    styleHeightmapCurve.value = terrs.attr("curve");
   }
 
   if (sel === 'markers') {
@@ -135,10 +144,14 @@ function selectStyleElement() {
     styleStrokeWidthInput.value = styleStrokeWidthOutput.value = el.attr('stroke-width') || '';
   }
 
-  if (sel === 'regions') {
-    styleStates.style.display = 'block';
-    styleStatesHaloWidth.value = styleStatesHaloWidthOutput.value = statesHalo.attr('data-width');
-    styleStatesHaloOpacity.value = styleStatesHaloOpacityOutput.value = statesHalo.attr('opacity');
+  if (sel === "regions") {
+    styleStates.style.display = "block";
+    styleStatesBodyOpacity.value = styleStatesBodyOpacityOutput.value = statesBody.attr("opacity") || 1;
+    styleStatesBodyFilter.value = statesBody.attr("filter") || "";
+    styleStatesHaloWidth.value = styleStatesHaloWidthOutput.value = statesHalo.attr("data-width") || 10;
+    styleStatesHaloOpacity.value = styleStatesHaloOpacityOutput.value = statesHalo.attr("opacity") || 1;
+    const blur = parseFloat(statesHalo.attr("filter")?.match(/blur\(([^)]+)\)/)?.[1]) || 0;
+    styleStatesHaloBlur.value = styleStatesHaloBlurOutput.value = blur;
   }
 
   if (sel === 'labels') {
@@ -260,18 +273,18 @@ function selectStyleElement() {
 
   // update group options
   styleGroupSelect.options.length = 0; // remove all options
-  if (['routes', 'labels', 'coastline', 'lakes', 'anchors', 'burgIcons', 'borders'].includes(sel)) {
-    document
-      .getElementById(sel)
-      .querySelectorAll('g')
-      .forEach((el) => {
-        if (el.id === 'burgLabels') return;
-        const count = el.childElementCount;
-        styleGroupSelect.options.add(new Option(`${el.id} (${count})`, el.id, false, false));
-      });
-    styleGroupSelect.value = el.attr('id');
+  if (["routes", "labels", "coastline", "lakes", "anchors", "burgIcons", "borders"].includes(sel)) {
+    const groups = document.getElementById(sel).querySelectorAll("g");
+    groups.forEach(el => {
+      if (el.id === "burgLabels") return;
+      const option = new Option(`${el.id} (${el.childElementCount})`, el.id, false, false);
+      styleGroupSelect.options.add(option);
+    });
+    styleGroupSelect.value = el.attr("id");
+    styleGroup.style.display = "block";
   } else {
     styleGroupSelect.options.add(new Option(sel, sel, false, true));
+    styleGroup.style.display = "none";
   }
 
   if (sel === 'coastline' && styleGroupSelect.value === 'sea_island') {
@@ -285,10 +298,10 @@ function selectStyleElement() {
 styleGroupSelect.addEventListener('change', selectStyleElement);
 
 function getEl() {
-  const el = styleElementSelect.value,
-    g = styleGroupSelect.value;
-  if (g === el) return svg.select('#' + el);
-  else return svg.select('#' + el).select('#' + g);
+  const el = styleElementSelect.value;
+  const g = styleGroupSelect.value;
+  if (g === el) return svg.select("#" + el);
+  else return svg.select("#" + el).select("#" + g);
 }
 
 styleFillInput.addEventListener('input', function () {
@@ -323,12 +336,9 @@ styleOpacityInput.addEventListener('input', function () {
   getEl().attr('opacity', this.value);
 });
 
-styleFilterInput.addEventListener('change', function () {
-  if (styleGroupSelect.value === 'ocean') {
-    oceanLayers.attr('filter', this.value);
-    return;
-  }
-  getEl().attr('filter', this.value);
+styleFilterInput.addEventListener("change", function () {
+  if (styleGroupSelect.value === "ocean") return oceanLayers.attr("filter", this.value);
+  getEl().attr("filter", this.value);
 });
 
 styleTextureInput.addEventListener('change', function () {
@@ -454,25 +464,15 @@ styleReliefSet.addEventListener('change', function () {
   if (!layerIsOn('toggleRelief')) toggleRelief();
 });
 
-styleReliefSizeInput.addEventListener('change', function () {
+styleReliefSizeInput.addEventListener("change", function () {
+  terrain.attr("size", this.value);
   styleReliefSizeOutput.value = this.value;
-  const size = +this.value;
-  terrain.attr('size', size);
-
-  terrain.selectAll('use').each(function (d) {
-    const newSize = this.getAttribute('data-size') * size;
-    const shift = (newSize - +this.getAttribute('width')) / 2;
-    this.setAttribute('width', newSize);
-    this.setAttribute('height', newSize);
-    const x = +this.getAttribute('x');
-    const y = +this.getAttribute('y');
-    this.setAttribute('x', x - shift);
-    this.setAttribute('y', y - shift);
-  });
+  ReliefIcons();
+  if (!layerIsOn("toggleRelief")) toggleRelief();
 });
 
-styleReliefDensityInput.addEventListener('input', function () {
-  terrain.attr('density', this.value);
+styleReliefDensityInput.addEventListener("change", function () {
+  terrain.attr("density", this.value);
   styleReliefDensityOutput.value = this.value;
   ReliefIcons();
   if (!layerIsOn('toggleRelief')) toggleRelief();
@@ -574,24 +574,32 @@ styleFontSize.addEventListener('change', function () {
   changeFontSize(+this.value);
 });
 
-styleFontPlus.addEventListener('click', function () {
-  const size = Math.max(rn(getEl().attr('data-size') * 1.1, 2), 1);
-  changeFontSize(size);
+styleFontPlus.addEventListener("click", function () {
+  const size = +getEl().attr("data-size") + 1;
+  changeFontSize(Math.min(size, 999));
 });
 
-styleFontMinus.addEventListener('click', function () {
-  const size = Math.max(rn(getEl().attr('data-size') * 0.9, 2), 1);
-  changeFontSize(size);
+styleFontMinus.addEventListener("click", function () {
+  const size = +getEl().attr("data-size") - 1;
+  changeFontSize(Math.max(size, 1));
 });
 
 function changeFontSize(size) {
-  const legend = styleElementSelect.value === 'legend';
-  const coords = styleElementSelect.value === 'coordinates';
-
-  const desSize = legend ? size : coords ? rn(size / scale ** 0.8, 2) : rn(size + size / scale);
-  getEl().attr('data-size', size).attr('font-size', desSize);
   styleFontSize.value = size;
-  if (legend) redrawLegend();
+
+  const getSizeOnScale = element => {
+    // some labels are rescaled on zoom
+    if (element === "labels") return Math.max(rn((size + size / scale) / 2, 2), 1);
+    if (element === "coordinates") return rn(size / scale ** 0.8, 2);
+
+    // other has the same size
+    return size;
+  };
+
+  const scaleSize = getSizeOnScale(styleElementSelect.value);
+  getEl().attr("data-size", size).attr("font-size", scaleSize);
+
+  if (styleElementSelect.value === "legend") redrawLegend();
 }
 
 styleRadiusInput.addEventListener('change', function () {
@@ -655,7 +663,16 @@ function changeIconSize(size, group) {
   styleIconSizeInput.value = size;
 }
 
-styleStatesHaloWidth.addEventListener('input', function () {
+styleStatesBodyOpacity.addEventListener("input", function () {
+  styleStatesBodyOpacityOutput.value = this.value;
+  statesBody.attr("opacity", this.value);
+});
+
+styleStatesBodyFilter.addEventListener("change", function () {
+  statesBody.attr("filter", this.value);
+});
+
+styleStatesHaloWidth.addEventListener("input", function () {
   styleStatesHaloWidthOutput.value = this.value;
   statesHalo.attr('data-width', this.value).attr('stroke-width', this.value);
 });
@@ -665,8 +682,14 @@ styleStatesHaloOpacity.addEventListener('input', function () {
   statesHalo.attr('opacity', this.value);
 });
 
-styleArmiesFillOpacity.addEventListener('input', function () {
-  armies.attr('fill-opacity', this.value);
+styleStatesHaloBlur.addEventListener("input", function () {
+  styleStatesHaloBlurOutput.value = this.value;
+  const blur = +this.value > 0 ? `blur(${this.value}px)` : null;
+  statesHalo.attr("filter", blur);
+});
+
+styleArmiesFillOpacity.addEventListener("input", function () {
+  armies.attr("fill-opacity", this.value);
   styleArmiesFillOpacityOutput.value = this.value;
 });
 
@@ -680,15 +703,9 @@ styleArmiesSize.addEventListener('input', function () {
   });
 });
 
-styleEmblemsStateSizeInput.addEventListener('input', drawEmblems);
-styleEmblemsProvinceSizeInput.addEventListener('input', drawEmblems);
-styleEmblemsBurgSizeInput.addEventListener('input', drawEmblems);
-
-styleResourcesCircle.addEventListener('change', function () {
-  goods.attr('data-circle', +this.checked);
-  goods.selectAll('*').remove();
-  drawResources();
-});
+emblemsStateSizeInput.addEventListener("change", drawEmblems);
+emblemsProvinceSizeInput.addEventListener("change", drawEmblems);
+emblemsBurgSizeInput.addEventListener("change", drawEmblems);
 
 // request a URL to image to be used as a texture
 function textureProvideURL() {
@@ -735,10 +752,12 @@ function fetchTextureURL(url) {
 }
 
 const defaultStyles = {
-  styleAncient: `{"#map":{"background-color":"#000000","filter":"url(#filter-sepia)","data-filter":"sepia"},"#armies":{"font-size":6,"box-size":3,"stroke":"#000","stroke-width":0.05,"opacity":0.8,"fill-opacity":0.8,"filter":null},"#biomes":{"opacity":null,"filter":null,"mask":null},"#stateBorders":{"opacity":0.8,"stroke":"#56566d","stroke-width":1,"stroke-dasharray":2,"stroke-linecap":"butt","filter":null},"#provinceBorders":{"opacity":0.8,"stroke":"#56566d","stroke-width":0.2,"stroke-dasharray":1,"stroke-linecap":"butt","filter":null},"#cells":{"opacity":null,"stroke":"#808080","stroke-width":0.1,"filter":null,"mask":null},"#gridOverlay":{"opacity":0.8,"scale":1,"dx":0,"dy":"0","type":"pointyHex","stroke":"#808080","stroke-width":0.5,"stroke-dasharray":null,"stroke-linecap":null,"transform":null,"filter":null,"mask":null},"#coordinates":{"opacity":1,"data-size":12,"font-size":12,"stroke":"#d4d4d4","stroke-width":1,"stroke-dasharray":5,"stroke-linecap":null,"filter":null,"mask":null},"#compass":{"opacity":0.8,"transform":null,"filter":null,"mask":"url(#water)","shape-rendering":"optimizespeed"},"#rose":{"transform":"translate(80 80) scale(.25)"},"#relig":{"opacity":0.7,"stroke":"#404040","stroke-width":0.7,"filter":null},"#cults":{"opacity":0.6,"stroke":"#777777","stroke-width":0.5,"stroke-dasharray":null,"stroke-linecap":null,"filter":null},"#landmass":{"opacity":1,"fill":"#eee9d7","filter":null},"#markers":{"opacity":null,"rescale":1,"filter":"url(#dropShadow01)"},"#prec":{"opacity":null,"stroke":"#000000","stroke-width":0.1,"fill":"#003dff","filter":null},"#population":{"opacity":null,"stroke-width":1.6,"stroke-dasharray":null,"stroke-linecap":"butt","filter":null},"#rural":{"stroke":"#0000ff"},"#urban":{"stroke":"#ff0000"},"#freshwater":{"opacity":0.5,"fill":"#a6c1fd","stroke":"#5f799d","stroke-width":0.7,"filter":null},"#salt":{"opacity":0.5,"fill":"#409b8a","stroke":"#388985","stroke-width":0.7,"filter":null},"#sinkhole":{"opacity":1,"fill":"#5bc9fd","stroke":"#53a3b0","stroke-width":0.7,"filter":null},"#frozen":{"opacity":0.95,"fill":"#cdd4e7","stroke":"#cfe0eb","stroke-width":0,"filter":null},"#lava":{"opacity":0.7,"fill":"#90270d","stroke":"#f93e0c","stroke-width":2,"filter":"url(#crumpled)"},"#dry":{"opacity":0.7,"fill":"#c9bfa7","stroke":"#8e816f","stroke-width":0.7,"filter":null},"#sea_island":{"opacity":0.5,"stroke":"#1f3846","stroke-width":0.7,"filter":"url(#dropShadow)","auto-filter":1},"#lake_island":{"opacity":1,"stroke":"#7c8eaf","stroke-width":0.35,"filter":null},"#terrain":{"opacity":null,"set":"simple","size":1,"density":0.4,"filter":null,"mask":null},"#rivers":{"opacity":null,"filter":null,"fill":"#5d97bb"},"#ruler":{"opacity":null,"filter":null},"#roads":{"opacity":0.8,"stroke":"#2e1607","stroke-width":1.23,"stroke-dasharray":3,"stroke-linecap":"inherit","filter":null,"mask":null},"#trails":{"opacity":0.8,"stroke":"#331809","stroke-width":0.5,"stroke-dasharray":"1 2","stroke-linecap":"butt","filter":null,"mask":null},"#searoutes":{"opacity":0.8,"stroke":"#ffffff","stroke-width":0.8,"stroke-dasharray":"1 2","stroke-linecap":"round","filter":null,"mask":null},"#regions":{"opacity":0.4,"filter":""},"#statesHalo":{"opacity":1,"data-width":10,"stroke-width":10},"#provs":{"opacity":0.7,"fill":"#000000","data-size":10,"font-size":10,"font-family":"Georgia","data-font":"Georgia","filter":null},"#temperature":{"opacity":null,"font-size":"8px","fill":"#000000","fill-opacity":0.3,"stroke":null,"stroke-width":1.8,"stroke-dasharray":null,"stroke-linecap":null,"filter":null},"#ice":{"opacity":0.8,"fill":"#e8f0f6","stroke":"#e8f0f6","stroke-width":1,"filter":"url(#outline)"},"#emblems":{"opacity":0.6,"stroke-width":0.8,"filter":"url(#dropShadow05)"},"#texture":{"opacity":null,"filter":null,"mask":"url(#land)"},"#textureImage":{},"#zones":{"opacity":0.6,"stroke":"#333333","stroke-width":0,"stroke-dasharray":null,"stroke-linecap":"butt","filter":null,"mask":null},"#oceanLayers":{"filter":"url(#blur5)","layers":"-6,-4,-2"},"#oceanBase":{"fill":"#a7a01f"},"#oceanicPattern":{"href":"./images/pattern1.png", "opacity":0.2},"#terrs":{"opacity":null,"scheme":"light","terracing":0,"skip":0,"relax":0,"curve":0,"filter":null,"mask":"url(#land)"},"#legend":{"data-size":13,"font-size":13,"data-font":"Almendra+SC","font-family":"Almendra SC","stroke":"#812929","stroke-width":2.5,"stroke-dasharray":"0 4 10 4","stroke-linecap":"round","data-x":99,"data-y":93,"data-columns":8},"#legendBox":{},"#burgLabels > #cities":{"opacity":1,"fill":"#3e3e4b","text-shadow":"white 0 0 4px","data-size":8,"font-size":8,"data-font":"Almendra+SC","font-family":"Almendra SC"},"#burgIcons > #cities":{"opacity":1,"fill":"#fdfab9","fill-opacity":0.7,"size":1,"stroke":"#54251d","stroke-width":0.3,"stroke-dasharray":".3 .4","stroke-linecap":"butt"},"#anchors > #cities":{"opacity":1,"fill":"#ffffff","size":2,"stroke":"#3e3e4b","stroke-width":1.2},"#burgLabels > #towns":{"opacity":1,"fill":"#3e3e4b","data-size":4,"font-size":4,"data-font":"Almendra+SC","font-family":"Almendra SC"},"#burgIcons > #towns":{"opacity":1,"fill":"#fef4d8","fill-opacity":0.7,"size":0.5,"stroke":"#463124","stroke-width":0.12,"stroke-dasharray":"","stroke-linecap":"butt"},"#anchors > #towns":{"opacity":1,"fill":"#ffffff","size":1,"stroke":"#3e3e4b","stroke-width":1.2},"#labels > #states":{"opacity":1,"fill":"#3e3e4b","stroke":"#3a3a3a","stroke-width":0,"text-shadow":"white 0 0 4px","data-size":22,"font-size":22,"data-font":"Almendra+SC","font-family":"Almendra SC","filter":null},"#labels > #addedLabels":{"opacity":1,"fill":"#3e3e4b","stroke":"#3a3a3a","stroke-width":0,"text-shadow":"white 0 0 4px","data-size":18,"font-size":18,"data-font":"Almendra+SC","font-family":"Almendra SC","filter":null},"#fogging":{"opacity":0.98,"fill":"#30426f","filter":null},"#goods":{"opacity":1,"stroke-width":0.32,"data-circle":1,"filter":"url(#dropShadow01)"}}`,
-  styleGloom: `{"#map":{"background-color":"#000000","filter":null,"data-filter":null},"#armies":{"font-size":6,"box-size":3,"stroke":"#000","stroke-width":0.3,"opacity":1,"fill-opacity":1,"filter":null},"#biomes":{"opacity":null,"filter":"url(#blur5)","mask":"url(#land)"},"#stateBorders":{"opacity":1,"stroke":"#56566d","stroke-width":1,"stroke-dasharray":2,"stroke-linecap":"butt","filter":""},"#provinceBorders":{"opacity":1,"stroke":"#56566d","stroke-width":0.3,"stroke-dasharray":".7 1","stroke-linecap":"butt","filter":null},"#cells":{"opacity":null,"stroke":"#808080","stroke-width":0.1,"filter":null,"mask":null},"#gridOverlay":{"opacity":0.8,"scale":1,"dx":0,"dy":"0","type":"pointyHex","stroke":"#808080","stroke-width":0.5,"stroke-dasharray":null,"stroke-linecap":null,"transform":null,"filter":null,"mask":null},"#coordinates":{"opacity":1,"data-size":14,"font-size":14,"stroke":"#4a4a4a","stroke-width":1,"stroke-dasharray":6,"stroke-linecap":null,"filter":"","mask":""},"#compass":{"opacity":0.6,"transform":null,"filter":null,"mask":"url(#water)","shape-rendering":"optimizespeed"},"#rose":{"transform":"translate(100 100) scale(0.3)"},"#relig":{"opacity":0.7,"stroke":"#404040","stroke-width":1,"filter":null},"#cults":{"opacity":0.7,"stroke":"#777777","stroke-width":1.5,"stroke-dasharray":null,"stroke-linecap":null,"filter":null},"#landmass":{"opacity":1,"fill":"#e0e0e0","filter":null},"#markers":{"opacity":0.8,"rescale":1,"filter":"url(#dropShadow05)"},"#prec":{"opacity":null,"stroke":"#000000","stroke-width":0.1,"fill":"#003dff","filter":null},"#population":{"opacity":null,"stroke-width":1.6,"stroke-dasharray":null,"stroke-linecap":"butt","filter":null},"#rural":{"stroke":"#0000aa"},"#urban":{"stroke":"#9d0000"},"#freshwater":{"opacity":0.5,"fill":"#a6c1fd","stroke":"#5f799d","stroke-width":0.7,"filter":null},"#salt":{"opacity":0.5,"fill":"#409b8a","stroke":"#388985","stroke-width":0.7,"filter":null},"#sinkhole":{"opacity":1,"fill":"#5bc9fd","stroke":"#53a3b0","stroke-width":0.7,"filter":null},"#frozen":{"opacity":0.95,"fill":"#cdd4e7","stroke":"#cfe0eb","stroke-width":0,"filter":null},"#lava":{"opacity":0.7,"fill":"#90270d","stroke":"#f93e0c","stroke-width":2,"filter":"url(#crumpled)"},"#dry":{"opacity":0.7,"fill":"#c9bfa7","stroke":"#8e816f","stroke-width":0.7,"filter":null},"#sea_island":{"opacity":0.6,"stroke":"#1f3846","stroke-width":0.7,"filter":"url(#dropShadow)","auto-filter":1},"#lake_island":{"opacity":1,"stroke":"#7c8eaf","stroke-width":0.35,"filter":null},"#terrain":{"opacity":0.9,"set":"simple","size":1,"density":0.4,"filter":null,"mask":null},"#rivers":{"opacity":null,"filter":"","fill":"#779582"},"#ruler":{"opacity":null,"filter":null},"#roads":{"opacity":1,"stroke":"#8b4418","stroke-width":0.9,"stroke-dasharray":"2 3","stroke-linecap":"round","filter":"","mask":null},"#trails":{"opacity":1,"stroke":"#844017","stroke-width":0.2,"stroke-dasharray":".5 1","stroke-linecap":"round","filter":null,"mask":null},"#searoutes":{"opacity":0.8,"stroke":"#5e1865","stroke-width":0.6,"stroke-dasharray":"1.2 2.4","stroke-linecap":"round","filter":null,"mask":null},"#regions":{"opacity":0.4,"filter":"url(#dropShadow)"},"#statesHalo":{"opacity":1,"data-width":10.2,"stroke-width":10.2},"#provs":{"opacity":0.7,"fill":"#000000","data-size":10,"font-size":10,"font-family":"Georgia","data-font":"Georgia","filter":null},"#temperature":{"opacity":1,"font-size":"11px","fill":"#62001b","fill-opacity":0.3,"stroke":null,"stroke-width":2,"stroke-dasharray":2,"stroke-linecap":null,"filter":null},"#ice":{"opacity":0.9,"fill":"#e8f0f6","stroke":"#e8f0f6","stroke-width":1,"filter":"url(#dropShadow05)"},"#emblems": {"opacity":0.6,"stroke-width":0.5,"filter":null},"#texture":{"opacity":null,"filter":null,"mask":"url(#land)"},"#textureImage":{"x":0,"y":0},"#zones":{"opacity":0.5,"stroke":"#333333","stroke-width":0,"stroke-dasharray":null,"stroke-linecap":"butt","filter":"url(#dropShadow01)","mask":null},"#oceanLayers":{"filter":null,"layers":"-6,-4,-2"},"#oceanBase":{"fill":"#4e6964"},"#oceanicPattern":{"href":"./images/pattern3.png", "opacity":0.2},"#terrs":{"opacity":1,"scheme":"bright","terracing":0,"skip":0,"relax":1,"curve":1,"filter":"url(#filter-grayscale)","mask":"url(#land)"},"#legend":{"data-size":13,"font-size":13,"data-font":"Almendra+SC","font-family":"Almendra SC","stroke":"#812929","stroke-width":2.5,"stroke-dasharray":"0 4 10 4","stroke-linecap":"round","data-x":99,"data-y":93,"data-columns":8},"#legendBox":{},"#burgLabels > #cities":{"opacity":1,"fill":"#3e3e4b","text-shadow":"white 0 0 4px","data-size":7,"font-size":7,"data-font":"Bitter","font-family":"Bitter"},"#burgIcons > #cities":{"opacity":1,"fill":"#ffffff","fill-opacity":0.7,"size":2,"stroke":"#444444","stroke-width":0.25,"stroke-dasharray":"","stroke-linecap":"butt"},"#anchors > #cities":{"opacity":0.8,"fill":"#ffffff","size":4,"stroke":"#3e3e4b","stroke-width":1},"#burgLabels > #towns":{"opacity":1,"fill":"#3e3e4b","data-size":3,"font-size":3,"data-font":"Bitter","font-family":"Bitter"},"#burgIcons > #towns":{"opacity":0.95,"fill":"#ffffff","fill-opacity":0.7,"size":0.8,"stroke":"#3e3e4b","stroke-width":0.2,"stroke-dasharray":"","stroke-linecap":"butt"},"#anchors > #towns":{"opacity":1,"fill":"#ffffff","size":1.6,"stroke":"#3e3e4b","stroke-width":1.2},"#labels > #states":{"opacity":1,"fill":"#4e4e4e","stroke":"#b5b5b5","stroke-width":0,"text-shadow":"white 0 0 4px","data-size":22,"font-size":22,"data-font":"Almendra+SC","font-family":"Almendra SC","filter":""},"#labels > #addedLabels":{"opacity":1,"fill":"#3e3e4b","stroke":"#3a3a3a","stroke-width":0,"text-shadow":"white 0 0 4px","data-size":18,"font-size":18,"data-font":"Almendra+SC","font-family":"Almendra SC","filter":null},"#fogging":{"opacity":0.98,"fill":"#1b1423","filter":null},"#goods":{"opacity":1,"stroke-width":0.32,"data-circle":1,"filter":"url(#dropShadow01)"}}`,
-  styleClean: `{"#map":{"background-color":"#000000","filter":null,"data-filter":null},"#armies":{"font-size":6,"box-size":3,"stroke":"#000","stroke-width":0,"opacity":1,"fill-opacity":1,"filter":null},"#biomes":{"opacity":0.5,"filter":"url(#blur7)","mask":"url(#land)"},"#stateBorders":{"opacity":0.8,"stroke":"#414141","stroke-width":0.7,"stroke-dasharray":0,"stroke-linecap":"butt","filter":""},"#provinceBorders":{"opacity":0.8,"stroke":"#414141","stroke-width":0.45,"stroke-dasharray":1,"stroke-linecap":"butt","filter":null},"#cells":{"opacity":null,"stroke":"#808080","stroke-width":0.09,"filter":null,"mask":"url(#land)"},"#gridOverlay":{"opacity":0.8,"scale":1,"dx":0,"dy":"0","type":"pointyHex","stroke":"#808080","stroke-width":0.5,"stroke-dasharray":null,"stroke-linecap":null,"transform":null,"filter":null,"mask":null},"#coordinates":{"opacity":1,"data-size":12,"font-size":12,"stroke":"#414141","stroke-width":0.45,"stroke-dasharray":3,"stroke-linecap":null,"filter":null,"mask":null},"#compass":{"opacity":0.8,"transform":null,"filter":null,"mask":"url(#water)","shape-rendering":"optimizespeed"},"#rose":{"transform":null},"#relig":{"opacity":0.7,"stroke":"#404040","stroke-width":0.7,"filter":null},"#cults":{"opacity":0.6,"stroke":"#777777","stroke-width":0.5,"stroke-dasharray":null,"stroke-linecap":null,"filter":null},"#landmass":{"opacity":1,"fill":"#eeedeb","filter":null},"#markers":{"opacity":null,"rescale":null,"filter":"url(#dropShadow01)"},"#prec":{"opacity":null,"stroke":"#000000","stroke-width":0,"fill":"#0080ff","filter":null},"#population":{"opacity":null,"stroke-width":2.58,"stroke-dasharray":0,"stroke-linecap":"butt","filter":"url(#blur3)"},"#rural":{"stroke":"#ff0000"},"#urban":{"stroke":"#800000"},"#freshwater":{"opacity":0.5,"fill":"#aadaff","stroke":"#5f799d","stroke-width":0,"filter":null},"#salt":{"opacity":0.5,"fill":"#409b8a","stroke":"#388985","stroke-width":0.7,"filter":null},"#sinkhole":{"opacity":1,"fill":"#5bc9fd","stroke":"#53a3b0","stroke-width":0.7,"filter":null},"#frozen":{"opacity":0.95,"fill":"#cdd4e7","stroke":"#cfe0eb","stroke-width":0,"filter":null},"#lava":{"opacity":0.7,"fill":"#90270d","stroke":"#f93e0c","stroke-width":2,"filter":"url(#crumpled)"},"#dry":{"opacity":0.7,"fill":"#c9bfa7","stroke":"#8e816f","stroke-width":0.7,"filter":null},"#sea_island":{"opacity":0.6,"stroke":"#595959","stroke-width":0.4,"filter":"","auto-filter":0},"#lake_island":{"opacity":0,"stroke":"#7c8eaf","stroke-width":0,"filter":null},"#terrain":{"opacity":null,"set":"simple","size":1,"density":0.4,"filter":null,"mask":null},"#rivers":{"opacity":null,"filter":null,"fill":"#aadaff"},"#ruler":{"opacity":null,"filter":null},"#roads":{"opacity":0.9,"stroke":"#f6d068","stroke-width":0.7,"stroke-dasharray":0,"stroke-linecap":"inherit","filter":null,"mask":null},"#trails":{"opacity":1,"stroke":"#ffffff","stroke-width":0.25,"stroke-dasharray":"","stroke-linecap":"round","filter":null,"mask":null},"#searoutes":{"opacity":0.8,"stroke":"#4f82c6","stroke-width":0.45,"stroke-dasharray":2,"stroke-linecap":"butt","filter":null,"mask":"url(#water)"},"#regions":{"opacity":0.4,"filter":null},"#statesHalo":{"opacity":0,"data-width":null,"stroke-width":0},"#provs":{"opacity":0.7,"fill":"#000000","data-size":10,"font-size":10,"font-family":"Georgia","data-font":"Georgia","filter":null},"#temperature":{"opacity":null,"font-size":"8px","fill":"#000000","fill-opacity":0.3,"stroke":null,"stroke-width":1.8,"stroke-dasharray":null,"stroke-linecap":null,"filter":null},"#ice":{"opacity":0.9,"fill":"#e8f0f6","stroke":"#e8f0f6","stroke-width":1,"filter":"url(#dropShadow01)"},"#emblems":{"opacity":1,"stroke-width":1,"filter":null},"#texture":{"opacity":null,"filter":null,"mask":"url(#land)"},"#textureImage":{},"#zones":{"opacity":0.7,"stroke":"#ff6262","stroke-width":0,"stroke-dasharray":"","stroke-linecap":"butt","filter":null,"mask":null},"#oceanLayers":{"filter":"","layers":"none"},"#oceanBase":{"fill":"#aadaff"},"#oceanicPattern":{"href":"", "opacity":0.2},"#terrs":{"opacity":0.5,"scheme":"bright","terracing":0,"skip":5,"relax":0,"curve":0,"filter":"","mask":"url(#land)"},"#legend":{"data-size":12.74,"font-size":12.74,"data-font":"Arial","font-family":"Arial","stroke":"#909090","stroke-width":1.13,"stroke-dasharray":0,"stroke-linecap":"round","data-x":98.39,"data-y":12.67,"data-columns":null},"#legendBox":{},"#burgLabels > #cities":{"opacity":1,"fill":"#414141","text-shadow":"white 0 0 4px","data-size":7,"font-size":7,"data-font":"Arial","font-family":"Arial"},"#burgIcons > #cities":{"opacity":1,"fill":"#ffffff","fill-opacity":0.7,"size":1,"stroke":"#3e3e4b","stroke-width":0.24,"stroke-dasharray":"","stroke-linecap":"butt"},"#anchors > #cities":{"opacity":1,"fill":"#ffffff","size":2,"stroke":"#303030","stroke-width":1.7},"#burgLabels > #towns":{"opacity":1,"fill":"#414141","data-size":3,"font-size":3,"data-font":"Arial","font-family":"Arial"},"#burgIcons > #towns":{"opacity":1,"fill":"#ffffff","fill-opacity":0.7,"size":0.5,"stroke":"#3e3e4b","stroke-width":0.12,"stroke-dasharray":"","stroke-linecap":"butt"},"#anchors > #towns":{"opacity":1,"fill":"#ffffff","size":1,"stroke":"#3e3e4b","stroke-width":1.06},"#labels > #states":{"opacity":1,"fill":"#292929","stroke":"#303030","stroke-width":0,"text-shadow":"white 0 0 2px","data-size":10,"font-size":10,"data-font":"Arial","font-family":"Arial","filter":null},"#labels > #addedLabels":{"opacity":1,"fill":"#414141","stroke":"#3a3a3a","stroke-width":0,"text-shadow":"white 0 0 4px","data-size":18,"font-size":18,"data-font":"Arial","font-family":"Arial","filter":null},"#fogging":{"opacity":1,"fill":"#ffffff","filter":null},"#goods":{"opacity":1,"stroke-width":0.2,"data-circle":1,"filter":null}}`,
-  styleMonochrome: `{"#map":{"background-color":"#000000","filter":"url(#filter-grayscale)","data-filter":"grayscale"},"#armies":{"font-size":6,"box-size":3,"stroke":"#000","stroke-width":0.3,"opacity":1,"fill-opacity":1,"filter":null},"#biomes":{"opacity":null,"filter":"url(#blur5)","mask":null},"#stateBorders":{"opacity":1,"stroke":"#56566d","stroke-width":1,"stroke-dasharray":2,"stroke-linecap":"butt","filter":null},"#provinceBorders":{"opacity":1,"stroke":"#56566d","stroke-width":0.4,"stroke-dasharray":1,"stroke-linecap":"butt","filter":null},"#cells":{"opacity":null,"stroke":"#808080","stroke-width":0.1,"filter":null,"mask":null},"#gridOverlay":{"opacity":0.8,"scale":1,"dx":0,"dy":"0","type":"pointyHex","stroke":"#808080","stroke-width":0.5,"stroke-dasharray":null,"stroke-linecap":null,"transform":null,"filter":null,"mask":null},"#coordinates":{"opacity":1,"data-size":12,"font-size":12,"stroke":"#d4d4d4","stroke-width":1,"stroke-dasharray":5,"stroke-linecap":null,"filter":null,"mask":null},"#compass":{"opacity":0.8,"transform":null,"filter":null,"mask":"url(#water)","shape-rendering":"optimizespeed"},"#rose":{"transform":null},"#relig":{"opacity":0.7,"stroke":"#404040","stroke-width":0.7,"filter":null},"#cults":{"opacity":0.6,"stroke":"#777777","stroke-width":0.5,"stroke-dasharray":null,"stroke-linecap":null,"filter":null},"#landmass":{"opacity":1,"fill":"#000000","filter":null},"#markers":{"opacity":null,"rescale":1,"filter":"url(#dropShadow01)"},"#prec":{"opacity":null,"stroke":"#000000","stroke-width":0.1,"fill":"#003dff","filter":null},"#population":{"opacity":null,"stroke-width":1.6,"stroke-dasharray":null,"stroke-linecap":"butt","filter":null},"#rural":{"stroke":"#0000ff"},"#urban":{"stroke":"#ff0000"},"#freshwater":{"opacity":1,"fill":"#000000","stroke":"#515151","stroke-width":0,"filter":null},"#salt":{"opacity":1,"fill":"#000000","stroke":"#484848","stroke-width":0,"filter":null},"#sinkhole":{"opacity":1,"fill":"#000000","stroke":"#5f5f5f","stroke-width":0.5,"filter":null},"#frozen":{"opacity":1,"fill":"#000000","stroke":"#6f6f6f","stroke-width":0,"filter":null},"#lava":{"opacity":1,"fill":"#000000","stroke":"#5d5d5d","stroke-width":0,"filter":""},"#sea_island":{"opacity":1,"stroke":"#1f3846","stroke-width":0,"filter":"","auto-filter":0},"#lake_island":{"opacity":0,"stroke":"#7c8eaf","stroke-width":0,"filter":null},"#terrain":{"opacity":null,"set":"simple","size":1,"density":0.4,"filter":null,"mask":null},"#rivers":{"opacity":0.2,"filter":"url(#blur1)","fill":"#000000"},"#ruler":{"opacity":null,"filter":null},"#roads":{"opacity":0.9,"stroke":"#d06324","stroke-width":0.7,"stroke-dasharray":2,"stroke-linecap":"butt","filter":null,"mask":null},"#trails":{"opacity":0.9,"stroke":"#d06324","stroke-width":0.25,"stroke-dasharray":".8 1.6","stroke-linecap":"butt","filter":null,"mask":null},"#searoutes":{"opacity":0.8,"stroke":"#ffffff","stroke-width":0.45,"stroke-dasharray":"1 2","stroke-linecap":"round","filter":null,"mask":null},"#regions":{"opacity":0.4,"filter":null},"#statesHalo":{"opacity":1,"data-width":10,"stroke-width":10},"#provs":{"opacity":0.7,"fill":"#000000","data-size":10,"font-size":10,"font-family":"Georgia","data-font":"Georgia","filter":null},"#temperature":{"opacity":null,"font-size":"8px","fill":"#000000","fill-opacity":0.3,"stroke":null,"stroke-width":1.8,"stroke-dasharray":null,"stroke-linecap":null,"filter":null},"#ice":{"opacity":0.9,"fill":"#e8f0f6","stroke":"#e8f0f6","stroke-width":1,"filter":"url(#dropShadow05)"},"#texture":{"opacity":1,"filter":null,"mask":"url(#land)"},"#emblems": {"opacity": 0.5,"stroke-width": 0.5,"filter": null},"#textureImage":{},"#zones":{"opacity":0.6,"stroke":"#333333","stroke-width":0,"stroke-dasharray":null,"stroke-linecap":"butt","filter":null,"mask":null},"#oceanLayers":{"filter":null,"layers":"none"},"#oceanBase":{"fill":"#000000"},"#oceanicPattern":{"href":"", "opacity":0.2},"#terrs":{"opacity":1,"scheme":"monochrome","terracing":0,"skip":5,"relax":0,"curve":0,"filter":"url(#blur3)","mask":"url(#land)"},"#legend":{"data-size":13,"font-size":13,"data-font":"Almendra+SC","font-family":"Almendra SC","stroke":"#812929","stroke-width":2.5,"stroke-dasharray":"0 4 10 4","stroke-linecap":"round","data-x":99,"data-y":93,"data-columns":8},"#legendBox":{},"#burgLabels > #cities":{"opacity":1,"fill":"#3e3e4b","text-shadow":"white 0 0 4px","data-size":7,"font-size":7,"data-font":"Almendra+SC","font-family":"Almendra SC"},"#burgIcons > #cities":{"opacity":1,"fill":"#ffffff","fill-opacity":0.7,"size":1,"stroke":"#3e3e4b","stroke-width":0.24,"stroke-dasharray":"","stroke-linecap":"butt"},"#anchors > #cities":{"opacity":1,"fill":"#ffffff","size":2,"stroke":"#3e3e4b","stroke-width":1.2},"#burgLabels > #towns":{"opacity":1,"fill":"#3e3e4b","data-size":4,"font-size":4,"data-font":"Almendra+SC","font-family":"Almendra SC"},"#burgIcons > #towns":{"opacity":1,"fill":"#ffffff","fill-opacity":0.7,"size":0.5,"stroke":"#3e3e4b","stroke-width":0.12,"stroke-dasharray":"","stroke-linecap":"butt"},"#anchors > #towns":{"opacity":1,"fill":"#ffffff","size":1,"stroke":"#3e3e4b","stroke-width":1.2},"#labels > #states":{"opacity":1,"fill":"#3e3e4b","stroke":"#3a3a3a","stroke-width":0,"text-shadow":"white 0 0 4px","data-size":22,"font-size":22,"data-font":"Almendra+SC","font-family":"Almendra SC","filter":null},"#labels > #addedLabels":{"opacity":1,"fill":"#3e3e4b","stroke":"#3a3a3a","stroke-width":0,"text-shadow":"white 0 0 4px","data-size":18,"font-size":18,"data-font":"Almendra+SC","font-family":"Almendra SC","filter":null},"#fogging":{"opacity":0.98,"fill":"#30426f","filter":null},"#goods":{"opacity":1,"stroke-width":0.32,"data-circle":1,"filter":null}}`
+  styleAncient: `{"#map":{"background-color":"#000000","filter":null,"data-filter":null},"#armies":{"font-size":8,"box-size":4,"stroke":"#000","stroke-width":0.2,"fill-opacity":1,"filter":null},"#biomes":{"opacity":null,"filter":null,"mask":null},"#stateBorders":{"opacity":0.8,"stroke":"#56566d","stroke-width":1,"stroke-dasharray":2,"stroke-linecap":"butt","filter":null},"#provinceBorders":{"opacity":0.8,"stroke":"#56566d","stroke-width":0.2,"stroke-dasharray":1,"stroke-linecap":"butt","filter":null},"#cells":{"opacity":null,"stroke":"#808080","stroke-width":0.1,"filter":null,"mask":null},"#gridOverlay":{"opacity":0.8,"scale":1,"dx":0,"dy":0,"type":"pointyHex","stroke":"#808080","stroke-width":0.5,"stroke-dasharray":null,"stroke-linecap":null,"transform":null,"filter":null,"mask":null},"#coordinates":{"opacity":1,"data-size":12,"font-size":12,"stroke":"#d4d4d4","stroke-width":1,"stroke-dasharray":5,"stroke-linecap":null,"filter":null,"mask":null},"#compass":{"opacity":0.5,"transform":null,"filter":"url(#filter-sepia)","mask":"url(#water)","shape-rendering":"optimizespeed"},"#rose":{"transform":"translate(80 80) scale(.25)"},"#relig":{"opacity":0.7,"stroke":"#404040","stroke-width":0.7,"filter":null},"#cults":{"opacity":0.6,"stroke":"#777777","stroke-width":0.5,"stroke-dasharray":null,"stroke-linecap":null,"filter":null},"#landmass":{"opacity":1,"fill":"#e3dfce","filter":null},"#markers":{"opacity":null,"rescale":1,"filter":""},"#prec":{"opacity":null,"stroke":"#000000","stroke-width":0.1,"fill":"#003dff","filter":null},"#population":{"opacity":null,"stroke-width":1.6,"stroke-dasharray":null,"stroke-linecap":"butt","filter":null},"#rural":{"stroke":"#0000ff"},"#urban":{"stroke":"#ff0000"},"#freshwater":{"opacity":0.6,"fill":"#c8d6e0","stroke":"#968d6e","stroke-width":0.7,"filter":null},"#salt":{"opacity":0.5,"fill":"#339482","stroke":"#836a34","stroke-width":0.7,"filter":null},"#sinkhole":{"opacity":1,"fill":"#c3d6df","stroke":"#b29062","stroke-width":0.7,"filter":null},"#frozen":{"opacity":0.95,"fill":"#cdd4e7","stroke":"#cfe0eb","stroke-width":0,"filter":null},"#lava":{"opacity":0.7,"fill":"#a04e18","stroke":"#835520","stroke-width":2,"filter":"url(#paper)"},"#dry":{"opacity":0.7,"fill":"#c6b795","stroke":"#8e816f","stroke-width":0.7,"filter":null},"#sea_island":{"opacity":0.5,"stroke":"#1f3846","stroke-width":0.7,"filter":"url(#dropShadow)","auto-filter":1},"#lake_island":{"opacity":1,"stroke":"#7c8eaf","stroke-width":0.35,"filter":null},"#terrain":{"opacity":1,"set":"simple","size":1,"density":0.4,"filter":null,"mask":null},"#rivers":{"opacity":null,"filter":"","fill":"#a69b7d"},"#ruler":{"opacity":null,"filter":null},"#roads":{"opacity":0.7,"stroke":"#8d502a","stroke-width":1,"stroke-dasharray":3,"stroke-linecap":"inherit","filter":"","mask":null},"#trails":{"opacity":0.7,"stroke":"#924217","stroke-width":0.5,"stroke-dasharray":"1 2","stroke-linecap":"butt","filter":null,"mask":null},"#searoutes":{"opacity":0.8,"stroke":"#b16925","stroke-width":0.8,"stroke-dasharray":"1 2","stroke-linecap":"round","filter":null,"mask":null},"#statesBody":{"opacity":0.2,"filter":"url(#filter-sepia)"},"#statesHalo":{"opacity":0.4,"data-width":10,"stroke-width":10,"filter":"blur(6px)"},"#provs":{"opacity":0.7,"fill":"#000000","font-size":10,"data-font":"Georgia","font-family":"Georgia","filter":null},"#temperature":{"opacity":null,"font-size":"8px","fill":"#000000","fill-opacity":0.3,"stroke":null,"stroke-width":1.8,"stroke-dasharray":null,"stroke-linecap":null,"filter":null},"#ice":{"opacity":0.35,"fill":"#e8f0f6","stroke":"#e8f0f6","stroke-width":3,"filter":"url(#dropShadow05)"},"#emblems":{"opacity":0.8,"stroke-width":0.8,"filter":"url(#dropShadow05)"},"#texture":{"opacity":0.6,"filter":"","mask":""},"#textureImage":{"x":0,"y":0},"#zones":{"opacity":0.6,"stroke":"#333333","stroke-width":0,"stroke-dasharray":null,"stroke-linecap":"butt","filter":null,"mask":null},"#oceanLayers":{"filter":"","layers":"-6,-4,-2"},"#oceanBase":{"fill":"#c99f64"},"#oceanicPattern":{"href":"./images/kiwiroo.png","opacity":0.4},"#terrs":{"opacity":null,"scheme":"bright","terracing":0,"skip":2,"relax":1,"curve":0,"filter":"url(#blur3)","mask":"url(#land)"},"#legend":{"data-size":13,"font-size":13,"data-font":"Almendra+SC","font-family":"Almendra SC","stroke":"#812929","stroke-width":2.5,"stroke-dasharray":"0 4 10 4","stroke-linecap":"round","data-x":99,"data-y":93,"data-columns":8},"#burgLabels > #cities":{"opacity":1,"fill":"#3e3e4b","text-shadow":"white 0px 0px 4px","data-size":12,"font-size":12,"data-font":"Great+Vibes","font-family":"Great Vibes"},"#burgIcons > #cities":{"opacity":1,"fill":"#fdfab9","fill-opacity":0.7,"size":1,"stroke":"#6f4e1f","stroke-width":0.3,"stroke-dasharray":".3 .4","stroke-linecap":"butt"},"#anchors > #cities":{"opacity":1,"fill":"#ffffff","size":2,"stroke":"#3e3e4b","stroke-width":1.2},"#burgLabels > #towns":{"opacity":1,"fill":"#3e3e4b","text-shadow":"white 0px 0px 4px","data-size":5,"font-size":5,"data-font":"Great+Vibes","font-family":"Great Vibes"},"#burgIcons > #towns":{"opacity":1,"fill":"#fef4d8","fill-opacity":0.7,"size":0.5,"stroke":"#72472c","stroke-width":0.12,"stroke-dasharray":"","stroke-linecap":"butt"},"#anchors > #towns":{"opacity":1,"fill":"#ffffff","size":1,"stroke":"#3e3e4b","stroke-width":1.2},"#labels > #states":{"opacity":1,"fill":"#3e3e4b","stroke":"#3a3a3a","stroke-width":0,"text-shadow":"white 0px 0px 4px","data-size":22,"font-size":22,"data-font":"Great+Vibes","font-family":"Great Vibes","filter":"url(#filter-sepia)"},"#labels > #addedLabels":{"opacity":1,"fill":"#3e3e4b","stroke":"#3a3a3a","stroke-width":0,"text-shadow":"white 0px 0px 4px","data-size":18,"font-size":18,"data-font":"Times+New+Roman","font-family":"Times New Roman","filter":"url(#filter-sepia)"},"#fogging":{"opacity":0.98,"fill":"#30426f","filter":null}}`,
+  styleGloom: `{"#map":{"background-color":"#000000","filter":null,"data-filter":null},"#armies":{"font-size":6,"box-size":3,"stroke":"#000","stroke-width":0.3,"opacity":1,"fill-opacity":1,"filter":null},"#biomes":{"opacity":null,"filter":"url(#blur5)","mask":"url(#land)"},"#stateBorders":{"opacity":1,"stroke":"#56566d","stroke-width":1,"stroke-dasharray":2,"stroke-linecap":"butt","filter":null},"#provinceBorders":{"opacity":1,"stroke":"#56566d","stroke-width":0.3,"stroke-dasharray":".7 1","stroke-linecap":"butt","filter":null},"#cells":{"opacity":null,"stroke":"#808080","stroke-width":0.1,"filter":null,"mask":null},"#gridOverlay":{"opacity":0.8,"scale":1,"dx":0,"dy":"0","type":"pointyHex","stroke":"#808080","stroke-width":0.5,"stroke-dasharray":null,"stroke-linecap":null,"transform":null,"filter":null,"mask":null},"#coordinates":{"opacity":1,"data-size":14,"font-size":14,"stroke":"#4a4a4a","stroke-width":1,"stroke-dasharray":6,"stroke-linecap":null,"filter":null,"mask":null},"#compass":{"opacity":0.6,"transform":null,"filter":null,"mask":"url(#water)","shape-rendering":"optimizespeed"},"#rose":{"transform":"translate(100 100) scale(0.3)"},"#relig":{"opacity":0.7,"stroke":"#404040","stroke-width":1,"filter":null},"#cults":{"opacity":0.7,"stroke":"#777777","stroke-width":1.5,"stroke-dasharray":null,"stroke-linecap":null,"filter":null},"#landmass":{"opacity":1,"fill":"#e0e0e0","filter":null},"#markers":{"opacity":0.8,"rescale":1,"filter":"url(#dropShadow05)"},"#prec":{"opacity":null,"stroke":"#000000","stroke-width":0.1,"fill":"#003dff","filter":null},"#population":{"opacity":null,"stroke-width":1.6,"stroke-dasharray":null,"stroke-linecap":"butt","filter":null},"#rural":{"stroke":"#0000aa"},"#urban":{"stroke":"#9d0000"},"#freshwater":{"opacity":0.5,"fill":"#a6c1fd","stroke":"#5f799d","stroke-width":0.7,"filter":null},"#salt":{"opacity":0.5,"fill":"#409b8a","stroke":"#388985","stroke-width":0.7,"filter":null},"#sinkhole":{"opacity":1,"fill":"#5bc9fd","stroke":"#53a3b0","stroke-width":0.7,"filter":null},"#frozen":{"opacity":0.95,"fill":"#cdd4e7","stroke":"#cfe0eb","stroke-width":0,"filter":null},"#lava":{"opacity":0.7,"fill":"#90270d","stroke":"#f93e0c","stroke-width":2,"filter":"url(#crumpled)"},"#dry":{"opacity":0.7,"fill":"#c9bfa7","stroke":"#8e816f","stroke-width":0.7,"filter":null},"#sea_island":{"opacity":0.6,"stroke":"#1f3846","stroke-width":0.7,"filter":"url(#dropShadow)","auto-filter":1},"#lake_island":{"opacity":1,"stroke":"#7c8eaf","stroke-width":0.35,"filter":null},"#terrain":{"opacity":0.9,"set":"simple","size":1,"density":0.4,"filter":null,"mask":null},"#rivers":{"opacity":null,"filter":null,"fill":"#779582"},"#ruler":{"opacity":null,"filter":null},"#roads":{"opacity":1,"stroke":"#8b4418","stroke-width":0.9,"stroke-dasharray":"2 3","stroke-linecap":"round","filter":null,"mask":null},"#trails":{"opacity":1,"stroke":"#844017","stroke-width":0.2,"stroke-dasharray":".5 1","stroke-linecap":"round","filter":null,"mask":null},"#searoutes":{"opacity":0.8,"stroke":"#5e1865","stroke-width":0.6,"stroke-dasharray":"1.2 2.4","stroke-linecap":"round","filter":null,"mask":null},"#statesBody":{"opacity":0.4,"filter":null},"#statesHalo":{"opacity":0.5,"data-width":12,"stroke-width":12,"filter":"blur(10px)"},"#provs":{"opacity":0.7,"fill":"#000000","data-size":10,"font-size":10,"font-family":"Georgia","data-font":"Georgia","filter":null},"#temperature":{"opacity":1,"font-size":"11px","fill":"#62001b","fill-opacity":0.3,"stroke":null,"stroke-width":2,"stroke-dasharray":2,"stroke-linecap":null,"filter":null},"#ice":{"opacity":0.9,"fill":"#e8f0f6","stroke":"#e8f0f6","stroke-width":1,"filter":"url(#dropShadow05)"},"#emblems": {"opacity":0.6,"stroke-width":0.5,"filter":null},"#texture":{"opacity":null,"filter":null,"mask":"url(#land)"},"#textureImage":{"x":0,"y":0},"#zones":{"opacity":0.5,"stroke":"#333333","stroke-width":0,"stroke-dasharray":null,"stroke-linecap":"butt","filter":"url(#dropShadow01)","mask":null},"#oceanLayers":{"filter":null,"layers":"-6,-4,-2"},"#oceanBase":{"fill":"#4e6964"},"#oceanicPattern":{"href":"./images/pattern3.png", "opacity":0.2},"#terrs":{"opacity":1,"scheme":"bright","terracing":0,"skip":0,"relax":1,"curve":1,"filter":"url(#filter-grayscale)","mask":"url(#land)"},"#legend":{"data-size":13,"font-size":13,"data-font":"Almendra+SC","font-family":"Almendra SC","stroke":"#812929","stroke-width":2.5,"stroke-dasharray":"0 4 10 4","stroke-linecap":"round","data-x":99,"data-y":93,"data-columns":8},"#legendBox":{},"#burgLabels > #cities":{"opacity":1,"fill":"#3e3e4b","text-shadow":"white 0 0 4px","data-size":7,"font-size":7,"data-font":"Bitter","font-family":"Bitter"},"#burgIcons > #cities":{"opacity":1,"fill":"#ffffff","fill-opacity":0.7,"size":2,"stroke":"#444444","stroke-width":0.25,"stroke-dasharray":"","stroke-linecap":"butt"},"#anchors > #cities":{"opacity":0.8,"fill":"#ffffff","size":4,"stroke":"#3e3e4b","stroke-width":1},"#burgLabels > #towns":{"opacity":1,"fill":"#3e3e4b","data-size":3,"font-size":3,"data-font":"Bitter","font-family":"Bitter"},"#burgIcons > #towns":{"opacity":0.95,"fill":"#ffffff","fill-opacity":0.7,"size":0.8,"stroke":"#3e3e4b","stroke-width":0.2,"stroke-dasharray":"","stroke-linecap":"butt"},"#anchors > #towns":{"opacity":1,"fill":"#ffffff","size":1.6,"stroke":"#3e3e4b","stroke-width":1.2},"#labels > #states":{"opacity":1,"fill":"#4e4e4e","stroke":"#b5b5b5","stroke-width":0,"text-shadow":"white 0 0 4px","data-size":22,"font-size":22,"data-font":"Almendra+SC","font-family":"Almendra SC","filter":null},"#labels > #addedLabels":{"opacity":1,"fill":"#3e3e4b","stroke":"#3a3a3a","stroke-width":0,"text-shadow":"white 0 0 4px","data-size":18,"font-size":18,"data-font":"Almendra+SC","font-family":"Almendra SC","filter":null},"#fogging":{"opacity":0.98,"fill":"#1b1423","filter":null}}`,
+  styleClean: `{"#map":{"background-color":"#000000","filter":null,"data-filter":null},"#armies":{"font-size":6,"box-size":3,"stroke":"#000","stroke-width":0,"opacity":1,"fill-opacity":1,"filter":null},"#biomes":{"opacity":0.5,"filter":"url(#blur7)","mask":"url(#land)"},"#stateBorders":{"opacity":0.8,"stroke":"#414141","stroke-width":0.7,"stroke-dasharray":0,"stroke-linecap":"butt","filter":null},"#provinceBorders":{"opacity":0.8,"stroke":"#414141","stroke-width":0.45,"stroke-dasharray":1,"stroke-linecap":"butt","filter":null},"#cells":{"opacity":null,"stroke":"#808080","stroke-width":0.09,"filter":null,"mask":"url(#land)"},"#gridOverlay":{"opacity":0.8,"scale":1,"dx":0,"dy":"0","type":"pointyHex","stroke":"#808080","stroke-width":0.5,"stroke-dasharray":null,"stroke-linecap":null,"transform":null,"filter":null,"mask":null},"#coordinates":{"opacity":1,"data-size":12,"font-size":12,"stroke":"#414141","stroke-width":0.45,"stroke-dasharray":3,"stroke-linecap":null,"filter":null,"mask":null},"#compass":{"opacity":0.8,"transform":null,"filter":null,"mask":"url(#water)","shape-rendering":"optimizespeed"},"#rose":{"transform":null},"#relig":{"opacity":0.7,"stroke":"#404040","stroke-width":0.7,"filter":null},"#cults":{"opacity":0.6,"stroke":"#777777","stroke-width":0.5,"stroke-dasharray":null,"stroke-linecap":null,"filter":null},"#landmass":{"opacity":1,"fill":"#eeedeb","filter":null},"#markers":{"opacity":null,"rescale":null,"filter":"url(#dropShadow01)"},"#prec":{"opacity":null,"stroke":"#000000","stroke-width":0,"fill":"#0080ff","filter":null},"#population":{"opacity":null,"stroke-width":2.58,"stroke-dasharray":0,"stroke-linecap":"butt","filter":"url(#blur3)"},"#rural":{"stroke":"#ff0000"},"#urban":{"stroke":"#800000"},"#freshwater":{"opacity":0.5,"fill":"#aadaff","stroke":"#5f799d","stroke-width":0,"filter":null},"#salt":{"opacity":0.5,"fill":"#409b8a","stroke":"#388985","stroke-width":0.7,"filter":null},"#sinkhole":{"opacity":1,"fill":"#5bc9fd","stroke":"#53a3b0","stroke-width":0.7,"filter":null},"#frozen":{"opacity":0.95,"fill":"#cdd4e7","stroke":"#cfe0eb","stroke-width":0,"filter":null},"#lava":{"opacity":0.7,"fill":"#90270d","stroke":"#f93e0c","stroke-width":2,"filter":"url(#crumpled)"},"#dry":{"opacity":0.7,"fill":"#c9bfa7","stroke":"#8e816f","stroke-width":0.7,"filter":null},"#sea_island":{"opacity":0.6,"stroke":"#595959","stroke-width":0.4,"filter":null,"auto-filter":0},"#lake_island":{"opacity":0,"stroke":"#7c8eaf","stroke-width":0,"filter":null},"#terrain":{"opacity":1,"set":"simple","size":1,"density":0.4,"filter":null,"mask":null},"#rivers":{"opacity":null,"filter":null,"fill":"#aadaff"},"#ruler":{"opacity":null,"filter":null},"#roads":{"opacity":0.9,"stroke":"#f6d068","stroke-width":0.7,"stroke-dasharray":0,"stroke-linecap":"inherit","filter":null,"mask":null},"#trails":{"opacity":1,"stroke":"#ffffff","stroke-width":0.25,"stroke-dasharray":"","stroke-linecap":"round","filter":null,"mask":null},"#searoutes":{"opacity":0.8,"stroke":"#4f82c6","stroke-width":0.45,"stroke-dasharray":2,"stroke-linecap":"butt","filter":null,"mask":"url(#water)"},"#statesBody":{"opacity":0.3,"filter":null},"#statesHalo":{"opacity":0.5,"data-width":1,"stroke-width":1,"filter":null},"#provs":{"opacity":0.7,"fill":"#000000","data-size":10,"font-size":10,"font-family":"Georgia","data-font":"Georgia","filter":null},"#temperature":{"opacity":null,"font-size":"8px","fill":"#000000","fill-opacity":0.3,"stroke":null,"stroke-width":1.8,"stroke-dasharray":null,"stroke-linecap":null,"filter":null},"#ice":{"opacity":0.9,"fill":"#e8f0f6","stroke":"#e8f0f6","stroke-width":1,"filter":"url(#dropShadow01)"},"#emblems":{"opacity":1,"stroke-width":1,"filter":null},"#texture":{"opacity":null,"filter":null,"mask":"url(#land)"},"#textureImage":{},"#zones":{"opacity":0.7,"stroke":"#ff6262","stroke-width":0,"stroke-dasharray":"","stroke-linecap":"butt","filter":null,"mask":null},"#oceanLayers":{"filter":null,"layers":"none"},"#oceanBase":{"fill":"#aadaff"},"#oceanicPattern":{"href":"", "opacity":0.2},"#terrs":{"opacity":0.5,"scheme":"bright","terracing":0,"skip":5,"relax":0,"curve":0,"filter":null,"mask":"url(#land)"},"#legend":{"data-size":12.74,"font-size":12.74,"data-font":"Arial","font-family":"Arial","stroke":"#909090","stroke-width":1.13,"stroke-dasharray":0,"stroke-linecap":"round","data-x":98.39,"data-y":12.67,"data-columns":null},"#legendBox":{},"#burgLabels > #cities":{"opacity":1,"fill":"#414141","text-shadow":"white 0 0 4px","data-size":7,"font-size":7,"data-font":"Arial","font-family":"Arial"},"#burgIcons > #cities":{"opacity":1,"fill":"#ffffff","fill-opacity":0.7,"size":1,"stroke":"#3e3e4b","stroke-width":0.24,"stroke-dasharray":"","stroke-linecap":"butt"},"#anchors > #cities":{"opacity":1,"fill":"#ffffff","size":2,"stroke":"#303030","stroke-width":1.7},"#burgLabels > #towns":{"opacity":1,"fill":"#414141","data-size":3,"font-size":3,"data-font":"Arial","font-family":"Arial"},"#burgIcons > #towns":{"opacity":1,"fill":"#ffffff","fill-opacity":0.7,"size":0.5,"stroke":"#3e3e4b","stroke-width":0.12,"stroke-dasharray":"","stroke-linecap":"butt"},"#anchors > #towns":{"opacity":1,"fill":"#ffffff","size":1,"stroke":"#3e3e4b","stroke-width":1.06},"#labels > #states":{"opacity":1,"fill":"#292929","stroke":"#303030","stroke-width":0,"text-shadow":"white 0 0 2px","data-size":10,"font-size":10,"data-font":"Arial","font-family":"Arial","filter":null},"#labels > #addedLabels":{"opacity":1,"fill":"#414141","stroke":"#3a3a3a","stroke-width":0,"text-shadow":"white 0 0 4px","data-size":18,"font-size":18,"data-font":"Arial","font-family":"Arial","filter":null},"#fogging":{"opacity":1,"fill":"#ffffff","filter":null}}`,
+  styleLight: `{"#map":{"background-color":"#000000","filter":null,"data-filter":null},"#armies":{"font-size":8,"box-size":4,"stroke":"#000","stroke-width":0.02,"fill-opacity":0.8,"filter":null},"#biomes":{"opacity":0.5,"filter":null,"mask":null},"#stateBorders":{"opacity":0.8,"stroke":"#4c483e","stroke-width":1,"stroke-dasharray":2,"stroke-linecap":"square","filter":null},"#provinceBorders":{"opacity":0.8,"stroke":"#56566d","stroke-width":0.2,"stroke-dasharray":1,"stroke-linecap":"butt","filter":null},"#cells":{"opacity":null,"stroke":"#808080","stroke-width":0.1,"filter":null,"mask":null},"#gridOverlay":{"opacity":0.5,"scale":1,"dx":0,"dy":0,"type":"pointyHex","stroke":"#808080","stroke-width":1,"stroke-dasharray":null,"stroke-linecap":null,"transform":null,"filter":null,"mask":null},"#coordinates":{"opacity":0.7,"data-size":15,"font-size":15,"stroke":"#734d37","stroke-width":1.5,"stroke-dasharray":5,"stroke-linecap":"square","filter":null,"mask":""},"#compass":{"opacity":0.6,"transform":null,"filter":null,"mask":"url(#water)","shape-rendering":"optimizespeed"},"#rose":{"transform":null},"#relig":{"opacity":0.5,"stroke":null,"stroke-width":0,"filter":null},"#cults":{"opacity":0.5,"stroke":"#777777","stroke-width":0,"stroke-dasharray":null,"stroke-linecap":null,"filter":null},"#landmass":{"opacity":1,"fill":"#f9f2ea","filter":null},"#markers":{"opacity":null,"rescale":1,"filter":null},"#prec":{"opacity":null,"stroke":"#000000","stroke-width":0.1,"fill":"#2554ef","filter":null},"#population":{"opacity":null,"stroke-width":1.6,"stroke-dasharray":null,"stroke-linecap":"butt","filter":null},"#rural":{"stroke":"#0000ff"},"#urban":{"stroke":"#ff0000"},"#freshwater":{"opacity":1,"fill":"#98cdc4","stroke":"#719892","stroke-width":0.46,"filter":"url(#dropShadow05)"},"#salt":{"opacity":0.5,"fill":"#409b8a","stroke":"#388985","stroke-width":0.7,"filter":null},"#sinkhole":{"opacity":1,"fill":"#5bc9fd","stroke":"#53a3b0","stroke-width":0.7,"filter":null},"#frozen":{"opacity":0.95,"fill":"#cdd4e7","stroke":"#cfe0eb","stroke-width":0,"filter":null},"#lava":{"opacity":0.7,"fill":"#90270d","stroke":"#f93e0c","stroke-width":2,"filter":"url(#crumpled)"},"#dry":{"opacity":1,"fill":"#c9bfa7","stroke":"#8e816f","stroke-width":0.7,"filter":null},"#sea_island":{"opacity":1,"stroke":"#5e5e5e","stroke-width":0.4,"filter":"url(#dropShadow)","auto-filter":1},"#lake_island":{"opacity":1,"stroke":"#7c8eaf","stroke-width":0.35,"filter":null},"#terrain":{"opacity":0.6,"set":"colored","size":1,"density":0.3,"filter":null,"mask":""},"#rivers":{"opacity":null,"filter":null,"fill":"#6d94ba"},"#ruler":{"opacity":null,"filter":null},"#roads":{"opacity":0.9,"stroke":"#3c1d0b","stroke-width":1.37,"stroke-dasharray":2,"stroke-linecap":"inherit","filter":null,"mask":null},"#trails":{"opacity":0.9,"stroke":"#95481a","stroke-width":0.88,"stroke-dasharray":".8 1.6","stroke-linecap":"butt","filter":null,"mask":null},"#searoutes":{"opacity":0.8,"stroke":"#ffffff","stroke-width":0.45,"stroke-dasharray":"1 2","stroke-linecap":"round","filter":null,"mask":null},"#statesBody":{"opacity":0.2,"filter":null},"#statesHalo":{"opacity":0.3,"data-width":25,"stroke-width":25,"filter":"blur(5px)"},"#provs":{"opacity":0.4,"fill":"#000000","font-size":5,"data-font":"IM+Fell+English","font-family":"IM Fell English","filter":null},"#temperature":{"opacity":null,"font-size":"8px","fill":"#000000","fill-opacity":0.3,"stroke":null,"stroke-width":1.8,"stroke-dasharray":null,"stroke-linecap":null,"filter":null},"#ice":{"opacity":0.5,"fill":"#e8f0f6","stroke":"#e8f0f6","stroke-width":1.5,"filter":"url(#dropShadow05)"},"#emblems":{"opacity":0.9,"stroke-width":1,"filter":null},"#texture":{"opacity":0.39,"filter":null,"mask":""},"#zones":{"opacity":0.6,"stroke":"#333333","stroke-width":0,"stroke-dasharray":null,"stroke-linecap":"butt","filter":null,"mask":null},"#oceanLayers":{"filter":"url(#dropShadow05)","layers":"-6,-3,-1"},"#oceanBase":{"fill":"#8dc1c8"},"#oceanicPattern":{"href":"./images/pattern1.png","opacity":0.2},"#terrs":{"opacity":0.4,"scheme":"light","terracing":10,"skip":5,"relax":0,"curve":0,"filter":"url(#turbulence)","mask":"url(#land)"},"#legend":{"data-size":13,"font-size":13,"data-font":"Almendra+SC","font-family":"Almendra SC","stroke":"#812929","stroke-width":2.5,"stroke-dasharray":"0 4 10 4","stroke-linecap":"round","data-x":54.73,"data-y":62.98,"data-columns":8},"#burgLabels > #cities":{"opacity":1,"fill":"#3a3a3a","text-shadow":"white 0px 0px 4px","data-size":8,"font-size":8,"data-font":"IM+Fell+English","font-family":"IM Fell English"},"#burgIcons > #cities":{"opacity":1,"fill":"#ffffff","fill-opacity":0.7,"size":3,"stroke":"#3e3e4b","stroke-width":0.4,"stroke-dasharray":"0.5 0.25","stroke-linecap":"butt"},"#anchors > #cities":{"opacity":1,"fill":"#ffffff","size":5.5,"stroke":"#3e3e4b","stroke-width":1.2},"#burgLabels > #towns":{"opacity":1,"fill":"#3e3e4b","text-shadow":"white 0px 0px 4px","data-size":4,"font-size":4,"data-font":"IM+Fell+English","font-family":"IM Fell English"},"#burgIcons > #towns":{"opacity":1,"fill":"#ffffff","fill-opacity":0.7,"size":1.2,"stroke":"#3e3e4b","stroke-width":0.2,"stroke-dasharray":"","stroke-linecap":"butt"},"#anchors > #towns":{"opacity":1,"fill":"#ffffff","size":2.2,"stroke":"#3e3e4b","stroke-width":1.2},"#labels > #states":{"opacity":1,"fill":"#3e3e3e","stroke":"#000000","stroke-width":0.3,"text-shadow":"white 0px 0px 6px","data-size":14,"font-size":14,"data-font":"IM+Fell+English","font-family":"IM Fell English","filter":null},"#labels > #addedLabels":{"opacity":1,"fill":"#f24706","stroke":"#701b05","stroke-width":0.1,"text-shadow":"white 0px 0px 4px","data-size":6,"font-size":6,"data-font":"IM+Fell+English","font-family":"IM Fell English","filter":null},"#fogging":{"opacity":1,"fill":"#30426f","filter":null}}`,
+  styleWatercolor: `{"#map":{"background-color":"#000000","filter":null,"data-filter":null},"#armies":{"font-size":8,"box-size":4,"stroke":"#000","stroke-width":0.2,"fill-opacity":1,"filter":null},"#biomes":{"opacity":0.6,"filter":null,"mask":null},"#stateBorders":{"opacity":0.6,"stroke":"#56566d","stroke-width":1,"stroke-dasharray":3,"stroke-linecap":"butt","filter":null},"#provinceBorders":{"opacity":0.5,"stroke":"#56566d","stroke-width":0.5,"stroke-dasharray":"0 2","stroke-linecap":"round","filter":null},"#cells":{"opacity":null,"stroke":"#808080","stroke-width":0.1,"filter":null,"mask":null},"#gridOverlay":{"opacity":0.8,"scale":1,"dx":0,"dy":0,"type":"pointyHex","stroke":"#777777","stroke-width":0.5,"stroke-dasharray":null,"stroke-linecap":null,"transform":null,"filter":null,"mask":null},"#coordinates":{"opacity":1,"data-size":12,"font-size":12,"stroke":"#d4d4d4","stroke-width":1,"stroke-dasharray":5,"stroke-linecap":null,"filter":null,"mask":null},"#compass":{"opacity":0.8,"transform":null,"filter":null,"mask":"url(#water)","shape-rendering":"optimizespeed"},"#rose":{"transform":"translate(80 80) scale(.25)"},"#relig":{"opacity":0.7,"stroke":"#777777","stroke-width":0,"filter":"url(#bluredSplotch)"},"#cults":{"opacity":0.6,"stroke":"#777777","stroke-width":0.5,"stroke-dasharray":null,"stroke-linecap":null,"filter":"url(#splotch)"},"#landmass":{"opacity":1,"fill":"#eef6fb","filter":null},"#markers":{"opacity":null,"rescale":1,"filter":"url(#dropShadow01)"},"#prec":{"opacity":null,"stroke":"#000000","stroke-width":0.1,"fill":"#003dff","filter":null},"#population":{"opacity":null,"stroke-width":1.6,"stroke-dasharray":null,"stroke-linecap":"butt","filter":null},"#rural":{"stroke":"#0000ff"},"#urban":{"stroke":"#ff0000"},"#freshwater":{"opacity":0.5,"fill":"#a6c1fd","stroke":"#5f799d","stroke-width":0.7,"filter":null},"#salt":{"opacity":0.5,"fill":"#409b8a","stroke":"#388985","stroke-width":0.7,"filter":null},"#sinkhole":{"opacity":1,"fill":"#5bc9fd","stroke":"#53a3b0","stroke-width":0.7,"filter":null},"#frozen":{"opacity":0.95,"fill":"#cdd4e7","stroke":"#cfe0eb","stroke-width":0,"filter":null},"#lava":{"opacity":0.7,"fill":"#90270d","stroke":"#f93e0c","stroke-width":2,"filter":"url(#crumpled)"},"#dry":{"opacity":1,"fill":"#c9bfa7","stroke":"#8e816f","stroke-width":0.7,"filter":null},"#sea_island":{"opacity":0.5,"stroke":"#1f3846","stroke-width":0.7,"filter":"url(#dropShadow)","auto-filter":1},"#lake_island":{"opacity":1,"stroke":"#7c8eaf","stroke-width":0.35,"filter":null},"#terrain":{"opacity":1,"set":"gray","size":1,"density":0.4,"filter":null,"mask":null},"#rivers":{"opacity":null,"filter":null,"fill":"#2e89c2"},"#ruler":{"opacity":null,"filter":null},"#roads":{"opacity":0.9,"stroke":"#969696","stroke-width":0.7,"stroke-dasharray":"","stroke-linecap":"butt","filter":null,"mask":null},"#trails":{"opacity":0.9,"stroke":"#969696","stroke-width":0.4,"stroke-dasharray":"","stroke-linecap":"butt","filter":null,"mask":null},"#searoutes":{"opacity":0.9,"stroke":"#969696","stroke-width":0.7,"stroke-dasharray":"","stroke-linecap":"round","filter":null,"mask":null},"#statesBody":{"opacity":0.05,"filter":null},"#statesHalo":{"opacity":0.4,"data-width":8,"stroke-width":8,"filter":"blur(2px)"},"#provs":{"opacity":0.7,"fill":"#000000","font-size":4,"data-font":"Comfortaa:700","font-family":"Comfortaa","filter":null},"#temperature":{"opacity":null,"font-size":"8px","fill":"#000000","fill-opacity":0.3,"stroke":null,"stroke-width":1.8,"stroke-dasharray":null,"stroke-linecap":null,"filter":null},"#ice":{"opacity":0.7,"fill":"#dfe8ec","stroke":"#000000","stroke-width":0,"filter":"url(#dropShadow05)"},"#emblems":{"opacity":0.95,"stroke-width":1,"filter":null},"#texture":{"opacity":0.2,"filter":null,"mask":"url(#land)"},"#zones":{"opacity":0.6,"stroke":"#333333","stroke-width":0,"stroke-dasharray":null,"stroke-linecap":"butt","filter":null,"mask":null},"#oceanLayers":{"filter":null,"layers":"-6,-4,-2"},"#oceanBase":{"fill":"#2d788b"},"#oceanicPattern":{"href":"./images/kiwiroo.png","opacity":0.5},"#terrs":{"opacity":0.5,"scheme":"light","terracing":0,"skip":5,"relax":1,"curve":0,"filter":null,"mask":"url(#land)"},"#legend":{"data-size":13,"font-size":13,"data-font":"Almendra+SC","font-family":"Almendra SC","stroke":"#812929","stroke-width":2.5,"stroke-dasharray":"0 4 10 4","stroke-linecap":"round","data-x":99,"data-y":93,"data-columns":8},"#burgLabels > #cities":{"opacity":1,"fill":"#043449","text-shadow":"white 0px 0px 2px","data-size":5,"font-size":5,"data-font":"Comfortaa:700","font-family":"Comfortaa"},"#burgIcons > #cities":{"opacity":1,"fill":"#ffffff","fill-opacity":0.7,"size":1,"stroke":"#3e3e4b","stroke-width":0.24,"stroke-dasharray":"","stroke-linecap":"butt"},"#anchors > #cities":{"opacity":1,"fill":"#ffffff","size":2,"stroke":"#3e3e4b","stroke-width":1.2},"#burgLabels > #towns":{"opacity":1,"fill":"#3e3e4b","text-shadow":"white 0px 0px 4px","data-size":3,"font-size":3,"data-font":"Comfortaa:700","font-family":"Comfortaa"},"#burgIcons > #towns":{"opacity":1,"fill":"#ffffff","fill-opacity":0.7,"size":0.5,"stroke":"#3e3e4b","stroke-width":0.12,"stroke-dasharray":"","stroke-linecap":"butt"},"#anchors > #towns":{"opacity":1,"fill":"#ffffff","size":1,"stroke":"#3e3e4b","stroke-width":1.2},"#labels > #states":{"opacity":1,"fill":"#ffffff","stroke":"#000000","stroke-width":0.15,"text-shadow":"black 1px 1px 2px","data-size":20,"font-size":20,"data-font":"Gloria+Hallelujah","font-family":"Gloria Hallelujah","filter":null},"#labels > #addedLabels":{"opacity":1,"fill":"#3e3e4b","stroke":"#3a3a3a","stroke-width":0,"text-shadow":"white 0px 0px 4px","data-size":18,"font-size":18,"data-font":"Comfortaa","font-family":"Comfortaa","filter":null},"#fogging":{"opacity":0.97,"fill":"#8398ce","filter":null}}`,
+  styleMonochrome: `{"#map":{"background-color":"#000000","filter":"url(#filter-grayscale)","data-filter":"grayscale"},"#armies":{"font-size":6,"box-size":3,"stroke":"#000","stroke-width":0.3,"opacity":1,"fill-opacity":1,"filter":null},"#biomes":{"opacity":null,"filter":"url(#blur5)","mask":null},"#stateBorders":{"opacity":1,"stroke":"#56566d","stroke-width":1,"stroke-dasharray":2,"stroke-linecap":"butt","filter":null},"#provinceBorders":{"opacity":1,"stroke":"#56566d","stroke-width":0.4,"stroke-dasharray":1,"stroke-linecap":"butt","filter":null},"#cells":{"opacity":null,"stroke":"#808080","stroke-width":0.1,"filter":null,"mask":null},"#gridOverlay":{"opacity":0.8,"scale":1,"dx":0,"dy":"0","type":"pointyHex","stroke":"#808080","stroke-width":0.5,"stroke-dasharray":null,"stroke-linecap":null,"transform":null,"filter":null,"mask":null},"#coordinates":{"opacity":1,"data-size":12,"font-size":12,"stroke":"#d4d4d4","stroke-width":1,"stroke-dasharray":5,"stroke-linecap":null,"filter":null,"mask":null},"#compass":{"opacity":0.8,"transform":null,"filter":null,"mask":"url(#water)","shape-rendering":"optimizespeed"},"#rose":{"transform":null},"#relig":{"opacity":0.7,"stroke":"#404040","stroke-width":0.7,"filter":null},"#cults":{"opacity":0.6,"stroke":"#777777","stroke-width":0.5,"stroke-dasharray":null,"stroke-linecap":null,"filter":null},"#landmass":{"opacity":1,"fill":"#000000","filter":null},"#markers":{"opacity":null,"rescale":1,"filter":"url(#dropShadow01)"},"#prec":{"opacity":null,"stroke":"#000000","stroke-width":0.1,"fill":"#003dff","filter":null},"#population":{"opacity":null,"stroke-width":1.6,"stroke-dasharray":null,"stroke-linecap":"butt","filter":null},"#rural":{"stroke":"#0000ff"},"#urban":{"stroke":"#ff0000"},"#freshwater":{"opacity":1,"fill":"#000000","stroke":"#515151","stroke-width":0,"filter":null},"#salt":{"opacity":1,"fill":"#000000","stroke":"#484848","stroke-width":0,"filter":null},"#sinkhole":{"opacity":1,"fill":"#000000","stroke":"#5f5f5f","stroke-width":0.5,"filter":null},"#frozen":{"opacity":1,"fill":"#000000","stroke":"#6f6f6f","stroke-width":0,"filter":null},"#lava":{"opacity":1,"fill":"#000000","stroke":"#5d5d5d","stroke-width":0,"filter":null},"#sea_island":{"opacity":1,"stroke":"#1f3846","stroke-width":0,"filter":null,"auto-filter":0},"#lake_island":{"opacity":0,"stroke":"#7c8eaf","stroke-width":0,"filter":null},"#terrain":{"opacity":null,"set":"simple","size":1,"density":0.4,"filter":null,"mask":null},"#rivers":{"opacity":0.2,"filter":"url(#blur1)","fill":"#000000"},"#ruler":{"opacity":null,"filter":null},"#roads":{"opacity":0.9,"stroke":"#d06324","stroke-width":0.7,"stroke-dasharray":2,"stroke-linecap":"butt","filter":null,"mask":null},"#trails":{"opacity":0.9,"stroke":"#d06324","stroke-width":0.25,"stroke-dasharray":".8 1.6","stroke-linecap":"butt","filter":null,"mask":null},"#searoutes":{"opacity":0.8,"stroke":"#ffffff","stroke-width":0.45,"stroke-dasharray":"1 2","stroke-linecap":"round","filter":null,"mask":null},"#statesBody":{"opacity":0.4,"filter":null},"#statesHalo":{"opacity":0.4,"data-width":10,"stroke-width":10,"filter":"blur(5px)"},"#provs":{"opacity":0.7,"fill":"#000000","data-size":10,"font-size":10,"font-family":"Georgia","data-font":"Georgia","filter":null},"#temperature":{"opacity":null,"font-size":"8px","fill":"#000000","fill-opacity":0.3,"stroke":null,"stroke-width":1.8,"stroke-dasharray":null,"stroke-linecap":null,"filter":null},"#ice":{"opacity":0.9,"fill":"#e8f0f6","stroke":"#e8f0f6","stroke-width":1,"filter":"url(#dropShadow05)"},"#texture":{"opacity":1,"filter":null,"mask":"url(#land)"},"#emblems": {"opacity": 0.5,"stroke-width": 0.5,"filter": null},"#textureImage":{},"#zones":{"opacity":0.6,"stroke":"#333333","stroke-width":0,"stroke-dasharray":null,"stroke-linecap":"butt","filter":null,"mask":null},"#oceanLayers":{"filter":null,"layers":"none"},"#oceanBase":{"fill":"#000000"},"#oceanicPattern":{"href":"", "opacity":0.2},"#terrs":{"opacity":1,"scheme":"monochrome","terracing":0,"skip":5,"relax":0,"curve":0,"filter":"url(#blur3)","mask":"url(#land)"},"#legend":{"data-size":13,"font-size":13,"data-font":"Almendra+SC","font-family":"Almendra SC","stroke":"#812929","stroke-width":2.5,"stroke-dasharray":"0 4 10 4","stroke-linecap":"round","data-x":99,"data-y":93,"data-columns":8},"#legendBox":{},"#burgLabels > #cities":{"opacity":1,"fill":"#3e3e4b","text-shadow":"white 0 0 4px","data-size":7,"font-size":7,"data-font":"Almendra+SC","font-family":"Almendra SC"},"#burgIcons > #cities":{"opacity":1,"fill":"#ffffff","fill-opacity":0.7,"size":1,"stroke":"#3e3e4b","stroke-width":0.24,"stroke-dasharray":"","stroke-linecap":"butt"},"#anchors > #cities":{"opacity":1,"fill":"#ffffff","size":2,"stroke":"#3e3e4b","stroke-width":1.2},"#burgLabels > #towns":{"opacity":1,"fill":"#3e3e4b","data-size":4,"font-size":4,"data-font":"Almendra+SC","font-family":"Almendra SC"},"#burgIcons > #towns":{"opacity":1,"fill":"#ffffff","fill-opacity":0.7,"size":0.5,"stroke":"#3e3e4b","stroke-width":0.12,"stroke-dasharray":"","stroke-linecap":"butt"},"#anchors > #towns":{"opacity":1,"fill":"#ffffff","size":1,"stroke":"#3e3e4b","stroke-width":1.2},"#labels > #states":{"opacity":1,"fill":"#3e3e4b","stroke":"#3a3a3a","stroke-width":0,"text-shadow":"white 0 0 4px","data-size":22,"font-size":22,"data-font":"Almendra+SC","font-family":"Almendra SC","filter":null},"#labels > #addedLabels":{"opacity":1,"fill":"#3e3e4b","stroke":"#3a3a3a","stroke-width":0,"text-shadow":"white 0 0 4px","data-size":18,"font-size":18,"data-font":"Almendra+SC","font-family":"Almendra SC","filter":null},"#fogging":{"opacity":0.98,"fill":"#30426f","filter":null}}`
 };
 
 // apply default or custom style settings on load
@@ -762,73 +781,56 @@ function applyStyleOnLoad() {
 
 // set default style
 function applyDefaultStyle() {
-  armies.attr('opacity', 1).attr('fill-opacity', 1).attr('font-size', 6).attr('box-size', 3).attr('stroke', '#000').attr('stroke-width', 0.3);
+  armies.attr("opacity", 1).attr("fill-opacity", 1).attr("font-size", 6).attr("box-size", 3).attr("stroke", "#000").attr("stroke-width", 0.3);
 
-  biomes.attr('opacity', null).attr('filter', null).attr('mask', null);
-  ice.attr('opacity', 0.9).attr('fill', '#e8f0f6').attr('stroke', '#e8f0f6').attr('stroke-width', 1).attr('filter', 'url(#dropShadow05)');
-  stateBorders.attr('opacity', 0.8).attr('stroke', '#56566d').attr('stroke-width', 1).attr('stroke-dasharray', '2').attr('stroke-linecap', 'butt').attr('filter', null);
-  provinceBorders.attr('opacity', 0.8).attr('stroke', '#56566d').attr('stroke-width', 0.5).attr('stroke-dasharray', '0 2').attr('stroke-linecap', 'round').attr('filter', null);
-  cells.attr('opacity', null).attr('stroke', '#808080').attr('stroke-width', 0.1).attr('filter', null).attr('mask', null);
+  biomes.attr("opacity", null).attr("filter", null).attr("mask", null);
+  ice.attr("opacity", 0.9).attr("fill", "#e8f0f6").attr("stroke", "#e8f0f6").attr("stroke-width", 1).attr("filter", "url(#dropShadow05)");
+  stateBorders.attr("opacity", 0.8).attr("stroke", "#56566d").attr("stroke-width", 1).attr("stroke-dasharray", "2").attr("stroke-linecap", "butt").attr("filter", null);
+  provinceBorders.attr("opacity", 0.8).attr("stroke", "#56566d").attr("stroke-width", 0.5).attr("stroke-dasharray", "0 2").attr("stroke-linecap", "round").attr("filter", null);
+  cells.attr("opacity", null).attr("stroke", "#808080").attr("stroke-width", 0.1).attr("filter", null).attr("mask", null);
 
-  gridOverlay
-    .attr('opacity', 0.8)
-    .attr('type', 'pointyHex')
-    .attr('scale', 1)
-    .attr('dx', 0)
-    .attr('dy', 0)
-    .attr('stroke', '#777777')
-    .attr('stroke-width', 0.5)
-    .attr('stroke-dasharray', null)
-    .attr('filter', null)
-    .attr('mask', null);
-  coordinates.attr('opacity', 1).attr('data-size', 12).attr('font-size', 12).attr('stroke', '#d4d4d4').attr('stroke-width', 1).attr('stroke-dasharray', 5).attr('filter', null).attr('mask', null);
-  compass.attr('opacity', 0.8).attr('transform', null).attr('filter', null).attr('mask', 'url(#water)').attr('shape-rendering', 'optimizespeed');
-  if (!d3.select('#initial').size()) d3.select('#rose').attr('transform', 'translate(80 80) scale(.25)');
+  gridOverlay.attr("opacity", 0.8).attr("type", "pointyHex").attr("scale", 1).attr("dx", 0).attr("dy", 0).attr("stroke", "#777777").attr("stroke-width", 0.5).attr("stroke-dasharray", null).attr("filter", null).attr("mask", null);
+  coordinates.attr("opacity", 1).attr("data-size", 12).attr("font-size", 12).attr("stroke", "#d4d4d4").attr("stroke-width", 1).attr("stroke-dasharray", 5).attr("filter", null).attr("mask", null);
+  compass.attr("opacity", 0.8).attr("transform", null).attr("filter", null).attr("mask", "url(#water)").attr("shape-rendering", "optimizespeed");
+  if (!d3.select("#initial").size()) d3.select("#rose").attr("transform", "translate(80 80) scale(.25)");
 
-  relig.attr('opacity', 0.7).attr('stroke', '#777777').attr('stroke-width', 0).attr('filter', null);
-  cults.attr('opacity', 0.6).attr('stroke', '#777777').attr('stroke-width', 0.5).attr('filter', null);
-  landmass.attr('opacity', 1).attr('fill', '#eef6fb').attr('filter', null);
-  markers.attr('opacity', null).attr('rescale', 1).attr('filter', 'url(#dropShadow01)');
+  relig.attr("opacity", 0.7).attr("stroke", "#777777").attr("stroke-width", 0).attr("filter", null);
+  cults.attr("opacity", 0.6).attr("stroke", "#777777").attr("stroke-width", 0.5).attr("filter", null);
+  landmass.attr("opacity", 1).attr("fill", "#eef6fb").attr("filter", null);
+  markers.attr("opacity", null).attr("rescale", 1).attr("filter", "url(#dropShadow01)");
 
-  prec.attr('opacity', null).attr('stroke', '#000000').attr('stroke-width', 0.1).attr('fill', '#003dff').attr('filter', null);
-  population.attr('opacity', null).attr('stroke-width', 1.6).attr('stroke-dasharray', null).attr('stroke-linecap', 'butt').attr('filter', null);
-  population.select('#rural').attr('stroke', '#0000ff');
-  population.select('#urban').attr('stroke', '#ff0000');
+  prec.attr("opacity", null).attr("stroke", "#000000").attr("stroke-width", 0.1).attr("fill", "#003dff").attr("filter", null);
+  population.attr("opacity", null).attr("stroke-width", 1.6).attr("stroke-dasharray", null).attr("stroke-linecap", "butt").attr("filter", null);
+  population.select("#rural").attr("stroke", "#0000ff");
+  population.select("#urban").attr("stroke", "#ff0000");
 
-  lakes.select('#freshwater').attr('opacity', 0.5).attr('fill', '#a6c1fd').attr('stroke', '#5f799d').attr('stroke-width', 0.7).attr('filter', null);
-  lakes.select('#salt').attr('opacity', 0.5).attr('fill', '#409b8a').attr('stroke', '#388985').attr('stroke-width', 0.7).attr('filter', null);
-  lakes.select('#sinkhole').attr('opacity', 1).attr('fill', '#5bc9fd').attr('stroke', '#53a3b0').attr('stroke-width', 0.7).attr('filter', null);
-  lakes.select('#frozen').attr('opacity', 0.95).attr('fill', '#cdd4e7').attr('stroke', '#cfe0eb').attr('stroke-width', 0).attr('filter', null);
-  lakes.select('#lava').attr('opacity', 0.7).attr('fill', '#90270d').attr('stroke', '#f93e0c').attr('stroke-width', 2).attr('filter', 'url(#crumpled)');
-  lakes.select('#dry').attr('opacity', 1).attr('fill', '#c9bfa7').attr('stroke', '#8e816f').attr('stroke-width', 0.7).attr('filter', null);
+  lakes.select("#freshwater").attr("opacity", 0.5).attr("fill", "#a6c1fd").attr("stroke", "#5f799d").attr("stroke-width", 0.7).attr("filter", null);
+  lakes.select("#salt").attr("opacity", 0.5).attr("fill", "#409b8a").attr("stroke", "#388985").attr("stroke-width", 0.7).attr("filter", null);
+  lakes.select("#sinkhole").attr("opacity", 1).attr("fill", "#5bc9fd").attr("stroke", "#53a3b0").attr("stroke-width", 0.7).attr("filter", null);
+  lakes.select("#frozen").attr("opacity", 0.95).attr("fill", "#cdd4e7").attr("stroke", "#cfe0eb").attr("stroke-width", 0).attr("filter", null);
+  lakes.select("#lava").attr("opacity", 0.7).attr("fill", "#90270d").attr("stroke", "#f93e0c").attr("stroke-width", 2).attr("filter", "url(#crumpled)");
+  lakes.select("#dry").attr("opacity", 1).attr("fill", "#c9bfa7").attr("stroke", "#8e816f").attr("stroke-width", 0.7).attr("filter", null);
 
-  coastline.select('#sea_island').attr('opacity', 0.5).attr('stroke', '#1f3846').attr('stroke-width', 0.7).attr('auto-filter', 1).attr('filter', 'url(#dropShadow)');
-  coastline.select('#lake_island').attr('opacity', 1).attr('stroke', '#7c8eaf').attr('stroke-width', 0.35).attr('filter', null);
+  coastline.select("#sea_island").attr("opacity", 0.5).attr("stroke", "#1f3846").attr("stroke-width", 0.7).attr("auto-filter", 1).attr("filter", "url(#dropShadow)");
+  coastline.select("#lake_island").attr("opacity", 1).attr("stroke", "#7c8eaf").attr("stroke-width", 0.35).attr("filter", null);
 
-  terrain.attr('opacity', null).attr('set', 'simple').attr('size', 1).attr('density', 0.4).attr('filter', null).attr('mask', null);
-  rivers.attr('opacity', null).attr('fill', '#5d97bb').attr('filter', null);
-  ruler.attr('opacity', null).attr('filter', null);
+  terrain.attr("opacity", null).attr("set", "simple").attr("size", 1).attr("density", 0.4).attr("filter", null).attr("mask", null);
+  rivers.attr("opacity", null).attr("fill", "#5d97bb").attr("filter", null);
+  ruler.attr("opacity", null).attr("filter", null);
 
-  roads.attr('opacity', 0.9).attr('stroke', '#d06324').attr('stroke-width', 0.7).attr('stroke-dasharray', '2').attr('stroke-linecap', 'butt').attr('filter', null).attr('mask', null);
-  trails.attr('opacity', 0.9).attr('stroke', '#d06324').attr('stroke-width', 0.25).attr('stroke-dasharray', '.8 1.6').attr('stroke-linecap', 'butt').attr('filter', null).attr('mask', null);
-  searoutes.attr('opacity', 0.8).attr('stroke', '#ffffff').attr('stroke-width', 0.45).attr('stroke-dasharray', '1 2').attr('stroke-linecap', 'round').attr('filter', null).attr('mask', null);
+  roads.attr("opacity", 0.9).attr("stroke", "#d06324").attr("stroke-width", 0.7).attr("stroke-dasharray", "2").attr("stroke-linecap", "butt").attr("filter", null).attr("mask", null);
+  trails.attr("opacity", 0.9).attr("stroke", "#d06324").attr("stroke-width", 0.25).attr("stroke-dasharray", ".8 1.6").attr("stroke-linecap", "butt").attr("filter", null).attr("mask", null);
+  searoutes.attr("opacity", 0.8).attr("stroke", "#ffffff").attr("stroke-width", 0.45).attr("stroke-dasharray", "1 2").attr("stroke-linecap", "round").attr("filter", null).attr("mask", null);
 
-  regions.attr('opacity', 0.4).attr('filter', null);
-  statesHalo.attr('data-width', 10).attr('stroke-width', 10).attr('opacity', 1);
-  provs.attr('opacity', 0.7).attr('fill', '#000000').attr('font-family', 'Georgia').attr('data-font', 'Georgia').attr('data-size', 10).attr('font-size', 10).attr('filter', null);
+  statesBody.attr("opacity", 0.4).attr("filter", null);
+  statesHalo.attr("data-width", 10).attr("stroke-width", 10).attr("opacity", 0.4).attr("filter", "blur(5px)");
 
-  temperature
-    .attr('opacity', null)
-    .attr('fill', '#000000')
-    .attr('stroke-width', 1.8)
-    .attr('fill-opacity', 0.3)
-    .attr('font-size', '8px')
-    .attr('stroke-dasharray', null)
-    .attr('filter', null)
-    .attr('mask', null);
-  texture.attr('opacity', null).attr('filter', null).attr('mask', 'url(#land)');
-  texture.select('#textureImage').attr('x', 0).attr('y', 0);
-  zones.attr('opacity', 0.6).attr('stroke', '#333333').attr('stroke-width', 0).attr('stroke-dasharray', null).attr('stroke-linecap', 'butt').attr('filter', null).attr('mask', null);
+  provs.attr("opacity", 0.7).attr("fill", "#000000").attr("font-family", "Georgia").attr("data-font", "Georgia").attr("data-size", 10).attr("font-size", 10).attr("filter", null);
+
+  temperature.attr("opacity", null).attr("fill", "#000000").attr("stroke-width", 1.8).attr("fill-opacity", 0.3).attr("font-size", "8px").attr("stroke-dasharray", null).attr("filter", null).attr("mask", null);
+  texture.attr("opacity", null).attr("filter", null).attr("mask", "url(#land)");
+  texture.select("#textureImage").attr("x", 0).attr("y", 0);
+  zones.attr("opacity", 0.6).attr("stroke", "#333333").attr("stroke-width", 0).attr("stroke-dasharray", null).attr("stroke-linecap", "butt").attr("filter", null).attr("mask", null);
 
   // ocean and svg default style
   svg.attr('background-color', '#000000').attr('data-filter', null).attr('filter', null);
@@ -953,16 +955,37 @@ function applyStyle(style) {
 
 // change current style preset to another saved one
 function changeStylePreset(preset) {
-  if (customization) return tip('Please exit the customization mode first', false, 'error');
+  if (customization) return tip("Please exit the customization mode first", false, "error");
 
-  const message = 'Are you sure you want to change the style preset? <br>All unsaved style changes will be lost';
-  const onConfirm = () => {
-    const customPreset = localStorage.getItem(preset);
-    if (customPreset) {
-      if (JSON.isValid(customPreset)) applyStyle(JSON.parse(customPreset));
-      else {
-        tip('Cannot parse stored style JSON. Default style applied', false, 'error', 5000);
-        applyDefaultStyle();
+  alertMessage.innerHTML = "Are you sure you want to change the style preset? All unsaved style changes will be lost";
+  $("#alert").dialog({
+    resizable: false,
+    title: "Change style preset",
+    width: "23em",
+    buttons: {
+      Change: function () {
+        const customPreset = localStorage.getItem(preset);
+        if (customPreset) {
+          if (JSON.isValid(customPreset)) applyStyle(JSON.parse(customPreset));
+          else {
+            tip("Cannot parse stored style JSON. Default style applied", false, "error", 5000);
+            applyDefaultStyle();
+          }
+        } else if (defaultStyles[preset]) applyStyle(JSON.parse(defaultStyles[preset]));
+        else applyDefaultStyle();
+        loadUsedFonts();
+
+        removeStyleButton.style.display = stylePreset.selectedOptions[0].dataset.system ? "none" : "inline-block";
+        updateElements(); // change elements
+        selectStyleElement(); // re-select element to trigger values update
+        updateMapFilter();
+        localStorage.setItem("presetStyle", preset); // save preset to use it onload
+        stylePreset.dataset.old = stylePreset.value; // save current value
+        $(this).dialog("close");
+      },
+      Cancel: function () {
+        stylePreset.value = stylePreset.dataset.old;
+        $(this).dialog("close");
       }
     } else if (defaultStyles[preset]) applyStyle(JSON.parse(defaultStyles[preset]));
     else applyDefaultStyle();
@@ -1025,6 +1048,8 @@ function addStylePreset() {
     position: {my: 'center', at: 'center', of: 'svg'}
   });
 
+  const currentStyle = document.getElementById("stylePreset").selectedOptions[0].text;
+  document.getElementById("styleSaverName").value = currentStyle;
   styleSaverJSON.value = JSON.stringify(getStyle(), null, 2);
   checkName();
 
@@ -1041,76 +1066,76 @@ function addStylePreset() {
   });
 
   function getStyle() {
-    const style = {},
-      attributes = {
-        '#map': ['background-color', 'filter', 'data-filter'],
-        '#armies': ['font-size', 'box-size', 'stroke', 'stroke-width', 'fill-opacity', 'filter'],
-        '#biomes': ['opacity', 'filter', 'mask'],
-        '#stateBorders': ['opacity', 'stroke', 'stroke-width', 'stroke-dasharray', 'stroke-linecap', 'filter'],
-        '#provinceBorders': ['opacity', 'stroke', 'stroke-width', 'stroke-dasharray', 'stroke-linecap', 'filter'],
-        '#cells': ['opacity', 'stroke', 'stroke-width', 'filter', 'mask'],
-        '#gridOverlay': ['opacity', 'scale', 'dx', 'dy', 'type', 'stroke', 'stroke-width', 'stroke-dasharray', 'stroke-linecap', 'transform', 'filter', 'mask'],
-        '#coordinates': ['opacity', 'data-size', 'font-size', 'stroke', 'stroke-width', 'stroke-dasharray', 'stroke-linecap', 'filter', 'mask'],
-        '#compass': ['opacity', 'transform', 'filter', 'mask', 'shape-rendering'],
-        '#rose': ['transform'],
-        '#relig': ['opacity', 'stroke', 'stroke-width', 'filter'],
-        '#cults': ['opacity', 'stroke', 'stroke-width', 'stroke-dasharray', 'stroke-linecap', 'filter'],
-        '#landmass': ['opacity', 'fill', 'filter'],
-        '#markers': ['opacity', 'rescale', 'filter'],
-        '#prec': ['opacity', 'stroke', 'stroke-width', 'fill', 'filter'],
-        '#population': ['opacity', 'stroke-width', 'stroke-dasharray', 'stroke-linecap', 'filter'],
-        '#rural': ['stroke'],
-        '#urban': ['stroke'],
-        '#goods': ['opacity', 'stroke-width', 'data-circle', 'filter'],
-        '#freshwater': ['opacity', 'fill', 'stroke', 'stroke-width', 'filter'],
-        '#salt': ['opacity', 'fill', 'stroke', 'stroke-width', 'filter'],
-        '#sinkhole': ['opacity', 'fill', 'stroke', 'stroke-width', 'filter'],
-        '#frozen': ['opacity', 'fill', 'stroke', 'stroke-width', 'filter'],
-        '#lava': ['opacity', 'fill', 'stroke', 'stroke-width', 'filter'],
-        '#dry': ['opacity', 'fill', 'stroke', 'stroke-width', 'filter'],
-        '#sea_island': ['opacity', 'stroke', 'stroke-width', 'filter', 'auto-filter'],
-        '#lake_island': ['opacity', 'stroke', 'stroke-width', 'filter'],
-        '#terrain': ['opacity', 'set', 'size', 'density', 'filter', 'mask'],
-        '#rivers': ['opacity', 'filter', 'fill'],
-        '#ruler': ['opacity', 'filter'],
-        '#roads': ['opacity', 'stroke', 'stroke-width', 'stroke-dasharray', 'stroke-linecap', 'filter', 'mask'],
-        '#trails': ['opacity', 'stroke', 'stroke-width', 'stroke-dasharray', 'stroke-linecap', 'filter', 'mask'],
-        '#searoutes': ['opacity', 'stroke', 'stroke-width', 'stroke-dasharray', 'stroke-linecap', 'filter', 'mask'],
-        '#regions': ['opacity', 'filter'],
-        '#statesHalo': ['opacity', 'data-width', 'stroke-width'],
-        '#provs': ['opacity', 'fill', 'font-size', 'data-font', 'font-family', 'filter'],
-        '#temperature': ['opacity', 'font-size', 'fill', 'fill-opacity', 'stroke', 'stroke-width', 'stroke-dasharray', 'stroke-linecap', 'filter'],
-        '#ice': ['opacity', 'fill', 'stroke', 'stroke-width', 'filter'],
-        '#emblems': ['opacity', 'stroke-width', 'filter'],
-        '#texture': ['opacity', 'filter', 'mask'],
-        '#textureImage': ['x', 'y'],
-        '#zones': ['opacity', 'stroke', 'stroke-width', 'stroke-dasharray', 'stroke-linecap', 'filter', 'mask'],
-        '#oceanLayers': ['filter', 'layers'],
-        '#oceanBase': ['fill'],
-        '#oceanicPattern': ['href', 'opacity'],
-        '#terrs': ['opacity', 'scheme', 'terracing', 'skip', 'relax', 'curve', 'filter', 'mask'],
-        '#legend': ['data-size', 'font-size', 'data-font', 'font-family', 'stroke', 'stroke-width', 'stroke-dasharray', 'stroke-linecap', 'data-x', 'data-y', 'data-columns'],
-        '#legendBox': ['fill', 'fill-opacity'],
-        '#burgLabels > #cities': ['opacity', 'fill', 'text-shadow', 'data-size', 'font-size', 'data-font', 'font-family'],
-        '#burgIcons > #cities': ['opacity', 'fill', 'fill-opacity', 'size', 'stroke', 'stroke-width', 'stroke-dasharray', 'stroke-linecap'],
-        '#anchors > #cities': ['opacity', 'fill', 'size', 'stroke', 'stroke-width'],
-        '#burgLabels > #towns': ['opacity', 'fill', 'text-shadow', 'data-size', 'font-size', 'data-font', 'font-family'],
-        '#burgIcons > #towns': ['opacity', 'fill', 'fill-opacity', 'size', 'stroke', 'stroke-width', 'stroke-dasharray', 'stroke-linecap'],
-        '#anchors > #towns': ['opacity', 'fill', 'size', 'stroke', 'stroke-width'],
-        '#labels > #states': ['opacity', 'fill', 'stroke', 'stroke-width', 'text-shadow', 'data-size', 'font-size', 'data-font', 'font-family', 'filter'],
-        '#labels > #addedLabels': ['opacity', 'fill', 'stroke', 'stroke-width', 'text-shadow', 'data-size', 'font-size', 'data-font', 'font-family', 'filter'],
-        '#fogging': ['opacity', 'fill', 'filter']
-      };
+    const style = {};
+    const attributes = {
+      "#map": ["background-color", "filter", "data-filter"],
+      "#armies": ["font-size", "box-size", "stroke", "stroke-width", "fill-opacity", "filter"],
+      "#biomes": ["opacity", "filter", "mask"],
+      "#stateBorders": ["opacity", "stroke", "stroke-width", "stroke-dasharray", "stroke-linecap", "filter"],
+      "#provinceBorders": ["opacity", "stroke", "stroke-width", "stroke-dasharray", "stroke-linecap", "filter"],
+      "#cells": ["opacity", "stroke", "stroke-width", "filter", "mask"],
+      "#gridOverlay": ["opacity", "scale", "dx", "dy", "type", "stroke", "stroke-width", "stroke-dasharray", "stroke-linecap", "transform", "filter", "mask"],
+      "#coordinates": ["opacity", "data-size", "font-size", "stroke", "stroke-width", "stroke-dasharray", "stroke-linecap", "filter", "mask"],
+      "#compass": ["opacity", "transform", "filter", "mask", "shape-rendering"],
+      "#rose": ["transform"],
+      "#relig": ["opacity", "stroke", "stroke-width", "filter"],
+      "#cults": ["opacity", "stroke", "stroke-width", "stroke-dasharray", "stroke-linecap", "filter"],
+      "#landmass": ["opacity", "fill", "filter"],
+      "#markers": ["opacity", "rescale", "filter"],
+      "#prec": ["opacity", "stroke", "stroke-width", "fill", "filter"],
+      "#population": ["opacity", "stroke-width", "stroke-dasharray", "stroke-linecap", "filter"],
+      "#rural": ["stroke"],
+      "#urban": ["stroke"],
+      "#freshwater": ["opacity", "fill", "stroke", "stroke-width", "filter"],
+      "#salt": ["opacity", "fill", "stroke", "stroke-width", "filter"],
+      "#sinkhole": ["opacity", "fill", "stroke", "stroke-width", "filter"],
+      "#frozen": ["opacity", "fill", "stroke", "stroke-width", "filter"],
+      "#lava": ["opacity", "fill", "stroke", "stroke-width", "filter"],
+      "#dry": ["opacity", "fill", "stroke", "stroke-width", "filter"],
+      "#sea_island": ["opacity", "stroke", "stroke-width", "filter", "auto-filter"],
+      "#lake_island": ["opacity", "stroke", "stroke-width", "filter"],
+      "#terrain": ["opacity", "set", "size", "density", "filter", "mask"],
+      "#rivers": ["opacity", "filter", "fill"],
+      "#ruler": ["opacity", "filter"],
+      "#roads": ["opacity", "stroke", "stroke-width", "stroke-dasharray", "stroke-linecap", "filter", "mask"],
+      "#trails": ["opacity", "stroke", "stroke-width", "stroke-dasharray", "stroke-linecap", "filter", "mask"],
+      "#searoutes": ["opacity", "stroke", "stroke-width", "stroke-dasharray", "stroke-linecap", "filter", "mask"],
+      "#statesBody": ["opacity", "filter"],
+      "#statesHalo": ["opacity", "data-width", "stroke-width", "filter"],
+      "#provs": ["opacity", "fill", "font-size", "data-font", "font-family", "filter"],
+      "#temperature": ["opacity", "font-size", "fill", "fill-opacity", "stroke", "stroke-width", "stroke-dasharray", "stroke-linecap", "filter"],
+      "#ice": ["opacity", "fill", "stroke", "stroke-width", "filter"],
+      "#emblems": ["opacity", "stroke-width", "filter"],
+      "#texture": ["opacity", "filter", "mask"],
+      "#textureImage": ["x", "y"],
+      "#zones": ["opacity", "stroke", "stroke-width", "stroke-dasharray", "stroke-linecap", "filter", "mask"],
+      "#oceanLayers": ["filter", "layers"],
+      "#oceanBase": ["fill"],
+      "#oceanicPattern": ["href", "opacity"],
+      "#terrs": ["opacity", "scheme", "terracing", "skip", "relax", "curve", "filter", "mask"],
+      "#legend": ["data-size", "font-size", "data-font", "font-family", "stroke", "stroke-width", "stroke-dasharray", "stroke-linecap", "data-x", "data-y", "data-columns"],
+      "#legendBox": ["fill", "fill-opacity"],
+      "#burgLabels > #cities": ["opacity", "fill", "text-shadow", "data-size", "font-size", "data-font", "font-family"],
+      "#burgIcons > #cities": ["opacity", "fill", "fill-opacity", "size", "stroke", "stroke-width", "stroke-dasharray", "stroke-linecap"],
+      "#anchors > #cities": ["opacity", "fill", "size", "stroke", "stroke-width"],
+      "#burgLabels > #towns": ["opacity", "fill", "text-shadow", "data-size", "font-size", "data-font", "font-family"],
+      "#burgIcons > #towns": ["opacity", "fill", "fill-opacity", "size", "stroke", "stroke-width", "stroke-dasharray", "stroke-linecap"],
+      "#anchors > #towns": ["opacity", "fill", "size", "stroke", "stroke-width"],
+      "#labels > #states": ["opacity", "fill", "stroke", "stroke-width", "text-shadow", "data-size", "font-size", "data-font", "font-family", "filter"],
+      "#labels > #addedLabels": ["opacity", "fill", "stroke", "stroke-width", "text-shadow", "data-size", "font-size", "data-font", "font-family", "filter"],
+      "#fogging": ["opacity", "fill", "filter"]
+    };
 
     for (const selector in attributes) {
-      const s = (style[selector] = {});
-      attributes[selector].forEach((attr) => {
-        const el = document.querySelector(selector);
-        if (!el) return;
-        let value = el.getAttribute(attr) || el.style[attr];
-        if (attr === 'font-size' && el.hasAttribute('data-size')) value = el.getAttribute('data-size');
-        s[attr] = parseValue(value);
-      });
+      const el = document.querySelector(selector);
+      if (!el) continue;
+
+      style[selector] = {};
+      for (const attr of attributes[selector]) {
+        let value = el.style[attr] || el.getAttribute(attr);
+        if (attr === "font-size" && el.hasAttribute("data-size")) value = el.getAttribute("data-size");
+        style[selector][attr] = parseValue(value);
+      }
     }
 
     function parseValue(value) {
@@ -1135,68 +1160,41 @@ function addStylePreset() {
   }
 
   function saveStyle() {
-    if (!styleSaverJSON.value) {
-      tip('Please provide a style JSON', false, 'error');
-      return;
-    }
-    if (!JSON.isValid(styleSaverJSON.value)) {
-      tip('JSON string is not valid, please check the format', false, 'error');
-      return;
-    }
-    if (!styleSaverName.value) {
-      tip('Please provide a preset name', false, 'error');
-      return;
-    }
-    if (styleSaverTip.innerHTML === 'default') {
-      tip('You cannot overwrite default preset, please change the name', false, 'error');
-      return;
-    }
-    const preset = 'style' + styleSaverName.value;
+    if (!styleSaverJSON.value) return tip("Please provide a style JSON", false, "error");
+    if (!JSON.isValid(styleSaverJSON.value)) return tip("JSON string is not valid, please check the format", false, "error");
+    if (!styleSaverName.value) return tip("Please provide a preset name", false, "error");
+    if (styleSaverTip.innerHTML === "default") return tip("You cannot overwrite default preset, please change the name", false, "error");
+
+    const preset = "style" + styleSaverName.value;
     applyOption(stylePreset, preset, styleSaverName.value); // add option
     localStorage.setItem('presetStyle', preset); // mark preset as default
     localStorage.setItem(preset, styleSaverJSON.value); // save preset
-    $('#styleSaver').dialog('close');
-    removeStyleButton.style.display = 'inline-block';
-    tip('Style preset is saved', false, 'success', 4000);
+    $("#styleSaver").dialog("close");
+    removeStyleButton.style.display = "inline-block";
+    tip("Style preset is saved", false, "success", 4000);
   }
 
   function styleDownload() {
-    if (!styleSaverJSON.value) {
-      tip('Please provide a style JSON', false, 'error');
-      return;
-    }
-    if (!JSON.isValid(styleSaverJSON.value)) {
-      tip('JSON string is not valid, please check the format', false, 'error');
-      return;
-    }
-    if (!styleSaverName.value) {
-      tip('Please provide a preset name', false, 'error');
-      return;
-    }
+    if (!styleSaverJSON.value) return tip("Please provide a style JSON", false, "error");
+    if (!JSON.isValid(styleSaverJSON.value)) return tip("JSON string is not valid, please check the format", false, "error");
+    if (!styleSaverName.value) return tip("Please provide a preset name", false, "error");
+
     const data = styleSaverJSON.value;
-    if (!data) {
-      tip('Please provide a style JSON', false, 'error');
-      return;
-    }
-    downloadFile(data, 'style' + styleSaverName.value + '.json', 'application/json');
+    if (!data) return tip("Please provide a style JSON", false, "error");
+    downloadFile(data, "style" + styleSaverName.value + ".json", "application/json");
   }
 
   function styleUpload(dataLoaded) {
-    if (!dataLoaded) {
-      tip('Cannot load the file. Please check the data format', false, 'error');
-      return;
-    }
+    if (!dataLoaded) return tip("Cannot load the file. Please check the data format", false, "error");
     const data = JSON.stringify(JSON.parse(dataLoaded), null, 2);
     styleSaverJSON.value = data;
   }
 }
 
 function removeStylePreset() {
-  if (stylePreset.selectedOptions[0].dataset.system) {
-    tip('Cannot remove system preset', false, 'error');
-    return;
-  }
-  localStorage.removeItem('presetStyle');
+  if (stylePreset.selectedOptions[0].dataset.system) return tip("Cannot remove system preset", false, "error");
+
+  localStorage.removeItem("presetStyle");
   localStorage.removeItem(stylePreset.value);
   stylePreset.selectedOptions[0].remove();
   removeStyleButton.style.display = 'none';
@@ -1207,14 +1205,12 @@ mapFilters.addEventListener('click', applyMapFilter);
 function applyMapFilter(event) {
   if (event.target.tagName !== 'BUTTON') return;
   const button = event.target;
-  svg.attr('data-filter', null).attr('filter', null);
-  if (button.classList.contains('pressed')) {
-    button.classList.remove('pressed');
-    return;
-  }
-  mapFilters.querySelectorAll('.pressed').forEach((button) => button.classList.remove('pressed'));
-  button.classList.add('pressed');
-  svg.attr('data-filter', button.id).attr('filter', 'url(#filter-' + button.id + ')');
+  svg.attr("data-filter", null).attr("filter", null);
+  if (button.classList.contains("pressed")) return button.classList.remove("pressed");
+
+  mapFilters.querySelectorAll(".pressed").forEach(button => button.classList.remove("pressed"));
+  button.classList.add("pressed");
+  svg.attr("data-filter", button.id).attr("filter", "url(#filter-" + button.id + ")");
 }
 
 function updateMapFilter() {
@@ -1223,110 +1219,3 @@ function updateMapFilter() {
   if (!filter) return;
   mapFilters.querySelector('#' + filter).classList.add('pressed');
 }
-
-// FONTS
-// fetch default fonts if not done before
-function loadDefaultFonts() {
-  if (!$('link[href="fonts.css"]').length) {
-    $('head').append('<link rel="stylesheet" type="text/css" href="fonts.css">');
-    const fontsToAdd = [
-      'Amatic+SC:700',
-      'IM+Fell+English',
-      'Great+Vibes',
-      'MedievalSharp',
-      'Metamorphous',
-      'Nova+Script',
-      'Uncial+Antiqua',
-      'Underdog',
-      'Caesar+Dressing',
-      'Bitter',
-      'Yellowtail',
-      'Montez',
-      'Shadows+Into+Light',
-      'Fredericka+the+Great',
-      'Orbitron',
-      'Dancing+Script:700',
-      'Architects+Daughter',
-      'Kaushan+Script',
-      'Gloria+Hallelujah',
-      'Satisfy',
-      'Comfortaa:700',
-      'Cinzel'
-    ];
-    fontsToAdd.forEach(function (f) {
-      if (fonts.indexOf(f) === -1) fonts.push(f);
-    });
-    updateFontOptions();
-  }
-}
-
-function fetchFonts(url) {
-  return new Promise((resolve, reject) => {
-    if (url === '') {
-      tip('Use a direct link to any @font-face declaration or just font name to fetch from Google Fonts');
-      return;
-    }
-    if (url.indexOf('http') === -1) {
-      url = url.replace(url.charAt(0), url.charAt(0).toUpperCase()).split(' ').join('+');
-      url = 'https://fonts.googleapis.com/css?family=' + url;
-    }
-    const fetched = addFonts(url).then((fetched) => {
-      if (fetched === undefined) {
-        tip('Cannot fetch font for this value!', false, 'error');
-        return;
-      }
-      if (fetched === 0) {
-        tip('Already in the fonts list!', false, 'error');
-        return;
-      }
-      updateFontOptions();
-      if (fetched === 1) {
-        tip('Font ' + fonts[fonts.length - 1] + ' is fetched');
-      } else if (fetched > 1) {
-        tip(fetched + ' fonts are added to the list');
-      }
-      resolve(fetched);
-    });
-  });
-}
-
-function addFonts(url) {
-  $('head').append('<link rel="stylesheet" type="text/css" href="' + url + '">');
-  return fetch(url)
-    .then((resp) => resp.text())
-    .then((text) => {
-      let s = document.createElement('style');
-      s.innerHTML = text;
-      document.head.appendChild(s);
-      let styleSheet = Array.prototype.filter.call(document.styleSheets, (sS) => sS.ownerNode === s)[0];
-      let FontRule = (rule) => {
-        let family = rule.style.getPropertyValue('font-family');
-        let font = family.replace(/['"]+/g, '').replace(/ /g, '+');
-        let weight = rule.style.getPropertyValue('font-weight');
-        if (weight && weight !== '400') font += ':' + weight;
-        if (fonts.indexOf(font) == -1) {
-          fonts.push(font);
-          fetched++;
-        }
-      };
-      let fetched = 0;
-      for (let r of styleSheet.cssRules) {
-        FontRule(r);
-      }
-      document.head.removeChild(s);
-      return fetched;
-    })
-    .catch(function () {});
-}
-
-// Update font list for Label and Burg Editors
-function updateFontOptions() {
-  styleSelectFont.innerHTML = '';
-  for (let i = 0; i < fonts.length; i++) {
-    const opt = document.createElement('option');
-    opt.value = i;
-    const font = fonts[i].split(':')[0].replace(/\+/g, ' ');
-    opt.style.fontFamily = opt.innerHTML = font;
-    styleSelectFont.add(opt);
-  }
-}
diff --git a/modules/ui/tools.js b/modules/ui/tools.js
index da3282f3..1d7f8ee4 100644
--- a/modules/ui/tools.js
+++ b/modules/ui/tools.js
@@ -551,94 +551,120 @@ function toggleAddRiver() {
 }
 
 function addRiverOnClick() {
-  const cells = pack.cells;
-  const point = d3.mouse(this);
-  let i = findCell(point[0], point[1]);
-  if (cells.r[i] || cells.h[i] < 20 || cells.b[i]) return;
+  const {cells, rivers} = pack;
+  let i = findCell(...d3.mouse(this));
 
-  const dataRiver = []; // to store river points
-  let river = +getNextId('river').slice(5); // river id
-  cells.fl[i] = grid.cells.prec[cells.g[i]]; // initial flux
+  if (cells.r[i]) return tip('There is already a river here', false, 'error');
+  if (cells.h[i] < 20) return tip('Cannot create river in water cell', false, 'error');
+  if (cells.b[i]) return;
 
-  const h = Rivers.alterHeights();
-  Lakes.prepareLakeData(h);
-  Rivers.resolveDepressions(h);
+  const {alterHeights, resolveDepressions, addMeandering, getRiverPath, getBasin, getName, getType, getWidth, getOffset, getApproximateLength} = Rivers;
+  const riverCells = [];
+  let riverId = rivers.length ? last(rivers).i + 1 : 1;
+  let parent = riverId;
+
+  const initialFlux = grid.cells.prec[cells.g[i]];
+  cells.fl[i] = initialFlux;
+
+  const h = alterHeights();
+  resolveDepressions(h);
 
   while (i) {
-    cells.r[i] = river;
-    const [x, y] = cells.p[i];
-    dataRiver.push({x, y, cell: i});
+    cells.r[i] = riverId;
+    riverCells.push(i);
 
     const min = cells.c[i].sort((a, b) => h[a] - h[b])[0]; // downhill cell
     if (h[i] <= h[min]) return tip(`Cell ${i} is depressed, river cannot flow further`, false, 'error');
 
-    const [tx, ty] = cells.p[min];
-
+    // pour to water body
     if (h[min] < 20) {
-      // pour to water body
-      dataRiver.push({x: tx, y: ty, cell: i});
+      riverCells.push(min);
+
+      const feature = pack.features[cells.f[min]];
+      if (feature.type === 'lake') {
+        if (feature.outlet) parent = feature.outlet;
+        feature.inlets ? feature.inlets.push(riverId) : (feature.inlets = [riverId]);
+      }
       break;
     }
 
+    // pour outside of map from border cell
+    if (cells.b[min]) {
+      cells.fl[min] += cells.fl[i];
+      riverCells.push(-1);
+      break;
+    }
+
+    // continue propagation if min cell has no river
     if (!cells.r[min]) {
-      // continue if next cell has not river
       cells.fl[min] += cells.fl[i];
       i = min;
       continue;
     }
 
     // handle case when lowest cell already has a river
-    const r = cells.r[min];
-    const riverCells = cells.i.filter((i) => cells.r[i] === r);
-    const riverCellsUpper = riverCells.filter((i) => h[i] > h[min]);
+    const oldRiverId = cells.r[min];
+    const oldRiver = rivers.find((river) => river.i === oldRiverId);
+    const oldRiverCells = oldRiver?.cells || cells.i.filter((i) => cells.r[i] === oldRiverId);
+    const oldRiverCellsUpper = oldRiverCells.filter((i) => h[i] > h[min]);
 
-    // finish new river if old river is longer
-    if (dataRiver.length <= riverCellsUpper.length) {
+    // create new river as a tributary
+    if (riverCells.length <= oldRiverCellsUpper.length) {
       cells.conf[min] += cells.fl[i];
-      dataRiver.push({x: tx, y: ty, cell: min});
-      dataRiver[0].parent = r; // new river is tributary
+      riverCells.push(min);
+      parent = oldRiverId;
       break;
     }
 
-    // extend old river
-    rivers.select('#river' + r).remove();
-    cells.i.filter((i) => cells.r[i] === river).forEach((i) => (cells.r[i] = r));
-    riverCells.forEach((i) => (cells.r[i] = 0));
-    river = r;
-    cells.fl[min] = cells.fl[i] + grid.cells.prec[cells.g[min]];
-    i = min;
+    // continue old river
+    document.getElementById('river' + oldRiverId)?.remove();
+    riverCells.forEach((i) => (cells.r[i] = oldRiverId));
+    oldRiverCells.forEach((cell) => {
+      if (h[cell] > h[min]) {
+        cells.r[cell] = 0;
+        cells.fl[cell] = grid.cells.prec[cells.g[cell]];
+      } else {
+        riverCells.push(cell);
+        cells.fl[cell] += cells.fl[i];
+      }
+    });
+    riverId = oldRiverId;
+
+    break;
   }
 
-  const points = Rivers.addMeandering(dataRiver, 1, 0.5);
-  const widthFactor = rn(0.8 + Math.random() * 0.4, 1); // river width modifier [.8, 1.2]
-  const sourceWidth = 0.1;
-  const [path, length, offset] = Rivers.getPath(points, widthFactor, sourceWidth);
-  rivers
-    .append('path')
-    .attr('d', path)
-    .attr('id', 'river' + river);
+  const river = rivers.find((r) => r.i === riverId);
 
-  // add new river to data or change extended river attributes
-  const r = pack.rivers.find((r) => r.i === river);
-  const mouth = last(dataRiver).cell;
-  const discharge = cells.fl[mouth]; // in m3/s
+  const source = riverCells[0];
+  const mouth = riverCells[riverCells.length - 2];
+  const widthFactor = river?.widthFactor || (!parent || parent === riverId ? 1.2 : 1);
+  const meanderedPoints = addMeandering(riverCells);
 
-  if (r) {
-    r.source = dataRiver[0].cell;
-    r.length = length;
-    r.discharge = discharge;
+  const discharge = cells.fl[mouth]; // m3 in second
+  const length = getApproximateLength(meanderedPoints);
+  const width = getWidth(getOffset(discharge, meanderedPoints.length, widthFactor));
+
+  if (river) {
+    river.source = source;
+    river.length = length;
+    river.discharge = discharge;
+    river.width = width;
+    river.cells = riverCells;
   } else {
-    const parent = dataRiver[0].parent || 0;
-    const basin = Rivers.getBasin(river);
-    const source = dataRiver[0].cell;
-    const width = rn(offset ** 2, 2); // mounth width in km
-    const name = Rivers.getName(mouth);
-    const smallLength = pack.rivers.map((r) => r.length || 0).sort((a, b) => a - b)[Math.ceil(pack.rivers.length * 0.15)];
-    const type = length < smallLength ? rw({Creek: 9, River: 3, Brook: 3, Stream: 1}) : 'River';
+    const basin = getBasin(parent);
+    const name = getName(mouth);
+    const type = getType({i: riverId, length, parent});
 
-    pack.rivers.push({i: river, source, mouth, discharge, length, width, widthFactor, sourceWidth, parent, basin, name, type});
+    rivers.push({i: riverId, source, mouth, discharge, length, width, widthFactor, sourceWidth: 0, parent, cells: riverCells, basin, name, type});
   }
 
+  // render river
+  lineGen.curve(d3.curveCatmullRom.alpha(0.1));
+  const path = getRiverPath(meanderedPoints, widthFactor);
+  const id = 'river' + riverId;
+  const riversG = viewbox.select('#rivers');
+  riversG.append('path').attr('id', id).attr('d', path);
+
   if (d3.event.shiftKey === false) {
     Lakes.cleanupLakeData();
     unpressClickToAddButton();
diff --git a/modules/ui/zones-editor.js b/modules/ui/zones-editor.js
index a27b1f0f..00ea9196 100644
--- a/modules/ui/zones-editor.js
+++ b/modules/ui/zones-editor.js
@@ -1,4 +1,5 @@
 "use strict";
+
 function editZones() {
   closeDialogs();
   if (!layerIsOn("toggleZones")) toggleZones();
diff --git a/modules/utils.js b/modules/utils.js
index afe22287..84389a3d 100644
--- a/modules/utils.js
+++ b/modules/utils.js
@@ -11,11 +11,11 @@ function getBoundaryPoints(width, height, spacing) {
   const numberY = Math.ceil(h / bSpacing) - 1;
   let points = [];
   for (let i = 0.5; i < numberX; i++) {
-    let x = Math.ceil(w * i / numberX + offset);
+    let x = Math.ceil((w * i) / numberX + offset);
     points.push([x, offset], [x, h + offset]);
   }
   for (let i = 0.5; i < numberY; i++) {
-    let y = Math.ceil(h * i / numberY + offset);
+    let y = Math.ceil((h * i) / numberY + offset);
     points.push([offset, y], [w + offset, y]);
   }
   return points;
@@ -24,7 +24,7 @@ function getBoundaryPoints(width, height, spacing) {
 // get points on a regular square grid and jitter them a bit
 function getJitteredGrid(width, height, spacing) {
   const radius = spacing / 2; // square radius
-  const jittering = radius * .9; // max deviation
+  const jittering = radius * 0.9; // max deviation
   const jitter = () => Math.random() * 2 * jittering - jittering;
 
   let points = [];
@@ -40,7 +40,7 @@ function getJitteredGrid(width, height, spacing) {
 
 // return cell index on a regular square grid
 function findGridCell(x, y) {
-  return Math.floor(Math.min(y / grid.spacing, grid.cellsY -1)) * grid.cellsX + Math.floor(Math.min(x / grid.spacing, grid.cellsX-1));
+  return Math.floor(Math.min(y / grid.spacing, grid.cellsY - 1)) * grid.cellsX + Math.floor(Math.min(x / grid.spacing, grid.cellsX - 1));
 }
 
 // return array of cell indexes in radius on a regular square grid
@@ -55,14 +55,12 @@ function findGridAll(x, y, radius) {
     while (r > 1) {
       let cycle = frontier.slice();
       frontier = [];
-      cycle.forEach(function(s) {
-
-        c[s].forEach(function(e) {
+      cycle.forEach(function (s) {
+        c[s].forEach(function (e) {
           if (found.indexOf(e) !== -1) return;
           found.push(e);
           frontier.push(e);
         });
-
       });
       r--;
     }
@@ -100,7 +98,7 @@ function getGridPolygon(i) {
 
 // mbostock's poissonDiscSampler
 function* poissonDiscSampler(x0, y0, x1, y1, r, k = 3) {
-  if (!(x1 >= x0) || !(y1 >= y0) || !(r > 0)) throw new Error;
+  if (!(x1 >= x0) || !(y1 >= y0) || !(r > 0)) throw new Error();
 
   const width = x1 - x0;
   const height = y1 - y0;
@@ -113,8 +111,8 @@ function* poissonDiscSampler(x0, y0, x1, y1, r, k = 3) {
   const queue = [];
 
   function far(x, y) {
-    const i = x / cellSize | 0;
-    const j = y / cellSize | 0;
+    const i = (x / cellSize) | 0;
+    const j = (y / cellSize) | 0;
     const i0 = Math.max(i - 2, 0);
     const j0 = Math.max(j - 2, 0);
     const i1 = Math.min(i + 3, gridWidth);
@@ -134,14 +132,14 @@ function* poissonDiscSampler(x0, y0, x1, y1, r, k = 3) {
   }
 
   function sample(x, y) {
-    queue.push(grid[gridWidth * (y / cellSize | 0) + (x / cellSize | 0)] = [x, y]);
+    queue.push((grid[gridWidth * ((y / cellSize) | 0) + ((x / cellSize) | 0)] = [x, y]));
     return [x + x0, y + y0];
   }
 
   yield sample(width / 2, height / 2);
 
   pick: while (queue.length) {
-    const i = Math.random() * queue.length | 0;
+    const i = (Math.random() * queue.length) | 0;
     const parent = queue[i];
 
     for (let j = 0; j < k; ++j) {
@@ -171,20 +169,19 @@ function isWater(i) {
 }
 
 // convert RGB color string to HEX without #
-function toHEX(rgb){
-  if (rgb.charAt(0) === "#") {return rgb;}
+function toHEX(rgb) {
+  if (rgb.charAt(0) === "#") {
+    return rgb;
+  }
   rgb = rgb.match(/^rgba?[\s+]?\([\s+]?(\d+)[\s+]?,[\s+]?(\d+)[\s+]?,[\s+]?(\d+)[\s+]?/i);
-    return (rgb && rgb.length === 4) ? "#" +
-    ("0" + parseInt(rgb[1],10).toString(16)).slice(-2) +
-    ("0" + parseInt(rgb[2],10).toString(16)).slice(-2) +
-    ("0" + parseInt(rgb[3],10).toString(16)).slice(-2) : '';
+  return rgb && rgb.length === 4 ? "#" + ("0" + parseInt(rgb[1], 10).toString(16)).slice(-2) + ("0" + parseInt(rgb[2], 10).toString(16)).slice(-2) + ("0" + parseInt(rgb[3], 10).toString(16)).slice(-2) : "";
 }
 
 // return array of standard shuffled colors
 function getColors(number) {
-  const c12 = ["#dababf","#fb8072","#80b1d3","#fdb462","#b3de69","#fccde5","#c6b9c1","#bc80bd","#ccebc5","#ffed6f","#8dd3c7","#eb8de7"];
+  const c12 = ["#dababf", "#fb8072", "#80b1d3", "#fdb462", "#b3de69", "#fccde5", "#c6b9c1", "#bc80bd", "#ccebc5", "#ffed6f", "#8dd3c7", "#eb8de7"];
   const cRB = d3.scaleSequential(d3.interpolateRainbow);
-  const colors = d3.shuffle(d3.range(number).map(i => i < 12 ? c12[i] : d3.color(cRB((i-12)/(number-12))).hex()));
+  const colors = d3.shuffle(d3.range(number).map(i => (i < 12 ? c12[i] : d3.color(cRB((i - 12) / (number - 12))).hex())));
   return colors;
 }
 
@@ -193,30 +190,42 @@ function getRandomColor() {
 }
 
 // mix a color with a random color
-function getMixedColor(color, mix = .2, bright = .3) {
+function getMixedColor(color, mix = 0.2, bright = 0.3) {
   const c = color && color[0] === "#" ? color : getRandomColor(); // if provided color is not hex (e.g. harching), generate random one
   return d3.color(d3.interpolate(c, getRandomColor())(mix)).brighter(bright).hex();
 }
 
 // conver temperature from °C to other scales
 function convertTemperature(c) {
-  switch(temperatureScale.value) {
-    case "°C": return c + "°C";
-    case "°F": return rn(c * 9 / 5 + 32) + "°F";
-    case "K": return rn(c + 273.15) + "K";
-    case "°R": return rn((c + 273.15) * 9 / 5) + "°R";
-    case "°De": return rn((100 - c) * 3 / 2) + "°De";
-    case "°N": return rn(c * 33 / 100) + "°N";
-    case "°Ré": return rn(c * 4 / 5) + "°Ré";
-    case "°Rø": return rn(c * 21 / 40 + 7.5) + "°Rø";
-    default: return c + "°C";
+  switch (temperatureScale.value) {
+    case "°C":
+      return c + "°C";
+    case "°F":
+      return rn((c * 9) / 5 + 32) + "°F";
+    case "K":
+      return rn(c + 273.15) + "K";
+    case "°R":
+      return rn(((c + 273.15) * 9) / 5) + "°R";
+    case "°De":
+      return rn(((100 - c) * 3) / 2) + "°De";
+    case "°N":
+      return rn((c * 33) / 100) + "°N";
+    case "°Ré":
+      return rn((c * 4) / 5) + "°Ré";
+    case "°Rø":
+      return rn((c * 21) / 40 + 7.5) + "°Rø";
+    default:
+      return c + "°C";
   }
 }
 
 // random number in a range
 function rand(min, max) {
   if (min === undefined && max === undefined) return Math.random();
-  if (max === undefined) {max = min; min = 0;}
+  if (max === undefined) {
+    max = min;
+    min = 0;
+  }
   return Math.floor(Math.random() * (max - min + 1)) + min;
 }
 
@@ -227,6 +236,10 @@ function P(probability) {
   return Math.random() < probability;
 }
 
+function each(n) {
+  return i => i % n === 0;
+}
+
 // random number (normal or gaussian distribution)
 function gauss(expected = 100, deviation = 30, min = 0, max = 300, round = 0) {
   return rn(Math.max(Math.min(d3.randomNormal(expected, deviation)(), max), min), round);
@@ -245,7 +258,9 @@ function rn(v, d = 0) {
 
 // round string to d decimals
 function round(s, d = 1) {
-   return s.replace(/[\d\.-][\d\.e-]*/g, function(n) {return rn(n, d);})
+  return s.replace(/[\d\.-][\d\.e-]*/g, function (n) {
+    return rn(n, d);
+  });
 }
 
 // corvent number to short string with SI postfix
@@ -279,52 +294,50 @@ function capitalize(string) {
 
 // transform string to array [translateX,translateY,rotateDeg,rotateX,rotateY,scale]
 function parseTransform(string) {
-  if (!string) {return [0,0,0,0,0,1];}
-  const a = string.replace(/[a-z()]/g, "").replace(/[ ]/g, ",").split(",");
+  if (!string) {
+    return [0, 0, 0, 0, 0, 1];
+  }
+  const a = string
+    .replace(/[a-z()]/g, "")
+    .replace(/[ ]/g, ",")
+    .split(",");
   return [a[0] || 0, a[1] || 0, a[2] || 0, a[3] || 0, a[4] || 0, a[5] || 1];
 }
 
 // findAll d3.quandtree search from https://bl.ocks.org/lwthatcher/b41479725e0ff2277c7ac90df2de2b5e
-void function addFindAll() {
-  const Quad = function(node, x0, y0, x1, y1) {
+void (function addFindAll() {
+  const Quad = function (node, x0, y0, x1, y1) {
     this.node = node;
     this.x0 = x0;
     this.y0 = y0;
     this.x1 = x1;
     this.y1 = y1;
-  }
+  };
 
-  const tree_filter = function(x, y, radius) {
+  const tree_filter = function (x, y, radius) {
     var t = {x, y, x0: this._x0, y0: this._y0, x3: this._x1, y3: this._y1, quads: [], node: this._root};
-    if (t.node) {t.quads.push(new Quad(t.node, t.x0, t.y0, t.x3, t.y3))};
+    if (t.node) {
+      t.quads.push(new Quad(t.node, t.x0, t.y0, t.x3, t.y3));
+    }
     radiusSearchInit(t, radius);
 
     var i = 0;
-    while (t.q = t.quads.pop()) {
+    while ((t.q = t.quads.pop())) {
       i++;
 
       // Stop searching if this quadrant can’t contain a closer node.
-      if (!(t.node = t.q.node)
-          || (t.x1 = t.q.x0) > t.x3
-          || (t.y1 = t.q.y0) > t.y3
-          || (t.x2 = t.q.x1) < t.x0
-          || (t.y2 = t.q.y1) < t.y0) continue;
+      if (!(t.node = t.q.node) || (t.x1 = t.q.x0) > t.x3 || (t.y1 = t.q.y0) > t.y3 || (t.x2 = t.q.x1) < t.x0 || (t.y2 = t.q.y1) < t.y0) continue;
 
       // Bisect the current quadrant.
       if (t.node.length) {
         t.node.explored = true;
         var xm = (t.x1 + t.x2) / 2,
-            ym = (t.y1 + t.y2) / 2;
+          ym = (t.y1 + t.y2) / 2;
 
-        t.quads.push(
-          new Quad(t.node[3], xm, ym, t.x2, t.y2),
-          new Quad(t.node[2], t.x1, ym, xm, t.y2),
-          new Quad(t.node[1], xm, t.y1, t.x2, ym),
-          new Quad(t.node[0], t.x1, t.y1, xm, ym)
-        );
+        t.quads.push(new Quad(t.node[3], xm, ym, t.x2, t.y2), new Quad(t.node[2], t.x1, ym, xm, t.y2), new Quad(t.node[1], xm, t.y1, t.x2, ym), new Quad(t.node[0], t.x1, t.y1, xm, ym));
 
         // Visit the closest quadrant first.
-        if (t.i = (y >= ym) << 1 | (x >= xm)) {
+        if ((t.i = ((y >= ym) << 1) | (x >= xm))) {
           t.q = t.quads[t.quads.length - 1];
           t.quads[t.quads.length - 1] = t.quads[t.quads.length - 1 - t.i];
           t.quads[t.quads.length - 1 - t.i] = t.q;
@@ -334,29 +347,32 @@ void function addFindAll() {
       // Visit this point. (Visiting coincident points isn’t necessary!)
       else {
         var dx = x - +this._x.call(null, t.node.data),
-            dy = y - +this._y.call(null, t.node.data),
-            d2 = dx * dx + dy * dy;
+          dy = y - +this._y.call(null, t.node.data),
+          d2 = dx * dx + dy * dy;
         radiusSearchVisit(t, d2);
       }
     }
     return t.result;
-  }
+  };
   d3.quadtree.prototype.findAll = tree_filter;
 
-  var radiusSearchInit = function(t, radius) {
+  var radiusSearchInit = function (t, radius) {
     t.result = [];
-    t.x0 = t.x - radius, t.y0 = t.y - radius;
-    t.x3 = t.x + radius, t.y3 = t.y + radius;
+    (t.x0 = t.x - radius), (t.y0 = t.y - radius);
+    (t.x3 = t.x + radius), (t.y3 = t.y + radius);
     t.radius = radius * radius;
-  }
+  };
 
-  var radiusSearchVisit = function(t, d2) {
+  var radiusSearchVisit = function (t, d2) {
     t.node.data.scanned = true;
     if (d2 < t.radius) {
-      do {t.result.push(t.node.data); t.node.data.selected = true;} while (t.node = t.node.next);
+      do {
+        t.result.push(t.node.data);
+        t.node.data.selected = true;
+      } while ((t.node = t.node.next));
     }
-  }
-}()
+  };
+})();
 
 // get segment of any point on polyline
 function getSegmentId(points, point, step = 10) {
@@ -366,23 +382,23 @@ function getSegmentId(points, point, step = 10) {
   let minSegment = 1;
   let minDist = Infinity;
 
-  for (let i=0; i < points.length-1; i++) {
+  for (let i = 0; i < points.length - 1; i++) {
     const p1 = points[i];
-    const p2 = points[i+1];
+    const p2 = points[i + 1];
 
     const length = Math.sqrt(d2(p1, p2));
     const segments = Math.ceil(length / step);
     const dx = (p2[0] - p1[0]) / segments;
     const dy = (p2[1] - p1[1]) / segments;
 
-    for (let s=0; s < segments; s++) {
+    for (let s = 0; s < segments; s++) {
       const x = p1[0] + s * dx;
       const y = p1[1] + s * dy;
       const dist2 = d2(point, [x, y]);
 
       if (dist2 >= minDist) continue;
       minDist = dist2;
-      minSegment = i+1;
+      minSegment = i + 1;
     }
   }
 
@@ -418,7 +434,9 @@ function vowel(c) {
 
 // remove vowels from the end of the string
 function trimVowels(string) {
-  while (string.length > 3 && vowel(last(string))) {string = string.slice(0,-1);}
+  while (string.length > 3 && vowel(last(string))) {
+    string = string.slice(0, -1);
+  }
   return string;
 }
 
@@ -427,7 +445,7 @@ function getAdjective(string) {
   // special cases for some suffixes
   if (string.length > 8 && string.slice(-6) === "orszag") return string.slice(0, -6);
   if (string.length > 6 && string.slice(-4) === "stan") return string.slice(0, -4);
-  if (P(.5) && string.slice(-4) === "land") return string + "ic";
+  if (P(0.5) && string.slice(-4) === "land") return string + "ic";
   if (string.slice(-4) === " Guo") string = string.slice(0, -4);
 
   // don't change is name ends on suffix
@@ -436,16 +454,16 @@ function getAdjective(string) {
   if (string.slice(-1) === "i") return string;
 
   const end = string.slice(-1); // last letter of string
-  if (end === "a") return string += "n";
-  if (end === "o") return string = trimVowels(string) + "an";
-  if (vowel(end) || end === "c") return string += "an"; // ceiuy
-  if (end === "m" || end === "n") return string += "ese";
-  if (end === "q") return string += "i";
+  if (end === "a") return (string += "n");
+  if (end === "o") return (string = trimVowels(string) + "an");
+  if (vowel(end) || end === "c") return (string += "an"); // ceiuy
+  if (end === "m" || end === "n") return (string += "ese");
+  if (end === "q") return (string += "i");
   return trimVowels(string) + "ian";
 }
 
 // get ordinal out of integer: 1 => 1st
-const nth = n => n+(["st","nd","rd"][((n+90)%100-10)%10-1]||"th");
+const nth = n => n + (["st", "nd", "rd"][((((n + 90) % 100) - 10) % 10) - 1] || "th");
 
 // get two-letters code (abbreviation) from string
 function abbreviate(name, restricted = []) {
@@ -453,8 +471,8 @@ function abbreviate(name, restricted = []) {
   const words = parsed.split(" ");
   const letters = words.join("");
 
-  let code = words.length === 2 ? words[0][0]+words[1][0] : letters.slice(0,2);
-  for (let i = 1; i < letters.length-1 && restricted.includes(code); i++) {
+  let code = words.length === 2 ? words[0][0] + words[1][0] : letters.slice(0, 2);
+  for (let i = 1; i < letters.length - 1 && restricted.includes(code); i++) {
     code = letters[0] + letters[i].toUpperCase();
   }
   return code;
@@ -463,7 +481,7 @@ function abbreviate(name, restricted = []) {
 // conjunct array: [A,B,C] => "A, B and C"
 function list(array) {
   if (!Intl.ListFormat) return array.join(", ");
-  const conjunction = new Intl.ListFormat(window.lang || "en", {style:"long", type:"conjunction"});
+  const conjunction = new Intl.ListFormat(window.lang || "en", {style: "long", type: "conjunction"});
   return conjunction.format(array);
 }
 
@@ -472,7 +490,10 @@ function splitInTwo(str) {
   const half = str.length / 2;
   const ar = str.split(" ");
   if (ar.length < 2) return ar; // only one word
-  let first = "", last = "",  middle = "", rest = "";
+  let first = "",
+    last = "",
+    middle = "",
+    rest = "";
 
   ar.forEach((w, d) => {
     if (d + 1 !== ar.length) w += " ";
@@ -501,10 +522,10 @@ function ra(array) {
 function rw(object) {
   const array = [];
   for (const key in object) {
-    for (let i=0; i < object[key]; i++) {
+    for (let i = 0; i < object[key]; i++) {
       array.push(key);
     }
-  };
+  }
   return array[Math.floor(Math.random() * array.length)];
 }
 
@@ -515,33 +536,69 @@ function lim(v) {
 
 // get number from string in format "1-3" or "2" or "0.5"
 function getNumberInRange(r) {
-  if (typeof r !== "string") {ERROR && console.error("The value should be a string", r); return 0;}
+  if (typeof r !== "string") {
+    ERROR && console.error("The value should be a string", r);
+    return 0;
+  }
   if (!isNaN(+r)) return ~~r + +P(r - ~~r);
   const sign = r[0] === "-" ? -1 : 1;
   if (isNaN(+r[0])) r = r.slice(1);
   const range = r.includes("-") ? r.split("-") : null;
-  if (!range) {ERROR && console.error("Cannot parse the number. Check the format", r); return 0;}
+  if (!range) {
+    ERROR && console.error("Cannot parse the number. Check the format", r);
+    return 0;
+  }
   const count = rand(range[0] * sign, +range[1]);
-  if (isNaN(count) || count < 0) {ERROR && console.error("Cannot parse number. Check the format", r); return 0;}
+  if (isNaN(count) || count < 0) {
+    ERROR && console.error("Cannot parse number. Check the format", r);
+    return 0;
+  }
   return count;
 }
 
+// return center point of common edge of 2 pack cells
+function getMiddlePoint(cell1, cell2) {
+  const {cells, vertices} = pack;
+
+  const commonVertices = cells.v[cell1].filter(vertex => vertices.c[vertex].some(cell => cell === cell2));
+  const [x1, y1] = vertices.p[commonVertices[0]];
+  const [x2, y2] = vertices.p[commonVertices[1]];
+
+  const x = (x1 + x2) / 2;
+  const y = (y1 + y2) / 2;
+
+  return [x, y];
+}
+
 // helper function non-used for the generation
 function drawCellsValue(data) {
   debug.selectAll("text").remove();
-  debug.selectAll("text").data(data).enter().append("text")
-    .attr("x", (d,i) => pack.cells.p[i][0]).attr("y", (d,i) => pack.cells.p[i][1]).text(d => d);
+  debug
+    .selectAll("text")
+    .data(data)
+    .enter()
+    .append("text")
+    .attr("x", (d, i) => pack.cells.p[i][0])
+    .attr("y", (d, i) => pack.cells.p[i][1])
+    .text(d => d);
 }
 
 // helper function non-used for the generation
 function drawPolygons(data) {
-  const max = d3.max(data), min = d3.min(data), scheme = getColorScheme();
+  const max = d3.max(data),
+    min = d3.min(data),
+    scheme = getColorScheme();
   data = data.map(d => 1 - normalize(d, min, max));
 
   debug.selectAll("polygon").remove();
-  debug.selectAll("polygon").data(data).enter().append("polygon")
-    .attr("points", (d,i) => getPackPolygon(i))
-    .attr("fill", d => scheme(d)).attr("stroke", d => scheme(d));
+  debug
+    .selectAll("polygon")
+    .data(data)
+    .enter()
+    .append("polygon")
+    .attr("points", (d, i) => getPackPolygon(i))
+    .attr("fill", d => scheme(d))
+    .attr("stroke", d => scheme(d));
 }
 
 // polyfill for composedPath
@@ -552,56 +609,86 @@ function getComposedPath(node) {
   else if (node.defaultView) parent = node.defaultView;
   if (parent !== undefined) return [node].concat(getComposedPath(parent));
   return [node];
-};
+}
 
 // polyfill for replaceAll
 if (!String.prototype.replaceAll) {
-  String.prototype.replaceAll = function(str, newStr){
-    if (Object.prototype.toString.call(str).toLowerCase() === '[object regexp]') return this.replace(str, newStr);
-    return this.replace(new RegExp(str, 'g'), newStr);
+  String.prototype.replaceAll = function (str, newStr) {
+    if (Object.prototype.toString.call(str).toLowerCase() === "[object regexp]") return this.replace(str, newStr);
+    return this.replace(new RegExp(str, "g"), newStr);
   };
 }
 
 // get next unused id
 function getNextId(core, i = 1) {
-  while (document.getElementById(core+i)) i++;
+  while (document.getElementById(core + i)) i++;
   return core + i;
 }
 
-function debounce(f, ms) {
+function debounce(func, ms) {
   let isCooldown = false;
 
-  return function() {
+  return function () {
     if (isCooldown) return;
-    f.apply(this, arguments);
+    func.apply(this, arguments);
     isCooldown = true;
-    setTimeout(() => isCooldown = false, ms);
+    setTimeout(() => (isCooldown = false), ms);
   };
 }
 
+function throttle(func, ms) {
+  let isThrottled = false;
+  let savedArgs;
+  let savedThis;
+
+  function wrapper() {
+    if (isThrottled) {
+      savedArgs = arguments;
+      savedThis = this;
+      return;
+    }
+
+    func.apply(this, arguments);
+    isThrottled = true;
+
+    setTimeout(function () {
+      isThrottled = false;
+      if (savedArgs) {
+        wrapper.apply(savedThis, savedArgs);
+        savedArgs = savedThis = null;
+      }
+    }, ms);
+  }
+
+  return wrapper;
+}
+
 // parse error to get the readable string in Chrome and Firefox
 function parseError(error) {
-  const isFirefox = navigator.userAgent.toLowerCase().indexOf('firefox') > -1;
+  const isFirefox = navigator.userAgent.toLowerCase().indexOf("firefox") > -1;
   const errorString = isFirefox ? error.toString() + " " + error.stack : error.stack;
-  const regex =/(\b(https?|ftp|file):\/\/[-A-Z0-9+&@#\/%?=~_|!:,.;]*[-A-Z0-9+&@#\/%=~_|])/ig;
-  const errorNoURL = errorString.replace(regex, url => '<i>' + last(url.split("/")) + '</i>');
-  const errorParsed = errorNoURL.replace(/at /ig, "<br>&nbsp;&nbsp;at ");
+  const regex = /(\b(https?|ftp|file):\/\/[-A-Z0-9+&@#\/%?=~_|!:,.;]*[-A-Z0-9+&@#\/%=~_|])/gi;
+  const errorNoURL = errorString.replace(regex, url => "<i>" + last(url.split("/")) + "</i>");
+  const errorParsed = errorNoURL.replace(/at /gi, "<br>&nbsp;&nbsp;at ");
   return errorParsed;
 }
 
 // polyfills
 if (Array.prototype.flat === undefined) {
-  Array.prototype.flat = function() {
-    return this.reduce((acc, val) => Array.isArray(val) ? acc.concat(val.flat()) : acc.concat(val), []);
-  }
+  Array.prototype.flat = function () {
+    return this.reduce((acc, val) => (Array.isArray(val) ? acc.concat(val.flat()) : acc.concat(val)), []);
+  };
 }
 
 // check if string is a valid for JSON parse
 JSON.isValid = str => {
-  try {JSON.parse(str);}
-  catch(e) {return false;}
+  try {
+    JSON.parse(str);
+  } catch (e) {
+    return false;
+  }
   return true;
-}
+};
 
 function getBase64(url, callback) {
   const xhr = new XMLHttpRequest();
@@ -640,16 +727,16 @@ function wiki(page) {
 
 // wrap URL into html a element
 function link(URL, description) {
-  return `<a href="${URL}" rel="noopener" target="_blank">${description}</a>`
+  return `<a href="${URL}" rel="noopener" target="_blank">${description}</a>`;
 }
 
 function isCtrlClick(event) {
   // meta key is cmd key on MacOs
-  return event.ctrlKey || event.metaKey;
+  return event.ctrlKey || event.metaKey;
 }
 
 function generateDate(from = 100, to = 1000) {
-  return new Date(rand(from, to),rand(12),rand(31)).toLocaleDateString("en", {year:'numeric', month:'long', day:'numeric'});
+  return new Date(rand(from, to), rand(12), rand(31)).toLocaleDateString("en", {year: "numeric", month: "long", day: "numeric"});
 }
 
 function getQGIScoordinates(x, y) {
@@ -659,15 +746,18 @@ function getQGIScoordinates(x, y) {
 }
 
 // prompt replacer (prompt does not work in Electron)
-void function() {
+void (function () {
   const prompt = document.getElementById("prompt");
   const form = prompt.querySelector("#promptForm");
 
-  window.prompt = function(promptText = "Please provide an input", options = {default:1, step:.01, min:0, max:100}, callback) {
-    if (options.default === undefined) {ERROR && console.error("Prompt: options object does not have default value defined"); return;}
+  window.prompt = function (promptText = "Please provide an input", options = {default: 1, step: 0.01, min: 0, max: 100}, callback) {
+    if (options.default === undefined) {
+      ERROR && console.error("Prompt: options object does not have default value defined");
+      return;
+    }
     const input = prompt.querySelector("#promptInput");
     prompt.querySelector("#promptText").innerHTML = promptText;
-    const type = typeof(options.default) === "number" ? "number" : "text";
+    const type = typeof options.default === "number" ? "number" : "text";
     input.type = type;
     if (options.step !== undefined) input.step = options.step;
     if (options.min !== undefined) input.min = options.min;
@@ -676,17 +766,56 @@ void function() {
     input.value = options.default;
     prompt.style.display = "block";
 
-    form.addEventListener("submit", event => {
-      prompt.style.display = "none";
-      const v = type === "number" ? +input.value : input.value;
-      event.preventDefault();
-      if (callback) callback(v);
-    }, {once: true});
-  }
+    form.addEventListener(
+      "submit",
+      event => {
+        prompt.style.display = "none";
+        const v = type === "number" ? +input.value : input.value;
+        event.preventDefault();
+        if (callback) callback(v);
+      },
+      {once: true}
+    );
+  };
 
   const cancel = prompt.querySelector("#promptCancel");
-  cancel.addEventListener("click", () => prompt.style.display = "none");
-}()
+  cancel.addEventListener("click", () => (prompt.style.display = "none"));
+})();
 
 // indexedDB; ldb object
-!function(){function e(t,o){return n?void(n.transaction("s").objectStore("s").get(t).onsuccess=function(e){var t=e.target.result&&e.target.result.v||null;o(t)}):void setTimeout(function(){e(t,o)},100)}var t=window.indexedDB||window.mozIndexedDB||window.webkitIndexedDB||window.msIndexedDB;if(!t)return void ERROR && console.error("indexedDB not supported");var n,o={k:"",v:""},r=t.open("d2",1);r.onsuccess=function(e){n=this.result},r.onerror=function(e){ERROR && console.error("indexedDB request error"),INFO && console.log(e)},r.onupgradeneeded=function(e){n=null;var t=e.target.result.createObjectStore("s",{keyPath:"k"});t.transaction.oncomplete=function(e){n=e.target.db}},window.ldb={get:e,set:function(e,t){o.k=e,o.v=t,n.transaction("s","readwrite").objectStore("s").put(o)}}}();
\ No newline at end of file
+!(function () {
+  function e(t, o) {
+    return n
+      ? void (n.transaction("s").objectStore("s").get(t).onsuccess = function (e) {
+          var t = (e.target.result && e.target.result.v) || null;
+          o(t);
+        })
+      : void setTimeout(function () {
+          e(t, o);
+        }, 100);
+  }
+  var t = window.indexedDB || window.mozIndexedDB || window.webkitIndexedDB || window.msIndexedDB;
+  if (!t) return void ERROR && console.error("indexedDB not supported");
+  var n,
+    o = {k: "", v: ""},
+    r = t.open("d2", 1);
+  (r.onsuccess = function (e) {
+    n = this.result;
+  }),
+    (r.onerror = function (e) {
+      ERROR && console.error("indexedDB request error"), INFO && console.log(e);
+    }),
+    (r.onupgradeneeded = function (e) {
+      n = null;
+      var t = e.target.result.createObjectStore("s", {keyPath: "k"});
+      t.transaction.oncomplete = function (e) {
+        n = e.target.db;
+      };
+    }),
+    (window.ldb = {
+      get: e,
+      set: function (e, t) {
+        (o.k = e), (o.v = t), n.transaction("s", "readwrite").objectStore("s").put(o);
+      }
+    });
+})();