diff --git a/ms-windows/osgeo4w/package.cmd b/ms-windows/osgeo4w/package.cmd
index 268f346a5760..67f4f9d14bf0 100644
--- a/ms-windows/osgeo4w/package.cmd
+++ b/ms-windows/osgeo4w/package.cmd
@@ -204,7 +204,7 @@ tar -C %OSGEO4W_ROOT% -cjf %PACKAGENAME%-common-%VERSION%-%PACKAGE%.tar.bz2 ^
 	"apps/%PACKAGENAME%/resources/qgis.db" ^
 	"apps/%PACKAGENAME%/resources/spatialite.db" ^
 	"apps/%PACKAGENAME%/resources/srs.db" ^
-	"apps/%PACKAGENAME%/resources/symbology-ng-style.xml" ^
+	"apps/%PACKAGENAME%/resources/symbology-ng-style.db" ^
 	"apps/%PACKAGENAME%/svg/" ^
 	"apps/%PACKAGENAME%/cpt-city-qgis-min/" ^
 	"apps/%PACKAGENAME%/crssync.exe" ^
diff --git a/resources/symbology-ng-style.db b/resources/symbology-ng-style.db
index e325ef01c035..130aa0b6782a 100644
Binary files a/resources/symbology-ng-style.db and b/resources/symbology-ng-style.db differ
diff --git a/resources/symbology-ng-style.xml b/resources/symbology-ng-style.xml
index 7af1c43ec7c4..2d7905321c62 100644
--- a/resources/symbology-ng-style.xml
+++ b/resources/symbology-ng-style.xml
@@ -1,656 +1,1270 @@
 <!DOCTYPE qgis_style>
-<qgis_style version="0">
+<qgis_style version="1">
   <symbols>
-    <symbol outputUnit="MM" alpha="1" type="line" name="Bridleway">
+    <symbol alpha="1" type="line" name="Bridleway">
       <layer pass="0" class="SimpleLine" locked="0">
         <prop k="capstyle" v="round"/>
         <prop k="color" v="122,245,0,255"/>
         <prop k="customdash" v="5;2"/>
+        <prop k="customdash_unit" v="MM"/>
         <prop k="joinstyle" v="round"/>
         <prop k="offset" v="0"/>
+        <prop k="offset_unit" v="MM"/>
         <prop k="penstyle" v="solid"/>
         <prop k="use_custom_dash" v="0"/>
         <prop k="width" v="1.56"/>
+        <prop k="width_unit" v="MM"/>
       </layer>
-      <layer pass="0" class="SimpleLine" locked="0">
+      <layer pass="0" class="SimpleLine" locked="1">
         <prop k="capstyle" v="round"/>
         <prop k="color" v="85,170,0,255"/>
         <prop k="customdash" v="5;2"/>
+        <prop k="customdash_unit" v="MM"/>
         <prop k="joinstyle" v="round"/>
         <prop k="offset" v="0"/>
+        <prop k="offset_unit" v="MM"/>
         <prop k="penstyle" v="dot"/>
         <prop k="use_custom_dash" v="0"/>
         <prop k="width" v="1.36"/>
+        <prop k="width_unit" v="MM"/>
       </layer>
     </symbol>
-    <symbol outputUnit="MM" alpha="1" type="line" name="Canal">
+    <symbol alpha="1" type="line" name="Canal">
       <layer pass="0" class="SimpleLine" locked="0">
         <prop k="capstyle" v="round"/>
         <prop k="color" v="192,223,255,255"/>
         <prop k="customdash" v="5;2"/>
+        <prop k="customdash_unit" v="MM"/>
         <prop k="joinstyle" v="round"/>
         <prop k="offset" v="0"/>
+        <prop k="offset_unit" v="MM"/>
         <prop k="penstyle" v="solid"/>
         <prop k="use_custom_dash" v="0"/>
         <prop k="width" v="1.86"/>
+        <prop k="width_unit" v="MM"/>
       </layer>
     </symbol>
-    <symbol outputUnit="MM" alpha="1" type="line" name="Canal river">
+    <symbol alpha="1" type="line" name="Canal river">
       <layer pass="0" class="SimpleLine" locked="0">
         <prop k="capstyle" v="round"/>
         <prop k="color" v="192,223,255,255"/>
         <prop k="customdash" v="5;2"/>
+        <prop k="customdash_unit" v="MM"/>
         <prop k="joinstyle" v="round"/>
         <prop k="offset" v="0"/>
+        <prop k="offset_unit" v="MM"/>
         <prop k="penstyle" v="solid"/>
         <prop k="use_custom_dash" v="0"/>
         <prop k="width" v="1.86"/>
+        <prop k="width_unit" v="MM"/>
       </layer>
     </symbol>
-    <symbol outputUnit="MM" alpha="1" type="line" name="Construction road">
+    <symbol alpha="1" type="line" name="Construction road">
       <layer pass="0" class="MarkerLine" locked="0">
         <prop k="interval" v="2"/>
+        <prop k="interval_unit" v="MM"/>
         <prop k="offset" v="0"/>
+        <prop k="offset_unit" v="MM"/>
         <prop k="placement" v="interval"/>
         <prop k="rotate" v="1"/>
+        <symbol alpha="1" type="marker" name="@Construction road@0">
+          <layer pass="0" class="SimpleMarker" locked="0">
+            <prop k="angle" v="0"/>
+            <prop k="color" v="255,0,0,255"/>
+            <prop k="color_border" v="0,0,0,255"/>
+            <prop k="name" v="rectangle"/>
+            <prop k="offset" v="0,0"/>
+            <prop k="offset_unit" v="MM"/>
+            <prop k="outline_width" v="0"/>
+            <prop k="outline_width_unit" v="MM"/>
+            <prop k="scale_method" v="area"/>
+            <prop k="size" v="1.5"/>
+            <prop k="size_unit" v="MM"/>
+          </layer>
+        </symbol>
       </layer>
     </symbol>
-    <symbol outputUnit="MM" alpha="1" type="line" name="Crossing">
+    <symbol alpha="1" type="line" name="Crossing">
       <layer pass="0" class="SimpleLine" locked="0">
         <prop k="capstyle" v="square"/>
         <prop k="color" v="255,255,255,255"/>
         <prop k="customdash" v="5;2"/>
+        <prop k="customdash_unit" v="MM"/>
         <prop k="joinstyle" v="bevel"/>
         <prop k="offset" v="0"/>
+        <prop k="offset_unit" v="MM"/>
         <prop k="penstyle" v="solid"/>
         <prop k="use_custom_dash" v="0"/>
         <prop k="width" v="1.26"/>
+        <prop k="width_unit" v="MM"/>
       </layer>
       <layer pass="1" class="MarkerLine" locked="0">
         <prop k="interval" v="6"/>
+        <prop k="interval_unit" v="MM"/>
         <prop k="offset" v="0"/>
+        <prop k="offset_unit" v="MM"/>
         <prop k="placement" v="interval"/>
         <prop k="rotate" v="1"/>
+        <symbol alpha="1" type="marker" name="@Crossing@1">
+          <layer pass="0" class="SimpleMarker" locked="0">
+            <prop k="angle" v="0"/>
+            <prop k="color" v="255,255,255,255"/>
+            <prop k="color_border" v="0,0,0,255"/>
+            <prop k="name" v="rectangle"/>
+            <prop k="offset" v="0,0"/>
+            <prop k="offset_unit" v="MM"/>
+            <prop k="outline_width" v="0"/>
+            <prop k="outline_width_unit" v="MM"/>
+            <prop k="scale_method" v="area"/>
+            <prop k="size" v="3"/>
+            <prop k="size_unit" v="MM"/>
+          </layer>
+          <layer pass="0" class="SimpleMarker" locked="0">
+            <prop k="angle" v="0"/>
+            <prop k="color" v="35,149,255,255"/>
+            <prop k="color_border" v="0,0,0,255"/>
+            <prop k="name" v="rectangle"/>
+            <prop k="offset" v="0,0"/>
+            <prop k="offset_unit" v="MM"/>
+            <prop k="outline_width" v="0"/>
+            <prop k="outline_width_unit" v="MM"/>
+            <prop k="scale_method" v="area"/>
+            <prop k="size" v="1"/>
+            <prop k="size_unit" v="MM"/>
+          </layer>
+        </symbol>
       </layer>
     </symbol>
-    <symbol outputUnit="MM" alpha="1" type="line" name="Cycle path">
+    <symbol alpha="1" type="line" name="Cycle path">
       <layer pass="0" class="SimpleLine" locked="0">
         <prop k="capstyle" v="round"/>
         <prop k="color" v="170,110,142,255"/>
         <prop k="customdash" v="5;2"/>
+        <prop k="customdash_unit" v="MM"/>
         <prop k="joinstyle" v="round"/>
         <prop k="offset" v="0"/>
+        <prop k="offset_unit" v="MM"/>
         <prop k="penstyle" v="solid"/>
         <prop k="use_custom_dash" v="0"/>
         <prop k="width" v="0.66"/>
+        <prop k="width_unit" v="MM"/>
       </layer>
-      <layer pass="2" class="SimpleLine" locked="0">
+      <layer pass="2" class="SimpleLine" locked="1">
         <prop k="capstyle" v="round"/>
         <prop k="color" v="255,255,255,255"/>
         <prop k="customdash" v="5;2"/>
+        <prop k="customdash_unit" v="MM"/>
         <prop k="joinstyle" v="round"/>
         <prop k="offset" v="0"/>
+        <prop k="offset_unit" v="MM"/>
         <prop k="penstyle" v="dot"/>
         <prop k="use_custom_dash" v="0"/>
         <prop k="width" v="0.53"/>
+        <prop k="width_unit" v="MM"/>
       </layer>
     </symbol>
-    <symbol outputUnit="MM" alpha="0.3058823529411765" type="line" name="Dam">
-      <layer pass="0" class="SimpleLine" locked="0">
+    <symbol alpha="0.305882" type="line" name="Dam">
+      <layer pass="0" class="SimpleLine" locked="1">
         <prop k="capstyle" v="square"/>
         <prop k="color" v="22,108,200,255"/>
         <prop k="customdash" v="5;2"/>
+        <prop k="customdash_unit" v="MM"/>
         <prop k="joinstyle" v="round"/>
         <prop k="offset" v="0"/>
+        <prop k="offset_unit" v="MM"/>
         <prop k="penstyle" v="solid"/>
         <prop k="use_custom_dash" v="0"/>
         <prop k="width" v="2.68301"/>
+        <prop k="width_unit" v="MM"/>
       </layer>
       <layer pass="0" class="SimpleLine" locked="0">
         <prop k="capstyle" v="square"/>
         <prop k="color" v="152,215,220,255"/>
         <prop k="customdash" v="5;2"/>
+        <prop k="customdash_unit" v="MM"/>
         <prop k="joinstyle" v="bevel"/>
         <prop k="offset" v="0"/>
+        <prop k="offset_unit" v="MM"/>
         <prop k="penstyle" v="solid"/>
         <prop k="use_custom_dash" v="0"/>
         <prop k="width" v="3.26"/>
+        <prop k="width_unit" v="MM"/>
       </layer>
     </symbol>
-    <symbol outputUnit="MM" alpha="1" type="line" name="Ditch">
-      <layer pass="0" class="SimpleLine" locked="0">
+    <symbol alpha="1" type="line" name="Ditch">
+      <layer pass="0" class="SimpleLine" locked="1">
         <prop k="capstyle" v="square"/>
         <prop k="color" v="134,67,0,255"/>
         <prop k="customdash" v="5;2"/>
+        <prop k="customdash_unit" v="MM"/>
         <prop k="joinstyle" v="bevel"/>
         <prop k="offset" v="0"/>
+        <prop k="offset_unit" v="MM"/>
         <prop k="penstyle" v="solid"/>
         <prop k="use_custom_dash" v="0"/>
         <prop k="width" v="1.46"/>
+        <prop k="width_unit" v="MM"/>
       </layer>
       <layer pass="0" class="SimpleLine" locked="0">
         <prop k="capstyle" v="square"/>
         <prop k="color" v="192,223,255,255"/>
         <prop k="customdash" v="5;2"/>
+        <prop k="customdash_unit" v="MM"/>
         <prop k="joinstyle" v="round"/>
         <prop k="offset" v="0"/>
+        <prop k="offset_unit" v="MM"/>
         <prop k="penstyle" v="solid"/>
         <prop k="use_custom_dash" v="0"/>
         <prop k="width" v="0.86"/>
+        <prop k="width_unit" v="MM"/>
       </layer>
     </symbol>
-    <symbol outputUnit="MM" alpha="0.2901960784313726" type="line" name="Drain">
-      <layer pass="0" class="SimpleLine" locked="0">
+    <symbol alpha="0.290196" type="line" name="Drain">
+      <layer pass="0" class="SimpleLine" locked="1">
         <prop k="capstyle" v="square"/>
         <prop k="color" v="22,108,200,255"/>
         <prop k="customdash" v="5;2"/>
+        <prop k="customdash_unit" v="MM"/>
         <prop k="joinstyle" v="round"/>
         <prop k="offset" v="0"/>
+        <prop k="offset_unit" v="MM"/>
         <prop k="penstyle" v="solid"/>
         <prop k="use_custom_dash" v="0"/>
         <prop k="width" v="1.56"/>
+        <prop k="width_unit" v="MM"/>
       </layer>
       <layer pass="0" class="SimpleLine" locked="0">
         <prop k="capstyle" v="square"/>
         <prop k="color" v="85,170,127,255"/>
         <prop k="customdash" v="5;2"/>
+        <prop k="customdash_unit" v="MM"/>
         <prop k="joinstyle" v="bevel"/>
         <prop k="offset" v="0"/>
+        <prop k="offset_unit" v="MM"/>
         <prop k="penstyle" v="solid"/>
         <prop k="use_custom_dash" v="0"/>
         <prop k="width" v="0.86"/>
+        <prop k="width_unit" v="MM"/>
       </layer>
-      <layer pass="0" class="SimpleLine" locked="0">
+      <layer pass="0" class="SimpleLine" locked="1">
         <prop k="capstyle" v="square"/>
         <prop k="color" v="126,63,0,255"/>
         <prop k="customdash" v="5;2"/>
+        <prop k="customdash_unit" v="MM"/>
         <prop k="joinstyle" v="bevel"/>
         <prop k="offset" v="0"/>
+        <prop k="offset_unit" v="MM"/>
         <prop k="penstyle" v="dash dot dot"/>
         <prop k="use_custom_dash" v="0"/>
         <prop k="width" v="0.26"/>
+        <prop k="width_unit" v="MM"/>
       </layer>
     </symbol>
-    <symbol outputUnit="MM" alpha="0.2980392156862745" type="line" name="Floodway">
-      <layer pass="0" class="SimpleLine" locked="0">
+    <symbol alpha="0.298039" type="line" name="Floodway">
+      <layer pass="0" class="SimpleLine" locked="1">
         <prop k="capstyle" v="square"/>
         <prop k="color" v="112,56,0,255"/>
         <prop k="customdash" v="5;2"/>
+        <prop k="customdash_unit" v="MM"/>
         <prop k="joinstyle" v="bevel"/>
         <prop k="offset" v="0"/>
+        <prop k="offset_unit" v="MM"/>
         <prop k="penstyle" v="solid"/>
         <prop k="use_custom_dash" v="0"/>
         <prop k="width" v="3.26"/>
+        <prop k="width_unit" v="MM"/>
       </layer>
       <layer pass="0" class="SimpleLine" locked="0">
         <prop k="capstyle" v="square"/>
         <prop k="color" v="22,108,200,255"/>
         <prop k="customdash" v="5;2"/>
+        <prop k="customdash_unit" v="MM"/>
         <prop k="joinstyle" v="round"/>
         <prop k="offset" v="0"/>
+        <prop k="offset_unit" v="MM"/>
         <prop k="penstyle" v="solid"/>
         <prop k="use_custom_dash" v="0"/>
         <prop k="width" v="2.26"/>
+        <prop k="width_unit" v="MM"/>
       </layer>
     </symbol>
-    <symbol outputUnit="MM" alpha="1" type="line" name="Footpath">
+    <symbol alpha="1" type="line" name="Footpath">
       <layer pass="3" class="SimpleLine" locked="0">
         <prop k="capstyle" v="square"/>
         <prop k="color" v="193,176,166,255"/>
         <prop k="customdash" v="5;2"/>
+        <prop k="customdash_unit" v="MM"/>
         <prop k="joinstyle" v="bevel"/>
         <prop k="offset" v="0"/>
+        <prop k="offset_unit" v="MM"/>
         <prop k="penstyle" v="solid"/>
         <prop k="use_custom_dash" v="0"/>
         <prop k="width" v="0.96"/>
+        <prop k="width_unit" v="MM"/>
       </layer>
     </symbol>
-    <symbol outputUnit="MM" alpha="0.2901960784313726" type="line" name="Jetty">
+    <symbol alpha="0.290196" type="line" name="Jetty">
       <layer pass="0" class="SimpleLine" locked="0">
         <prop k="capstyle" v="round"/>
         <prop k="color" v="22,108,200,255"/>
         <prop k="customdash" v="5;2"/>
+        <prop k="customdash_unit" v="MM"/>
         <prop k="joinstyle" v="round"/>
         <prop k="offset" v="0"/>
+        <prop k="offset_unit" v="MM"/>
         <prop k="penstyle" v="solid"/>
         <prop k="use_custom_dash" v="0"/>
         <prop k="width" v="0.7"/>
+        <prop k="width_unit" v="MM"/>
       </layer>
     </symbol>
-    <symbol outputUnit="MM" alpha="1" type="line" name="Living street">
-      <layer pass="0" class="SimpleLine" locked="0">
+    <symbol alpha="1" type="line" name="Living street">
+      <layer pass="0" class="SimpleLine" locked="1">
         <prop k="capstyle" v="round"/>
         <prop k="color" v="90,80,100,255"/>
         <prop k="customdash" v="5;2"/>
+        <prop k="customdash_unit" v="MM"/>
         <prop k="joinstyle" v="round"/>
         <prop k="offset" v="0"/>
+        <prop k="offset_unit" v="MM"/>
         <prop k="penstyle" v="solid"/>
         <prop k="use_custom_dash" v="0"/>
         <prop k="width" v="2.56"/>
+        <prop k="width_unit" v="MM"/>
       </layer>
       <layer pass="11" class="SimpleLine" locked="0">
         <prop k="capstyle" v="round"/>
         <prop k="color" v="244,221,255,255"/>
         <prop k="customdash" v="5;2"/>
+        <prop k="customdash_unit" v="MM"/>
         <prop k="joinstyle" v="round"/>
         <prop k="offset" v="0"/>
+        <prop k="offset_unit" v="MM"/>
         <prop k="penstyle" v="solid"/>
         <prop k="use_custom_dash" v="0"/>
         <prop k="width" v="2.36"/>
+        <prop k="width_unit" v="MM"/>
       </layer>
     </symbol>
-    <symbol outputUnit="MM" alpha="1" type="line" name="LockedRoad">
+    <symbol alpha="1" type="line" name="LockedRoad">
       <layer pass="0" class="SimpleLine" locked="1">
         <prop k="capstyle" v="round"/>
         <prop k="color" v="0,0,0,255"/>
         <prop k="customdash" v="5;2"/>
+        <prop k="customdash_unit" v="MM"/>
         <prop k="joinstyle" v="round"/>
         <prop k="offset" v="0"/>
+        <prop k="offset_unit" v="MM"/>
         <prop k="penstyle" v="solid"/>
         <prop k="use_custom_dash" v="0"/>
         <prop k="width" v="2.26"/>
+        <prop k="width_unit" v="MM"/>
       </layer>
       <layer pass="0" class="SimpleLine" locked="0">
         <prop k="capstyle" v="round"/>
         <prop k="color" v="255,255,255,255"/>
         <prop k="customdash" v="5;2"/>
+        <prop k="customdash_unit" v="MM"/>
         <prop k="joinstyle" v="round"/>
         <prop k="offset" v="0"/>
+        <prop k="offset_unit" v="MM"/>
         <prop k="penstyle" v="solid"/>
         <prop k="use_custom_dash" v="0"/>
         <prop k="width" v="1.26"/>
+        <prop k="width_unit" v="MM"/>
       </layer>
     </symbol>
-    <symbol outputUnit="MM" alpha="1" type="line" name="Motorway">
-      <layer pass="0" class="SimpleLine" locked="0">
+    <symbol alpha="1" type="line" name="Motorway">
+      <layer pass="0" class="SimpleLine" locked="1">
         <prop k="capstyle" v="round"/>
         <prop k="color" v="20,50,50,255"/>
         <prop k="customdash" v="5;2"/>
+        <prop k="customdash_unit" v="MM"/>
         <prop k="joinstyle" v="round"/>
         <prop k="offset" v="0"/>
+        <prop k="offset_unit" v="MM"/>
         <prop k="penstyle" v="solid"/>
         <prop k="use_custom_dash" v="0"/>
         <prop k="width" v="3.86"/>
+        <prop k="width_unit" v="MM"/>
       </layer>
       <layer pass="20" class="SimpleLine" locked="0">
         <prop k="capstyle" v="round"/>
         <prop k="color" v="94,146,148,255"/>
         <prop k="customdash" v="5;2"/>
+        <prop k="customdash_unit" v="MM"/>
         <prop k="joinstyle" v="round"/>
         <prop k="offset" v="0"/>
+        <prop k="offset_unit" v="MM"/>
         <prop k="penstyle" v="solid"/>
         <prop k="use_custom_dash" v="0"/>
         <prop k="width" v="3.56"/>
+        <prop k="width_unit" v="MM"/>
       </layer>
     </symbol>
-    <symbol outputUnit="MM" alpha="1" type="line" name="Motorway link">
-      <layer pass="0" class="SimpleLine" locked="0">
+    <symbol alpha="1" type="line" name="Motorway link">
+      <layer pass="0" class="SimpleLine" locked="1">
         <prop k="capstyle" v="round"/>
         <prop k="color" v="20,50,50,255"/>
         <prop k="customdash" v="5;2"/>
+        <prop k="customdash_unit" v="MM"/>
         <prop k="joinstyle" v="round"/>
         <prop k="offset" v="0"/>
+        <prop k="offset_unit" v="MM"/>
         <prop k="penstyle" v="solid"/>
         <prop k="use_custom_dash" v="0"/>
         <prop k="width" v="2.2"/>
+        <prop k="width_unit" v="MM"/>
       </layer>
       <layer pass="16" class="SimpleLine" locked="0">
         <prop k="capstyle" v="round"/>
         <prop k="color" v="100,165,165,255"/>
         <prop k="customdash" v="5;2"/>
+        <prop k="customdash_unit" v="MM"/>
         <prop k="joinstyle" v="round"/>
         <prop k="offset" v="0"/>
+        <prop k="offset_unit" v="MM"/>
         <prop k="penstyle" v="solid"/>
         <prop k="use_custom_dash" v="0"/>
         <prop k="width" v="2.1"/>
+        <prop k="width_unit" v="MM"/>
       </layer>
     </symbol>
-    <symbol outputUnit="MM" alpha="1" type="line" name="Pedestrian way">
-      <layer pass="0" class="SimpleLine" locked="0">
+    <symbol alpha="1" type="line" name="Pedestrian way">
+      <layer pass="0" class="SimpleLine" locked="1">
         <prop k="capstyle" v="round"/>
         <prop k="color" v="100,100,80,255"/>
         <prop k="customdash" v="5;2"/>
+        <prop k="customdash_unit" v="MM"/>
         <prop k="joinstyle" v="round"/>
         <prop k="offset" v="0"/>
+        <prop k="offset_unit" v="MM"/>
         <prop k="penstyle" v="solid"/>
         <prop k="use_custom_dash" v="0"/>
         <prop k="width" v="1.96"/>
+        <prop k="width_unit" v="MM"/>
       </layer>
       <layer pass="0" class="SimpleLine" locked="0">
         <prop k="capstyle" v="round"/>
         <prop k="color" v="255,248,195,255"/>
         <prop k="customdash" v="5;2"/>
+        <prop k="customdash_unit" v="MM"/>
         <prop k="joinstyle" v="round"/>
         <prop k="offset" v="0"/>
+        <prop k="offset_unit" v="MM"/>
         <prop k="penstyle" v="solid"/>
         <prop k="use_custom_dash" v="0"/>
         <prop k="width" v="1.76"/>
+        <prop k="width_unit" v="MM"/>
       </layer>
     </symbol>
-    <symbol outputUnit="MM" alpha="1" type="line" name="Primary link">
-      <layer pass="0" class="SimpleLine" locked="0">
+    <symbol alpha="1" type="line" name="Primary link">
+      <layer pass="0" class="SimpleLine" locked="1">
         <prop k="capstyle" v="round"/>
         <prop k="color" v="76,38,0,255"/>
         <prop k="customdash" v="5;2"/>
+        <prop k="customdash_unit" v="MM"/>
         <prop k="joinstyle" v="round"/>
         <prop k="offset" v="0"/>
+        <prop k="offset_unit" v="MM"/>
         <prop k="penstyle" v="solid"/>
         <prop k="use_custom_dash" v="0"/>
         <prop k="width" v="2.1"/>
+        <prop k="width_unit" v="MM"/>
       </layer>
       <layer pass="16" class="SimpleLine" locked="0">
         <prop k="capstyle" v="round"/>
         <prop k="color" v="255,206,128,255"/>
         <prop k="customdash" v="5;2"/>
+        <prop k="customdash_unit" v="MM"/>
         <prop k="joinstyle" v="round"/>
         <prop k="offset" v="0"/>
+        <prop k="offset_unit" v="MM"/>
         <prop k="penstyle" v="solid"/>
         <prop k="use_custom_dash" v="0"/>
         <prop k="width" v="1.9"/>
+        <prop k="width_unit" v="MM"/>
       </layer>
     </symbol>
-    <symbol outputUnit="MM" alpha="1" type="line" name="Primary road">
-      <layer pass="0" class="SimpleLine" locked="0">
+    <symbol alpha="1" type="line" name="Primary road">
+      <layer pass="0" class="SimpleLine" locked="1">
         <prop k="capstyle" v="round"/>
         <prop k="color" v="76,38,0,255"/>
         <prop k="customdash" v="5;2"/>
+        <prop k="customdash_unit" v="MM"/>
         <prop k="joinstyle" v="round"/>
         <prop k="offset" v="0"/>
+        <prop k="offset_unit" v="MM"/>
         <prop k="penstyle" v="solid"/>
         <prop k="use_custom_dash" v="0"/>
         <prop k="width" v="3.56"/>
+        <prop k="width_unit" v="MM"/>
       </layer>
       <layer pass="18" class="SimpleLine" locked="0">
         <prop k="capstyle" v="round"/>
         <prop k="color" v="255,206,128,255"/>
         <prop k="customdash" v="5;2"/>
+        <prop k="customdash_unit" v="MM"/>
         <prop k="joinstyle" v="round"/>
         <prop k="offset" v="0"/>
+        <prop k="offset_unit" v="MM"/>
         <prop k="penstyle" v="solid"/>
         <prop k="use_custom_dash" v="0"/>
         <prop k="width" v="3.36"/>
+        <prop k="width_unit" v="MM"/>
       </layer>
     </symbol>
-    <symbol outputUnit="MM" alpha="1" type="line" name="Residential road">
+    <symbol alpha="1" type="line" name="Residential road">
       <layer pass="1" class="SimpleLine" locked="0">
         <prop k="capstyle" v="square"/>
         <prop k="color" v="80,80,80,255"/>
         <prop k="customdash" v="5;2"/>
+        <prop k="customdash_unit" v="MM"/>
         <prop k="joinstyle" v="bevel"/>
         <prop k="offset" v="0"/>
+        <prop k="offset_unit" v="MM"/>
         <prop k="penstyle" v="solid"/>
         <prop k="use_custom_dash" v="0"/>
         <prop k="width" v="0.26"/>
+        <prop k="width_unit" v="MM"/>
       </layer>
     </symbol>
-    <symbol outputUnit="MM" alpha="1" type="line" name="Residential service road">
-      <layer pass="7" class="SimpleLine" locked="0">
+    <symbol alpha="1" type="line" name="Residential service road">
+      <layer pass="7" class="SimpleLine" locked="1">
         <prop k="capstyle" v="round"/>
         <prop k="color" v="80,80,80,255"/>
         <prop k="customdash" v="5;2"/>
+        <prop k="customdash_unit" v="MM"/>
         <prop k="joinstyle" v="round"/>
         <prop k="offset" v="0"/>
+        <prop k="offset_unit" v="MM"/>
         <prop k="penstyle" v="solid"/>
         <prop k="use_custom_dash" v="0"/>
         <prop k="width" v="3.36"/>
+        <prop k="width_unit" v="MM"/>
       </layer>
       <layer pass="14" class="SimpleLine" locked="0">
         <prop k="capstyle" v="round"/>
         <prop k="color" v="248,248,248,255"/>
         <prop k="customdash" v="5;2"/>
+        <prop k="customdash_unit" v="MM"/>
         <prop k="joinstyle" v="round"/>
         <prop k="offset" v="0"/>
+        <prop k="offset_unit" v="MM"/>
         <prop k="penstyle" v="solid"/>
         <prop k="use_custom_dash" v="0"/>
         <prop k="width" v="3.16"/>
+        <prop k="width_unit" v="MM"/>
       </layer>
     </symbol>
-    <symbol outputUnit="MM" alpha="1" type="line" name="River">
+    <symbol alpha="1" type="line" name="River">
       <layer pass="1" class="SimpleLine" locked="0">
         <prop k="capstyle" v="square"/>
         <prop k="color" v="192,223,255,255"/>
         <prop k="customdash" v="5;2"/>
+        <prop k="customdash_unit" v="MM"/>
         <prop k="joinstyle" v="round"/>
         <prop k="offset" v="0"/>
+        <prop k="offset_unit" v="MM"/>
         <prop k="penstyle" v="solid"/>
         <prop k="use_custom_dash" v="0"/>
         <prop k="width" v="2.26"/>
+        <prop k="width_unit" v="MM"/>
       </layer>
     </symbol>
-    <symbol outputUnit="MM" alpha="0.2862745098039216" type="line" name="Riverbank">
+    <symbol alpha="0.286275" type="line" name="Riverbank">
       <layer pass="0" class="SimpleLine" locked="0">
         <prop k="capstyle" v="round"/>
         <prop k="color" v="22,108,200,255"/>
         <prop k="customdash" v="5;2"/>
+        <prop k="customdash_unit" v="MM"/>
         <prop k="joinstyle" v="round"/>
         <prop k="offset" v="0"/>
+        <prop k="offset_unit" v="MM"/>
         <prop k="penstyle" v="solid"/>
         <prop k="use_custom_dash" v="0"/>
         <prop k="width" v="1.86"/>
+        <prop k="width_unit" v="MM"/>
       </layer>
     </symbol>
-    <symbol outputUnit="MM" alpha="1" type="line" name="Road">
-      <layer pass="0" class="SimpleLine" locked="0">
+    <symbol alpha="1" type="line" name="Road">
+      <layer pass="0" class="SimpleLine" locked="1">
         <prop k="capstyle" v="round"/>
         <prop k="color" v="0,0,0,255"/>
         <prop k="customdash" v="5;2"/>
+        <prop k="customdash_unit" v="MM"/>
         <prop k="joinstyle" v="round"/>
         <prop k="offset" v="0"/>
+        <prop k="offset_unit" v="MM"/>
         <prop k="penstyle" v="solid"/>
         <prop k="use_custom_dash" v="0"/>
         <prop k="width" v="2.26"/>
+        <prop k="width_unit" v="MM"/>
       </layer>
       <layer pass="0" class="SimpleLine" locked="0">
         <prop k="capstyle" v="round"/>
         <prop k="color" v="255,255,255,255"/>
         <prop k="customdash" v="5;2"/>
+        <prop k="customdash_unit" v="MM"/>
         <prop k="joinstyle" v="round"/>
         <prop k="offset" v="0"/>
+        <prop k="offset_unit" v="MM"/>
         <prop k="penstyle" v="solid"/>
         <prop k="use_custom_dash" v="0"/>
         <prop k="width" v="1.26"/>
+        <prop k="width_unit" v="MM"/>
       </layer>
     </symbol>
-    <symbol outputUnit="MM" alpha="1" type="line" name="Secondary road">
-      <layer pass="0" class="SimpleLine" locked="0">
+    <symbol alpha="1" type="line" name="Secondary road">
+      <layer pass="0" class="SimpleLine" locked="1">
         <prop k="capstyle" v="square"/>
         <prop k="color" v="108,58,83,255"/>
         <prop k="customdash" v="5;2"/>
+        <prop k="customdash_unit" v="MM"/>
         <prop k="joinstyle" v="bevel"/>
         <prop k="offset" v="0"/>
+        <prop k="offset_unit" v="MM"/>
         <prop k="penstyle" v="solid"/>
         <prop k="use_custom_dash" v="0"/>
         <prop k="width" v="0.4"/>
+        <prop k="width_unit" v="MM"/>
       </layer>
       <layer pass="3" class="SimpleLine" locked="0">
         <prop k="capstyle" v="square"/>
         <prop k="color" v="255,206,211,255"/>
         <prop k="customdash" v="5;2"/>
+        <prop k="customdash_unit" v="MM"/>
         <prop k="joinstyle" v="bevel"/>
         <prop k="offset" v="0"/>
+        <prop k="offset_unit" v="MM"/>
         <prop k="penstyle" v="solid"/>
         <prop k="use_custom_dash" v="0"/>
         <prop k="width" v="0.36"/>
+        <prop k="width_unit" v="MM"/>
       </layer>
     </symbol>
-    <symbol outputUnit="MM" alpha="1" type="line" name="Steps">
+    <symbol alpha="1" type="line" name="Steps">
       <layer pass="0" class="SimpleLine" locked="0">
         <prop k="capstyle" v="square"/>
         <prop k="color" v="149,149,112,255"/>
         <prop k="customdash" v="5;2"/>
+        <prop k="customdash_unit" v="MM"/>
         <prop k="joinstyle" v="round"/>
         <prop k="offset" v="-1"/>
+        <prop k="offset_unit" v="MM"/>
         <prop k="penstyle" v="solid"/>
         <prop k="use_custom_dash" v="0"/>
         <prop k="width" v="0.26"/>
+        <prop k="width_unit" v="MM"/>
       </layer>
       <layer pass="0" class="SimpleLine" locked="0">
         <prop k="capstyle" v="square"/>
         <prop k="color" v="144,144,108,255"/>
         <prop k="customdash" v="5;2"/>
+        <prop k="customdash_unit" v="MM"/>
         <prop k="joinstyle" v="bevel"/>
         <prop k="offset" v="2"/>
+        <prop k="offset_unit" v="MM"/>
         <prop k="penstyle" v="solid"/>
         <prop k="use_custom_dash" v="0"/>
         <prop k="width" v="0.26"/>
+        <prop k="width_unit" v="MM"/>
       </layer>
       <layer pass="0" class="MarkerLine" locked="0">
         <prop k="interval" v="1.5"/>
+        <prop k="interval_unit" v="MM"/>
         <prop k="offset" v="0"/>
+        <prop k="offset_unit" v="MM"/>
         <prop k="placement" v="interval"/>
         <prop k="rotate" v="1"/>
+        <symbol alpha="1" type="marker" name="@Steps@2">
+          <layer pass="0" class="SimpleMarker" locked="0">
+            <prop k="angle" v="0"/>
+            <prop k="color" v="255,0,0,255"/>
+            <prop k="color_border" v="0,0,0,255"/>
+            <prop k="name" v="line"/>
+            <prop k="offset" v="0,0"/>
+            <prop k="offset_unit" v="MM"/>
+            <prop k="outline_width" v="0"/>
+            <prop k="outline_width_unit" v="MM"/>
+            <prop k="scale_method" v="area"/>
+            <prop k="size" v="0.5"/>
+            <prop k="size_unit" v="MM"/>
+          </layer>
+        </symbol>
       </layer>
     </symbol>
-    <symbol outputUnit="MM" alpha="0.2235294117647059" type="line" name="Stream">
+    <symbol alpha="0.223529" type="line" name="Stream">
       <layer pass="0" class="SimpleLine" locked="0">
         <prop k="capstyle" v="round"/>
         <prop k="color" v="22,108,200,255"/>
         <prop k="customdash" v="5;2"/>
+        <prop k="customdash_unit" v="MM"/>
         <prop k="joinstyle" v="round"/>
         <prop k="offset" v="0"/>
+        <prop k="offset_unit" v="MM"/>
         <prop k="penstyle" v="solid"/>
         <prop k="use_custom_dash" v="0"/>
         <prop k="width" v="1.06"/>
+        <prop k="width_unit" v="MM"/>
       </layer>
     </symbol>
-    <symbol outputUnit="MM" alpha="1" type="line" name="Tertiary road">
+    <symbol alpha="1" type="line" name="Tertiary road">
       <layer pass="2" class="SimpleLine" locked="0">
         <prop k="capstyle" v="square"/>
         <prop k="color" v="246,255,168,255"/>
         <prop k="customdash" v="5;2"/>
+        <prop k="customdash_unit" v="MM"/>
         <prop k="joinstyle" v="bevel"/>
         <prop k="offset" v="0"/>
+        <prop k="offset_unit" v="MM"/>
         <prop k="penstyle" v="solid"/>
         <prop k="use_custom_dash" v="0"/>
         <prop k="width" v="0.36"/>
+        <prop k="width_unit" v="MM"/>
       </layer>
     </symbol>
-    <symbol outputUnit="MM" alpha="1" type="line" name="Trunk road">
-      <layer pass="0" class="SimpleLine" locked="0">
+    <symbol alpha="1" type="line" name="Trunk road">
+      <layer pass="0" class="SimpleLine" locked="1">
         <prop k="capstyle" v="round"/>
         <prop k="color" v="0,0,0,255"/>
         <prop k="customdash" v="5;2"/>
+        <prop k="customdash_unit" v="MM"/>
         <prop k="joinstyle" v="round"/>
         <prop k="offset" v="0"/>
+        <prop k="offset_unit" v="MM"/>
         <prop k="penstyle" v="solid"/>
         <prop k="use_custom_dash" v="0"/>
         <prop k="width" v="0.6"/>
+        <prop k="width_unit" v="MM"/>
       </layer>
       <layer pass="5" class="SimpleLine" locked="0">
         <prop k="capstyle" v="round"/>
         <prop k="color" v="22,219,193,255"/>
         <prop k="customdash" v="5;2"/>
+        <prop k="customdash_unit" v="MM"/>
         <prop k="joinstyle" v="round"/>
         <prop k="offset" v="0"/>
+        <prop k="offset_unit" v="MM"/>
         <prop k="penstyle" v="solid"/>
         <prop k="use_custom_dash" v="0"/>
         <prop k="width" v="0.56"/>
+        <prop k="width_unit" v="MM"/>
       </layer>
     </symbol>
-    <symbol outputUnit="MM" alpha="1" type="line" name="Turning circle">
-      <layer pass="0" class="SimpleLine" locked="0">
+    <symbol alpha="1" type="line" name="Turning circle">
+      <layer pass="0" class="SimpleLine" locked="1">
         <prop k="capstyle" v="round"/>
         <prop k="color" v="108,58,83,255"/>
         <prop k="customdash" v="5;2"/>
+        <prop k="customdash_unit" v="MM"/>
         <prop k="joinstyle" v="round"/>
         <prop k="offset" v="0"/>
+        <prop k="offset_unit" v="MM"/>
         <prop k="penstyle" v="solid"/>
         <prop k="use_custom_dash" v="0"/>
         <prop k="width" v="3.46"/>
+        <prop k="width_unit" v="MM"/>
       </layer>
       <layer pass="3" class="SimpleLine" locked="0">
         <prop k="capstyle" v="round"/>
         <prop k="color" v="255,238,241,255"/>
         <prop k="customdash" v="5;2"/>
+        <prop k="customdash_unit" v="MM"/>
         <prop k="joinstyle" v="round"/>
         <prop k="offset" v="0"/>
+        <prop k="offset_unit" v="MM"/>
         <prop k="penstyle" v="solid"/>
         <prop k="use_custom_dash" v="0"/>
         <prop k="width" v="3.36"/>
+        <prop k="width_unit" v="MM"/>
       </layer>
     </symbol>
-    <symbol outputUnit="MM" alpha="1" type="line" name="Unclassified road">
+    <symbol alpha="1" type="line" name="Unclassified road">
       <layer pass="0" class="SimpleLine" locked="0">
         <prop k="capstyle" v="square"/>
         <prop k="color" v="80,80,80,255"/>
         <prop k="customdash" v="5;2"/>
+        <prop k="customdash_unit" v="MM"/>
         <prop k="joinstyle" v="bevel"/>
         <prop k="offset" v="0"/>
+        <prop k="offset_unit" v="MM"/>
         <prop k="penstyle" v="solid"/>
         <prop k="use_custom_dash" v="0"/>
         <prop k="width" v="0.06"/>
+        <prop k="width_unit" v="MM"/>
       </layer>
     </symbol>
-    <symbol outputUnit="MM" alpha="0.2235294117647059" type="line" name="Waterfall">
-      <layer pass="0" class="SimpleLine" locked="0">
+    <symbol alpha="0.223529" type="line" name="Waterfall">
+      <layer pass="0" class="SimpleLine" locked="1">
         <prop k="capstyle" v="square"/>
         <prop k="color" v="255,255,255,255"/>
         <prop k="customdash" v="5;2"/>
+        <prop k="customdash_unit" v="MM"/>
         <prop k="joinstyle" v="bevel"/>
         <prop k="offset" v="0"/>
+        <prop k="offset_unit" v="MM"/>
         <prop k="penstyle" v="solid"/>
         <prop k="use_custom_dash" v="0"/>
         <prop k="width" v="3.26"/>
+        <prop k="width_unit" v="MM"/>
       </layer>
       <layer pass="0" class="SimpleLine" locked="0">
         <prop k="capstyle" v="square"/>
         <prop k="color" v="22,108,200,255"/>
         <prop k="customdash" v="5;2"/>
+        <prop k="customdash_unit" v="MM"/>
         <prop k="joinstyle" v="round"/>
         <prop k="offset" v="0"/>
+        <prop k="offset_unit" v="MM"/>
         <prop k="penstyle" v="solid"/>
         <prop k="use_custom_dash" v="0"/>
         <prop k="width" v="2.26"/>
+        <prop k="width_unit" v="MM"/>
       </layer>
     </symbol>
-    <symbol outputUnit="MM" alpha="1" type="line" name="Weir">
+    <symbol alpha="1" type="line" name="Weir">
       <layer pass="0" class="SimpleLine" locked="0">
         <prop k="capstyle" v="round"/>
         <prop k="color" v="192,223,255,255"/>
         <prop k="customdash" v="5;2"/>
+        <prop k="customdash_unit" v="MM"/>
         <prop k="joinstyle" v="round"/>
         <prop k="offset" v="0"/>
+        <prop k="offset_unit" v="MM"/>
         <prop k="penstyle" v="solid"/>
         <prop k="use_custom_dash" v="0"/>
         <prop k="width" v="0.86"/>
+        <prop k="width_unit" v="MM"/>
       </layer>
     </symbol>
-    <symbol outputUnit="MM" alpha="1" type="marker" name="@Construction road@0">
+    <symbol alpha="1" type="marker" name="airport">
+      <layer pass="0" class="SvgMarker" locked="0">
+        <prop k="angle" v="0"/>
+        <prop k="fill" v="#000000"/>
+        <prop k="name" v="/gpsicons/plane.svg"/>
+        <prop k="offset" v="0,0"/>
+        <prop k="offset_unit" v="MM"/>
+        <prop k="outline" v="#000000"/>
+        <prop k="outline-width" v="1"/>
+        <prop k="outline_width_unit" v="MM"/>
+        <prop k="size" v="5"/>
+        <prop k="size_unit" v="MM"/>
+      </layer>
+    </symbol>
+    <symbol alpha="1" type="marker" name="arrow">
       <layer pass="0" class="SimpleMarker" locked="0">
         <prop k="angle" v="0"/>
-        <prop k="color" v="255,0,0,255"/>
+        <prop k="color" v="253,191,111,255"/>
         <prop k="color_border" v="0,0,0,255"/>
-        <prop k="name" v="rectangle"/>
+        <prop k="name" v="arrow"/>
         <prop k="offset" v="0,0"/>
-        <prop k="size" v="1.5"/>
+        <prop k="offset_unit" v="MM"/>
+        <prop k="outline_width" v="0"/>
+        <prop k="outline_width_unit" v="MM"/>
+        <prop k="scale_method" v="area"/>
+        <prop k="size" v="5"/>
+        <prop k="size_unit" v="MM"/>
       </layer>
     </symbol>
-    <symbol outputUnit="MM" alpha="1" type="marker" name="@Crossing@1">
+    <symbol alpha="1" type="marker" name="capital">
       <layer pass="0" class="SimpleMarker" locked="0">
         <prop k="angle" v="0"/>
         <prop k="color" v="255,255,255,255"/>
         <prop k="color_border" v="0,0,0,255"/>
-        <prop k="name" v="rectangle"/>
+        <prop k="name" v="circle"/>
+        <prop k="offset" v="0,0"/>
+        <prop k="offset_unit" v="MM"/>
+        <prop k="outline_width" v="0"/>
+        <prop k="outline_width_unit" v="MM"/>
+        <prop k="scale_method" v="area"/>
+        <prop k="size" v="2.4"/>
+        <prop k="size_unit" v="MM"/>
+      </layer>
+      <layer pass="0" class="SimpleMarker" locked="0">
+        <prop k="angle" v="0"/>
+        <prop k="color" v="0,0,0,255"/>
+        <prop k="color_border" v="0,0,0,255"/>
+        <prop k="name" v="circle"/>
+        <prop k="offset" v="0,0"/>
+        <prop k="offset_unit" v="MM"/>
+        <prop k="outline_width" v="0"/>
+        <prop k="outline_width_unit" v="MM"/>
+        <prop k="scale_method" v="area"/>
+        <prop k="size" v="0.5"/>
+        <prop k="size_unit" v="MM"/>
+      </layer>
+    </symbol>
+    <symbol alpha="1" type="marker" name="circle">
+      <layer pass="0" class="SimpleMarker" locked="0">
+        <prop k="angle" v="0"/>
+        <prop k="color" v="166,206,227,255"/>
+        <prop k="color_border" v="0,0,0,255"/>
+        <prop k="name" v="circle"/>
+        <prop k="offset" v="0,0"/>
+        <prop k="offset_unit" v="MM"/>
+        <prop k="outline_width" v="0"/>
+        <prop k="outline_width_unit" v="MM"/>
+        <prop k="scale_method" v="area"/>
+        <prop k="size" v="2"/>
+        <prop k="size_unit" v="MM"/>
+      </layer>
+    </symbol>
+    <symbol alpha="1" type="marker" name="city">
+      <layer pass="0" class="SimpleMarker" locked="0">
+        <prop k="angle" v="0"/>
+        <prop k="color" v="255,255,255,255"/>
+        <prop k="color_border" v="0,0,0,255"/>
+        <prop k="name" v="circle"/>
+        <prop k="offset" v="0,0"/>
+        <prop k="offset_unit" v="MM"/>
+        <prop k="outline_width" v="0"/>
+        <prop k="outline_width_unit" v="MM"/>
+        <prop k="scale_method" v="area"/>
+        <prop k="size" v="2.2"/>
+        <prop k="size_unit" v="MM"/>
+      </layer>
+    </symbol>
+    <symbol alpha="1" type="fill" name="corners">
+      <layer pass="0" class="SimpleFill" locked="0">
+        <prop k="border_width_unit" v="MM"/>
+        <prop k="color" v="241,244,199,255"/>
+        <prop k="color_border" v="175,179,138,255"/>
+        <prop k="offset" v="0,0"/>
+        <prop k="offset_unit" v="MM"/>
+        <prop k="style" v="solid"/>
+        <prop k="style_border" v="solid"/>
+        <prop k="width_border" v="0.26"/>
+      </layer>
+      <layer pass="0" class="MarkerLine" locked="0">
+        <prop k="interval" v="3"/>
+        <prop k="interval_unit" v="MM"/>
+        <prop k="offset" v="0"/>
+        <prop k="offset_unit" v="MM"/>
+        <prop k="placement" v="vertex"/>
+        <prop k="rotate" v="1"/>
+        <symbol alpha="1" type="marker" name="@corners@1">
+          <layer pass="0" class="SimpleMarker" locked="0">
+            <prop k="angle" v="0"/>
+            <prop k="color" v="255,255,255,255"/>
+            <prop k="color_border" v="0,0,0,255"/>
+            <prop k="name" v="cross"/>
+            <prop k="offset" v="0,0"/>
+            <prop k="offset_unit" v="MM"/>
+            <prop k="outline_width" v="0"/>
+            <prop k="outline_width_unit" v="MM"/>
+            <prop k="scale_method" v="area"/>
+            <prop k="size" v="2"/>
+            <prop k="size_unit" v="MM"/>
+          </layer>
+        </symbol>
+      </layer>
+    </symbol>
+    <symbol alpha="1" type="fill" name="diagonal">
+      <layer pass="0" class="SimpleFill" locked="0">
+        <prop k="border_width_unit" v="MM"/>
+        <prop k="color" v="165,191,221,255"/>
+        <prop k="color_border" v="114,133,132,255"/>
+        <prop k="offset" v="0,0"/>
+        <prop k="offset_unit" v="MM"/>
+        <prop k="style" v="solid"/>
+        <prop k="style_border" v="solid"/>
+        <prop k="width_border" v="0.26"/>
+      </layer>
+      <layer pass="0" class="LinePatternFill" locked="1">
+        <prop k="color" v="52,111,107,255"/>
+        <prop k="distance" v="2"/>
+        <prop k="distance_unit" v="MM"/>
+        <prop k="line_width_unit" v="MM"/>
+        <prop k="lineangle" v="45"/>
+        <prop k="linewidth" v="0.1"/>
+        <prop k="offset" v="1"/>
+        <prop k="offset_unit" v="MM"/>
+        <symbol alpha="1" type="line" name="@diagonal@1">
+          <layer pass="0" class="SimpleLine" locked="0">
+            <prop k="capstyle" v="square"/>
+            <prop k="color" v="0,0,0,255"/>
+            <prop k="customdash" v="5;2"/>
+            <prop k="customdash_unit" v="MM"/>
+            <prop k="joinstyle" v="bevel"/>
+            <prop k="offset" v="0"/>
+            <prop k="offset_unit" v="MM"/>
+            <prop k="penstyle" v="no"/>
+            <prop k="use_custom_dash" v="0"/>
+            <prop k="width" v="0.26"/>
+            <prop k="width_unit" v="MM"/>
+          </layer>
+        </symbol>
+      </layer>
+    </symbol>
+    <symbol alpha="1" type="marker" name="diamond">
+      <layer pass="0" class="SimpleMarker" locked="0">
+        <prop k="angle" v="0"/>
+        <prop k="color" v="178,223,138,255"/>
+        <prop k="color_border" v="0,0,0,255"/>
+        <prop k="name" v="diamond"/>
         <prop k="offset" v="0,0"/>
+        <prop k="offset_unit" v="MM"/>
+        <prop k="outline_width" v="0"/>
+        <prop k="outline_width_unit" v="MM"/>
+        <prop k="scale_method" v="area"/>
         <prop k="size" v="3"/>
+        <prop k="size_unit" v="MM"/>
+      </layer>
+    </symbol>
+    <symbol alpha="1" type="fill" name="dotted">
+      <layer pass="0" class="SimpleFill" locked="0">
+        <prop k="border_width_unit" v="MM"/>
+        <prop k="color" v="241,244,199,255"/>
+        <prop k="color_border" v="175,179,138,255"/>
+        <prop k="offset" v="0,0"/>
+        <prop k="offset_unit" v="MM"/>
+        <prop k="style" v="solid"/>
+        <prop k="style_border" v="solid"/>
+        <prop k="width_border" v="0.26"/>
+      </layer>
+      <layer pass="0" class="PointPatternFill" locked="0">
+        <prop k="displacement_x" v="0"/>
+        <prop k="displacement_x_unit" v="MM"/>
+        <prop k="displacement_y" v="1"/>
+        <prop k="displacement_y_unit" v="MM"/>
+        <prop k="distance_x" v="1.5"/>
+        <prop k="distance_x_unit" v="MM"/>
+        <prop k="distance_y" v="2"/>
+        <prop k="distance_y_unit" v="MM"/>
+        <symbol alpha="1" type="marker" name="@dotted@1">
+          <layer pass="0" class="SimpleMarker" locked="0">
+            <prop k="angle" v="0"/>
+            <prop k="color" v="144,112,76,255"/>
+            <prop k="color_border" v="0,0,0,0"/>
+            <prop k="name" v="circle"/>
+            <prop k="offset" v="0,0"/>
+            <prop k="offset_unit" v="MM"/>
+            <prop k="outline_width" v="0"/>
+            <prop k="outline_width_unit" v="MM"/>
+            <prop k="scale_method" v="area"/>
+            <prop k="size" v="0.6"/>
+            <prop k="size_unit" v="MM"/>
+          </layer>
+        </symbol>
+      </layer>
+    </symbol>
+    <symbol alpha="1" type="marker" name="ellipse">
+      <layer pass="0" class="EllipseMarker" locked="0">
+        <prop k="angle" v="45"/>
+        <prop k="fill_color" v="255,255,255,255"/>
+        <prop k="outline_color" v="0,0,0,255"/>
+        <prop k="outline_width" v="0"/>
+        <prop k="outline_width_unit" v="MM"/>
+        <prop k="symbol_height" v="2"/>
+        <prop k="symbol_height_unit" v="MM"/>
+        <prop k="symbol_name" v="circle"/>
+        <prop k="symbol_width" v="5"/>
+        <prop k="symbol_width_unit" v="MM"/>
+      </layer>
+    </symbol>
+    <symbol alpha="1" type="fill" name="green">
+      <layer pass="0" class="SimpleFill" locked="0">
+        <prop k="border_width_unit" v="MM"/>
+        <prop k="color" v="186,221,105,255"/>
+        <prop k="color_border" v="128,152,72,255"/>
+        <prop k="offset" v="0,0"/>
+        <prop k="offset_unit" v="MM"/>
+        <prop k="style" v="solid"/>
+        <prop k="style_border" v="solid"/>
+        <prop k="width_border" v="0.26"/>
       </layer>
+    </symbol>
+    <symbol alpha="1" type="fill" name="land">
+      <layer pass="0" class="SimpleFill" locked="0">
+        <prop k="border_width_unit" v="MM"/>
+        <prop k="color" v="241,244,199,255"/>
+        <prop k="color_border" v="175,179,138,255"/>
+        <prop k="offset" v="0,0"/>
+        <prop k="offset_unit" v="MM"/>
+        <prop k="style" v="solid"/>
+        <prop k="style_border" v="solid"/>
+        <prop k="width_border" v="0.26"/>
+      </layer>
+    </symbol>
+    <symbol alpha="1" type="marker" name="pentagon">
       <layer pass="0" class="SimpleMarker" locked="0">
         <prop k="angle" v="0"/>
-        <prop k="color" v="35,149,255,255"/>
+        <prop k="color" v="51,160,44,255"/>
+        <prop k="color_border" v="0,0,0,255"/>
+        <prop k="name" v="pentagon"/>
+        <prop k="offset" v="0,0"/>
+        <prop k="offset_unit" v="MM"/>
+        <prop k="outline_width" v="0"/>
+        <prop k="outline_width_unit" v="MM"/>
+        <prop k="scale_method" v="area"/>
+        <prop k="size" v="3"/>
+        <prop k="size_unit" v="MM"/>
+      </layer>
+    </symbol>
+    <symbol alpha="1" type="marker" name="square">
+      <layer pass="0" class="SimpleMarker" locked="0">
+        <prop k="angle" v="0"/>
+        <prop k="color" v="31,120,180,255"/>
         <prop k="color_border" v="0,0,0,255"/>
         <prop k="name" v="rectangle"/>
         <prop k="offset" v="0,0"/>
-        <prop k="size" v="1"/>
+        <prop k="offset_unit" v="MM"/>
+        <prop k="outline_width" v="0"/>
+        <prop k="outline_width_unit" v="MM"/>
+        <prop k="scale_method" v="area"/>
+        <prop k="size" v="2"/>
+        <prop k="size_unit" v="MM"/>
+      </layer>
+    </symbol>
+    <symbol alpha="1" type="marker" name="star">
+      <layer pass="0" class="SimpleMarker" locked="0">
+        <prop k="angle" v="0"/>
+        <prop k="color" v="227,26,28,255"/>
+        <prop k="color_border" v="0,0,0,255"/>
+        <prop k="name" v="regular_star"/>
+        <prop k="offset" v="0,0"/>
+        <prop k="offset_unit" v="MM"/>
+        <prop k="outline_width" v="0"/>
+        <prop k="outline_width_unit" v="MM"/>
+        <prop k="scale_method" v="area"/>
+        <prop k="size" v="4"/>
+        <prop k="size_unit" v="MM"/>
       </layer>
     </symbol>
-    <symbol outputUnit="MM" alpha="1" type="marker" name="@Steps@2">
+    <symbol alpha="1" type="marker" name="star2">
+      <layer pass="0" class="SimpleMarker" locked="0">
+        <prop k="angle" v="0"/>
+        <prop k="color" v="106,61,154,255"/>
+        <prop k="color_border" v="255,0,0,0"/>
+        <prop k="name" v="regular_star"/>
+        <prop k="offset" v="0,0"/>
+        <prop k="offset_unit" v="MM"/>
+        <prop k="outline_width" v="0"/>
+        <prop k="outline_width_unit" v="MM"/>
+        <prop k="scale_method" v="area"/>
+        <prop k="size" v="6"/>
+        <prop k="size_unit" v="MM"/>
+      </layer>
+      <layer pass="0" class="SimpleMarker" locked="1">
+        <prop k="angle" v="0"/>
+        <prop k="color" v="255,255,127,255"/>
+        <prop k="color_border" v="0,0,0,0"/>
+        <prop k="name" v="circle"/>
+        <prop k="offset" v="0,0"/>
+        <prop k="offset_unit" v="MM"/>
+        <prop k="outline_width" v="0"/>
+        <prop k="outline_width_unit" v="MM"/>
+        <prop k="scale_method" v="area"/>
+        <prop k="size" v="2"/>
+        <prop k="size_unit" v="MM"/>
+      </layer>
+    </symbol>
+    <symbol alpha="1" type="marker" name="star3">
+      <layer pass="0" class="SimpleMarker" locked="0">
+        <prop k="angle" v="0"/>
+        <prop k="color" v="251,154,153,255"/>
+        <prop k="color_border" v="0,0,0,255"/>
+        <prop k="name" v="cross2"/>
+        <prop k="offset" v="0,0"/>
+        <prop k="offset_unit" v="MM"/>
+        <prop k="outline_width" v="0"/>
+        <prop k="outline_width_unit" v="MM"/>
+        <prop k="scale_method" v="area"/>
+        <prop k="size" v="2"/>
+        <prop k="size_unit" v="MM"/>
+      </layer>
       <layer pass="0" class="SimpleMarker" locked="0">
         <prop k="angle" v="0"/>
         <prop k="color" v="255,0,0,255"/>
         <prop k="color_border" v="0,0,0,255"/>
-        <prop k="name" v="line"/>
+        <prop k="name" v="cross"/>
         <prop k="offset" v="0,0"/>
-        <prop k="size" v="0.5"/>
+        <prop k="offset_unit" v="MM"/>
+        <prop k="outline_width" v="0"/>
+        <prop k="outline_width_unit" v="MM"/>
+        <prop k="scale_method" v="area"/>
+        <prop k="size" v="3"/>
+        <prop k="size_unit" v="MM"/>
+      </layer>
+    </symbol>
+    <symbol alpha="1" type="marker" name="triangle">
+      <layer pass="0" class="SimpleMarker" locked="0">
+        <prop k="angle" v="0"/>
+        <prop k="color" v="251,154,153,255"/>
+        <prop k="color_border" v="0,0,0,255"/>
+        <prop k="name" v="triangle"/>
+        <prop k="offset" v="0,0"/>
+        <prop k="offset_unit" v="MM"/>
+        <prop k="outline_width" v="0"/>
+        <prop k="outline_width_unit" v="MM"/>
+        <prop k="scale_method" v="area"/>
+        <prop k="size" v="3"/>
+        <prop k="size_unit" v="MM"/>
+      </layer>
+    </symbol>
+    <symbol alpha="1" type="marker" name="triangle2">
+      <layer pass="0" class="SimpleMarker" locked="0">
+        <prop k="angle" v="0"/>
+        <prop k="color" v="255,127,0,255"/>
+        <prop k="color_border" v="0,0,0,255"/>
+        <prop k="name" v="filled_arrowhead"/>
+        <prop k="offset" v="0,0"/>
+        <prop k="offset_unit" v="MM"/>
+        <prop k="outline_width" v="0"/>
+        <prop k="outline_width_unit" v="MM"/>
+        <prop k="scale_method" v="area"/>
+        <prop k="size" v="4"/>
+        <prop k="size_unit" v="MM"/>
+      </layer>
+    </symbol>
+    <symbol alpha="1" type="fill" name="water">
+      <layer pass="0" class="SimpleFill" locked="0">
+        <prop k="border_width_unit" v="MM"/>
+        <prop k="color" v="165,191,221,255"/>
+        <prop k="color_border" v="114,133,132,255"/>
+        <prop k="offset" v="0,0"/>
+        <prop k="offset_unit" v="MM"/>
+        <prop k="style" v="solid"/>
+        <prop k="style_border" v="solid"/>
+        <prop k="width_border" v="0.26"/>
+      </layer>
+    </symbol>
+    <symbol alpha="1" type="fill" name="wine">
+      <layer pass="0" class="SimpleFill" locked="0">
+        <prop k="border_width_unit" v="MM"/>
+        <prop k="color" v="186,221,105,255"/>
+        <prop k="color_border" v="128,152,72,255"/>
+        <prop k="offset" v="0,0"/>
+        <prop k="offset_unit" v="MM"/>
+        <prop k="style" v="solid"/>
+        <prop k="style_border" v="solid"/>
+        <prop k="width_border" v="0.26"/>
+      </layer>
+      <layer pass="0" class="PointPatternFill" locked="0">
+        <prop k="displacement_x" v="1"/>
+        <prop k="displacement_x_unit" v="MM"/>
+        <prop k="displacement_y" v="0"/>
+        <prop k="displacement_y_unit" v="MM"/>
+        <prop k="distance_x" v="2"/>
+        <prop k="distance_x_unit" v="MM"/>
+        <prop k="distance_y" v="2"/>
+        <prop k="distance_y_unit" v="MM"/>
+        <symbol alpha="1" type="marker" name="@wine@1">
+          <layer pass="0" class="SimpleMarker" locked="0">
+            <prop k="angle" v="0"/>
+            <prop k="color" v="255,0,0,255"/>
+            <prop k="color_border" v="87,104,49,255"/>
+            <prop k="name" v="line"/>
+            <prop k="offset" v="0,0"/>
+            <prop k="offset_unit" v="MM"/>
+            <prop k="outline_width" v="0"/>
+            <prop k="outline_width_unit" v="MM"/>
+            <prop k="scale_method" v="area"/>
+            <prop k="size" v="1"/>
+            <prop k="size_unit" v="MM"/>
+          </layer>
+        </symbol>
       </layer>
     </symbol>
   </symbols>
@@ -658,135 +1272,162 @@
     <colorramp type="gradient" name="Blues">
       <prop k="color1" v="247,251,255,255"/>
       <prop k="color2" v="8,48,107,255"/>
+      <prop k="discrete" v="0"/>
       <prop k="stops" v="0.13;222,235,247,255:0.26;198,219,239,255:0.39;158,202,225,255:0.52;107,174,214,255:0.65;66,146,198,255:0.78;33,113,181,255:0.9;8,81,156,255"/>
     </colorramp>
     <colorramp type="gradient" name="BrBG">
       <prop k="color1" v="166,97,26,255"/>
       <prop k="color2" v="1,133,113,255"/>
+      <prop k="discrete" v="0"/>
       <prop k="stops" v="0.25;223,194,125,255:0.5;245,245,245,255:0.75;128,205,193,255"/>
     </colorramp>
     <colorramp type="gradient" name="BuGn">
       <prop k="color1" v="237,248,251,255"/>
       <prop k="color2" v="0,109,44,255"/>
+      <prop k="discrete" v="0"/>
       <prop k="stops" v="0.25;178,226,226,255:0.5;102,194,164,255:0.75;44,162,95,255"/>
     </colorramp>
     <colorramp type="gradient" name="BuPu">
       <prop k="color1" v="237,248,251,255"/>
       <prop k="color2" v="129,15,124,255"/>
+      <prop k="discrete" v="0"/>
       <prop k="stops" v="0.25;179,205,227,255:0.5;140,150,198,255:0.75;136,86,167,255"/>
     </colorramp>
     <colorramp type="gradient" name="GnBu">
       <prop k="color1" v="240,249,232,255"/>
       <prop k="color2" v="8,104,172,255"/>
+      <prop k="discrete" v="0"/>
       <prop k="stops" v="0.25;186,228,188,255:0.5;123,204,196,255:0.75;67,162,202,255"/>
     </colorramp>
     <colorramp type="gradient" name="Greens">
       <prop k="color1" v="247,252,245,255"/>
       <prop k="color2" v="0,68,27,255"/>
+      <prop k="discrete" v="0"/>
       <prop k="stops" v="0.13;229,245,224,255:0.26;199,233,192,255:0.39;161,217,155,255:0.52;116,196,118,255:0.65;65,171,93,255:0.78;35,139,69,255:0.9;0,109,44,255"/>
     </colorramp>
     <colorramp type="gradient" name="Greys">
       <prop k="color1" v="250,250,250,255"/>
       <prop k="color2" v="5,5,5,255"/>
+      <prop k="discrete" v="0"/>
     </colorramp>
     <colorramp type="gradient" name="OrRd">
       <prop k="color1" v="254,240,217,255"/>
       <prop k="color2" v="179,0,0,255"/>
+      <prop k="discrete" v="0"/>
       <prop k="stops" v="0.25;253,204,138,255:0.5;252,141,89,255:0.75;227,74,51,255"/>
     </colorramp>
     <colorramp type="gradient" name="Oranges">
       <prop k="color1" v="255,245,235,255"/>
       <prop k="color2" v="127,39,4,255"/>
+      <prop k="discrete" v="0"/>
       <prop k="stops" v="0.13;254,230,206,255:0.26;253,208,162,255:0.39;253,174,107,255:0.52;253,141,60,255:0.65;241,105,19,255:0.78;217,72,1,255:0.9;166,54,3,255"/>
     </colorramp>
     <colorramp type="gradient" name="PRGn">
       <prop k="color1" v="123,50,148,255"/>
       <prop k="color2" v="0,136,55,255"/>
+      <prop k="discrete" v="0"/>
       <prop k="stops" v="0.25;194,165,207,255:0.5;247,247,247,255:0.75;166,219,160,255"/>
     </colorramp>
     <colorramp type="gradient" name="PiYG">
       <prop k="color1" v="208,28,139,255"/>
       <prop k="color2" v="77,172,38,255"/>
+      <prop k="discrete" v="0"/>
       <prop k="stops" v="0.25;241,182,218,255:0.5;247,247,247,255:0.75;184,225,134,255"/>
     </colorramp>
     <colorramp type="gradient" name="PuBu">
       <prop k="color1" v="241,238,246,255"/>
       <prop k="color2" v="4,90,141,255"/>
+      <prop k="discrete" v="0"/>
       <prop k="stops" v="0.25;189,201,225,255:0.5;116,169,207,255:0.75;43,140,190,255"/>
     </colorramp>
     <colorramp type="gradient" name="PuBuGn">
       <prop k="color1" v="246,239,247,255"/>
       <prop k="color2" v="1,108,89,255"/>
+      <prop k="discrete" v="0"/>
       <prop k="stops" v="0.25;189,201,225,255:0.5;103,169,207,255:0.75;28,144,153,255"/>
     </colorramp>
     <colorramp type="gradient" name="PuOr">
       <prop k="color1" v="230,97,1,255"/>
       <prop k="color2" v="94,60,153,255"/>
+      <prop k="discrete" v="0"/>
       <prop k="stops" v="0.25;253,184,99,255:0.5;247,247,247,255:0.75;178,171,210,255"/>
     </colorramp>
     <colorramp type="gradient" name="PuRd">
       <prop k="color1" v="241,238,246,255"/>
       <prop k="color2" v="152,0,67,255"/>
+      <prop k="discrete" v="0"/>
       <prop k="stops" v="0.25;215,181,216,255:0.5;223,101,176,255:0.75;221,28,119,255"/>
     </colorramp>
     <colorramp type="gradient" name="Purples">
       <prop k="color1" v="252,251,253,255"/>
       <prop k="color2" v="63,0,125,255"/>
+      <prop k="discrete" v="0"/>
       <prop k="stops" v="0.13;239,237,245,255:0.26;218,218,235,255:0.39;188,189,220,255:0.52;158,154,200,255:0.65;128,125,186,255:0.75;106,81,163,255:0.9;84,39,143,255"/>
     </colorramp>
     <colorramp type="gradient" name="RdBu">
       <prop k="color1" v="202,0,32,255"/>
       <prop k="color2" v="5,113,176,255"/>
+      <prop k="discrete" v="0"/>
       <prop k="stops" v="0.25;244,165,130,255:0.5;247,247,247,255:0.75;146,197,222,255"/>
     </colorramp>
     <colorramp type="gradient" name="RdGy">
       <prop k="color1" v="202,0,32,255"/>
       <prop k="color2" v="64,64,64,255"/>
+      <prop k="discrete" v="0"/>
       <prop k="stops" v="0.25;244,165,130,255:0.5;255,255,255,255:0.75;186,186,186,255"/>
     </colorramp>
     <colorramp type="gradient" name="RdPu">
       <prop k="color1" v="254,235,226,255"/>
       <prop k="color2" v="122,1,119,255"/>
+      <prop k="discrete" v="0"/>
       <prop k="stops" v="0.25;251,180,185,255:0.5;247,104,161,255:0.75;197,27,138,255"/>
     </colorramp>
     <colorramp type="gradient" name="RdYlBu">
       <prop k="color1" v="215,25,28,255"/>
       <prop k="color2" v="44,123,182,255"/>
+      <prop k="discrete" v="0"/>
       <prop k="stops" v="0.25;253,174,97,255:0.5;255,255,191,255:0.75;171,217,233,255"/>
     </colorramp>
     <colorramp type="gradient" name="RdYlGn">
       <prop k="color1" v="215,25,28,255"/>
       <prop k="color2" v="26,150,65,255"/>
+      <prop k="discrete" v="0"/>
       <prop k="stops" v="0.25;253,174,97,255:0.5;255,255,192,255:0.75;166,217,106,255"/>
     </colorramp>
     <colorramp type="gradient" name="Reds">
       <prop k="color1" v="255,245,240,255"/>
       <prop k="color2" v="103,0,13,255"/>
+      <prop k="discrete" v="0"/>
       <prop k="stops" v="0.13;254,224,210,255:0.26;252,187,161,255:0.39;252,146,114,255:0.52;251,106,74,255:0.65;239,59,44,255:0.78;203,24,29,255:0.9;165,15,21,255"/>
     </colorramp>
     <colorramp type="gradient" name="Spectral">
       <prop k="color1" v="215,25,28,255"/>
       <prop k="color2" v="43,131,186,255"/>
+      <prop k="discrete" v="0"/>
       <prop k="stops" v="0.25;253,174,97,255:0.5;255,255,191,255:0.75;171,221,164,255"/>
     </colorramp>
     <colorramp type="gradient" name="YlGn">
       <prop k="color1" v="255,255,204,255"/>
       <prop k="color2" v="0,104,55,255"/>
+      <prop k="discrete" v="0"/>
       <prop k="stops" v="0.25;194,230,153,255:0.5;120,198,121,255:0.75;49,163,84,255"/>
     </colorramp>
     <colorramp type="gradient" name="YlGnBu">
       <prop k="color1" v="255,255,204,255"/>
       <prop k="color2" v="37,52,148,255"/>
+      <prop k="discrete" v="0"/>
       <prop k="stops" v="0.25;161,218,180,255:0.5;65,182,196,255:0.75;44,127,184,255"/>
     </colorramp>
     <colorramp type="gradient" name="YlOrBr">
       <prop k="color1" v="255,255,212,255"/>
       <prop k="color2" v="153,52,4,255"/>
+      <prop k="discrete" v="0"/>
       <prop k="stops" v="0.25;254,217,142,255:0.5;254,153,41,255:0.75;217,95,14,255"/>
     </colorramp>
     <colorramp type="gradient" name="YlOrRd">
       <prop k="color1" v="255,255,178,255"/>
       <prop k="color2" v="189,0,38,255"/>
+      <prop k="discrete" v="0"/>
       <prop k="stops" v="0.25;254,204,92,255:0.5;253,141,60,255:0.75;240,59,32,255"/>
     </colorramp>
   </colorramps>