From 82d5c4784f855711393a61a46ea1743e49c079d1 Mon Sep 17 00:00:00 2001
From: Joshua Gilbert <joshuadgilby@gmail.com>
Date: Mon, 16 Sep 2024 15:12:51 -0600
Subject: [PATCH] Changes to QRIS Symbology

---
 Symbology/qgis/QRiS/dam_crests.qml            | 1136 ++++---------
 Symbology/qgis/QRiS/risk_potential_lines.qml  |  521 +++---
 Symbology/qgis/QRiS/risk_potential_points.qml |  425 +++--
 .../qgis/QRiS/risk_potential_polygons.qml     |  329 ++--
 Symbology/qgis/QRiS/structure_lines.qml       | 1414 ++++++++---------
 Symbology/qgis/QRiS/structure_points.qml      | 1254 +++++++--------
 .../qgis/RiverscapesStudio/dam_crests.qml     | 1136 ++++---------
 .../risk_potential_lines.qml                  |  521 +++---
 .../risk_potential_points.qml                 |  425 +++--
 .../risk_potential_polygons.qml               |  329 ++--
 .../RiverscapesStudio/structure_lines.qml     | 1414 ++++++++---------
 .../RiverscapesStudio/structure_points.qml    | 1254 +++++++--------
 12 files changed, 4950 insertions(+), 5208 deletions(-)

diff --git a/Symbology/qgis/QRiS/dam_crests.qml b/Symbology/qgis/QRiS/dam_crests.qml
index f83f2426..fcd0e9b9 100644
--- a/Symbology/qgis/QRiS/dam_crests.qml
+++ b/Symbology/qgis/QRiS/dam_crests.qml
@@ -1,874 +1,246 @@
 <!DOCTYPE qgis PUBLIC 'http://mrcc.com/qgis.dtd' 'SYSTEM'>
-<qgis version="3.22.3-Białowieża" styleCategories="Symbology|Legend">
-  <renderer-v2 type="categorizedSymbol" forceraster="0" attr="structure_source_id" symbollevels="0" referencescale="-1" enableorderby="0">
+<qgis version="3.34.8-Prizren" styleCategories="Symbology|Labeling" labelsEnabled="0">
+  <renderer-v2 type="categorizedSymbol" referencescale="-1" attr="Dam State" symbollevels="0" enableorderby="0" forceraster="0">
     <categories>
-      <category label="Natural" symbol="0" render="true" value="1"/>
-      <category label="Artificial" symbol="1" render="true" value="2"/>
-      <category label="Unknown" symbol="2" render="true" value="3"/>
+      <category type="string" uuid="{e441aab4-15a9-44bb-90f9-b5827ea5e338}" symbol="0" label="Blown Out" value="Blown Out" render="true"/>
+      <category type="string" uuid="{bb7d5c6a-f46a-40ac-b03c-1ba30188d518}" symbol="1" label="Breached" value="Breached" render="true"/>
+      <category type="string" uuid="{dd198cad-89a6-43ca-9327-78189b605780}" symbol="2" label="Intact" value="Intact" render="true"/>
+      <category type="string" uuid="{19167abc-7d47-4123-9bc6-d4ee567298f2}" symbol="3" label="" value="" render="true"/>
     </categories>
     <symbols>
-      <symbol name="0" type="line" clip_to_extent="1" force_rhr="0" alpha="1">
+      <symbol type="line" clip_to_extent="1" name="0" is_animated="0" alpha="1" force_rhr="0" frame_rate="10">
         <data_defined_properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data_defined_properties>
-        <layer locked="0" class="SimpleLine" pass="0" enabled="1">
+        <layer class="SimpleLine" locked="0" enabled="1" id="{c643dd5b-b33e-48cd-ae81-580b2c3c60be}" pass="0">
           <Option type="Map">
-            <Option name="align_dash_pattern" type="QString" value="0"/>
-            <Option name="capstyle" type="QString" value="round"/>
-            <Option name="customdash" type="QString" value="5;2"/>
-            <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-            <Option name="customdash_unit" type="QString" value="MM"/>
-            <Option name="dash_pattern_offset" type="QString" value="0"/>
-            <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-            <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-            <Option name="draw_inside_polygon" type="QString" value="0"/>
-            <Option name="joinstyle" type="QString" value="round"/>
-            <Option name="line_color" type="QString" value="183,72,75,255"/>
-            <Option name="line_style" type="QString" value="solid"/>
-            <Option name="line_width" type="QString" value="1"/>
-            <Option name="line_width_unit" type="QString" value="MM"/>
-            <Option name="offset" type="QString" value="0"/>
-            <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-            <Option name="offset_unit" type="QString" value="MM"/>
-            <Option name="ring_filter" type="QString" value="0"/>
-            <Option name="trim_distance_end" type="QString" value="0"/>
-            <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-            <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-            <Option name="trim_distance_start" type="QString" value="0"/>
-            <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-            <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-            <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-            <Option name="use_custom_dash" type="QString" value="0"/>
-            <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="align_dash_pattern" value="0"/>
+            <Option type="QString" name="capstyle" value="square"/>
+            <Option type="QString" name="customdash" value="0.5;1"/>
+            <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="customdash_unit" value="MM"/>
+            <Option type="QString" name="dash_pattern_offset" value="0"/>
+            <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+            <Option type="QString" name="draw_inside_polygon" value="0"/>
+            <Option type="QString" name="joinstyle" value="bevel"/>
+            <Option type="QString" name="line_color" value="215,25,28,255"/>
+            <Option type="QString" name="line_style" value="dot"/>
+            <Option type="QString" name="line_width" value="0.66"/>
+            <Option type="QString" name="line_width_unit" value="MM"/>
+            <Option type="QString" name="offset" value="0"/>
+            <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="offset_unit" value="MM"/>
+            <Option type="QString" name="ring_filter" value="0"/>
+            <Option type="QString" name="trim_distance_end" value="0"/>
+            <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+            <Option type="QString" name="trim_distance_start" value="0"/>
+            <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+            <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+            <Option type="QString" name="use_custom_dash" value="1"/>
+            <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
           </Option>
-          <prop k="align_dash_pattern" v="0"/>
-          <prop k="capstyle" v="round"/>
-          <prop k="customdash" v="5;2"/>
-          <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-          <prop k="customdash_unit" v="MM"/>
-          <prop k="dash_pattern_offset" v="0"/>
-          <prop k="dash_pattern_offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-          <prop k="dash_pattern_offset_unit" v="MM"/>
-          <prop k="draw_inside_polygon" v="0"/>
-          <prop k="joinstyle" v="round"/>
-          <prop k="line_color" v="183,72,75,255"/>
-          <prop k="line_style" v="solid"/>
-          <prop k="line_width" v="1"/>
-          <prop k="line_width_unit" v="MM"/>
-          <prop k="offset" v="0"/>
-          <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-          <prop k="offset_unit" v="MM"/>
-          <prop k="ring_filter" v="0"/>
-          <prop k="trim_distance_end" v="0"/>
-          <prop k="trim_distance_end_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-          <prop k="trim_distance_end_unit" v="MM"/>
-          <prop k="trim_distance_start" v="0"/>
-          <prop k="trim_distance_start_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-          <prop k="trim_distance_start_unit" v="MM"/>
-          <prop k="tweak_dash_pattern_on_corners" v="0"/>
-          <prop k="use_custom_dash" v="0"/>
-          <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-          <effect type="effectStack" enabled="1">
-            <effect type="dropShadow">
-              <Option type="Map">
-                <Option name="blend_mode" type="QString" value="13"/>
-                <Option name="blur_level" type="QString" value="1"/>
-                <Option name="blur_unit" type="QString" value="MM"/>
-                <Option name="blur_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="0,0,0,255"/>
-                <Option name="draw_mode" type="QString" value="2"/>
-                <Option name="enabled" type="QString" value="1"/>
-                <Option name="offset_angle" type="QString" value="135"/>
-                <Option name="offset_distance" type="QString" value="1"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="offset_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="opacity" type="QString" value="1"/>
-              </Option>
-              <prop k="blend_mode" v="13"/>
-              <prop k="blur_level" v="1"/>
-              <prop k="blur_unit" v="MM"/>
-              <prop k="blur_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="0,0,0,255"/>
-              <prop k="draw_mode" v="2"/>
-              <prop k="enabled" v="1"/>
-              <prop k="offset_angle" v="135"/>
-              <prop k="offset_distance" v="1"/>
-              <prop k="offset_unit" v="MM"/>
-              <prop k="offset_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="opacity" v="1"/>
-            </effect>
-            <effect type="outerGlow">
-              <Option type="Map">
-                <Option name="blend_mode" type="QString" value="0"/>
-                <Option name="blur_level" type="QString" value="2.645"/>
-                <Option name="blur_unit" type="QString" value="MM"/>
-                <Option name="blur_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color1" type="QString" value="69,116,40,255"/>
-                <Option name="color2" type="QString" value="188,220,60,255"/>
-                <Option name="color_type" type="QString" value="0"/>
-                <Option name="discrete" type="QString" value="0"/>
-                <Option name="draw_mode" type="QString" value="2"/>
-                <Option name="enabled" type="QString" value="0"/>
-                <Option name="opacity" type="QString" value="0.5"/>
-                <Option name="rampType" type="QString" value="gradient"/>
-                <Option name="single_color" type="QString" value="255,255,255,255"/>
-                <Option name="spread" type="QString" value="2"/>
-                <Option name="spread_unit" type="QString" value="MM"/>
-                <Option name="spread_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              </Option>
-              <prop k="blend_mode" v="0"/>
-              <prop k="blur_level" v="2.645"/>
-              <prop k="blur_unit" v="MM"/>
-              <prop k="blur_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color1" v="69,116,40,255"/>
-              <prop k="color2" v="188,220,60,255"/>
-              <prop k="color_type" v="0"/>
-              <prop k="discrete" v="0"/>
-              <prop k="draw_mode" v="2"/>
-              <prop k="enabled" v="0"/>
-              <prop k="opacity" v="0.5"/>
-              <prop k="rampType" v="gradient"/>
-              <prop k="single_color" v="255,255,255,255"/>
-              <prop k="spread" v="2"/>
-              <prop k="spread_unit" v="MM"/>
-              <prop k="spread_unit_scale" v="3x:0,0,0,0,0,0"/>
-            </effect>
-            <effect type="drawSource">
-              <Option type="Map">
-                <Option name="blend_mode" type="QString" value="0"/>
-                <Option name="draw_mode" type="QString" value="2"/>
-                <Option name="enabled" type="QString" value="1"/>
-                <Option name="opacity" type="QString" value="1"/>
-              </Option>
-              <prop k="blend_mode" v="0"/>
-              <prop k="draw_mode" v="2"/>
-              <prop k="enabled" v="1"/>
-              <prop k="opacity" v="1"/>
-            </effect>
-            <effect type="innerShadow">
-              <Option type="Map">
-                <Option name="blend_mode" type="QString" value="13"/>
-                <Option name="blur_level" type="QString" value="2.645"/>
-                <Option name="blur_unit" type="QString" value="MM"/>
-                <Option name="blur_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="0,0,0,255"/>
-                <Option name="draw_mode" type="QString" value="2"/>
-                <Option name="enabled" type="QString" value="0"/>
-                <Option name="offset_angle" type="QString" value="135"/>
-                <Option name="offset_distance" type="QString" value="2"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="offset_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="opacity" type="QString" value="1"/>
-              </Option>
-              <prop k="blend_mode" v="13"/>
-              <prop k="blur_level" v="2.645"/>
-              <prop k="blur_unit" v="MM"/>
-              <prop k="blur_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="0,0,0,255"/>
-              <prop k="draw_mode" v="2"/>
-              <prop k="enabled" v="0"/>
-              <prop k="offset_angle" v="135"/>
-              <prop k="offset_distance" v="2"/>
-              <prop k="offset_unit" v="MM"/>
-              <prop k="offset_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="opacity" v="1"/>
-            </effect>
-            <effect type="innerGlow">
-              <Option type="Map">
-                <Option name="blend_mode" type="QString" value="0"/>
-                <Option name="blur_level" type="QString" value="2.645"/>
-                <Option name="blur_unit" type="QString" value="MM"/>
-                <Option name="blur_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color1" type="QString" value="69,116,40,255"/>
-                <Option name="color2" type="QString" value="188,220,60,255"/>
-                <Option name="color_type" type="QString" value="0"/>
-                <Option name="discrete" type="QString" value="0"/>
-                <Option name="draw_mode" type="QString" value="2"/>
-                <Option name="enabled" type="QString" value="0"/>
-                <Option name="opacity" type="QString" value="0.5"/>
-                <Option name="rampType" type="QString" value="gradient"/>
-                <Option name="single_color" type="QString" value="255,255,255,255"/>
-                <Option name="spread" type="QString" value="2"/>
-                <Option name="spread_unit" type="QString" value="MM"/>
-                <Option name="spread_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              </Option>
-              <prop k="blend_mode" v="0"/>
-              <prop k="blur_level" v="2.645"/>
-              <prop k="blur_unit" v="MM"/>
-              <prop k="blur_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color1" v="69,116,40,255"/>
-              <prop k="color2" v="188,220,60,255"/>
-              <prop k="color_type" v="0"/>
-              <prop k="discrete" v="0"/>
-              <prop k="draw_mode" v="2"/>
-              <prop k="enabled" v="0"/>
-              <prop k="opacity" v="0.5"/>
-              <prop k="rampType" v="gradient"/>
-              <prop k="single_color" v="255,255,255,255"/>
-              <prop k="spread" v="2"/>
-              <prop k="spread_unit" v="MM"/>
-              <prop k="spread_unit_scale" v="3x:0,0,0,0,0,0"/>
-            </effect>
-          </effect>
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
         </layer>
       </symbol>
-      <symbol name="1" type="line" clip_to_extent="1" force_rhr="0" alpha="1">
+      <symbol type="line" clip_to_extent="1" name="1" is_animated="0" alpha="1" force_rhr="0" frame_rate="10">
         <data_defined_properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data_defined_properties>
-        <layer locked="0" class="SimpleLine" pass="0" enabled="1">
+        <layer class="SimpleLine" locked="0" enabled="1" id="{c643dd5b-b33e-48cd-ae81-580b2c3c60be}" pass="0">
           <Option type="Map">
-            <Option name="align_dash_pattern" type="QString" value="0"/>
-            <Option name="capstyle" type="QString" value="round"/>
-            <Option name="customdash" type="QString" value="5;2"/>
-            <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-            <Option name="customdash_unit" type="QString" value="MM"/>
-            <Option name="dash_pattern_offset" type="QString" value="0"/>
-            <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-            <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-            <Option name="draw_inside_polygon" type="QString" value="0"/>
-            <Option name="joinstyle" type="QString" value="round"/>
-            <Option name="line_color" type="QString" value="18,169,203,255"/>
-            <Option name="line_style" type="QString" value="solid"/>
-            <Option name="line_width" type="QString" value="1"/>
-            <Option name="line_width_unit" type="QString" value="MM"/>
-            <Option name="offset" type="QString" value="0"/>
-            <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-            <Option name="offset_unit" type="QString" value="MM"/>
-            <Option name="ring_filter" type="QString" value="0"/>
-            <Option name="trim_distance_end" type="QString" value="0"/>
-            <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-            <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-            <Option name="trim_distance_start" type="QString" value="0"/>
-            <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-            <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-            <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-            <Option name="use_custom_dash" type="QString" value="0"/>
-            <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="align_dash_pattern" value="0"/>
+            <Option type="QString" name="capstyle" value="square"/>
+            <Option type="QString" name="customdash" value="0.5;1"/>
+            <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="customdash_unit" value="MM"/>
+            <Option type="QString" name="dash_pattern_offset" value="0"/>
+            <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+            <Option type="QString" name="draw_inside_polygon" value="0"/>
+            <Option type="QString" name="joinstyle" value="bevel"/>
+            <Option type="QString" name="line_color" value="255,141,35,255"/>
+            <Option type="QString" name="line_style" value="dot"/>
+            <Option type="QString" name="line_width" value="0.66"/>
+            <Option type="QString" name="line_width_unit" value="MM"/>
+            <Option type="QString" name="offset" value="0"/>
+            <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="offset_unit" value="MM"/>
+            <Option type="QString" name="ring_filter" value="0"/>
+            <Option type="QString" name="trim_distance_end" value="0"/>
+            <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+            <Option type="QString" name="trim_distance_start" value="0"/>
+            <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+            <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+            <Option type="QString" name="use_custom_dash" value="1"/>
+            <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
           </Option>
-          <prop k="align_dash_pattern" v="0"/>
-          <prop k="capstyle" v="round"/>
-          <prop k="customdash" v="5;2"/>
-          <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-          <prop k="customdash_unit" v="MM"/>
-          <prop k="dash_pattern_offset" v="0"/>
-          <prop k="dash_pattern_offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-          <prop k="dash_pattern_offset_unit" v="MM"/>
-          <prop k="draw_inside_polygon" v="0"/>
-          <prop k="joinstyle" v="round"/>
-          <prop k="line_color" v="18,169,203,255"/>
-          <prop k="line_style" v="solid"/>
-          <prop k="line_width" v="1"/>
-          <prop k="line_width_unit" v="MM"/>
-          <prop k="offset" v="0"/>
-          <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-          <prop k="offset_unit" v="MM"/>
-          <prop k="ring_filter" v="0"/>
-          <prop k="trim_distance_end" v="0"/>
-          <prop k="trim_distance_end_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-          <prop k="trim_distance_end_unit" v="MM"/>
-          <prop k="trim_distance_start" v="0"/>
-          <prop k="trim_distance_start_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-          <prop k="trim_distance_start_unit" v="MM"/>
-          <prop k="tweak_dash_pattern_on_corners" v="0"/>
-          <prop k="use_custom_dash" v="0"/>
-          <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-          <effect type="effectStack" enabled="1">
-            <effect type="dropShadow">
-              <Option type="Map">
-                <Option name="blend_mode" type="QString" value="13"/>
-                <Option name="blur_level" type="QString" value="1"/>
-                <Option name="blur_unit" type="QString" value="MM"/>
-                <Option name="blur_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="0,0,0,255"/>
-                <Option name="draw_mode" type="QString" value="2"/>
-                <Option name="enabled" type="QString" value="1"/>
-                <Option name="offset_angle" type="QString" value="135"/>
-                <Option name="offset_distance" type="QString" value="1"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="offset_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="opacity" type="QString" value="1"/>
-              </Option>
-              <prop k="blend_mode" v="13"/>
-              <prop k="blur_level" v="1"/>
-              <prop k="blur_unit" v="MM"/>
-              <prop k="blur_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="0,0,0,255"/>
-              <prop k="draw_mode" v="2"/>
-              <prop k="enabled" v="1"/>
-              <prop k="offset_angle" v="135"/>
-              <prop k="offset_distance" v="1"/>
-              <prop k="offset_unit" v="MM"/>
-              <prop k="offset_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="opacity" v="1"/>
-            </effect>
-            <effect type="outerGlow">
-              <Option type="Map">
-                <Option name="blend_mode" type="QString" value="0"/>
-                <Option name="blur_level" type="QString" value="2.645"/>
-                <Option name="blur_unit" type="QString" value="MM"/>
-                <Option name="blur_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color1" type="QString" value="69,116,40,255"/>
-                <Option name="color2" type="QString" value="188,220,60,255"/>
-                <Option name="color_type" type="QString" value="0"/>
-                <Option name="discrete" type="QString" value="0"/>
-                <Option name="draw_mode" type="QString" value="2"/>
-                <Option name="enabled" type="QString" value="0"/>
-                <Option name="opacity" type="QString" value="0.5"/>
-                <Option name="rampType" type="QString" value="gradient"/>
-                <Option name="single_color" type="QString" value="255,255,255,255"/>
-                <Option name="spread" type="QString" value="2"/>
-                <Option name="spread_unit" type="QString" value="MM"/>
-                <Option name="spread_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              </Option>
-              <prop k="blend_mode" v="0"/>
-              <prop k="blur_level" v="2.645"/>
-              <prop k="blur_unit" v="MM"/>
-              <prop k="blur_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color1" v="69,116,40,255"/>
-              <prop k="color2" v="188,220,60,255"/>
-              <prop k="color_type" v="0"/>
-              <prop k="discrete" v="0"/>
-              <prop k="draw_mode" v="2"/>
-              <prop k="enabled" v="0"/>
-              <prop k="opacity" v="0.5"/>
-              <prop k="rampType" v="gradient"/>
-              <prop k="single_color" v="255,255,255,255"/>
-              <prop k="spread" v="2"/>
-              <prop k="spread_unit" v="MM"/>
-              <prop k="spread_unit_scale" v="3x:0,0,0,0,0,0"/>
-            </effect>
-            <effect type="drawSource">
-              <Option type="Map">
-                <Option name="blend_mode" type="QString" value="0"/>
-                <Option name="draw_mode" type="QString" value="2"/>
-                <Option name="enabled" type="QString" value="1"/>
-                <Option name="opacity" type="QString" value="1"/>
-              </Option>
-              <prop k="blend_mode" v="0"/>
-              <prop k="draw_mode" v="2"/>
-              <prop k="enabled" v="1"/>
-              <prop k="opacity" v="1"/>
-            </effect>
-            <effect type="innerShadow">
-              <Option type="Map">
-                <Option name="blend_mode" type="QString" value="13"/>
-                <Option name="blur_level" type="QString" value="2.645"/>
-                <Option name="blur_unit" type="QString" value="MM"/>
-                <Option name="blur_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="0,0,0,255"/>
-                <Option name="draw_mode" type="QString" value="2"/>
-                <Option name="enabled" type="QString" value="0"/>
-                <Option name="offset_angle" type="QString" value="135"/>
-                <Option name="offset_distance" type="QString" value="2"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="offset_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="opacity" type="QString" value="1"/>
-              </Option>
-              <prop k="blend_mode" v="13"/>
-              <prop k="blur_level" v="2.645"/>
-              <prop k="blur_unit" v="MM"/>
-              <prop k="blur_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="0,0,0,255"/>
-              <prop k="draw_mode" v="2"/>
-              <prop k="enabled" v="0"/>
-              <prop k="offset_angle" v="135"/>
-              <prop k="offset_distance" v="2"/>
-              <prop k="offset_unit" v="MM"/>
-              <prop k="offset_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="opacity" v="1"/>
-            </effect>
-            <effect type="innerGlow">
-              <Option type="Map">
-                <Option name="blend_mode" type="QString" value="0"/>
-                <Option name="blur_level" type="QString" value="2.645"/>
-                <Option name="blur_unit" type="QString" value="MM"/>
-                <Option name="blur_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color1" type="QString" value="69,116,40,255"/>
-                <Option name="color2" type="QString" value="188,220,60,255"/>
-                <Option name="color_type" type="QString" value="0"/>
-                <Option name="discrete" type="QString" value="0"/>
-                <Option name="draw_mode" type="QString" value="2"/>
-                <Option name="enabled" type="QString" value="0"/>
-                <Option name="opacity" type="QString" value="0.5"/>
-                <Option name="rampType" type="QString" value="gradient"/>
-                <Option name="single_color" type="QString" value="255,255,255,255"/>
-                <Option name="spread" type="QString" value="2"/>
-                <Option name="spread_unit" type="QString" value="MM"/>
-                <Option name="spread_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              </Option>
-              <prop k="blend_mode" v="0"/>
-              <prop k="blur_level" v="2.645"/>
-              <prop k="blur_unit" v="MM"/>
-              <prop k="blur_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color1" v="69,116,40,255"/>
-              <prop k="color2" v="188,220,60,255"/>
-              <prop k="color_type" v="0"/>
-              <prop k="discrete" v="0"/>
-              <prop k="draw_mode" v="2"/>
-              <prop k="enabled" v="0"/>
-              <prop k="opacity" v="0.5"/>
-              <prop k="rampType" v="gradient"/>
-              <prop k="single_color" v="255,255,255,255"/>
-              <prop k="spread" v="2"/>
-              <prop k="spread_unit" v="MM"/>
-              <prop k="spread_unit_scale" v="3x:0,0,0,0,0,0"/>
-            </effect>
-          </effect>
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
         </layer>
       </symbol>
-      <symbol name="2" type="line" clip_to_extent="1" force_rhr="0" alpha="1">
+      <symbol type="line" clip_to_extent="1" name="2" is_animated="0" alpha="1" force_rhr="0" frame_rate="10">
         <data_defined_properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data_defined_properties>
-        <layer locked="0" class="SimpleLine" pass="0" enabled="1">
+        <layer class="SimpleLine" locked="0" enabled="1" id="{c643dd5b-b33e-48cd-ae81-580b2c3c60be}" pass="0">
           <Option type="Map">
-            <Option name="align_dash_pattern" type="QString" value="0"/>
-            <Option name="capstyle" type="QString" value="round"/>
-            <Option name="customdash" type="QString" value="5;2"/>
-            <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-            <Option name="customdash_unit" type="QString" value="MM"/>
-            <Option name="dash_pattern_offset" type="QString" value="0"/>
-            <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-            <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-            <Option name="draw_inside_polygon" type="QString" value="0"/>
-            <Option name="joinstyle" type="QString" value="round"/>
-            <Option name="line_color" type="QString" value="190,102,234,255"/>
-            <Option name="line_style" type="QString" value="solid"/>
-            <Option name="line_width" type="QString" value="1"/>
-            <Option name="line_width_unit" type="QString" value="MM"/>
-            <Option name="offset" type="QString" value="0"/>
-            <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-            <Option name="offset_unit" type="QString" value="MM"/>
-            <Option name="ring_filter" type="QString" value="0"/>
-            <Option name="trim_distance_end" type="QString" value="0"/>
-            <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-            <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-            <Option name="trim_distance_start" type="QString" value="0"/>
-            <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-            <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-            <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-            <Option name="use_custom_dash" type="QString" value="0"/>
-            <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="align_dash_pattern" value="0"/>
+            <Option type="QString" name="capstyle" value="square"/>
+            <Option type="QString" name="customdash" value="0.5;1"/>
+            <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="customdash_unit" value="MM"/>
+            <Option type="QString" name="dash_pattern_offset" value="0"/>
+            <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+            <Option type="QString" name="draw_inside_polygon" value="0"/>
+            <Option type="QString" name="joinstyle" value="bevel"/>
+            <Option type="QString" name="line_color" value="25,215,38,255"/>
+            <Option type="QString" name="line_style" value="dot"/>
+            <Option type="QString" name="line_width" value="0.66"/>
+            <Option type="QString" name="line_width_unit" value="MM"/>
+            <Option type="QString" name="offset" value="0"/>
+            <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="offset_unit" value="MM"/>
+            <Option type="QString" name="ring_filter" value="0"/>
+            <Option type="QString" name="trim_distance_end" value="0"/>
+            <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+            <Option type="QString" name="trim_distance_start" value="0"/>
+            <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+            <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+            <Option type="QString" name="use_custom_dash" value="1"/>
+            <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
           </Option>
-          <prop k="align_dash_pattern" v="0"/>
-          <prop k="capstyle" v="round"/>
-          <prop k="customdash" v="5;2"/>
-          <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-          <prop k="customdash_unit" v="MM"/>
-          <prop k="dash_pattern_offset" v="0"/>
-          <prop k="dash_pattern_offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-          <prop k="dash_pattern_offset_unit" v="MM"/>
-          <prop k="draw_inside_polygon" v="0"/>
-          <prop k="joinstyle" v="round"/>
-          <prop k="line_color" v="190,102,234,255"/>
-          <prop k="line_style" v="solid"/>
-          <prop k="line_width" v="1"/>
-          <prop k="line_width_unit" v="MM"/>
-          <prop k="offset" v="0"/>
-          <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-          <prop k="offset_unit" v="MM"/>
-          <prop k="ring_filter" v="0"/>
-          <prop k="trim_distance_end" v="0"/>
-          <prop k="trim_distance_end_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-          <prop k="trim_distance_end_unit" v="MM"/>
-          <prop k="trim_distance_start" v="0"/>
-          <prop k="trim_distance_start_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-          <prop k="trim_distance_start_unit" v="MM"/>
-          <prop k="tweak_dash_pattern_on_corners" v="0"/>
-          <prop k="use_custom_dash" v="0"/>
-          <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-          <effect type="effectStack" enabled="1">
-            <effect type="dropShadow">
-              <Option type="Map">
-                <Option name="blend_mode" type="QString" value="13"/>
-                <Option name="blur_level" type="QString" value="1"/>
-                <Option name="blur_unit" type="QString" value="MM"/>
-                <Option name="blur_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="0,0,0,255"/>
-                <Option name="draw_mode" type="QString" value="2"/>
-                <Option name="enabled" type="QString" value="1"/>
-                <Option name="offset_angle" type="QString" value="135"/>
-                <Option name="offset_distance" type="QString" value="1"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="offset_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="opacity" type="QString" value="1"/>
-              </Option>
-              <prop k="blend_mode" v="13"/>
-              <prop k="blur_level" v="1"/>
-              <prop k="blur_unit" v="MM"/>
-              <prop k="blur_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="0,0,0,255"/>
-              <prop k="draw_mode" v="2"/>
-              <prop k="enabled" v="1"/>
-              <prop k="offset_angle" v="135"/>
-              <prop k="offset_distance" v="1"/>
-              <prop k="offset_unit" v="MM"/>
-              <prop k="offset_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="opacity" v="1"/>
-            </effect>
-            <effect type="outerGlow">
-              <Option type="Map">
-                <Option name="blend_mode" type="QString" value="0"/>
-                <Option name="blur_level" type="QString" value="2.645"/>
-                <Option name="blur_unit" type="QString" value="MM"/>
-                <Option name="blur_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color1" type="QString" value="69,116,40,255"/>
-                <Option name="color2" type="QString" value="188,220,60,255"/>
-                <Option name="color_type" type="QString" value="0"/>
-                <Option name="discrete" type="QString" value="0"/>
-                <Option name="draw_mode" type="QString" value="2"/>
-                <Option name="enabled" type="QString" value="0"/>
-                <Option name="opacity" type="QString" value="0.5"/>
-                <Option name="rampType" type="QString" value="gradient"/>
-                <Option name="single_color" type="QString" value="255,255,255,255"/>
-                <Option name="spread" type="QString" value="2"/>
-                <Option name="spread_unit" type="QString" value="MM"/>
-                <Option name="spread_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              </Option>
-              <prop k="blend_mode" v="0"/>
-              <prop k="blur_level" v="2.645"/>
-              <prop k="blur_unit" v="MM"/>
-              <prop k="blur_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color1" v="69,116,40,255"/>
-              <prop k="color2" v="188,220,60,255"/>
-              <prop k="color_type" v="0"/>
-              <prop k="discrete" v="0"/>
-              <prop k="draw_mode" v="2"/>
-              <prop k="enabled" v="0"/>
-              <prop k="opacity" v="0.5"/>
-              <prop k="rampType" v="gradient"/>
-              <prop k="single_color" v="255,255,255,255"/>
-              <prop k="spread" v="2"/>
-              <prop k="spread_unit" v="MM"/>
-              <prop k="spread_unit_scale" v="3x:0,0,0,0,0,0"/>
-            </effect>
-            <effect type="drawSource">
-              <Option type="Map">
-                <Option name="blend_mode" type="QString" value="0"/>
-                <Option name="draw_mode" type="QString" value="2"/>
-                <Option name="enabled" type="QString" value="1"/>
-                <Option name="opacity" type="QString" value="1"/>
-              </Option>
-              <prop k="blend_mode" v="0"/>
-              <prop k="draw_mode" v="2"/>
-              <prop k="enabled" v="1"/>
-              <prop k="opacity" v="1"/>
-            </effect>
-            <effect type="innerShadow">
-              <Option type="Map">
-                <Option name="blend_mode" type="QString" value="13"/>
-                <Option name="blur_level" type="QString" value="2.645"/>
-                <Option name="blur_unit" type="QString" value="MM"/>
-                <Option name="blur_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="0,0,0,255"/>
-                <Option name="draw_mode" type="QString" value="2"/>
-                <Option name="enabled" type="QString" value="0"/>
-                <Option name="offset_angle" type="QString" value="135"/>
-                <Option name="offset_distance" type="QString" value="2"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="offset_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="opacity" type="QString" value="1"/>
-              </Option>
-              <prop k="blend_mode" v="13"/>
-              <prop k="blur_level" v="2.645"/>
-              <prop k="blur_unit" v="MM"/>
-              <prop k="blur_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="0,0,0,255"/>
-              <prop k="draw_mode" v="2"/>
-              <prop k="enabled" v="0"/>
-              <prop k="offset_angle" v="135"/>
-              <prop k="offset_distance" v="2"/>
-              <prop k="offset_unit" v="MM"/>
-              <prop k="offset_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="opacity" v="1"/>
-            </effect>
-            <effect type="innerGlow">
-              <Option type="Map">
-                <Option name="blend_mode" type="QString" value="0"/>
-                <Option name="blur_level" type="QString" value="2.645"/>
-                <Option name="blur_unit" type="QString" value="MM"/>
-                <Option name="blur_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color1" type="QString" value="69,116,40,255"/>
-                <Option name="color2" type="QString" value="188,220,60,255"/>
-                <Option name="color_type" type="QString" value="0"/>
-                <Option name="discrete" type="QString" value="0"/>
-                <Option name="draw_mode" type="QString" value="2"/>
-                <Option name="enabled" type="QString" value="0"/>
-                <Option name="opacity" type="QString" value="0.5"/>
-                <Option name="rampType" type="QString" value="gradient"/>
-                <Option name="single_color" type="QString" value="255,255,255,255"/>
-                <Option name="spread" type="QString" value="2"/>
-                <Option name="spread_unit" type="QString" value="MM"/>
-                <Option name="spread_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              </Option>
-              <prop k="blend_mode" v="0"/>
-              <prop k="blur_level" v="2.645"/>
-              <prop k="blur_unit" v="MM"/>
-              <prop k="blur_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color1" v="69,116,40,255"/>
-              <prop k="color2" v="188,220,60,255"/>
-              <prop k="color_type" v="0"/>
-              <prop k="discrete" v="0"/>
-              <prop k="draw_mode" v="2"/>
-              <prop k="enabled" v="0"/>
-              <prop k="opacity" v="0.5"/>
-              <prop k="rampType" v="gradient"/>
-              <prop k="single_color" v="255,255,255,255"/>
-              <prop k="spread" v="2"/>
-              <prop k="spread_unit" v="MM"/>
-              <prop k="spread_unit_scale" v="3x:0,0,0,0,0,0"/>
-            </effect>
-          </effect>
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
+            </Option>
+          </data_defined_properties>
+        </layer>
+      </symbol>
+      <symbol type="line" clip_to_extent="1" name="3" is_animated="0" alpha="1" force_rhr="0" frame_rate="10">
+        <data_defined_properties>
+          <Option type="Map">
+            <Option type="QString" name="name" value=""/>
+            <Option name="properties"/>
+            <Option type="QString" name="type" value="collection"/>
+          </Option>
+        </data_defined_properties>
+        <layer class="SimpleLine" locked="0" enabled="1" id="{c643dd5b-b33e-48cd-ae81-580b2c3c60be}" pass="0">
+          <Option type="Map">
+            <Option type="QString" name="align_dash_pattern" value="0"/>
+            <Option type="QString" name="capstyle" value="square"/>
+            <Option type="QString" name="customdash" value="5;2"/>
+            <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="customdash_unit" value="MM"/>
+            <Option type="QString" name="dash_pattern_offset" value="0"/>
+            <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+            <Option type="QString" name="draw_inside_polygon" value="0"/>
+            <Option type="QString" name="joinstyle" value="bevel"/>
+            <Option type="QString" name="line_color" value="33,213,102,255"/>
+            <Option type="QString" name="line_style" value="solid"/>
+            <Option type="QString" name="line_width" value="0.26"/>
+            <Option type="QString" name="line_width_unit" value="MM"/>
+            <Option type="QString" name="offset" value="0"/>
+            <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="offset_unit" value="MM"/>
+            <Option type="QString" name="ring_filter" value="0"/>
+            <Option type="QString" name="trim_distance_end" value="0"/>
+            <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+            <Option type="QString" name="trim_distance_start" value="0"/>
+            <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+            <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+            <Option type="QString" name="use_custom_dash" value="0"/>
+            <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+          </Option>
+          <data_defined_properties>
+            <Option type="Map">
+              <Option type="QString" name="name" value=""/>
+              <Option name="properties"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
         </layer>
       </symbol>
     </symbols>
     <source-symbol>
-      <symbol name="0" type="line" clip_to_extent="1" force_rhr="0" alpha="1">
+      <symbol type="line" clip_to_extent="1" name="0" is_animated="0" alpha="1" force_rhr="0" frame_rate="10">
         <data_defined_properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data_defined_properties>
-        <layer locked="0" class="SimpleLine" pass="0" enabled="1">
+        <layer class="SimpleLine" locked="0" enabled="1" id="{c643dd5b-b33e-48cd-ae81-580b2c3c60be}" pass="0">
           <Option type="Map">
-            <Option name="align_dash_pattern" type="QString" value="0"/>
-            <Option name="capstyle" type="QString" value="round"/>
-            <Option name="customdash" type="QString" value="5;2"/>
-            <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-            <Option name="customdash_unit" type="QString" value="MM"/>
-            <Option name="dash_pattern_offset" type="QString" value="0"/>
-            <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-            <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-            <Option name="draw_inside_polygon" type="QString" value="0"/>
-            <Option name="joinstyle" type="QString" value="round"/>
-            <Option name="line_color" type="QString" value="133,182,111,255"/>
-            <Option name="line_style" type="QString" value="solid"/>
-            <Option name="line_width" type="QString" value="1"/>
-            <Option name="line_width_unit" type="QString" value="MM"/>
-            <Option name="offset" type="QString" value="0"/>
-            <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-            <Option name="offset_unit" type="QString" value="MM"/>
-            <Option name="ring_filter" type="QString" value="0"/>
-            <Option name="trim_distance_end" type="QString" value="0"/>
-            <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-            <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-            <Option name="trim_distance_start" type="QString" value="0"/>
-            <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-            <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-            <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-            <Option name="use_custom_dash" type="QString" value="0"/>
-            <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="align_dash_pattern" value="0"/>
+            <Option type="QString" name="capstyle" value="square"/>
+            <Option type="QString" name="customdash" value="5;2"/>
+            <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="customdash_unit" value="MM"/>
+            <Option type="QString" name="dash_pattern_offset" value="0"/>
+            <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+            <Option type="QString" name="draw_inside_polygon" value="0"/>
+            <Option type="QString" name="joinstyle" value="bevel"/>
+            <Option type="QString" name="line_color" value="164,113,88,255"/>
+            <Option type="QString" name="line_style" value="solid"/>
+            <Option type="QString" name="line_width" value="0.26"/>
+            <Option type="QString" name="line_width_unit" value="MM"/>
+            <Option type="QString" name="offset" value="0"/>
+            <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="offset_unit" value="MM"/>
+            <Option type="QString" name="ring_filter" value="0"/>
+            <Option type="QString" name="trim_distance_end" value="0"/>
+            <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+            <Option type="QString" name="trim_distance_start" value="0"/>
+            <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+            <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+            <Option type="QString" name="use_custom_dash" value="0"/>
+            <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
           </Option>
-          <prop k="align_dash_pattern" v="0"/>
-          <prop k="capstyle" v="round"/>
-          <prop k="customdash" v="5;2"/>
-          <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-          <prop k="customdash_unit" v="MM"/>
-          <prop k="dash_pattern_offset" v="0"/>
-          <prop k="dash_pattern_offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-          <prop k="dash_pattern_offset_unit" v="MM"/>
-          <prop k="draw_inside_polygon" v="0"/>
-          <prop k="joinstyle" v="round"/>
-          <prop k="line_color" v="133,182,111,255"/>
-          <prop k="line_style" v="solid"/>
-          <prop k="line_width" v="1"/>
-          <prop k="line_width_unit" v="MM"/>
-          <prop k="offset" v="0"/>
-          <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-          <prop k="offset_unit" v="MM"/>
-          <prop k="ring_filter" v="0"/>
-          <prop k="trim_distance_end" v="0"/>
-          <prop k="trim_distance_end_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-          <prop k="trim_distance_end_unit" v="MM"/>
-          <prop k="trim_distance_start" v="0"/>
-          <prop k="trim_distance_start_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-          <prop k="trim_distance_start_unit" v="MM"/>
-          <prop k="tweak_dash_pattern_on_corners" v="0"/>
-          <prop k="use_custom_dash" v="0"/>
-          <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-          <effect type="effectStack" enabled="1">
-            <effect type="dropShadow">
-              <Option type="Map">
-                <Option name="blend_mode" type="QString" value="13"/>
-                <Option name="blur_level" type="QString" value="1"/>
-                <Option name="blur_unit" type="QString" value="MM"/>
-                <Option name="blur_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="0,0,0,255"/>
-                <Option name="draw_mode" type="QString" value="2"/>
-                <Option name="enabled" type="QString" value="1"/>
-                <Option name="offset_angle" type="QString" value="135"/>
-                <Option name="offset_distance" type="QString" value="1"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="offset_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="opacity" type="QString" value="1"/>
-              </Option>
-              <prop k="blend_mode" v="13"/>
-              <prop k="blur_level" v="1"/>
-              <prop k="blur_unit" v="MM"/>
-              <prop k="blur_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="0,0,0,255"/>
-              <prop k="draw_mode" v="2"/>
-              <prop k="enabled" v="1"/>
-              <prop k="offset_angle" v="135"/>
-              <prop k="offset_distance" v="1"/>
-              <prop k="offset_unit" v="MM"/>
-              <prop k="offset_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="opacity" v="1"/>
-            </effect>
-            <effect type="outerGlow">
-              <Option type="Map">
-                <Option name="blend_mode" type="QString" value="0"/>
-                <Option name="blur_level" type="QString" value="2.645"/>
-                <Option name="blur_unit" type="QString" value="MM"/>
-                <Option name="blur_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color1" type="QString" value="69,116,40,255"/>
-                <Option name="color2" type="QString" value="188,220,60,255"/>
-                <Option name="color_type" type="QString" value="0"/>
-                <Option name="discrete" type="QString" value="0"/>
-                <Option name="draw_mode" type="QString" value="2"/>
-                <Option name="enabled" type="QString" value="0"/>
-                <Option name="opacity" type="QString" value="0.5"/>
-                <Option name="rampType" type="QString" value="gradient"/>
-                <Option name="single_color" type="QString" value="255,255,255,255"/>
-                <Option name="spread" type="QString" value="2"/>
-                <Option name="spread_unit" type="QString" value="MM"/>
-                <Option name="spread_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              </Option>
-              <prop k="blend_mode" v="0"/>
-              <prop k="blur_level" v="2.645"/>
-              <prop k="blur_unit" v="MM"/>
-              <prop k="blur_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color1" v="69,116,40,255"/>
-              <prop k="color2" v="188,220,60,255"/>
-              <prop k="color_type" v="0"/>
-              <prop k="discrete" v="0"/>
-              <prop k="draw_mode" v="2"/>
-              <prop k="enabled" v="0"/>
-              <prop k="opacity" v="0.5"/>
-              <prop k="rampType" v="gradient"/>
-              <prop k="single_color" v="255,255,255,255"/>
-              <prop k="spread" v="2"/>
-              <prop k="spread_unit" v="MM"/>
-              <prop k="spread_unit_scale" v="3x:0,0,0,0,0,0"/>
-            </effect>
-            <effect type="drawSource">
-              <Option type="Map">
-                <Option name="blend_mode" type="QString" value="0"/>
-                <Option name="draw_mode" type="QString" value="2"/>
-                <Option name="enabled" type="QString" value="1"/>
-                <Option name="opacity" type="QString" value="1"/>
-              </Option>
-              <prop k="blend_mode" v="0"/>
-              <prop k="draw_mode" v="2"/>
-              <prop k="enabled" v="1"/>
-              <prop k="opacity" v="1"/>
-            </effect>
-            <effect type="innerShadow">
-              <Option type="Map">
-                <Option name="blend_mode" type="QString" value="13"/>
-                <Option name="blur_level" type="QString" value="2.645"/>
-                <Option name="blur_unit" type="QString" value="MM"/>
-                <Option name="blur_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="0,0,0,255"/>
-                <Option name="draw_mode" type="QString" value="2"/>
-                <Option name="enabled" type="QString" value="0"/>
-                <Option name="offset_angle" type="QString" value="135"/>
-                <Option name="offset_distance" type="QString" value="2"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="offset_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="opacity" type="QString" value="1"/>
-              </Option>
-              <prop k="blend_mode" v="13"/>
-              <prop k="blur_level" v="2.645"/>
-              <prop k="blur_unit" v="MM"/>
-              <prop k="blur_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="0,0,0,255"/>
-              <prop k="draw_mode" v="2"/>
-              <prop k="enabled" v="0"/>
-              <prop k="offset_angle" v="135"/>
-              <prop k="offset_distance" v="2"/>
-              <prop k="offset_unit" v="MM"/>
-              <prop k="offset_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="opacity" v="1"/>
-            </effect>
-            <effect type="innerGlow">
-              <Option type="Map">
-                <Option name="blend_mode" type="QString" value="0"/>
-                <Option name="blur_level" type="QString" value="2.645"/>
-                <Option name="blur_unit" type="QString" value="MM"/>
-                <Option name="blur_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color1" type="QString" value="69,116,40,255"/>
-                <Option name="color2" type="QString" value="188,220,60,255"/>
-                <Option name="color_type" type="QString" value="0"/>
-                <Option name="discrete" type="QString" value="0"/>
-                <Option name="draw_mode" type="QString" value="2"/>
-                <Option name="enabled" type="QString" value="0"/>
-                <Option name="opacity" type="QString" value="0.5"/>
-                <Option name="rampType" type="QString" value="gradient"/>
-                <Option name="single_color" type="QString" value="255,255,255,255"/>
-                <Option name="spread" type="QString" value="2"/>
-                <Option name="spread_unit" type="QString" value="MM"/>
-                <Option name="spread_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              </Option>
-              <prop k="blend_mode" v="0"/>
-              <prop k="blur_level" v="2.645"/>
-              <prop k="blur_unit" v="MM"/>
-              <prop k="blur_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color1" v="69,116,40,255"/>
-              <prop k="color2" v="188,220,60,255"/>
-              <prop k="color_type" v="0"/>
-              <prop k="discrete" v="0"/>
-              <prop k="draw_mode" v="2"/>
-              <prop k="enabled" v="0"/>
-              <prop k="opacity" v="0.5"/>
-              <prop k="rampType" v="gradient"/>
-              <prop k="single_color" v="255,255,255,255"/>
-              <prop k="spread" v="2"/>
-              <prop k="spread_unit" v="MM"/>
-              <prop k="spread_unit_scale" v="3x:0,0,0,0,0,0"/>
-            </effect>
-          </effect>
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
         </layer>
@@ -877,8 +249,144 @@
     <rotation/>
     <sizescale/>
   </renderer-v2>
+  <selection mode="Default">
+    <selectionColor invalid="1"/>
+    <selectionSymbol>
+      <symbol type="line" clip_to_extent="1" name="" is_animated="0" alpha="1" force_rhr="0" frame_rate="10">
+        <data_defined_properties>
+          <Option type="Map">
+            <Option type="QString" name="name" value=""/>
+            <Option name="properties"/>
+            <Option type="QString" name="type" value="collection"/>
+          </Option>
+        </data_defined_properties>
+        <layer class="SimpleLine" locked="0" enabled="1" id="{374f04df-fcbd-48e7-b6b4-e96761c9cfab}" pass="0">
+          <Option type="Map">
+            <Option type="QString" name="align_dash_pattern" value="0"/>
+            <Option type="QString" name="capstyle" value="square"/>
+            <Option type="QString" name="customdash" value="5;2"/>
+            <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="customdash_unit" value="MM"/>
+            <Option type="QString" name="dash_pattern_offset" value="0"/>
+            <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+            <Option type="QString" name="draw_inside_polygon" value="0"/>
+            <Option type="QString" name="joinstyle" value="bevel"/>
+            <Option type="QString" name="line_color" value="35,35,35,255"/>
+            <Option type="QString" name="line_style" value="solid"/>
+            <Option type="QString" name="line_width" value="0.26"/>
+            <Option type="QString" name="line_width_unit" value="MM"/>
+            <Option type="QString" name="offset" value="0"/>
+            <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="offset_unit" value="MM"/>
+            <Option type="QString" name="ring_filter" value="0"/>
+            <Option type="QString" name="trim_distance_end" value="0"/>
+            <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+            <Option type="QString" name="trim_distance_start" value="0"/>
+            <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+            <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+            <Option type="QString" name="use_custom_dash" value="0"/>
+            <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+          </Option>
+          <data_defined_properties>
+            <Option type="Map">
+              <Option type="QString" name="name" value=""/>
+              <Option name="properties"/>
+              <Option type="QString" name="type" value="collection"/>
+            </Option>
+          </data_defined_properties>
+        </layer>
+      </symbol>
+    </selectionSymbol>
+  </selection>
+  <labeling type="simple">
+    <settings calloutType="simple">
+      <text-style fieldName="&quot;dam_state&quot;" capitalization="0" fontSizeUnit="Point" fontWeight="16" textColor="0,0,0,255" isExpression="1" previewBkgrdColor="255,255,255,255" multilineHeightUnit="Percentage" textOrientation="horizontal" fontItalic="0" blendMode="0" namedStyle="" textOpacity="1" forcedBold="0" fontKerning="1" useSubstitutions="0" fontLetterSpacing="0" legendString="Aa" fontStrikeout="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" fontSize="8" fontFamily="Arial" fontUnderline="0" multilineHeight="1" allowHtml="0">
+        <families/>
+        <text-buffer bufferColor="255,255,255,255" bufferSizeUnits="Point" bufferOpacity="1" bufferSize="2" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferDraw="0" bufferBlendMode="0" bufferJoinStyle="128"/>
+        <text-mask maskOpacity="1" maskSize="1.5" maskType="0" maskJoinStyle="128" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskedSymbolLayers=""/>
+        <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeDraw="0" shapeRotationType="0" shapeJoinStyle="64" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeSizeY="0" shapeRadiiUnit="MM" shapeBlendMode="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSizeType="0" shapeType="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeBorderWidthUnit="MM">
+          <symbol type="fill" clip_to_extent="1" name="fillSymbol" is_animated="0" alpha="1" force_rhr="0" frame_rate="10">
+            <data_defined_properties>
+              <Option type="Map">
+                <Option type="QString" name="name" value=""/>
+                <Option name="properties"/>
+                <Option type="QString" name="type" value="collection"/>
+              </Option>
+            </data_defined_properties>
+            <layer class="SimpleFill" locked="0" enabled="1" id="" pass="0">
+              <Option type="Map">
+                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color" value="255,255,255,255"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                <Option type="QString" name="outline_style" value="no"/>
+                <Option type="QString" name="outline_width" value="0"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="style" value="solid"/>
+              </Option>
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option type="QString" name="name" value=""/>
+                  <Option name="properties"/>
+                  <Option type="QString" name="type" value="collection"/>
+                </Option>
+              </data_defined_properties>
+            </layer>
+          </symbol>
+        </background>
+        <shadow shadowRadius="1.5" shadowScale="100" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowOffsetUnit="MM"/>
+        <dd_properties>
+          <Option type="Map">
+            <Option type="QString" name="name" value=""/>
+            <Option name="properties"/>
+            <Option type="QString" name="type" value="collection"/>
+          </Option>
+        </dd_properties>
+        <substitutions/>
+      </text-style>
+      <text-format wrapChar="" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" reverseDirectionSymbol="0" decimals="3" rightDirectionSymbol=">" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" multilineAlign="1" autoWrapLength="0" plussign="0"/>
+      <placement maxCurvedCharAngleIn="25" polygonPlacementFlags="2" fitInPolygonOnly="0" layerType="UnknownGeometry" placementFlags="10" preserveRotation="1" centroidWhole="0" rotationAngle="0" offsetType="1" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" overrunDistance="0" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-25" distUnits="Point" geometryGenerator="" rotationUnit="AngleDegrees" placement="2" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGeneratorEnabled="0" centroidInside="0" offsetUnits="MM" yOffset="0" priority="2" overlapHandling="PreventOverlap" allowDegraded="0" quadOffset="4" xOffset="0" repeatDistanceUnits="MM" geometryGeneratorType="PointGeometry" lineAnchorClipping="0" dist="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorType="0" overrunDistanceUnit="MM"/>
+      <rendering scaleMax="0" fontLimitPixelSize="0" limitNumLabels="0" drawLabels="1" scaleMin="0" obstacle="0" mergeLines="0" unplacedVisibility="0" fontMaxPixelSize="10000" fontMinPixelSize="0" obstacleType="1" upsidedownLabels="0" maxNumLabels="2000" minFeatureSize="0" scaleVisibility="0" obstacleFactor="0" labelPerPart="0" zIndex="0"/>
+      <dd_properties>
+        <Option type="Map">
+          <Option type="QString" name="name" value=""/>
+          <Option name="properties"/>
+          <Option type="QString" name="type" value="collection"/>
+        </Option>
+      </dd_properties>
+      <callout type="simple">
+        <Option type="Map">
+          <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
+          <Option type="int" name="blendMode" value="0"/>
+          <Option type="Map" name="ddProperties">
+            <Option type="QString" name="name" value=""/>
+            <Option name="properties"/>
+            <Option type="QString" name="type" value="collection"/>
+          </Option>
+          <Option type="bool" name="drawToAllParts" value="false"/>
+          <Option type="QString" name="enabled" value="0"/>
+          <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
+          <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; clip_to_extent=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; id=&quot;{4de5e1d1-8807-4dc6-8da2-56cdca08942b}&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+          <Option type="double" name="minLength" value="0"/>
+          <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+          <Option type="QString" name="minLengthUnit" value="MM"/>
+          <Option type="double" name="offsetFromAnchor" value="0"/>
+          <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+          <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+          <Option type="double" name="offsetFromLabel" value="0"/>
+          <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+          <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
+        </Option>
+      </callout>
+    </settings>
+  </labeling>
   <blendMode>0</blendMode>
   <featureBlendMode>0</featureBlendMode>
-  <legend showLabelLegend="0" type="default-vector"/>
   <layerGeometryType>1</layerGeometryType>
 </qgis>
diff --git a/Symbology/qgis/QRiS/risk_potential_lines.qml b/Symbology/qgis/QRiS/risk_potential_lines.qml
index 90224ffc..b0f9edcb 100644
--- a/Symbology/qgis/QRiS/risk_potential_lines.qml
+++ b/Symbology/qgis/QRiS/risk_potential_lines.qml
@@ -1,56 +1,56 @@
 <!DOCTYPE qgis PUBLIC 'http://mrcc.com/qgis.dtd' 'SYSTEM'>
-<qgis styleCategories="Symbology" version="3.34.8-Prizren">
+<qgis version="3.34.8-Prizren" styleCategories="Symbology|Labeling" labelsEnabled="1">
   <renderer-v2 type="categorizedSymbol" referencescale="-1" attr="Risk" symbollevels="0" enableorderby="0" forceraster="0">
     <categories>
-      <category type="string" uuid="{246372a6-108a-4bf2-8fae-317ef6055d47}" value="High" label="High" render="true" symbol="0"/>
-      <category type="string" uuid="{b4140cf5-c8ee-41ac-a379-38e0445d887f}" value="Low" label="Low" render="true" symbol="1"/>
-      <category type="string" uuid="{618a54da-b58e-4b39-a8fb-3bf74f0307c4}" value="Medium" label="Medium" render="true" symbol="2"/>
-      <category type="string" uuid="{6d00e40e-6915-449a-9e68-f888036110b8}" value="" label="" render="true" symbol="3"/>
+      <category type="string" uuid="{246372a6-108a-4bf2-8fae-317ef6055d47}" symbol="0" label="High" value="High" render="true"/>
+      <category type="string" uuid="{b4140cf5-c8ee-41ac-a379-38e0445d887f}" symbol="1" label="Low" value="Low" render="true"/>
+      <category type="string" uuid="{618a54da-b58e-4b39-a8fb-3bf74f0307c4}" symbol="2" label="Medium" value="Medium" render="true"/>
+      <category type="string" uuid="{6d00e40e-6915-449a-9e68-f888036110b8}" symbol="3" label="" value="" render="true"/>
     </categories>
     <symbols>
       <symbol type="line" clip_to_extent="1" name="0" is_animated="0" alpha="1" force_rhr="0" frame_rate="10">
         <data_defined_properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data_defined_properties>
-        <layer pass="0" locked="0" class="SimpleLine" id="{a70bb4ab-07e3-47a9-9ef9-bdb23b4decc4}" enabled="1">
+        <layer class="SimpleLine" locked="0" enabled="1" id="{a70bb4ab-07e3-47a9-9ef9-bdb23b4decc4}" pass="0">
           <Option type="Map">
-            <Option type="QString" value="0" name="align_dash_pattern"/>
-            <Option type="QString" value="square" name="capstyle"/>
-            <Option type="QString" value="5;2" name="customdash"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-            <Option type="QString" value="MM" name="customdash_unit"/>
-            <Option type="QString" value="0" name="dash_pattern_offset"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-            <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-            <Option type="QString" value="0" name="draw_inside_polygon"/>
-            <Option type="QString" value="bevel" name="joinstyle"/>
-            <Option type="QString" value="192,0,0,255" name="line_color"/>
-            <Option type="QString" value="solid" name="line_style"/>
-            <Option type="QString" value="0.66" name="line_width"/>
-            <Option type="QString" value="MM" name="line_width_unit"/>
-            <Option type="QString" value="0" name="offset"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-            <Option type="QString" value="MM" name="offset_unit"/>
-            <Option type="QString" value="0" name="ring_filter"/>
-            <Option type="QString" value="0" name="trim_distance_end"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-            <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-            <Option type="QString" value="0" name="trim_distance_start"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-            <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-            <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-            <Option type="QString" value="0" name="use_custom_dash"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+            <Option type="QString" name="align_dash_pattern" value="0"/>
+            <Option type="QString" name="capstyle" value="square"/>
+            <Option type="QString" name="customdash" value="5;2"/>
+            <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="customdash_unit" value="MM"/>
+            <Option type="QString" name="dash_pattern_offset" value="0"/>
+            <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+            <Option type="QString" name="draw_inside_polygon" value="0"/>
+            <Option type="QString" name="joinstyle" value="bevel"/>
+            <Option type="QString" name="line_color" value="192,0,0,255"/>
+            <Option type="QString" name="line_style" value="solid"/>
+            <Option type="QString" name="line_width" value="0.66"/>
+            <Option type="QString" name="line_width_unit" value="MM"/>
+            <Option type="QString" name="offset" value="0"/>
+            <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="offset_unit" value="MM"/>
+            <Option type="QString" name="ring_filter" value="0"/>
+            <Option type="QString" name="trim_distance_end" value="0"/>
+            <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+            <Option type="QString" name="trim_distance_start" value="0"/>
+            <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+            <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+            <Option type="QString" name="use_custom_dash" value="0"/>
+            <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
           </Option>
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
         </layer>
@@ -58,46 +58,46 @@
       <symbol type="line" clip_to_extent="1" name="1" is_animated="0" alpha="1" force_rhr="0" frame_rate="10">
         <data_defined_properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data_defined_properties>
-        <layer pass="0" locked="0" class="SimpleLine" id="{a70bb4ab-07e3-47a9-9ef9-bdb23b4decc4}" enabled="1">
+        <layer class="SimpleLine" locked="0" enabled="1" id="{a70bb4ab-07e3-47a9-9ef9-bdb23b4decc4}" pass="0">
           <Option type="Map">
-            <Option type="QString" value="0" name="align_dash_pattern"/>
-            <Option type="QString" value="square" name="capstyle"/>
-            <Option type="QString" value="5;2" name="customdash"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-            <Option type="QString" value="MM" name="customdash_unit"/>
-            <Option type="QString" value="0" name="dash_pattern_offset"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-            <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-            <Option type="QString" value="0" name="draw_inside_polygon"/>
-            <Option type="QString" value="bevel" name="joinstyle"/>
-            <Option type="QString" value="0,176,80,255" name="line_color"/>
-            <Option type="QString" value="solid" name="line_style"/>
-            <Option type="QString" value="0.66" name="line_width"/>
-            <Option type="QString" value="MM" name="line_width_unit"/>
-            <Option type="QString" value="0" name="offset"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-            <Option type="QString" value="MM" name="offset_unit"/>
-            <Option type="QString" value="0" name="ring_filter"/>
-            <Option type="QString" value="0" name="trim_distance_end"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-            <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-            <Option type="QString" value="0" name="trim_distance_start"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-            <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-            <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-            <Option type="QString" value="0" name="use_custom_dash"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+            <Option type="QString" name="align_dash_pattern" value="0"/>
+            <Option type="QString" name="capstyle" value="square"/>
+            <Option type="QString" name="customdash" value="5;2"/>
+            <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="customdash_unit" value="MM"/>
+            <Option type="QString" name="dash_pattern_offset" value="0"/>
+            <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+            <Option type="QString" name="draw_inside_polygon" value="0"/>
+            <Option type="QString" name="joinstyle" value="bevel"/>
+            <Option type="QString" name="line_color" value="0,176,80,255"/>
+            <Option type="QString" name="line_style" value="solid"/>
+            <Option type="QString" name="line_width" value="0.66"/>
+            <Option type="QString" name="line_width_unit" value="MM"/>
+            <Option type="QString" name="offset" value="0"/>
+            <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="offset_unit" value="MM"/>
+            <Option type="QString" name="ring_filter" value="0"/>
+            <Option type="QString" name="trim_distance_end" value="0"/>
+            <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+            <Option type="QString" name="trim_distance_start" value="0"/>
+            <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+            <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+            <Option type="QString" name="use_custom_dash" value="0"/>
+            <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
           </Option>
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
         </layer>
@@ -105,46 +105,46 @@
       <symbol type="line" clip_to_extent="1" name="2" is_animated="0" alpha="1" force_rhr="0" frame_rate="10">
         <data_defined_properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data_defined_properties>
-        <layer pass="0" locked="0" class="SimpleLine" id="{a70bb4ab-07e3-47a9-9ef9-bdb23b4decc4}" enabled="1">
+        <layer class="SimpleLine" locked="0" enabled="1" id="{a70bb4ab-07e3-47a9-9ef9-bdb23b4decc4}" pass="0">
           <Option type="Map">
-            <Option type="QString" value="0" name="align_dash_pattern"/>
-            <Option type="QString" value="square" name="capstyle"/>
-            <Option type="QString" value="5;2" name="customdash"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-            <Option type="QString" value="MM" name="customdash_unit"/>
-            <Option type="QString" value="0" name="dash_pattern_offset"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-            <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-            <Option type="QString" value="0" name="draw_inside_polygon"/>
-            <Option type="QString" value="bevel" name="joinstyle"/>
-            <Option type="QString" value="255,255,0,255" name="line_color"/>
-            <Option type="QString" value="solid" name="line_style"/>
-            <Option type="QString" value="0.66" name="line_width"/>
-            <Option type="QString" value="MM" name="line_width_unit"/>
-            <Option type="QString" value="0" name="offset"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-            <Option type="QString" value="MM" name="offset_unit"/>
-            <Option type="QString" value="0" name="ring_filter"/>
-            <Option type="QString" value="0" name="trim_distance_end"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-            <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-            <Option type="QString" value="0" name="trim_distance_start"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-            <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-            <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-            <Option type="QString" value="0" name="use_custom_dash"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+            <Option type="QString" name="align_dash_pattern" value="0"/>
+            <Option type="QString" name="capstyle" value="square"/>
+            <Option type="QString" name="customdash" value="5;2"/>
+            <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="customdash_unit" value="MM"/>
+            <Option type="QString" name="dash_pattern_offset" value="0"/>
+            <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+            <Option type="QString" name="draw_inside_polygon" value="0"/>
+            <Option type="QString" name="joinstyle" value="bevel"/>
+            <Option type="QString" name="line_color" value="255,255,0,255"/>
+            <Option type="QString" name="line_style" value="solid"/>
+            <Option type="QString" name="line_width" value="0.66"/>
+            <Option type="QString" name="line_width_unit" value="MM"/>
+            <Option type="QString" name="offset" value="0"/>
+            <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="offset_unit" value="MM"/>
+            <Option type="QString" name="ring_filter" value="0"/>
+            <Option type="QString" name="trim_distance_end" value="0"/>
+            <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+            <Option type="QString" name="trim_distance_start" value="0"/>
+            <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+            <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+            <Option type="QString" name="use_custom_dash" value="0"/>
+            <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
           </Option>
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
         </layer>
@@ -152,46 +152,46 @@
       <symbol type="line" clip_to_extent="1" name="3" is_animated="0" alpha="1" force_rhr="0" frame_rate="10">
         <data_defined_properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data_defined_properties>
-        <layer pass="0" locked="0" class="SimpleLine" id="{a70bb4ab-07e3-47a9-9ef9-bdb23b4decc4}" enabled="1">
+        <layer class="SimpleLine" locked="0" enabled="1" id="{a70bb4ab-07e3-47a9-9ef9-bdb23b4decc4}" pass="0">
           <Option type="Map">
-            <Option type="QString" value="0" name="align_dash_pattern"/>
-            <Option type="QString" value="square" name="capstyle"/>
-            <Option type="QString" value="5;2" name="customdash"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-            <Option type="QString" value="MM" name="customdash_unit"/>
-            <Option type="QString" value="0" name="dash_pattern_offset"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-            <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-            <Option type="QString" value="0" name="draw_inside_polygon"/>
-            <Option type="QString" value="bevel" name="joinstyle"/>
-            <Option type="QString" value="237,27,191,255" name="line_color"/>
-            <Option type="QString" value="solid" name="line_style"/>
-            <Option type="QString" value="0.66" name="line_width"/>
-            <Option type="QString" value="MM" name="line_width_unit"/>
-            <Option type="QString" value="0" name="offset"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-            <Option type="QString" value="MM" name="offset_unit"/>
-            <Option type="QString" value="0" name="ring_filter"/>
-            <Option type="QString" value="0" name="trim_distance_end"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-            <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-            <Option type="QString" value="0" name="trim_distance_start"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-            <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-            <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-            <Option type="QString" value="0" name="use_custom_dash"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+            <Option type="QString" name="align_dash_pattern" value="0"/>
+            <Option type="QString" name="capstyle" value="square"/>
+            <Option type="QString" name="customdash" value="5;2"/>
+            <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="customdash_unit" value="MM"/>
+            <Option type="QString" name="dash_pattern_offset" value="0"/>
+            <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+            <Option type="QString" name="draw_inside_polygon" value="0"/>
+            <Option type="QString" name="joinstyle" value="bevel"/>
+            <Option type="QString" name="line_color" value="237,27,191,255"/>
+            <Option type="QString" name="line_style" value="solid"/>
+            <Option type="QString" name="line_width" value="0.66"/>
+            <Option type="QString" name="line_width_unit" value="MM"/>
+            <Option type="QString" name="offset" value="0"/>
+            <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="offset_unit" value="MM"/>
+            <Option type="QString" name="ring_filter" value="0"/>
+            <Option type="QString" name="trim_distance_end" value="0"/>
+            <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+            <Option type="QString" name="trim_distance_start" value="0"/>
+            <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+            <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+            <Option type="QString" name="use_custom_dash" value="0"/>
+            <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
           </Option>
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
         </layer>
@@ -201,54 +201,51 @@
       <symbol type="line" clip_to_extent="1" name="0" is_animated="0" alpha="1" force_rhr="0" frame_rate="10">
         <data_defined_properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data_defined_properties>
-        <layer pass="0" locked="0" class="SimpleLine" id="{a70bb4ab-07e3-47a9-9ef9-bdb23b4decc4}" enabled="1">
+        <layer class="SimpleLine" locked="0" enabled="1" id="{a70bb4ab-07e3-47a9-9ef9-bdb23b4decc4}" pass="0">
           <Option type="Map">
-            <Option type="QString" value="0" name="align_dash_pattern"/>
-            <Option type="QString" value="square" name="capstyle"/>
-            <Option type="QString" value="5;2" name="customdash"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-            <Option type="QString" value="MM" name="customdash_unit"/>
-            <Option type="QString" value="0" name="dash_pattern_offset"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-            <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-            <Option type="QString" value="0" name="draw_inside_polygon"/>
-            <Option type="QString" value="bevel" name="joinstyle"/>
-            <Option type="QString" value="190,207,80,255" name="line_color"/>
-            <Option type="QString" value="solid" name="line_style"/>
-            <Option type="QString" value="0.66" name="line_width"/>
-            <Option type="QString" value="MM" name="line_width_unit"/>
-            <Option type="QString" value="0" name="offset"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-            <Option type="QString" value="MM" name="offset_unit"/>
-            <Option type="QString" value="0" name="ring_filter"/>
-            <Option type="QString" value="0" name="trim_distance_end"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-            <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-            <Option type="QString" value="0" name="trim_distance_start"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-            <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-            <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-            <Option type="QString" value="0" name="use_custom_dash"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+            <Option type="QString" name="align_dash_pattern" value="0"/>
+            <Option type="QString" name="capstyle" value="square"/>
+            <Option type="QString" name="customdash" value="5;2"/>
+            <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="customdash_unit" value="MM"/>
+            <Option type="QString" name="dash_pattern_offset" value="0"/>
+            <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+            <Option type="QString" name="draw_inside_polygon" value="0"/>
+            <Option type="QString" name="joinstyle" value="bevel"/>
+            <Option type="QString" name="line_color" value="190,207,80,255"/>
+            <Option type="QString" name="line_style" value="solid"/>
+            <Option type="QString" name="line_width" value="0.66"/>
+            <Option type="QString" name="line_width_unit" value="MM"/>
+            <Option type="QString" name="offset" value="0"/>
+            <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="offset_unit" value="MM"/>
+            <Option type="QString" name="ring_filter" value="0"/>
+            <Option type="QString" name="trim_distance_end" value="0"/>
+            <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+            <Option type="QString" name="trim_distance_start" value="0"/>
+            <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+            <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+            <Option type="QString" name="use_custom_dash" value="0"/>
+            <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
           </Option>
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
         </layer>
       </symbol>
     </source-symbol>
-    <colorramp type="randomcolors" name="[source]">
-      <Option/>
-    </colorramp>
     <rotation/>
     <sizescale/>
   </renderer-v2>
@@ -258,52 +255,176 @@
       <symbol type="line" clip_to_extent="1" name="" is_animated="0" alpha="1" force_rhr="0" frame_rate="10">
         <data_defined_properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data_defined_properties>
-        <layer pass="0" locked="0" class="SimpleLine" id="{689c086c-fbb2-4ccc-955b-cdaf78e60bcb}" enabled="1">
+        <layer class="SimpleLine" locked="0" enabled="1" id="{689c086c-fbb2-4ccc-955b-cdaf78e60bcb}" pass="0">
           <Option type="Map">
-            <Option type="QString" value="0" name="align_dash_pattern"/>
-            <Option type="QString" value="square" name="capstyle"/>
-            <Option type="QString" value="5;2" name="customdash"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-            <Option type="QString" value="MM" name="customdash_unit"/>
-            <Option type="QString" value="0" name="dash_pattern_offset"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-            <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-            <Option type="QString" value="0" name="draw_inside_polygon"/>
-            <Option type="QString" value="bevel" name="joinstyle"/>
-            <Option type="QString" value="35,35,35,255" name="line_color"/>
-            <Option type="QString" value="solid" name="line_style"/>
-            <Option type="QString" value="0.26" name="line_width"/>
-            <Option type="QString" value="MM" name="line_width_unit"/>
-            <Option type="QString" value="0" name="offset"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-            <Option type="QString" value="MM" name="offset_unit"/>
-            <Option type="QString" value="0" name="ring_filter"/>
-            <Option type="QString" value="0" name="trim_distance_end"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-            <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-            <Option type="QString" value="0" name="trim_distance_start"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-            <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-            <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-            <Option type="QString" value="0" name="use_custom_dash"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+            <Option type="QString" name="align_dash_pattern" value="0"/>
+            <Option type="QString" name="capstyle" value="square"/>
+            <Option type="QString" name="customdash" value="5;2"/>
+            <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="customdash_unit" value="MM"/>
+            <Option type="QString" name="dash_pattern_offset" value="0"/>
+            <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+            <Option type="QString" name="draw_inside_polygon" value="0"/>
+            <Option type="QString" name="joinstyle" value="bevel"/>
+            <Option type="QString" name="line_color" value="35,35,35,255"/>
+            <Option type="QString" name="line_style" value="solid"/>
+            <Option type="QString" name="line_width" value="0.26"/>
+            <Option type="QString" name="line_width_unit" value="MM"/>
+            <Option type="QString" name="offset" value="0"/>
+            <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="offset_unit" value="MM"/>
+            <Option type="QString" name="ring_filter" value="0"/>
+            <Option type="QString" name="trim_distance_end" value="0"/>
+            <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+            <Option type="QString" name="trim_distance_start" value="0"/>
+            <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+            <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+            <Option type="QString" name="use_custom_dash" value="0"/>
+            <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
           </Option>
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
         </layer>
       </symbol>
     </selectionSymbol>
   </selection>
+  <labeling type="simple">
+    <settings calloutType="simple">
+      <text-style fieldName="Type" capitalization="0" fontSizeUnit="Point" fontWeight="50" textColor="50,50,50,255" isExpression="0" previewBkgrdColor="255,255,255,255" multilineHeightUnit="Percentage" textOrientation="horizontal" fontItalic="0" blendMode="0" namedStyle="Regular" textOpacity="1" forcedBold="0" fontKerning="1" useSubstitutions="0" fontLetterSpacing="0" legendString="Aa" fontStrikeout="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" fontSize="10" fontFamily="Open Sans" fontUnderline="0" multilineHeight="1" allowHtml="0">
+        <families/>
+        <text-buffer bufferColor="250,250,250,255" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="0.5" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferDraw="1" bufferBlendMode="0" bufferJoinStyle="128"/>
+        <text-mask maskOpacity="1" maskSize="0" maskType="0" maskJoinStyle="128" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskedSymbolLayers=""/>
+        <background shapeOffsetX="0" shapeOffsetUnit="Point" shapeDraw="0" shapeRotationType="0" shapeJoinStyle="64" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="Point" shapeSizeY="0" shapeRadiiUnit="Point" shapeBlendMode="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSizeType="0" shapeType="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeBorderWidthUnit="Point">
+          <symbol type="marker" clip_to_extent="1" name="markerSymbol" is_animated="0" alpha="1" force_rhr="0" frame_rate="10">
+            <data_defined_properties>
+              <Option type="Map">
+                <Option type="QString" name="name" value=""/>
+                <Option name="properties"/>
+                <Option type="QString" name="type" value="collection"/>
+              </Option>
+            </data_defined_properties>
+            <layer class="SimpleMarker" locked="0" enabled="1" id="" pass="0">
+              <Option type="Map">
+                <Option type="QString" name="angle" value="0"/>
+                <Option type="QString" name="cap_style" value="square"/>
+                <Option type="QString" name="color" value="229,182,54,255"/>
+                <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="name" value="circle"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="35,35,35,255"/>
+                <Option type="QString" name="outline_style" value="solid"/>
+                <Option type="QString" name="outline_width" value="0"/>
+                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="scale_method" value="diameter"/>
+                <Option type="QString" name="size" value="2"/>
+                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="size_unit" value="MM"/>
+                <Option type="QString" name="vertical_anchor_point" value="1"/>
+              </Option>
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option type="QString" name="name" value=""/>
+                  <Option name="properties"/>
+                  <Option type="QString" name="type" value="collection"/>
+                </Option>
+              </data_defined_properties>
+            </layer>
+          </symbol>
+          <symbol type="fill" clip_to_extent="1" name="fillSymbol" is_animated="0" alpha="1" force_rhr="0" frame_rate="10">
+            <data_defined_properties>
+              <Option type="Map">
+                <Option type="QString" name="name" value=""/>
+                <Option name="properties"/>
+                <Option type="QString" name="type" value="collection"/>
+              </Option>
+            </data_defined_properties>
+            <layer class="SimpleFill" locked="0" enabled="1" id="" pass="0">
+              <Option type="Map">
+                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color" value="255,255,255,255"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                <Option type="QString" name="outline_style" value="no"/>
+                <Option type="QString" name="outline_width" value="0"/>
+                <Option type="QString" name="outline_width_unit" value="Point"/>
+                <Option type="QString" name="style" value="solid"/>
+              </Option>
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option type="QString" name="name" value=""/>
+                  <Option name="properties"/>
+                  <Option type="QString" name="type" value="collection"/>
+                </Option>
+              </data_defined_properties>
+            </layer>
+          </symbol>
+        </background>
+        <shadow shadowRadius="1.5" shadowScale="100" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="1" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowOffsetUnit="MM"/>
+        <dd_properties>
+          <Option type="Map">
+            <Option type="QString" name="name" value=""/>
+            <Option name="properties"/>
+            <Option type="QString" name="type" value="collection"/>
+          </Option>
+        </dd_properties>
+        <substitutions/>
+      </text-style>
+      <text-format wrapChar="" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" reverseDirectionSymbol="0" decimals="3" rightDirectionSymbol=">" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" multilineAlign="0" autoWrapLength="0" plussign="0"/>
+      <placement maxCurvedCharAngleIn="25" polygonPlacementFlags="2" fitInPolygonOnly="0" layerType="LineGeometry" placementFlags="10" preserveRotation="1" centroidWhole="0" rotationAngle="0" offsetType="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="1" overrunDistance="0" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-25" distUnits="MM" geometryGenerator="" rotationUnit="AngleDegrees" placement="4" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGeneratorEnabled="0" centroidInside="0" offsetUnits="MM" yOffset="0" priority="5" overlapHandling="PreventOverlap" allowDegraded="0" quadOffset="4" xOffset="0" repeatDistanceUnits="MM" geometryGeneratorType="PointGeometry" lineAnchorClipping="0" dist="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="StartOfText" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorType="0" overrunDistanceUnit="MM"/>
+      <rendering scaleMax="20000" fontLimitPixelSize="0" limitNumLabels="0" drawLabels="1" scaleMin="0" obstacle="1" mergeLines="0" unplacedVisibility="0" fontMaxPixelSize="10000" fontMinPixelSize="3" obstacleType="1" upsidedownLabels="0" maxNumLabels="2000" minFeatureSize="0" scaleVisibility="1" obstacleFactor="2" labelPerPart="0" zIndex="0"/>
+      <dd_properties>
+        <Option type="Map">
+          <Option type="QString" name="name" value=""/>
+          <Option name="properties"/>
+          <Option type="QString" name="type" value="collection"/>
+        </Option>
+      </dd_properties>
+      <callout type="simple">
+        <Option type="Map">
+          <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
+          <Option type="int" name="blendMode" value="0"/>
+          <Option type="Map" name="ddProperties">
+            <Option type="QString" name="name" value=""/>
+            <Option name="properties"/>
+            <Option type="QString" name="type" value="collection"/>
+          </Option>
+          <Option type="bool" name="drawToAllParts" value="false"/>
+          <Option type="QString" name="enabled" value="0"/>
+          <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
+          <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; clip_to_extent=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; id=&quot;{23810b94-281f-44af-a451-312bad834917}&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+          <Option type="double" name="minLength" value="0"/>
+          <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+          <Option type="QString" name="minLengthUnit" value="MM"/>
+          <Option type="double" name="offsetFromAnchor" value="0"/>
+          <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+          <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+          <Option type="double" name="offsetFromLabel" value="0"/>
+          <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+          <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
+        </Option>
+      </callout>
+    </settings>
+  </labeling>
   <blendMode>0</blendMode>
   <featureBlendMode>0</featureBlendMode>
   <layerGeometryType>1</layerGeometryType>
diff --git a/Symbology/qgis/QRiS/risk_potential_points.qml b/Symbology/qgis/QRiS/risk_potential_points.qml
index c2ebfd04..3dcccd85 100644
--- a/Symbology/qgis/QRiS/risk_potential_points.qml
+++ b/Symbology/qgis/QRiS/risk_potential_points.qml
@@ -1,48 +1,48 @@
 <!DOCTYPE qgis PUBLIC 'http://mrcc.com/qgis.dtd' 'SYSTEM'>
-<qgis styleCategories="Symbology" version="3.34.8-Prizren">
+<qgis version="3.34.8-Prizren" styleCategories="Symbology|Labeling" labelsEnabled="1">
   <renderer-v2 type="categorizedSymbol" referencescale="-1" attr="Risk" symbollevels="0" enableorderby="0" forceraster="0">
     <categories>
-      <category type="string" uuid="{93e49bbd-578a-435a-a62b-f080b8a5a0b1}" value="High" label="High" render="true" symbol="0"/>
-      <category type="string" uuid="{6303580c-cecf-483d-986d-0d5763bc3925}" value="Low" label="Low" render="true" symbol="1"/>
-      <category type="string" uuid="{8d204a6d-d323-4df4-8c6f-df41b5f1ada5}" value="Medium" label="Medium" render="true" symbol="2"/>
-      <category type="string" uuid="{223fceac-5049-46ad-939e-cc4133d7b778}" value="" label="" render="true" symbol="3"/>
+      <category type="string" uuid="{93e49bbd-578a-435a-a62b-f080b8a5a0b1}" symbol="0" label="High" value="High" render="true"/>
+      <category type="string" uuid="{6303580c-cecf-483d-986d-0d5763bc3925}" symbol="1" label="Low" value="Low" render="true"/>
+      <category type="string" uuid="{8d204a6d-d323-4df4-8c6f-df41b5f1ada5}" symbol="2" label="Medium" value="Medium" render="true"/>
+      <category type="string" uuid="{223fceac-5049-46ad-939e-cc4133d7b778}" symbol="3" label="" value="" render="true"/>
     </categories>
     <symbols>
       <symbol type="marker" clip_to_extent="1" name="0" is_animated="0" alpha="1" force_rhr="0" frame_rate="10">
         <data_defined_properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data_defined_properties>
-        <layer pass="0" locked="0" class="SimpleMarker" id="{b97a7e1b-1386-4bd7-a1fc-56e8dc8a8060}" enabled="1">
+        <layer class="SimpleMarker" locked="0" enabled="1" id="{b97a7e1b-1386-4bd7-a1fc-56e8dc8a8060}" pass="0">
           <Option type="Map">
-            <Option type="QString" value="0" name="angle"/>
-            <Option type="QString" value="square" name="cap_style"/>
-            <Option type="QString" value="192,0,0,255" name="color"/>
-            <Option type="QString" value="1" name="horizontal_anchor_point"/>
-            <Option type="QString" value="bevel" name="joinstyle"/>
-            <Option type="QString" value="circle" name="name"/>
-            <Option type="QString" value="0,0" name="offset"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-            <Option type="QString" value="MM" name="offset_unit"/>
-            <Option type="QString" value="35,35,35,255" name="outline_color"/>
-            <Option type="QString" value="solid" name="outline_style"/>
-            <Option type="QString" value="0" name="outline_width"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-            <Option type="QString" value="MM" name="outline_width_unit"/>
-            <Option type="QString" value="diameter" name="scale_method"/>
-            <Option type="QString" value="2" name="size"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-            <Option type="QString" value="MM" name="size_unit"/>
-            <Option type="QString" value="1" name="vertical_anchor_point"/>
+            <Option type="QString" name="angle" value="0"/>
+            <Option type="QString" name="cap_style" value="square"/>
+            <Option type="QString" name="color" value="192,0,0,255"/>
+            <Option type="QString" name="horizontal_anchor_point" value="1"/>
+            <Option type="QString" name="joinstyle" value="bevel"/>
+            <Option type="QString" name="name" value="circle"/>
+            <Option type="QString" name="offset" value="0,0"/>
+            <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="offset_unit" value="MM"/>
+            <Option type="QString" name="outline_color" value="35,35,35,255"/>
+            <Option type="QString" name="outline_style" value="solid"/>
+            <Option type="QString" name="outline_width" value="0"/>
+            <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="outline_width_unit" value="MM"/>
+            <Option type="QString" name="scale_method" value="diameter"/>
+            <Option type="QString" name="size" value="2"/>
+            <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="size_unit" value="MM"/>
+            <Option type="QString" name="vertical_anchor_point" value="1"/>
           </Option>
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
         </layer>
@@ -50,38 +50,38 @@
       <symbol type="marker" clip_to_extent="1" name="1" is_animated="0" alpha="1" force_rhr="0" frame_rate="10">
         <data_defined_properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data_defined_properties>
-        <layer pass="0" locked="0" class="SimpleMarker" id="{b97a7e1b-1386-4bd7-a1fc-56e8dc8a8060}" enabled="1">
+        <layer class="SimpleMarker" locked="0" enabled="1" id="{b97a7e1b-1386-4bd7-a1fc-56e8dc8a8060}" pass="0">
           <Option type="Map">
-            <Option type="QString" value="0" name="angle"/>
-            <Option type="QString" value="square" name="cap_style"/>
-            <Option type="QString" value="0,176,80,255" name="color"/>
-            <Option type="QString" value="1" name="horizontal_anchor_point"/>
-            <Option type="QString" value="bevel" name="joinstyle"/>
-            <Option type="QString" value="circle" name="name"/>
-            <Option type="QString" value="0,0" name="offset"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-            <Option type="QString" value="MM" name="offset_unit"/>
-            <Option type="QString" value="35,35,35,255" name="outline_color"/>
-            <Option type="QString" value="solid" name="outline_style"/>
-            <Option type="QString" value="0" name="outline_width"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-            <Option type="QString" value="MM" name="outline_width_unit"/>
-            <Option type="QString" value="diameter" name="scale_method"/>
-            <Option type="QString" value="2" name="size"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-            <Option type="QString" value="MM" name="size_unit"/>
-            <Option type="QString" value="1" name="vertical_anchor_point"/>
+            <Option type="QString" name="angle" value="0"/>
+            <Option type="QString" name="cap_style" value="square"/>
+            <Option type="QString" name="color" value="0,176,80,255"/>
+            <Option type="QString" name="horizontal_anchor_point" value="1"/>
+            <Option type="QString" name="joinstyle" value="bevel"/>
+            <Option type="QString" name="name" value="circle"/>
+            <Option type="QString" name="offset" value="0,0"/>
+            <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="offset_unit" value="MM"/>
+            <Option type="QString" name="outline_color" value="35,35,35,255"/>
+            <Option type="QString" name="outline_style" value="solid"/>
+            <Option type="QString" name="outline_width" value="0"/>
+            <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="outline_width_unit" value="MM"/>
+            <Option type="QString" name="scale_method" value="diameter"/>
+            <Option type="QString" name="size" value="2"/>
+            <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="size_unit" value="MM"/>
+            <Option type="QString" name="vertical_anchor_point" value="1"/>
           </Option>
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
         </layer>
@@ -89,38 +89,38 @@
       <symbol type="marker" clip_to_extent="1" name="2" is_animated="0" alpha="1" force_rhr="0" frame_rate="10">
         <data_defined_properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data_defined_properties>
-        <layer pass="0" locked="0" class="SimpleMarker" id="{b97a7e1b-1386-4bd7-a1fc-56e8dc8a8060}" enabled="1">
+        <layer class="SimpleMarker" locked="0" enabled="1" id="{b97a7e1b-1386-4bd7-a1fc-56e8dc8a8060}" pass="0">
           <Option type="Map">
-            <Option type="QString" value="0" name="angle"/>
-            <Option type="QString" value="square" name="cap_style"/>
-            <Option type="QString" value="255,255,0,255" name="color"/>
-            <Option type="QString" value="1" name="horizontal_anchor_point"/>
-            <Option type="QString" value="bevel" name="joinstyle"/>
-            <Option type="QString" value="circle" name="name"/>
-            <Option type="QString" value="0,0" name="offset"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-            <Option type="QString" value="MM" name="offset_unit"/>
-            <Option type="QString" value="35,35,35,255" name="outline_color"/>
-            <Option type="QString" value="solid" name="outline_style"/>
-            <Option type="QString" value="0" name="outline_width"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-            <Option type="QString" value="MM" name="outline_width_unit"/>
-            <Option type="QString" value="diameter" name="scale_method"/>
-            <Option type="QString" value="2" name="size"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-            <Option type="QString" value="MM" name="size_unit"/>
-            <Option type="QString" value="1" name="vertical_anchor_point"/>
+            <Option type="QString" name="angle" value="0"/>
+            <Option type="QString" name="cap_style" value="square"/>
+            <Option type="QString" name="color" value="255,255,0,255"/>
+            <Option type="QString" name="horizontal_anchor_point" value="1"/>
+            <Option type="QString" name="joinstyle" value="bevel"/>
+            <Option type="QString" name="name" value="circle"/>
+            <Option type="QString" name="offset" value="0,0"/>
+            <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="offset_unit" value="MM"/>
+            <Option type="QString" name="outline_color" value="35,35,35,255"/>
+            <Option type="QString" name="outline_style" value="solid"/>
+            <Option type="QString" name="outline_width" value="0"/>
+            <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="outline_width_unit" value="MM"/>
+            <Option type="QString" name="scale_method" value="diameter"/>
+            <Option type="QString" name="size" value="2"/>
+            <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="size_unit" value="MM"/>
+            <Option type="QString" name="vertical_anchor_point" value="1"/>
           </Option>
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
         </layer>
@@ -128,38 +128,38 @@
       <symbol type="marker" clip_to_extent="1" name="3" is_animated="0" alpha="1" force_rhr="0" frame_rate="10">
         <data_defined_properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data_defined_properties>
-        <layer pass="0" locked="0" class="SimpleMarker" id="{b97a7e1b-1386-4bd7-a1fc-56e8dc8a8060}" enabled="1">
+        <layer class="SimpleMarker" locked="0" enabled="1" id="{b97a7e1b-1386-4bd7-a1fc-56e8dc8a8060}" pass="0">
           <Option type="Map">
-            <Option type="QString" value="0" name="angle"/>
-            <Option type="QString" value="square" name="cap_style"/>
-            <Option type="QString" value="29,200,154,255" name="color"/>
-            <Option type="QString" value="1" name="horizontal_anchor_point"/>
-            <Option type="QString" value="bevel" name="joinstyle"/>
-            <Option type="QString" value="circle" name="name"/>
-            <Option type="QString" value="0,0" name="offset"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-            <Option type="QString" value="MM" name="offset_unit"/>
-            <Option type="QString" value="35,35,35,255" name="outline_color"/>
-            <Option type="QString" value="solid" name="outline_style"/>
-            <Option type="QString" value="0" name="outline_width"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-            <Option type="QString" value="MM" name="outline_width_unit"/>
-            <Option type="QString" value="diameter" name="scale_method"/>
-            <Option type="QString" value="2" name="size"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-            <Option type="QString" value="MM" name="size_unit"/>
-            <Option type="QString" value="1" name="vertical_anchor_point"/>
+            <Option type="QString" name="angle" value="0"/>
+            <Option type="QString" name="cap_style" value="square"/>
+            <Option type="QString" name="color" value="29,200,154,255"/>
+            <Option type="QString" name="horizontal_anchor_point" value="1"/>
+            <Option type="QString" name="joinstyle" value="bevel"/>
+            <Option type="QString" name="name" value="circle"/>
+            <Option type="QString" name="offset" value="0,0"/>
+            <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="offset_unit" value="MM"/>
+            <Option type="QString" name="outline_color" value="35,35,35,255"/>
+            <Option type="QString" name="outline_style" value="solid"/>
+            <Option type="QString" name="outline_width" value="0"/>
+            <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="outline_width_unit" value="MM"/>
+            <Option type="QString" name="scale_method" value="diameter"/>
+            <Option type="QString" name="size" value="2"/>
+            <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="size_unit" value="MM"/>
+            <Option type="QString" name="vertical_anchor_point" value="1"/>
           </Option>
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
         </layer>
@@ -169,46 +169,43 @@
       <symbol type="marker" clip_to_extent="1" name="0" is_animated="0" alpha="1" force_rhr="0" frame_rate="10">
         <data_defined_properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data_defined_properties>
-        <layer pass="0" locked="0" class="SimpleMarker" id="{b97a7e1b-1386-4bd7-a1fc-56e8dc8a8060}" enabled="1">
+        <layer class="SimpleMarker" locked="0" enabled="1" id="{b97a7e1b-1386-4bd7-a1fc-56e8dc8a8060}" pass="0">
           <Option type="Map">
-            <Option type="QString" value="0" name="angle"/>
-            <Option type="QString" value="square" name="cap_style"/>
-            <Option type="QString" value="229,182,54,255" name="color"/>
-            <Option type="QString" value="1" name="horizontal_anchor_point"/>
-            <Option type="QString" value="bevel" name="joinstyle"/>
-            <Option type="QString" value="circle" name="name"/>
-            <Option type="QString" value="0,0" name="offset"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-            <Option type="QString" value="MM" name="offset_unit"/>
-            <Option type="QString" value="35,35,35,255" name="outline_color"/>
-            <Option type="QString" value="solid" name="outline_style"/>
-            <Option type="QString" value="0" name="outline_width"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-            <Option type="QString" value="MM" name="outline_width_unit"/>
-            <Option type="QString" value="diameter" name="scale_method"/>
-            <Option type="QString" value="2" name="size"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-            <Option type="QString" value="MM" name="size_unit"/>
-            <Option type="QString" value="1" name="vertical_anchor_point"/>
+            <Option type="QString" name="angle" value="0"/>
+            <Option type="QString" name="cap_style" value="square"/>
+            <Option type="QString" name="color" value="229,182,54,255"/>
+            <Option type="QString" name="horizontal_anchor_point" value="1"/>
+            <Option type="QString" name="joinstyle" value="bevel"/>
+            <Option type="QString" name="name" value="circle"/>
+            <Option type="QString" name="offset" value="0,0"/>
+            <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="offset_unit" value="MM"/>
+            <Option type="QString" name="outline_color" value="35,35,35,255"/>
+            <Option type="QString" name="outline_style" value="solid"/>
+            <Option type="QString" name="outline_width" value="0"/>
+            <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="outline_width_unit" value="MM"/>
+            <Option type="QString" name="scale_method" value="diameter"/>
+            <Option type="QString" name="size" value="2"/>
+            <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="size_unit" value="MM"/>
+            <Option type="QString" name="vertical_anchor_point" value="1"/>
           </Option>
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
         </layer>
       </symbol>
     </source-symbol>
-    <colorramp type="randomcolors" name="[source]">
-      <Option/>
-    </colorramp>
     <rotation/>
     <sizescale/>
   </renderer-v2>
@@ -218,44 +215,168 @@
       <symbol type="marker" clip_to_extent="1" name="" is_animated="0" alpha="1" force_rhr="0" frame_rate="10">
         <data_defined_properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data_defined_properties>
-        <layer pass="0" locked="0" class="SimpleMarker" id="{d44b88e7-3f50-4ac0-908e-2b97910c1507}" enabled="1">
+        <layer class="SimpleMarker" locked="0" enabled="1" id="{d44b88e7-3f50-4ac0-908e-2b97910c1507}" pass="0">
           <Option type="Map">
-            <Option type="QString" value="0" name="angle"/>
-            <Option type="QString" value="square" name="cap_style"/>
-            <Option type="QString" value="255,0,0,255" name="color"/>
-            <Option type="QString" value="1" name="horizontal_anchor_point"/>
-            <Option type="QString" value="bevel" name="joinstyle"/>
-            <Option type="QString" value="circle" name="name"/>
-            <Option type="QString" value="0,0" name="offset"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-            <Option type="QString" value="MM" name="offset_unit"/>
-            <Option type="QString" value="35,35,35,255" name="outline_color"/>
-            <Option type="QString" value="solid" name="outline_style"/>
-            <Option type="QString" value="0" name="outline_width"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-            <Option type="QString" value="MM" name="outline_width_unit"/>
-            <Option type="QString" value="diameter" name="scale_method"/>
-            <Option type="QString" value="2" name="size"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-            <Option type="QString" value="MM" name="size_unit"/>
-            <Option type="QString" value="1" name="vertical_anchor_point"/>
+            <Option type="QString" name="angle" value="0"/>
+            <Option type="QString" name="cap_style" value="square"/>
+            <Option type="QString" name="color" value="255,0,0,255"/>
+            <Option type="QString" name="horizontal_anchor_point" value="1"/>
+            <Option type="QString" name="joinstyle" value="bevel"/>
+            <Option type="QString" name="name" value="circle"/>
+            <Option type="QString" name="offset" value="0,0"/>
+            <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="offset_unit" value="MM"/>
+            <Option type="QString" name="outline_color" value="35,35,35,255"/>
+            <Option type="QString" name="outline_style" value="solid"/>
+            <Option type="QString" name="outline_width" value="0"/>
+            <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="outline_width_unit" value="MM"/>
+            <Option type="QString" name="scale_method" value="diameter"/>
+            <Option type="QString" name="size" value="2"/>
+            <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="size_unit" value="MM"/>
+            <Option type="QString" name="vertical_anchor_point" value="1"/>
           </Option>
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
         </layer>
       </symbol>
     </selectionSymbol>
   </selection>
+  <labeling type="simple">
+    <settings calloutType="simple">
+      <text-style fieldName="Type" capitalization="0" fontSizeUnit="Point" fontWeight="50" textColor="50,50,50,255" isExpression="0" previewBkgrdColor="255,255,255,255" multilineHeightUnit="Percentage" textOrientation="horizontal" fontItalic="0" blendMode="0" namedStyle="Regular" textOpacity="1" forcedBold="0" fontKerning="1" useSubstitutions="0" fontLetterSpacing="0" legendString="Aa" fontStrikeout="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" fontSize="10" fontFamily="Open Sans" fontUnderline="0" multilineHeight="1" allowHtml="0">
+        <families/>
+        <text-buffer bufferColor="250,250,250,255" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="0.5" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferDraw="1" bufferBlendMode="0" bufferJoinStyle="128"/>
+        <text-mask maskOpacity="1" maskSize="0" maskType="0" maskJoinStyle="128" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskedSymbolLayers=""/>
+        <background shapeOffsetX="0" shapeOffsetUnit="Point" shapeDraw="0" shapeRotationType="0" shapeJoinStyle="64" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="Point" shapeSizeY="0" shapeRadiiUnit="Point" shapeBlendMode="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSizeType="0" shapeType="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeBorderWidthUnit="Point">
+          <symbol type="marker" clip_to_extent="1" name="markerSymbol" is_animated="0" alpha="1" force_rhr="0" frame_rate="10">
+            <data_defined_properties>
+              <Option type="Map">
+                <Option type="QString" name="name" value=""/>
+                <Option name="properties"/>
+                <Option type="QString" name="type" value="collection"/>
+              </Option>
+            </data_defined_properties>
+            <layer class="SimpleMarker" locked="0" enabled="1" id="" pass="0">
+              <Option type="Map">
+                <Option type="QString" name="angle" value="0"/>
+                <Option type="QString" name="cap_style" value="square"/>
+                <Option type="QString" name="color" value="232,113,141,255"/>
+                <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="name" value="circle"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="35,35,35,255"/>
+                <Option type="QString" name="outline_style" value="solid"/>
+                <Option type="QString" name="outline_width" value="0"/>
+                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="scale_method" value="diameter"/>
+                <Option type="QString" name="size" value="2"/>
+                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="size_unit" value="MM"/>
+                <Option type="QString" name="vertical_anchor_point" value="1"/>
+              </Option>
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option type="QString" name="name" value=""/>
+                  <Option name="properties"/>
+                  <Option type="QString" name="type" value="collection"/>
+                </Option>
+              </data_defined_properties>
+            </layer>
+          </symbol>
+          <symbol type="fill" clip_to_extent="1" name="fillSymbol" is_animated="0" alpha="1" force_rhr="0" frame_rate="10">
+            <data_defined_properties>
+              <Option type="Map">
+                <Option type="QString" name="name" value=""/>
+                <Option name="properties"/>
+                <Option type="QString" name="type" value="collection"/>
+              </Option>
+            </data_defined_properties>
+            <layer class="SimpleFill" locked="0" enabled="1" id="" pass="0">
+              <Option type="Map">
+                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color" value="255,255,255,255"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                <Option type="QString" name="outline_style" value="no"/>
+                <Option type="QString" name="outline_width" value="0"/>
+                <Option type="QString" name="outline_width_unit" value="Point"/>
+                <Option type="QString" name="style" value="solid"/>
+              </Option>
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option type="QString" name="name" value=""/>
+                  <Option name="properties"/>
+                  <Option type="QString" name="type" value="collection"/>
+                </Option>
+              </data_defined_properties>
+            </layer>
+          </symbol>
+        </background>
+        <shadow shadowRadius="1.5" shadowScale="100" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="1" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowOffsetUnit="MM"/>
+        <dd_properties>
+          <Option type="Map">
+            <Option type="QString" name="name" value=""/>
+            <Option name="properties"/>
+            <Option type="QString" name="type" value="collection"/>
+          </Option>
+        </dd_properties>
+        <substitutions/>
+      </text-style>
+      <text-format wrapChar="" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" reverseDirectionSymbol="0" decimals="3" rightDirectionSymbol=">" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" multilineAlign="3" autoWrapLength="0" plussign="0"/>
+      <placement maxCurvedCharAngleIn="25" polygonPlacementFlags="2" fitInPolygonOnly="0" layerType="PointGeometry" placementFlags="10" preserveRotation="1" centroidWhole="0" rotationAngle="0" offsetType="1" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" overrunDistance="0" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-25" distUnits="MM" geometryGenerator="" rotationUnit="AngleDegrees" placement="6" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGeneratorEnabled="0" centroidInside="0" offsetUnits="MM" yOffset="0" priority="5" overlapHandling="PreventOverlap" allowDegraded="0" quadOffset="4" xOffset="0" repeatDistanceUnits="MM" geometryGeneratorType="PointGeometry" lineAnchorClipping="0" dist="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="FollowPlacement" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorType="0" overrunDistanceUnit="MM"/>
+      <rendering scaleMax="20000" fontLimitPixelSize="0" limitNumLabels="0" drawLabels="1" scaleMin="0" obstacle="1" mergeLines="0" unplacedVisibility="0" fontMaxPixelSize="10000" fontMinPixelSize="3" obstacleType="1" upsidedownLabels="0" maxNumLabels="2000" minFeatureSize="0" scaleVisibility="1" obstacleFactor="1" labelPerPart="0" zIndex="0"/>
+      <dd_properties>
+        <Option type="Map">
+          <Option type="QString" name="name" value=""/>
+          <Option name="properties"/>
+          <Option type="QString" name="type" value="collection"/>
+        </Option>
+      </dd_properties>
+      <callout type="simple">
+        <Option type="Map">
+          <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
+          <Option type="int" name="blendMode" value="0"/>
+          <Option type="Map" name="ddProperties">
+            <Option type="QString" name="name" value=""/>
+            <Option name="properties"/>
+            <Option type="QString" name="type" value="collection"/>
+          </Option>
+          <Option type="bool" name="drawToAllParts" value="false"/>
+          <Option type="QString" name="enabled" value="0"/>
+          <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
+          <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; clip_to_extent=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; id=&quot;{370a7c76-ac83-442a-9b30-65552f7ef2dd}&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+          <Option type="double" name="minLength" value="0"/>
+          <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+          <Option type="QString" name="minLengthUnit" value="MM"/>
+          <Option type="double" name="offsetFromAnchor" value="0"/>
+          <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+          <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+          <Option type="double" name="offsetFromLabel" value="0"/>
+          <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+          <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
+        </Option>
+      </callout>
+    </settings>
+  </labeling>
   <blendMode>0</blendMode>
   <featureBlendMode>0</featureBlendMode>
   <layerGeometryType>0</layerGeometryType>
diff --git a/Symbology/qgis/QRiS/risk_potential_polygons.qml b/Symbology/qgis/QRiS/risk_potential_polygons.qml
index f2098c72..ace8a751 100644
--- a/Symbology/qgis/QRiS/risk_potential_polygons.qml
+++ b/Symbology/qgis/QRiS/risk_potential_polygons.qml
@@ -1,40 +1,40 @@
 <!DOCTYPE qgis PUBLIC 'http://mrcc.com/qgis.dtd' 'SYSTEM'>
-<qgis styleCategories="Symbology" version="3.34.8-Prizren">
+<qgis version="3.34.8-Prizren" styleCategories="Symbology|Labeling" labelsEnabled="1">
   <renderer-v2 type="categorizedSymbol" referencescale="-1" attr="Risk" symbollevels="0" enableorderby="0" forceraster="0">
     <categories>
-      <category type="string" uuid="{ab0adaf1-e994-4c9b-8053-b5e82ce59e49}" value="High" label="High" render="true" symbol="0"/>
-      <category type="string" uuid="{6eeef180-571e-4b3c-9fae-e8a0e7f3f7c9}" value="Low" label="Low" render="true" symbol="1"/>
-      <category type="string" uuid="{e92198d3-a4f3-48fe-b016-434b5e75a43a}" value="Medium" label="Medium" render="true" symbol="2"/>
-      <category type="string" uuid="{30cc77a2-5cca-412a-a103-0d63ad59414e}" value="" label="" render="true" symbol="3"/>
+      <category type="string" uuid="{ab0adaf1-e994-4c9b-8053-b5e82ce59e49}" symbol="0" label="High" value="High" render="true"/>
+      <category type="string" uuid="{6eeef180-571e-4b3c-9fae-e8a0e7f3f7c9}" symbol="1" label="Low" value="Low" render="true"/>
+      <category type="string" uuid="{e92198d3-a4f3-48fe-b016-434b5e75a43a}" symbol="2" label="Medium" value="Medium" render="true"/>
+      <category type="string" uuid="{30cc77a2-5cca-412a-a103-0d63ad59414e}" symbol="3" label="" value="" render="true"/>
     </categories>
     <symbols>
       <symbol type="fill" clip_to_extent="1" name="0" is_animated="0" alpha="1" force_rhr="0" frame_rate="10">
         <data_defined_properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data_defined_properties>
-        <layer pass="0" locked="0" class="SimpleFill" id="{ef3d1fb5-c9bf-4cda-9136-60fd988883e3}" enabled="1">
+        <layer class="SimpleFill" locked="0" enabled="1" id="{ef3d1fb5-c9bf-4cda-9136-60fd988883e3}" pass="0">
           <Option type="Map">
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-            <Option type="QString" value="192,0,0,255" name="color"/>
-            <Option type="QString" value="bevel" name="joinstyle"/>
-            <Option type="QString" value="0,0" name="offset"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-            <Option type="QString" value="MM" name="offset_unit"/>
-            <Option type="QString" value="35,35,35,255" name="outline_color"/>
-            <Option type="QString" value="solid" name="outline_style"/>
-            <Option type="QString" value="0.26" name="outline_width"/>
-            <Option type="QString" value="MM" name="outline_width_unit"/>
-            <Option type="QString" value="solid" name="style"/>
+            <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="color" value="192,0,0,255"/>
+            <Option type="QString" name="joinstyle" value="bevel"/>
+            <Option type="QString" name="offset" value="0,0"/>
+            <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="offset_unit" value="MM"/>
+            <Option type="QString" name="outline_color" value="35,35,35,255"/>
+            <Option type="QString" name="outline_style" value="solid"/>
+            <Option type="QString" name="outline_width" value="0.26"/>
+            <Option type="QString" name="outline_width_unit" value="MM"/>
+            <Option type="QString" name="style" value="solid"/>
           </Option>
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
         </layer>
@@ -42,30 +42,30 @@
       <symbol type="fill" clip_to_extent="1" name="1" is_animated="0" alpha="1" force_rhr="0" frame_rate="10">
         <data_defined_properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data_defined_properties>
-        <layer pass="0" locked="0" class="SimpleFill" id="{ef3d1fb5-c9bf-4cda-9136-60fd988883e3}" enabled="1">
+        <layer class="SimpleFill" locked="0" enabled="1" id="{ef3d1fb5-c9bf-4cda-9136-60fd988883e3}" pass="0">
           <Option type="Map">
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-            <Option type="QString" value="0,176,80,255" name="color"/>
-            <Option type="QString" value="bevel" name="joinstyle"/>
-            <Option type="QString" value="0,0" name="offset"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-            <Option type="QString" value="MM" name="offset_unit"/>
-            <Option type="QString" value="35,35,35,255" name="outline_color"/>
-            <Option type="QString" value="solid" name="outline_style"/>
-            <Option type="QString" value="0.26" name="outline_width"/>
-            <Option type="QString" value="MM" name="outline_width_unit"/>
-            <Option type="QString" value="solid" name="style"/>
+            <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="color" value="0,176,80,255"/>
+            <Option type="QString" name="joinstyle" value="bevel"/>
+            <Option type="QString" name="offset" value="0,0"/>
+            <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="offset_unit" value="MM"/>
+            <Option type="QString" name="outline_color" value="35,35,35,255"/>
+            <Option type="QString" name="outline_style" value="solid"/>
+            <Option type="QString" name="outline_width" value="0.26"/>
+            <Option type="QString" name="outline_width_unit" value="MM"/>
+            <Option type="QString" name="style" value="solid"/>
           </Option>
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
         </layer>
@@ -73,30 +73,30 @@
       <symbol type="fill" clip_to_extent="1" name="2" is_animated="0" alpha="1" force_rhr="0" frame_rate="10">
         <data_defined_properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data_defined_properties>
-        <layer pass="0" locked="0" class="SimpleFill" id="{ef3d1fb5-c9bf-4cda-9136-60fd988883e3}" enabled="1">
+        <layer class="SimpleFill" locked="0" enabled="1" id="{ef3d1fb5-c9bf-4cda-9136-60fd988883e3}" pass="0">
           <Option type="Map">
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-            <Option type="QString" value="255,255,0,255" name="color"/>
-            <Option type="QString" value="bevel" name="joinstyle"/>
-            <Option type="QString" value="0,0" name="offset"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-            <Option type="QString" value="MM" name="offset_unit"/>
-            <Option type="QString" value="35,35,35,255" name="outline_color"/>
-            <Option type="QString" value="solid" name="outline_style"/>
-            <Option type="QString" value="0.26" name="outline_width"/>
-            <Option type="QString" value="MM" name="outline_width_unit"/>
-            <Option type="QString" value="solid" name="style"/>
+            <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="color" value="255,255,0,255"/>
+            <Option type="QString" name="joinstyle" value="bevel"/>
+            <Option type="QString" name="offset" value="0,0"/>
+            <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="offset_unit" value="MM"/>
+            <Option type="QString" name="outline_color" value="35,35,35,255"/>
+            <Option type="QString" name="outline_style" value="solid"/>
+            <Option type="QString" name="outline_width" value="0.26"/>
+            <Option type="QString" name="outline_width_unit" value="MM"/>
+            <Option type="QString" name="style" value="solid"/>
           </Option>
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
         </layer>
@@ -104,30 +104,30 @@
       <symbol type="fill" clip_to_extent="1" name="3" is_animated="0" alpha="1" force_rhr="0" frame_rate="10">
         <data_defined_properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data_defined_properties>
-        <layer pass="0" locked="0" class="SimpleFill" id="{ef3d1fb5-c9bf-4cda-9136-60fd988883e3}" enabled="1">
+        <layer class="SimpleFill" locked="0" enabled="1" id="{ef3d1fb5-c9bf-4cda-9136-60fd988883e3}" pass="0">
           <Option type="Map">
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-            <Option type="QString" value="87,128,232,255" name="color"/>
-            <Option type="QString" value="bevel" name="joinstyle"/>
-            <Option type="QString" value="0,0" name="offset"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-            <Option type="QString" value="MM" name="offset_unit"/>
-            <Option type="QString" value="35,35,35,255" name="outline_color"/>
-            <Option type="QString" value="solid" name="outline_style"/>
-            <Option type="QString" value="0.26" name="outline_width"/>
-            <Option type="QString" value="MM" name="outline_width_unit"/>
-            <Option type="QString" value="solid" name="style"/>
+            <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="color" value="87,128,232,255"/>
+            <Option type="QString" name="joinstyle" value="bevel"/>
+            <Option type="QString" name="offset" value="0,0"/>
+            <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="offset_unit" value="MM"/>
+            <Option type="QString" name="outline_color" value="35,35,35,255"/>
+            <Option type="QString" name="outline_style" value="solid"/>
+            <Option type="QString" name="outline_width" value="0.26"/>
+            <Option type="QString" name="outline_width_unit" value="MM"/>
+            <Option type="QString" name="style" value="solid"/>
           </Option>
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
         </layer>
@@ -137,38 +137,35 @@
       <symbol type="fill" clip_to_extent="1" name="0" is_animated="0" alpha="1" force_rhr="0" frame_rate="10">
         <data_defined_properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data_defined_properties>
-        <layer pass="0" locked="0" class="SimpleFill" id="{ef3d1fb5-c9bf-4cda-9136-60fd988883e3}" enabled="1">
+        <layer class="SimpleFill" locked="0" enabled="1" id="{ef3d1fb5-c9bf-4cda-9136-60fd988883e3}" pass="0">
           <Option type="Map">
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-            <Option type="QString" value="190,178,151,255" name="color"/>
-            <Option type="QString" value="bevel" name="joinstyle"/>
-            <Option type="QString" value="0,0" name="offset"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-            <Option type="QString" value="MM" name="offset_unit"/>
-            <Option type="QString" value="35,35,35,255" name="outline_color"/>
-            <Option type="QString" value="solid" name="outline_style"/>
-            <Option type="QString" value="0.26" name="outline_width"/>
-            <Option type="QString" value="MM" name="outline_width_unit"/>
-            <Option type="QString" value="solid" name="style"/>
+            <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="color" value="190,178,151,255"/>
+            <Option type="QString" name="joinstyle" value="bevel"/>
+            <Option type="QString" name="offset" value="0,0"/>
+            <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="offset_unit" value="MM"/>
+            <Option type="QString" name="outline_color" value="35,35,35,255"/>
+            <Option type="QString" name="outline_style" value="solid"/>
+            <Option type="QString" name="outline_width" value="0.26"/>
+            <Option type="QString" name="outline_width_unit" value="MM"/>
+            <Option type="QString" name="style" value="solid"/>
           </Option>
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
         </layer>
       </symbol>
     </source-symbol>
-    <colorramp type="randomcolors" name="[source]">
-      <Option/>
-    </colorramp>
     <rotation/>
     <sizescale/>
   </renderer-v2>
@@ -178,36 +175,160 @@
       <symbol type="fill" clip_to_extent="1" name="" is_animated="0" alpha="1" force_rhr="0" frame_rate="10">
         <data_defined_properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data_defined_properties>
-        <layer pass="0" locked="0" class="SimpleFill" id="{83024c32-ba84-4b79-b8ee-13d2a215a8bd}" enabled="1">
+        <layer class="SimpleFill" locked="0" enabled="1" id="{83024c32-ba84-4b79-b8ee-13d2a215a8bd}" pass="0">
           <Option type="Map">
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-            <Option type="QString" value="0,0,255,255" name="color"/>
-            <Option type="QString" value="bevel" name="joinstyle"/>
-            <Option type="QString" value="0,0" name="offset"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-            <Option type="QString" value="MM" name="offset_unit"/>
-            <Option type="QString" value="35,35,35,255" name="outline_color"/>
-            <Option type="QString" value="solid" name="outline_style"/>
-            <Option type="QString" value="0.26" name="outline_width"/>
-            <Option type="QString" value="MM" name="outline_width_unit"/>
-            <Option type="QString" value="solid" name="style"/>
+            <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="color" value="0,0,255,255"/>
+            <Option type="QString" name="joinstyle" value="bevel"/>
+            <Option type="QString" name="offset" value="0,0"/>
+            <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="offset_unit" value="MM"/>
+            <Option type="QString" name="outline_color" value="35,35,35,255"/>
+            <Option type="QString" name="outline_style" value="solid"/>
+            <Option type="QString" name="outline_width" value="0.26"/>
+            <Option type="QString" name="outline_width_unit" value="MM"/>
+            <Option type="QString" name="style" value="solid"/>
           </Option>
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
         </layer>
       </symbol>
     </selectionSymbol>
   </selection>
+  <labeling type="simple">
+    <settings calloutType="simple">
+      <text-style fieldName="Type" capitalization="0" fontSizeUnit="Point" fontWeight="50" textColor="50,50,50,255" isExpression="0" previewBkgrdColor="255,255,255,255" multilineHeightUnit="Percentage" textOrientation="horizontal" fontItalic="0" blendMode="0" namedStyle="Regular" textOpacity="1" forcedBold="0" fontKerning="1" useSubstitutions="0" fontLetterSpacing="0" legendString="Aa" fontStrikeout="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" fontSize="10" fontFamily="Open Sans" fontUnderline="0" multilineHeight="1" allowHtml="0">
+        <families/>
+        <text-buffer bufferColor="250,250,250,255" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="0.5" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferDraw="1" bufferBlendMode="0" bufferJoinStyle="128"/>
+        <text-mask maskOpacity="1" maskSize="0" maskType="0" maskJoinStyle="128" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskedSymbolLayers=""/>
+        <background shapeOffsetX="0" shapeOffsetUnit="Point" shapeDraw="0" shapeRotationType="0" shapeJoinStyle="64" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="Point" shapeSizeY="0" shapeRadiiUnit="Point" shapeBlendMode="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSizeType="0" shapeType="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeBorderWidthUnit="Point">
+          <symbol type="marker" clip_to_extent="1" name="markerSymbol" is_animated="0" alpha="1" force_rhr="0" frame_rate="10">
+            <data_defined_properties>
+              <Option type="Map">
+                <Option type="QString" name="name" value=""/>
+                <Option name="properties"/>
+                <Option type="QString" name="type" value="collection"/>
+              </Option>
+            </data_defined_properties>
+            <layer class="SimpleMarker" locked="0" enabled="1" id="" pass="0">
+              <Option type="Map">
+                <Option type="QString" name="angle" value="0"/>
+                <Option type="QString" name="cap_style" value="square"/>
+                <Option type="QString" name="color" value="213,180,60,255"/>
+                <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="name" value="circle"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="35,35,35,255"/>
+                <Option type="QString" name="outline_style" value="solid"/>
+                <Option type="QString" name="outline_width" value="0"/>
+                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="scale_method" value="diameter"/>
+                <Option type="QString" name="size" value="2"/>
+                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="size_unit" value="MM"/>
+                <Option type="QString" name="vertical_anchor_point" value="1"/>
+              </Option>
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option type="QString" name="name" value=""/>
+                  <Option name="properties"/>
+                  <Option type="QString" name="type" value="collection"/>
+                </Option>
+              </data_defined_properties>
+            </layer>
+          </symbol>
+          <symbol type="fill" clip_to_extent="1" name="fillSymbol" is_animated="0" alpha="1" force_rhr="0" frame_rate="10">
+            <data_defined_properties>
+              <Option type="Map">
+                <Option type="QString" name="name" value=""/>
+                <Option name="properties"/>
+                <Option type="QString" name="type" value="collection"/>
+              </Option>
+            </data_defined_properties>
+            <layer class="SimpleFill" locked="0" enabled="1" id="" pass="0">
+              <Option type="Map">
+                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color" value="255,255,255,255"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                <Option type="QString" name="outline_style" value="no"/>
+                <Option type="QString" name="outline_width" value="0"/>
+                <Option type="QString" name="outline_width_unit" value="Point"/>
+                <Option type="QString" name="style" value="solid"/>
+              </Option>
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option type="QString" name="name" value=""/>
+                  <Option name="properties"/>
+                  <Option type="QString" name="type" value="collection"/>
+                </Option>
+              </data_defined_properties>
+            </layer>
+          </symbol>
+        </background>
+        <shadow shadowRadius="1.5" shadowScale="100" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="1" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowOffsetUnit="MM"/>
+        <dd_properties>
+          <Option type="Map">
+            <Option type="QString" name="name" value=""/>
+            <Option name="properties"/>
+            <Option type="QString" name="type" value="collection"/>
+          </Option>
+        </dd_properties>
+        <substitutions/>
+      </text-style>
+      <text-format wrapChar="" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" reverseDirectionSymbol="0" decimals="3" rightDirectionSymbol=">" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" multilineAlign="3" autoWrapLength="0" plussign="0"/>
+      <placement maxCurvedCharAngleIn="25" polygonPlacementFlags="2" fitInPolygonOnly="0" layerType="PolygonGeometry" placementFlags="10" preserveRotation="1" centroidWhole="0" rotationAngle="0" offsetType="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" overrunDistance="0" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-25" distUnits="MM" geometryGenerator="" rotationUnit="AngleDegrees" placement="0" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGeneratorEnabled="0" centroidInside="0" offsetUnits="MM" yOffset="0" priority="5" overlapHandling="PreventOverlap" allowDegraded="0" quadOffset="4" xOffset="0" repeatDistanceUnits="MM" geometryGeneratorType="PointGeometry" lineAnchorClipping="0" dist="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="FollowPlacement" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorType="0" overrunDistanceUnit="MM"/>
+      <rendering scaleMax="20000" fontLimitPixelSize="0" limitNumLabels="0" drawLabels="1" scaleMin="0" obstacle="1" mergeLines="0" unplacedVisibility="0" fontMaxPixelSize="10000" fontMinPixelSize="3" obstacleType="1" upsidedownLabels="0" maxNumLabels="2000" minFeatureSize="0" scaleVisibility="1" obstacleFactor="1" labelPerPart="0" zIndex="0"/>
+      <dd_properties>
+        <Option type="Map">
+          <Option type="QString" name="name" value=""/>
+          <Option name="properties"/>
+          <Option type="QString" name="type" value="collection"/>
+        </Option>
+      </dd_properties>
+      <callout type="simple">
+        <Option type="Map">
+          <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
+          <Option type="int" name="blendMode" value="0"/>
+          <Option type="Map" name="ddProperties">
+            <Option type="QString" name="name" value=""/>
+            <Option name="properties"/>
+            <Option type="QString" name="type" value="collection"/>
+          </Option>
+          <Option type="bool" name="drawToAllParts" value="false"/>
+          <Option type="QString" name="enabled" value="0"/>
+          <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
+          <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; clip_to_extent=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; id=&quot;{34099c95-5f6e-4b95-ac00-592f7eee1a27}&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+          <Option type="double" name="minLength" value="0"/>
+          <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+          <Option type="QString" name="minLengthUnit" value="MM"/>
+          <Option type="double" name="offsetFromAnchor" value="0"/>
+          <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+          <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+          <Option type="double" name="offsetFromLabel" value="0"/>
+          <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+          <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
+        </Option>
+      </callout>
+    </settings>
+  </labeling>
   <blendMode>0</blendMode>
   <featureBlendMode>0</featureBlendMode>
   <layerGeometryType>2</layerGeometryType>
diff --git a/Symbology/qgis/QRiS/structure_lines.qml b/Symbology/qgis/QRiS/structure_lines.qml
index c640bb77..360c130c 100644
--- a/Symbology/qgis/QRiS/structure_lines.qml
+++ b/Symbology/qgis/QRiS/structure_lines.qml
@@ -1,181 +1,181 @@
 <!DOCTYPE qgis PUBLIC 'http://mrcc.com/qgis.dtd' 'SYSTEM'>
-<qgis styleCategories="Symbology|Labeling" labelsEnabled="1" version="3.34.8-Prizren">
+<qgis version="3.34.8-Prizren" styleCategories="Symbology|Labeling" labelsEnabled="1">
   <renderer-v2 type="RuleRenderer" referencescale="-1" symbollevels="0" enableorderby="0" forceraster="0">
     <rules key="{ff32fc76-302d-47a7-ab2b-2f9253988f06}">
-      <rule filter="&quot;Structure Type&quot; = 'BDA' or &quot;Structure Type&quot; = 'Primary BDA' or &quot;Structure Type&quot; = 'Secondary BDA' or  &quot;Structure Type&quot; = 'BDA Postless' or &quot;Structure Type&quot; = 'Tight PALS (BDA without sod)'  or &quot;Structure Type&quot; = 'Postline Wicker Weave'" label="BDA" key="{f5185101-7ec5-448d-b2e1-3a474e6dce11}" symbol="0"/>
-      <rule filter="&quot;Structure Type&quot; = 'PALS' or &quot;Structure Type&quot; = 'PALS - Bank Attached' or &quot;Structure Type&quot; = 'PALS - Right Bank Attached' or &quot;Structure Type&quot; = 'PALS - Left Bank Attached' or &quot;Structure Type&quot; = 'PALS - Bank Blaster' or &quot;Structure Type&quot; = 'PALS - Constriction Jet' or &quot;Structure Type&quot; = 'PALS - Mid Channel' or &quot;Structure Type&quot; = 'PALS - Rhino' or &quot;Structure Type&quot; = 'PALS - Channel Spanning' or &quot;Structure Type&quot; = 'Rhino'  or &quot;Structure Type&quot; = 'Leaky Dam' or &quot;Structure Type&quot; = 'Post and Brush Plug'  or &quot;Structure Type&quot; = 'Wicker Weirs' " label="PALS" key="{f6676c63-23b4-44fb-b592-e7cb02b9b7c6}" symbol="1"/>
-      <rule filter="&quot;Structure Type&quot; = 'ALS' or  &quot;Structure Type&quot; = 'ALS - Bank Attached' or  &quot;Structure Type&quot; = 'ALS - Bank Blaster' or  &quot;Structure Type&quot; = 'ALS - Mid Channel' or  &quot;Structure Type&quot; = 'ALS - Rhino' or  &quot;Structure Type&quot; = 'ALS - Channel Spanning' or  &quot;Structure Type&quot; = 'Wood Jam' or  &quot;Structure Type&quot; = 'Full Tree' or  &quot;Structure Type&quot; = 'Strategic Felling' or  &quot;Structure Type&quot; = 'Grip Hoist Tree' or  &quot;Structure Type&quot; = 'Fell Tree' or  &quot;Structure Type&quot; = 'Tree Dam' or  &quot;Structure Type&quot; = 'Tree Plug'" label="ALS" key="{ee37a95b-4b89-478d-bae6-d647a810b72d}" symbol="2"/>
-      <rule filter="&quot;Structure Type&quot; = 'One Rock Dam' or &quot;Structure Type&quot; = 'Zuni Bowl' or &quot;Structure Type&quot; = 'Spreaders' or &quot;Structure Type&quot; = 'Floodplain BDA' or &quot;Structure Type&quot; = 'Sedge Plugs' or &quot;Structure Type&quot; = 'Headcut Treatment' or  &quot;Structure Type&quot; = 'Bag Plugs' or  &quot;Structure Type&quot; = 'Floodplain LWD' or  &quot;Structure Type&quot; = 'Vanes'" label="Other" key="{378b0370-892b-4d36-8191-d661a195830a}" symbol="3"/>
-      <rule filter="ELSE" key="{933751e9-a5d5-4360-ab12-0ace17227c49}" symbol="4"/>
+      <rule symbol="0" filter="&quot;Structure Type&quot; = 'BDA' or &quot;Structure Type&quot; = 'Primary BDA' or &quot;Structure Type&quot; = 'Secondary BDA' or  &quot;Structure Type&quot; = 'BDA Postless' or &quot;Structure Type&quot; = 'Tight PALS (BDA without sod)'  or &quot;Structure Type&quot; = 'Postline Wicker Weave'" label="BDA" key="{f5185101-7ec5-448d-b2e1-3a474e6dce11}"/>
+      <rule symbol="1" filter="&quot;Structure Type&quot; = 'PALS' or &quot;Structure Type&quot; = 'PALS - Bank Attached' or &quot;Structure Type&quot; = 'PALS - Right Bank Attached' or &quot;Structure Type&quot; = 'PALS - Left Bank Attached' or &quot;Structure Type&quot; = 'PALS - Bank Blaster' or &quot;Structure Type&quot; = 'PALS - Constriction Jet' or &quot;Structure Type&quot; = 'PALS - Mid Channel' or &quot;Structure Type&quot; = 'PALS - Rhino' or &quot;Structure Type&quot; = 'PALS - Channel Spanning' or &quot;Structure Type&quot; = 'Rhino'  or &quot;Structure Type&quot; = 'Leaky Dam' or &quot;Structure Type&quot; = 'Post and Brush Plug'  or &quot;Structure Type&quot; = 'Wicker Weirs' " label="PALS" key="{f6676c63-23b4-44fb-b592-e7cb02b9b7c6}"/>
+      <rule symbol="2" filter="&quot;Structure Type&quot; = 'ALS' or  &quot;Structure Type&quot; = 'ALS - Bank Attached' or  &quot;Structure Type&quot; = 'ALS - Bank Blaster' or  &quot;Structure Type&quot; = 'ALS - Mid Channel' or  &quot;Structure Type&quot; = 'ALS - Rhino' or  &quot;Structure Type&quot; = 'ALS - Channel Spanning' or  &quot;Structure Type&quot; = 'Wood Jam' or  &quot;Structure Type&quot; = 'Full Tree' or  &quot;Structure Type&quot; = 'Strategic Felling' or  &quot;Structure Type&quot; = 'Grip Hoist Tree' or  &quot;Structure Type&quot; = 'Fell Tree' or  &quot;Structure Type&quot; = 'Tree Dam' or  &quot;Structure Type&quot; = 'Tree Plug'" label="ALS" key="{ee37a95b-4b89-478d-bae6-d647a810b72d}"/>
+      <rule symbol="3" filter="&quot;Structure Type&quot; = 'One Rock Dam' or &quot;Structure Type&quot; = 'Zuni Bowl' or &quot;Structure Type&quot; = 'Spreaders' or &quot;Structure Type&quot; = 'Floodplain BDA' or &quot;Structure Type&quot; = 'Sedge Plugs' or &quot;Structure Type&quot; = 'Headcut Treatment' or  &quot;Structure Type&quot; = 'Bag Plugs' or  &quot;Structure Type&quot; = 'Floodplain LWD' or  &quot;Structure Type&quot; = 'Vanes'" label="Other" key="{378b0370-892b-4d36-8191-d661a195830a}"/>
+      <rule symbol="4" filter="ELSE" key="{933751e9-a5d5-4360-ab12-0ace17227c49}"/>
     </rules>
     <symbols>
       <symbol type="line" clip_to_extent="1" name="0" is_animated="0" alpha="1" force_rhr="0" frame_rate="10">
         <data_defined_properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data_defined_properties>
-        <layer pass="0" locked="0" class="SimpleLine" id="{969e4a7b-89e5-4198-ac5c-569c3bed15e1}" enabled="1">
+        <layer class="SimpleLine" locked="0" enabled="1" id="{969e4a7b-89e5-4198-ac5c-569c3bed15e1}" pass="0">
           <Option type="Map">
-            <Option type="QString" value="0" name="align_dash_pattern"/>
-            <Option type="QString" value="square" name="capstyle"/>
-            <Option type="QString" value="5;2" name="customdash"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-            <Option type="QString" value="MM" name="customdash_unit"/>
-            <Option type="QString" value="0" name="dash_pattern_offset"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-            <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-            <Option type="QString" value="0" name="draw_inside_polygon"/>
-            <Option type="QString" value="bevel" name="joinstyle"/>
-            <Option type="QString" value="255,255,255,255" name="line_color"/>
-            <Option type="QString" value="solid" name="line_style"/>
-            <Option type="QString" value="1" name="line_width"/>
-            <Option type="QString" value="MM" name="line_width_unit"/>
-            <Option type="QString" value="0" name="offset"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-            <Option type="QString" value="MM" name="offset_unit"/>
-            <Option type="QString" value="0" name="ring_filter"/>
-            <Option type="QString" value="0" name="trim_distance_end"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-            <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-            <Option type="QString" value="0" name="trim_distance_start"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-            <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-            <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-            <Option type="QString" value="0" name="use_custom_dash"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+            <Option type="QString" name="align_dash_pattern" value="0"/>
+            <Option type="QString" name="capstyle" value="square"/>
+            <Option type="QString" name="customdash" value="5;2"/>
+            <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="customdash_unit" value="MM"/>
+            <Option type="QString" name="dash_pattern_offset" value="0"/>
+            <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+            <Option type="QString" name="draw_inside_polygon" value="0"/>
+            <Option type="QString" name="joinstyle" value="bevel"/>
+            <Option type="QString" name="line_color" value="255,255,255,255"/>
+            <Option type="QString" name="line_style" value="solid"/>
+            <Option type="QString" name="line_width" value="1"/>
+            <Option type="QString" name="line_width_unit" value="MM"/>
+            <Option type="QString" name="offset" value="0"/>
+            <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="offset_unit" value="MM"/>
+            <Option type="QString" name="ring_filter" value="0"/>
+            <Option type="QString" name="trim_distance_end" value="0"/>
+            <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+            <Option type="QString" name="trim_distance_start" value="0"/>
+            <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+            <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+            <Option type="QString" name="use_custom_dash" value="0"/>
+            <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
           </Option>
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
         </layer>
-        <layer pass="1" locked="0" class="SimpleLine" id="{1f4a534b-0bae-4609-98e0-5c6ad46c20fc}" enabled="1">
+        <layer class="SimpleLine" locked="0" enabled="1" id="{1f4a534b-0bae-4609-98e0-5c6ad46c20fc}" pass="1">
           <Option type="Map">
-            <Option type="QString" value="0" name="align_dash_pattern"/>
-            <Option type="QString" value="round" name="capstyle"/>
-            <Option type="QString" value="5;2" name="customdash"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-            <Option type="QString" value="MM" name="customdash_unit"/>
-            <Option type="QString" value="-5.55112e-17" name="dash_pattern_offset"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-            <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-            <Option type="QString" value="0" name="draw_inside_polygon"/>
-            <Option type="QString" value="round" name="joinstyle"/>
-            <Option type="QString" value="43,131,186,255" name="line_color"/>
-            <Option type="QString" value="solid" name="line_style"/>
-            <Option type="QString" value="0.8" name="line_width"/>
-            <Option type="QString" value="MM" name="line_width_unit"/>
-            <Option type="QString" value="0" name="offset"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-            <Option type="QString" value="MM" name="offset_unit"/>
-            <Option type="QString" value="0" name="ring_filter"/>
-            <Option type="QString" value="0" name="trim_distance_end"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-            <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-            <Option type="QString" value="0" name="trim_distance_start"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-            <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-            <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-            <Option type="QString" value="0" name="use_custom_dash"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+            <Option type="QString" name="align_dash_pattern" value="0"/>
+            <Option type="QString" name="capstyle" value="round"/>
+            <Option type="QString" name="customdash" value="5;2"/>
+            <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="customdash_unit" value="MM"/>
+            <Option type="QString" name="dash_pattern_offset" value="-5.55112e-17"/>
+            <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+            <Option type="QString" name="draw_inside_polygon" value="0"/>
+            <Option type="QString" name="joinstyle" value="round"/>
+            <Option type="QString" name="line_color" value="43,131,186,255"/>
+            <Option type="QString" name="line_style" value="solid"/>
+            <Option type="QString" name="line_width" value="0.8"/>
+            <Option type="QString" name="line_width_unit" value="MM"/>
+            <Option type="QString" name="offset" value="0"/>
+            <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="offset_unit" value="MM"/>
+            <Option type="QString" name="ring_filter" value="0"/>
+            <Option type="QString" name="trim_distance_end" value="0"/>
+            <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+            <Option type="QString" name="trim_distance_start" value="0"/>
+            <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+            <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+            <Option type="QString" name="use_custom_dash" value="0"/>
+            <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
           </Option>
           <effect type="effectStack" enabled="0">
             <effect type="dropShadow">
               <Option type="Map">
-                <Option type="QString" value="13" name="blend_mode"/>
-                <Option type="QString" value="2.645" name="blur_level"/>
-                <Option type="QString" value="MM" name="blur_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="blur_unit_scale"/>
-                <Option type="QString" value="0,0,0,255" name="color"/>
-                <Option type="QString" value="2" name="draw_mode"/>
-                <Option type="QString" value="0" name="enabled"/>
-                <Option type="QString" value="135" name="offset_angle"/>
-                <Option type="QString" value="2" name="offset_distance"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_unit_scale"/>
-                <Option type="QString" value="1" name="opacity"/>
+                <Option type="QString" name="blend_mode" value="13"/>
+                <Option type="QString" name="blur_level" value="2.645"/>
+                <Option type="QString" name="blur_unit" value="MM"/>
+                <Option type="QString" name="blur_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color" value="0,0,0,255"/>
+                <Option type="QString" name="draw_mode" value="2"/>
+                <Option type="QString" name="enabled" value="0"/>
+                <Option type="QString" name="offset_angle" value="135"/>
+                <Option type="QString" name="offset_distance" value="2"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="offset_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="opacity" value="1"/>
               </Option>
             </effect>
             <effect type="outerGlow">
               <Option type="Map">
-                <Option type="QString" value="0" name="blend_mode"/>
-                <Option type="QString" value="2.645" name="blur_level"/>
-                <Option type="QString" value="MM" name="blur_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="blur_unit_scale"/>
-                <Option type="QString" value="69,116,40,255" name="color1"/>
-                <Option type="QString" value="188,220,60,255" name="color2"/>
-                <Option type="QString" value="0" name="color_type"/>
-                <Option type="QString" value="ccw" name="direction"/>
-                <Option type="QString" value="0" name="discrete"/>
-                <Option type="QString" value="2" name="draw_mode"/>
-                <Option type="QString" value="1" name="enabled"/>
-                <Option type="QString" value="0.5" name="opacity"/>
-                <Option type="QString" value="gradient" name="rampType"/>
-                <Option type="QString" value="255,255,255,255" name="single_color"/>
-                <Option type="QString" value="rgb" name="spec"/>
-                <Option type="QString" value="2" name="spread"/>
-                <Option type="QString" value="MM" name="spread_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="spread_unit_scale"/>
+                <Option type="QString" name="blend_mode" value="0"/>
+                <Option type="QString" name="blur_level" value="2.645"/>
+                <Option type="QString" name="blur_unit" value="MM"/>
+                <Option type="QString" name="blur_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color1" value="69,116,40,255"/>
+                <Option type="QString" name="color2" value="188,220,60,255"/>
+                <Option type="QString" name="color_type" value="0"/>
+                <Option type="QString" name="direction" value="ccw"/>
+                <Option type="QString" name="discrete" value="0"/>
+                <Option type="QString" name="draw_mode" value="2"/>
+                <Option type="QString" name="enabled" value="1"/>
+                <Option type="QString" name="opacity" value="0.5"/>
+                <Option type="QString" name="rampType" value="gradient"/>
+                <Option type="QString" name="single_color" value="255,255,255,255"/>
+                <Option type="QString" name="spec" value="rgb"/>
+                <Option type="QString" name="spread" value="2"/>
+                <Option type="QString" name="spread_unit" value="MM"/>
+                <Option type="QString" name="spread_unit_scale" value="3x:0,0,0,0,0,0"/>
               </Option>
             </effect>
             <effect type="drawSource">
               <Option type="Map">
-                <Option type="QString" value="0" name="blend_mode"/>
-                <Option type="QString" value="2" name="draw_mode"/>
-                <Option type="QString" value="1" name="enabled"/>
-                <Option type="QString" value="1" name="opacity"/>
+                <Option type="QString" name="blend_mode" value="0"/>
+                <Option type="QString" name="draw_mode" value="2"/>
+                <Option type="QString" name="enabled" value="1"/>
+                <Option type="QString" name="opacity" value="1"/>
               </Option>
             </effect>
             <effect type="innerShadow">
               <Option type="Map">
-                <Option type="QString" value="13" name="blend_mode"/>
-                <Option type="QString" value="2.645" name="blur_level"/>
-                <Option type="QString" value="MM" name="blur_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="blur_unit_scale"/>
-                <Option type="QString" value="0,0,0,255" name="color"/>
-                <Option type="QString" value="2" name="draw_mode"/>
-                <Option type="QString" value="0" name="enabled"/>
-                <Option type="QString" value="135" name="offset_angle"/>
-                <Option type="QString" value="2" name="offset_distance"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_unit_scale"/>
-                <Option type="QString" value="1" name="opacity"/>
+                <Option type="QString" name="blend_mode" value="13"/>
+                <Option type="QString" name="blur_level" value="2.645"/>
+                <Option type="QString" name="blur_unit" value="MM"/>
+                <Option type="QString" name="blur_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color" value="0,0,0,255"/>
+                <Option type="QString" name="draw_mode" value="2"/>
+                <Option type="QString" name="enabled" value="0"/>
+                <Option type="QString" name="offset_angle" value="135"/>
+                <Option type="QString" name="offset_distance" value="2"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="offset_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="opacity" value="1"/>
               </Option>
             </effect>
             <effect type="innerGlow">
               <Option type="Map">
-                <Option type="QString" value="0" name="blend_mode"/>
-                <Option type="QString" value="2.645" name="blur_level"/>
-                <Option type="QString" value="MM" name="blur_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="blur_unit_scale"/>
-                <Option type="QString" value="69,116,40,255" name="color1"/>
-                <Option type="QString" value="188,220,60,255" name="color2"/>
-                <Option type="QString" value="0" name="color_type"/>
-                <Option type="QString" value="ccw" name="direction"/>
-                <Option type="QString" value="0" name="discrete"/>
-                <Option type="QString" value="2" name="draw_mode"/>
-                <Option type="QString" value="0" name="enabled"/>
-                <Option type="QString" value="0.5" name="opacity"/>
-                <Option type="QString" value="gradient" name="rampType"/>
-                <Option type="QString" value="255,255,255,255" name="single_color"/>
-                <Option type="QString" value="rgb" name="spec"/>
-                <Option type="QString" value="2" name="spread"/>
-                <Option type="QString" value="MM" name="spread_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="spread_unit_scale"/>
+                <Option type="QString" name="blend_mode" value="0"/>
+                <Option type="QString" name="blur_level" value="2.645"/>
+                <Option type="QString" name="blur_unit" value="MM"/>
+                <Option type="QString" name="blur_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color1" value="69,116,40,255"/>
+                <Option type="QString" name="color2" value="188,220,60,255"/>
+                <Option type="QString" name="color_type" value="0"/>
+                <Option type="QString" name="direction" value="ccw"/>
+                <Option type="QString" name="discrete" value="0"/>
+                <Option type="QString" name="draw_mode" value="2"/>
+                <Option type="QString" name="enabled" value="0"/>
+                <Option type="QString" name="opacity" value="0.5"/>
+                <Option type="QString" name="rampType" value="gradient"/>
+                <Option type="QString" name="single_color" value="255,255,255,255"/>
+                <Option type="QString" name="spec" value="rgb"/>
+                <Option type="QString" name="spread" value="2"/>
+                <Option type="QString" name="spread_unit" value="MM"/>
+                <Option type="QString" name="spread_unit_scale" value="3x:0,0,0,0,0,0"/>
               </Option>
             </effect>
           </effect>
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
         </layer>
@@ -183,170 +183,170 @@
       <symbol type="line" clip_to_extent="1" name="1" is_animated="0" alpha="1" force_rhr="0" frame_rate="10">
         <data_defined_properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data_defined_properties>
-        <layer pass="0" locked="0" class="SimpleLine" id="{15392395-9868-45ab-a7ac-31f9f7f4c813}" enabled="1">
+        <layer class="SimpleLine" locked="0" enabled="1" id="{15392395-9868-45ab-a7ac-31f9f7f4c813}" pass="0">
           <Option type="Map">
-            <Option type="QString" value="0" name="align_dash_pattern"/>
-            <Option type="QString" value="square" name="capstyle"/>
-            <Option type="QString" value="5;2" name="customdash"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-            <Option type="QString" value="MM" name="customdash_unit"/>
-            <Option type="QString" value="0" name="dash_pattern_offset"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-            <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-            <Option type="QString" value="0" name="draw_inside_polygon"/>
-            <Option type="QString" value="bevel" name="joinstyle"/>
-            <Option type="QString" value="255,255,255,255" name="line_color"/>
-            <Option type="QString" value="solid" name="line_style"/>
-            <Option type="QString" value="1" name="line_width"/>
-            <Option type="QString" value="MM" name="line_width_unit"/>
-            <Option type="QString" value="0" name="offset"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-            <Option type="QString" value="MM" name="offset_unit"/>
-            <Option type="QString" value="0" name="ring_filter"/>
-            <Option type="QString" value="0" name="trim_distance_end"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-            <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-            <Option type="QString" value="0" name="trim_distance_start"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-            <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-            <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-            <Option type="QString" value="0" name="use_custom_dash"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+            <Option type="QString" name="align_dash_pattern" value="0"/>
+            <Option type="QString" name="capstyle" value="square"/>
+            <Option type="QString" name="customdash" value="5;2"/>
+            <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="customdash_unit" value="MM"/>
+            <Option type="QString" name="dash_pattern_offset" value="0"/>
+            <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+            <Option type="QString" name="draw_inside_polygon" value="0"/>
+            <Option type="QString" name="joinstyle" value="bevel"/>
+            <Option type="QString" name="line_color" value="255,255,255,255"/>
+            <Option type="QString" name="line_style" value="solid"/>
+            <Option type="QString" name="line_width" value="1"/>
+            <Option type="QString" name="line_width_unit" value="MM"/>
+            <Option type="QString" name="offset" value="0"/>
+            <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="offset_unit" value="MM"/>
+            <Option type="QString" name="ring_filter" value="0"/>
+            <Option type="QString" name="trim_distance_end" value="0"/>
+            <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+            <Option type="QString" name="trim_distance_start" value="0"/>
+            <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+            <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+            <Option type="QString" name="use_custom_dash" value="0"/>
+            <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
           </Option>
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
         </layer>
-        <layer pass="0" locked="0" class="SimpleLine" id="{15506160-b456-4330-ad70-71f8aa2ab067}" enabled="1">
+        <layer class="SimpleLine" locked="0" enabled="1" id="{15506160-b456-4330-ad70-71f8aa2ab067}" pass="0">
           <Option type="Map">
-            <Option type="QString" value="0" name="align_dash_pattern"/>
-            <Option type="QString" value="round" name="capstyle"/>
-            <Option type="QString" value="5;2" name="customdash"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-            <Option type="QString" value="MM" name="customdash_unit"/>
-            <Option type="QString" value="-5.55112e-17" name="dash_pattern_offset"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-            <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-            <Option type="QString" value="0" name="draw_inside_polygon"/>
-            <Option type="QString" value="round" name="joinstyle"/>
-            <Option type="QString" value="166,97,26,255" name="line_color"/>
-            <Option type="QString" value="solid" name="line_style"/>
-            <Option type="QString" value="0.8" name="line_width"/>
-            <Option type="QString" value="MM" name="line_width_unit"/>
-            <Option type="QString" value="0" name="offset"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-            <Option type="QString" value="MM" name="offset_unit"/>
-            <Option type="QString" value="0" name="ring_filter"/>
-            <Option type="QString" value="0" name="trim_distance_end"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-            <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-            <Option type="QString" value="0" name="trim_distance_start"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-            <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-            <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-            <Option type="QString" value="0" name="use_custom_dash"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+            <Option type="QString" name="align_dash_pattern" value="0"/>
+            <Option type="QString" name="capstyle" value="round"/>
+            <Option type="QString" name="customdash" value="5;2"/>
+            <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="customdash_unit" value="MM"/>
+            <Option type="QString" name="dash_pattern_offset" value="-5.55112e-17"/>
+            <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+            <Option type="QString" name="draw_inside_polygon" value="0"/>
+            <Option type="QString" name="joinstyle" value="round"/>
+            <Option type="QString" name="line_color" value="166,97,26,255"/>
+            <Option type="QString" name="line_style" value="solid"/>
+            <Option type="QString" name="line_width" value="0.8"/>
+            <Option type="QString" name="line_width_unit" value="MM"/>
+            <Option type="QString" name="offset" value="0"/>
+            <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="offset_unit" value="MM"/>
+            <Option type="QString" name="ring_filter" value="0"/>
+            <Option type="QString" name="trim_distance_end" value="0"/>
+            <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+            <Option type="QString" name="trim_distance_start" value="0"/>
+            <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+            <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+            <Option type="QString" name="use_custom_dash" value="0"/>
+            <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
           </Option>
           <effect type="effectStack" enabled="0">
             <effect type="dropShadow">
               <Option type="Map">
-                <Option type="QString" value="13" name="blend_mode"/>
-                <Option type="QString" value="2.645" name="blur_level"/>
-                <Option type="QString" value="MM" name="blur_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="blur_unit_scale"/>
-                <Option type="QString" value="0,0,0,255" name="color"/>
-                <Option type="QString" value="2" name="draw_mode"/>
-                <Option type="QString" value="0" name="enabled"/>
-                <Option type="QString" value="135" name="offset_angle"/>
-                <Option type="QString" value="2" name="offset_distance"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_unit_scale"/>
-                <Option type="QString" value="1" name="opacity"/>
+                <Option type="QString" name="blend_mode" value="13"/>
+                <Option type="QString" name="blur_level" value="2.645"/>
+                <Option type="QString" name="blur_unit" value="MM"/>
+                <Option type="QString" name="blur_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color" value="0,0,0,255"/>
+                <Option type="QString" name="draw_mode" value="2"/>
+                <Option type="QString" name="enabled" value="0"/>
+                <Option type="QString" name="offset_angle" value="135"/>
+                <Option type="QString" name="offset_distance" value="2"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="offset_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="opacity" value="1"/>
               </Option>
             </effect>
             <effect type="outerGlow">
               <Option type="Map">
-                <Option type="QString" value="0" name="blend_mode"/>
-                <Option type="QString" value="2.645" name="blur_level"/>
-                <Option type="QString" value="MM" name="blur_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="blur_unit_scale"/>
-                <Option type="QString" value="69,116,40,255" name="color1"/>
-                <Option type="QString" value="188,220,60,255" name="color2"/>
-                <Option type="QString" value="0" name="color_type"/>
-                <Option type="QString" value="ccw" name="direction"/>
-                <Option type="QString" value="0" name="discrete"/>
-                <Option type="QString" value="2" name="draw_mode"/>
-                <Option type="QString" value="1" name="enabled"/>
-                <Option type="QString" value="0.5" name="opacity"/>
-                <Option type="QString" value="gradient" name="rampType"/>
-                <Option type="QString" value="255,255,255,255" name="single_color"/>
-                <Option type="QString" value="rgb" name="spec"/>
-                <Option type="QString" value="2" name="spread"/>
-                <Option type="QString" value="MM" name="spread_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="spread_unit_scale"/>
+                <Option type="QString" name="blend_mode" value="0"/>
+                <Option type="QString" name="blur_level" value="2.645"/>
+                <Option type="QString" name="blur_unit" value="MM"/>
+                <Option type="QString" name="blur_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color1" value="69,116,40,255"/>
+                <Option type="QString" name="color2" value="188,220,60,255"/>
+                <Option type="QString" name="color_type" value="0"/>
+                <Option type="QString" name="direction" value="ccw"/>
+                <Option type="QString" name="discrete" value="0"/>
+                <Option type="QString" name="draw_mode" value="2"/>
+                <Option type="QString" name="enabled" value="1"/>
+                <Option type="QString" name="opacity" value="0.5"/>
+                <Option type="QString" name="rampType" value="gradient"/>
+                <Option type="QString" name="single_color" value="255,255,255,255"/>
+                <Option type="QString" name="spec" value="rgb"/>
+                <Option type="QString" name="spread" value="2"/>
+                <Option type="QString" name="spread_unit" value="MM"/>
+                <Option type="QString" name="spread_unit_scale" value="3x:0,0,0,0,0,0"/>
               </Option>
             </effect>
             <effect type="drawSource">
               <Option type="Map">
-                <Option type="QString" value="0" name="blend_mode"/>
-                <Option type="QString" value="2" name="draw_mode"/>
-                <Option type="QString" value="1" name="enabled"/>
-                <Option type="QString" value="1" name="opacity"/>
+                <Option type="QString" name="blend_mode" value="0"/>
+                <Option type="QString" name="draw_mode" value="2"/>
+                <Option type="QString" name="enabled" value="1"/>
+                <Option type="QString" name="opacity" value="1"/>
               </Option>
             </effect>
             <effect type="innerShadow">
               <Option type="Map">
-                <Option type="QString" value="13" name="blend_mode"/>
-                <Option type="QString" value="2.645" name="blur_level"/>
-                <Option type="QString" value="MM" name="blur_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="blur_unit_scale"/>
-                <Option type="QString" value="0,0,0,255" name="color"/>
-                <Option type="QString" value="2" name="draw_mode"/>
-                <Option type="QString" value="0" name="enabled"/>
-                <Option type="QString" value="135" name="offset_angle"/>
-                <Option type="QString" value="2" name="offset_distance"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_unit_scale"/>
-                <Option type="QString" value="1" name="opacity"/>
+                <Option type="QString" name="blend_mode" value="13"/>
+                <Option type="QString" name="blur_level" value="2.645"/>
+                <Option type="QString" name="blur_unit" value="MM"/>
+                <Option type="QString" name="blur_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color" value="0,0,0,255"/>
+                <Option type="QString" name="draw_mode" value="2"/>
+                <Option type="QString" name="enabled" value="0"/>
+                <Option type="QString" name="offset_angle" value="135"/>
+                <Option type="QString" name="offset_distance" value="2"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="offset_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="opacity" value="1"/>
               </Option>
             </effect>
             <effect type="innerGlow">
               <Option type="Map">
-                <Option type="QString" value="0" name="blend_mode"/>
-                <Option type="QString" value="2.645" name="blur_level"/>
-                <Option type="QString" value="MM" name="blur_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="blur_unit_scale"/>
-                <Option type="QString" value="69,116,40,255" name="color1"/>
-                <Option type="QString" value="188,220,60,255" name="color2"/>
-                <Option type="QString" value="0" name="color_type"/>
-                <Option type="QString" value="ccw" name="direction"/>
-                <Option type="QString" value="0" name="discrete"/>
-                <Option type="QString" value="2" name="draw_mode"/>
-                <Option type="QString" value="0" name="enabled"/>
-                <Option type="QString" value="0.5" name="opacity"/>
-                <Option type="QString" value="gradient" name="rampType"/>
-                <Option type="QString" value="255,255,255,255" name="single_color"/>
-                <Option type="QString" value="rgb" name="spec"/>
-                <Option type="QString" value="2" name="spread"/>
-                <Option type="QString" value="MM" name="spread_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="spread_unit_scale"/>
+                <Option type="QString" name="blend_mode" value="0"/>
+                <Option type="QString" name="blur_level" value="2.645"/>
+                <Option type="QString" name="blur_unit" value="MM"/>
+                <Option type="QString" name="blur_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color1" value="69,116,40,255"/>
+                <Option type="QString" name="color2" value="188,220,60,255"/>
+                <Option type="QString" name="color_type" value="0"/>
+                <Option type="QString" name="direction" value="ccw"/>
+                <Option type="QString" name="discrete" value="0"/>
+                <Option type="QString" name="draw_mode" value="2"/>
+                <Option type="QString" name="enabled" value="0"/>
+                <Option type="QString" name="opacity" value="0.5"/>
+                <Option type="QString" name="rampType" value="gradient"/>
+                <Option type="QString" name="single_color" value="255,255,255,255"/>
+                <Option type="QString" name="spec" value="rgb"/>
+                <Option type="QString" name="spread" value="2"/>
+                <Option type="QString" name="spread_unit" value="MM"/>
+                <Option type="QString" name="spread_unit_scale" value="3x:0,0,0,0,0,0"/>
               </Option>
             </effect>
           </effect>
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
         </layer>
@@ -354,170 +354,170 @@
       <symbol type="line" clip_to_extent="1" name="2" is_animated="0" alpha="1" force_rhr="0" frame_rate="10">
         <data_defined_properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data_defined_properties>
-        <layer pass="0" locked="0" class="SimpleLine" id="{7404dc09-c5e3-4f28-a06f-e8e9a7cff1c1}" enabled="1">
+        <layer class="SimpleLine" locked="0" enabled="1" id="{7404dc09-c5e3-4f28-a06f-e8e9a7cff1c1}" pass="0">
           <Option type="Map">
-            <Option type="QString" value="0" name="align_dash_pattern"/>
-            <Option type="QString" value="square" name="capstyle"/>
-            <Option type="QString" value="5;2" name="customdash"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-            <Option type="QString" value="MM" name="customdash_unit"/>
-            <Option type="QString" value="0" name="dash_pattern_offset"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-            <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-            <Option type="QString" value="0" name="draw_inside_polygon"/>
-            <Option type="QString" value="bevel" name="joinstyle"/>
-            <Option type="QString" value="255,255,255,255" name="line_color"/>
-            <Option type="QString" value="solid" name="line_style"/>
-            <Option type="QString" value="1" name="line_width"/>
-            <Option type="QString" value="MM" name="line_width_unit"/>
-            <Option type="QString" value="0" name="offset"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-            <Option type="QString" value="MM" name="offset_unit"/>
-            <Option type="QString" value="0" name="ring_filter"/>
-            <Option type="QString" value="0" name="trim_distance_end"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-            <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-            <Option type="QString" value="0" name="trim_distance_start"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-            <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-            <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-            <Option type="QString" value="0" name="use_custom_dash"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+            <Option type="QString" name="align_dash_pattern" value="0"/>
+            <Option type="QString" name="capstyle" value="square"/>
+            <Option type="QString" name="customdash" value="5;2"/>
+            <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="customdash_unit" value="MM"/>
+            <Option type="QString" name="dash_pattern_offset" value="0"/>
+            <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+            <Option type="QString" name="draw_inside_polygon" value="0"/>
+            <Option type="QString" name="joinstyle" value="bevel"/>
+            <Option type="QString" name="line_color" value="255,255,255,255"/>
+            <Option type="QString" name="line_style" value="solid"/>
+            <Option type="QString" name="line_width" value="1"/>
+            <Option type="QString" name="line_width_unit" value="MM"/>
+            <Option type="QString" name="offset" value="0"/>
+            <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="offset_unit" value="MM"/>
+            <Option type="QString" name="ring_filter" value="0"/>
+            <Option type="QString" name="trim_distance_end" value="0"/>
+            <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+            <Option type="QString" name="trim_distance_start" value="0"/>
+            <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+            <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+            <Option type="QString" name="use_custom_dash" value="0"/>
+            <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
           </Option>
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
         </layer>
-        <layer pass="0" locked="0" class="SimpleLine" id="{986eef26-4bc3-4403-8a58-da665651942c}" enabled="1">
+        <layer class="SimpleLine" locked="0" enabled="1" id="{986eef26-4bc3-4403-8a58-da665651942c}" pass="0">
           <Option type="Map">
-            <Option type="QString" value="0" name="align_dash_pattern"/>
-            <Option type="QString" value="round" name="capstyle"/>
-            <Option type="QString" value="5;2" name="customdash"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-            <Option type="QString" value="MM" name="customdash_unit"/>
-            <Option type="QString" value="-5.55112e-17" name="dash_pattern_offset"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-            <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-            <Option type="QString" value="0" name="draw_inside_polygon"/>
-            <Option type="QString" value="round" name="joinstyle"/>
-            <Option type="QString" value="106,106,106,255" name="line_color"/>
-            <Option type="QString" value="solid" name="line_style"/>
-            <Option type="QString" value="0.8" name="line_width"/>
-            <Option type="QString" value="MM" name="line_width_unit"/>
-            <Option type="QString" value="0" name="offset"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-            <Option type="QString" value="MM" name="offset_unit"/>
-            <Option type="QString" value="0" name="ring_filter"/>
-            <Option type="QString" value="0" name="trim_distance_end"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-            <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-            <Option type="QString" value="0" name="trim_distance_start"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-            <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-            <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-            <Option type="QString" value="0" name="use_custom_dash"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+            <Option type="QString" name="align_dash_pattern" value="0"/>
+            <Option type="QString" name="capstyle" value="round"/>
+            <Option type="QString" name="customdash" value="5;2"/>
+            <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="customdash_unit" value="MM"/>
+            <Option type="QString" name="dash_pattern_offset" value="-5.55112e-17"/>
+            <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+            <Option type="QString" name="draw_inside_polygon" value="0"/>
+            <Option type="QString" name="joinstyle" value="round"/>
+            <Option type="QString" name="line_color" value="106,106,106,255"/>
+            <Option type="QString" name="line_style" value="solid"/>
+            <Option type="QString" name="line_width" value="0.8"/>
+            <Option type="QString" name="line_width_unit" value="MM"/>
+            <Option type="QString" name="offset" value="0"/>
+            <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="offset_unit" value="MM"/>
+            <Option type="QString" name="ring_filter" value="0"/>
+            <Option type="QString" name="trim_distance_end" value="0"/>
+            <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+            <Option type="QString" name="trim_distance_start" value="0"/>
+            <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+            <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+            <Option type="QString" name="use_custom_dash" value="0"/>
+            <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
           </Option>
           <effect type="effectStack" enabled="0">
             <effect type="dropShadow">
               <Option type="Map">
-                <Option type="QString" value="13" name="blend_mode"/>
-                <Option type="QString" value="2.645" name="blur_level"/>
-                <Option type="QString" value="MM" name="blur_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="blur_unit_scale"/>
-                <Option type="QString" value="0,0,0,255" name="color"/>
-                <Option type="QString" value="2" name="draw_mode"/>
-                <Option type="QString" value="0" name="enabled"/>
-                <Option type="QString" value="135" name="offset_angle"/>
-                <Option type="QString" value="2" name="offset_distance"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_unit_scale"/>
-                <Option type="QString" value="1" name="opacity"/>
+                <Option type="QString" name="blend_mode" value="13"/>
+                <Option type="QString" name="blur_level" value="2.645"/>
+                <Option type="QString" name="blur_unit" value="MM"/>
+                <Option type="QString" name="blur_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color" value="0,0,0,255"/>
+                <Option type="QString" name="draw_mode" value="2"/>
+                <Option type="QString" name="enabled" value="0"/>
+                <Option type="QString" name="offset_angle" value="135"/>
+                <Option type="QString" name="offset_distance" value="2"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="offset_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="opacity" value="1"/>
               </Option>
             </effect>
             <effect type="outerGlow">
               <Option type="Map">
-                <Option type="QString" value="0" name="blend_mode"/>
-                <Option type="QString" value="2.645" name="blur_level"/>
-                <Option type="QString" value="MM" name="blur_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="blur_unit_scale"/>
-                <Option type="QString" value="69,116,40,255" name="color1"/>
-                <Option type="QString" value="188,220,60,255" name="color2"/>
-                <Option type="QString" value="0" name="color_type"/>
-                <Option type="QString" value="ccw" name="direction"/>
-                <Option type="QString" value="0" name="discrete"/>
-                <Option type="QString" value="2" name="draw_mode"/>
-                <Option type="QString" value="1" name="enabled"/>
-                <Option type="QString" value="0.5" name="opacity"/>
-                <Option type="QString" value="gradient" name="rampType"/>
-                <Option type="QString" value="255,255,255,255" name="single_color"/>
-                <Option type="QString" value="rgb" name="spec"/>
-                <Option type="QString" value="2" name="spread"/>
-                <Option type="QString" value="MM" name="spread_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="spread_unit_scale"/>
+                <Option type="QString" name="blend_mode" value="0"/>
+                <Option type="QString" name="blur_level" value="2.645"/>
+                <Option type="QString" name="blur_unit" value="MM"/>
+                <Option type="QString" name="blur_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color1" value="69,116,40,255"/>
+                <Option type="QString" name="color2" value="188,220,60,255"/>
+                <Option type="QString" name="color_type" value="0"/>
+                <Option type="QString" name="direction" value="ccw"/>
+                <Option type="QString" name="discrete" value="0"/>
+                <Option type="QString" name="draw_mode" value="2"/>
+                <Option type="QString" name="enabled" value="1"/>
+                <Option type="QString" name="opacity" value="0.5"/>
+                <Option type="QString" name="rampType" value="gradient"/>
+                <Option type="QString" name="single_color" value="255,255,255,255"/>
+                <Option type="QString" name="spec" value="rgb"/>
+                <Option type="QString" name="spread" value="2"/>
+                <Option type="QString" name="spread_unit" value="MM"/>
+                <Option type="QString" name="spread_unit_scale" value="3x:0,0,0,0,0,0"/>
               </Option>
             </effect>
             <effect type="drawSource">
               <Option type="Map">
-                <Option type="QString" value="0" name="blend_mode"/>
-                <Option type="QString" value="2" name="draw_mode"/>
-                <Option type="QString" value="1" name="enabled"/>
-                <Option type="QString" value="1" name="opacity"/>
+                <Option type="QString" name="blend_mode" value="0"/>
+                <Option type="QString" name="draw_mode" value="2"/>
+                <Option type="QString" name="enabled" value="1"/>
+                <Option type="QString" name="opacity" value="1"/>
               </Option>
             </effect>
             <effect type="innerShadow">
               <Option type="Map">
-                <Option type="QString" value="13" name="blend_mode"/>
-                <Option type="QString" value="2.645" name="blur_level"/>
-                <Option type="QString" value="MM" name="blur_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="blur_unit_scale"/>
-                <Option type="QString" value="0,0,0,255" name="color"/>
-                <Option type="QString" value="2" name="draw_mode"/>
-                <Option type="QString" value="0" name="enabled"/>
-                <Option type="QString" value="135" name="offset_angle"/>
-                <Option type="QString" value="2" name="offset_distance"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_unit_scale"/>
-                <Option type="QString" value="1" name="opacity"/>
+                <Option type="QString" name="blend_mode" value="13"/>
+                <Option type="QString" name="blur_level" value="2.645"/>
+                <Option type="QString" name="blur_unit" value="MM"/>
+                <Option type="QString" name="blur_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color" value="0,0,0,255"/>
+                <Option type="QString" name="draw_mode" value="2"/>
+                <Option type="QString" name="enabled" value="0"/>
+                <Option type="QString" name="offset_angle" value="135"/>
+                <Option type="QString" name="offset_distance" value="2"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="offset_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="opacity" value="1"/>
               </Option>
             </effect>
             <effect type="innerGlow">
               <Option type="Map">
-                <Option type="QString" value="0" name="blend_mode"/>
-                <Option type="QString" value="2.645" name="blur_level"/>
-                <Option type="QString" value="MM" name="blur_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="blur_unit_scale"/>
-                <Option type="QString" value="69,116,40,255" name="color1"/>
-                <Option type="QString" value="188,220,60,255" name="color2"/>
-                <Option type="QString" value="0" name="color_type"/>
-                <Option type="QString" value="ccw" name="direction"/>
-                <Option type="QString" value="0" name="discrete"/>
-                <Option type="QString" value="2" name="draw_mode"/>
-                <Option type="QString" value="0" name="enabled"/>
-                <Option type="QString" value="0.5" name="opacity"/>
-                <Option type="QString" value="gradient" name="rampType"/>
-                <Option type="QString" value="255,255,255,255" name="single_color"/>
-                <Option type="QString" value="rgb" name="spec"/>
-                <Option type="QString" value="2" name="spread"/>
-                <Option type="QString" value="MM" name="spread_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="spread_unit_scale"/>
+                <Option type="QString" name="blend_mode" value="0"/>
+                <Option type="QString" name="blur_level" value="2.645"/>
+                <Option type="QString" name="blur_unit" value="MM"/>
+                <Option type="QString" name="blur_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color1" value="69,116,40,255"/>
+                <Option type="QString" name="color2" value="188,220,60,255"/>
+                <Option type="QString" name="color_type" value="0"/>
+                <Option type="QString" name="direction" value="ccw"/>
+                <Option type="QString" name="discrete" value="0"/>
+                <Option type="QString" name="draw_mode" value="2"/>
+                <Option type="QString" name="enabled" value="0"/>
+                <Option type="QString" name="opacity" value="0.5"/>
+                <Option type="QString" name="rampType" value="gradient"/>
+                <Option type="QString" name="single_color" value="255,255,255,255"/>
+                <Option type="QString" name="spec" value="rgb"/>
+                <Option type="QString" name="spread" value="2"/>
+                <Option type="QString" name="spread_unit" value="MM"/>
+                <Option type="QString" name="spread_unit_scale" value="3x:0,0,0,0,0,0"/>
               </Option>
             </effect>
           </effect>
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
         </layer>
@@ -525,170 +525,170 @@
       <symbol type="line" clip_to_extent="1" name="3" is_animated="0" alpha="1" force_rhr="0" frame_rate="10">
         <data_defined_properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data_defined_properties>
-        <layer pass="0" locked="0" class="SimpleLine" id="{39dcde25-c6c8-449f-ad79-450f60b94500}" enabled="1">
+        <layer class="SimpleLine" locked="0" enabled="1" id="{39dcde25-c6c8-449f-ad79-450f60b94500}" pass="0">
           <Option type="Map">
-            <Option type="QString" value="0" name="align_dash_pattern"/>
-            <Option type="QString" value="square" name="capstyle"/>
-            <Option type="QString" value="5;2" name="customdash"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-            <Option type="QString" value="MM" name="customdash_unit"/>
-            <Option type="QString" value="0" name="dash_pattern_offset"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-            <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-            <Option type="QString" value="0" name="draw_inside_polygon"/>
-            <Option type="QString" value="bevel" name="joinstyle"/>
-            <Option type="QString" value="255,255,255,255" name="line_color"/>
-            <Option type="QString" value="solid" name="line_style"/>
-            <Option type="QString" value="1" name="line_width"/>
-            <Option type="QString" value="MM" name="line_width_unit"/>
-            <Option type="QString" value="0" name="offset"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-            <Option type="QString" value="MM" name="offset_unit"/>
-            <Option type="QString" value="0" name="ring_filter"/>
-            <Option type="QString" value="0" name="trim_distance_end"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-            <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-            <Option type="QString" value="0" name="trim_distance_start"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-            <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-            <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-            <Option type="QString" value="0" name="use_custom_dash"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+            <Option type="QString" name="align_dash_pattern" value="0"/>
+            <Option type="QString" name="capstyle" value="square"/>
+            <Option type="QString" name="customdash" value="5;2"/>
+            <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="customdash_unit" value="MM"/>
+            <Option type="QString" name="dash_pattern_offset" value="0"/>
+            <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+            <Option type="QString" name="draw_inside_polygon" value="0"/>
+            <Option type="QString" name="joinstyle" value="bevel"/>
+            <Option type="QString" name="line_color" value="255,255,255,255"/>
+            <Option type="QString" name="line_style" value="solid"/>
+            <Option type="QString" name="line_width" value="1"/>
+            <Option type="QString" name="line_width_unit" value="MM"/>
+            <Option type="QString" name="offset" value="0"/>
+            <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="offset_unit" value="MM"/>
+            <Option type="QString" name="ring_filter" value="0"/>
+            <Option type="QString" name="trim_distance_end" value="0"/>
+            <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+            <Option type="QString" name="trim_distance_start" value="0"/>
+            <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+            <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+            <Option type="QString" name="use_custom_dash" value="0"/>
+            <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
           </Option>
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
         </layer>
-        <layer pass="0" locked="0" class="SimpleLine" id="{fb273714-20f8-4e93-9d66-94381421ca76}" enabled="1">
+        <layer class="SimpleLine" locked="0" enabled="1" id="{fb273714-20f8-4e93-9d66-94381421ca76}" pass="0">
           <Option type="Map">
-            <Option type="QString" value="0" name="align_dash_pattern"/>
-            <Option type="QString" value="round" name="capstyle"/>
-            <Option type="QString" value="5;2" name="customdash"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-            <Option type="QString" value="MM" name="customdash_unit"/>
-            <Option type="QString" value="-5.55112e-17" name="dash_pattern_offset"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-            <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-            <Option type="QString" value="0" name="draw_inside_polygon"/>
-            <Option type="QString" value="round" name="joinstyle"/>
-            <Option type="QString" value="166,217,106,255" name="line_color"/>
-            <Option type="QString" value="solid" name="line_style"/>
-            <Option type="QString" value="0.8" name="line_width"/>
-            <Option type="QString" value="MM" name="line_width_unit"/>
-            <Option type="QString" value="0" name="offset"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-            <Option type="QString" value="MM" name="offset_unit"/>
-            <Option type="QString" value="0" name="ring_filter"/>
-            <Option type="QString" value="0" name="trim_distance_end"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-            <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-            <Option type="QString" value="0" name="trim_distance_start"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-            <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-            <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-            <Option type="QString" value="0" name="use_custom_dash"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+            <Option type="QString" name="align_dash_pattern" value="0"/>
+            <Option type="QString" name="capstyle" value="round"/>
+            <Option type="QString" name="customdash" value="5;2"/>
+            <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="customdash_unit" value="MM"/>
+            <Option type="QString" name="dash_pattern_offset" value="-5.55112e-17"/>
+            <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+            <Option type="QString" name="draw_inside_polygon" value="0"/>
+            <Option type="QString" name="joinstyle" value="round"/>
+            <Option type="QString" name="line_color" value="166,217,106,255"/>
+            <Option type="QString" name="line_style" value="solid"/>
+            <Option type="QString" name="line_width" value="0.8"/>
+            <Option type="QString" name="line_width_unit" value="MM"/>
+            <Option type="QString" name="offset" value="0"/>
+            <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="offset_unit" value="MM"/>
+            <Option type="QString" name="ring_filter" value="0"/>
+            <Option type="QString" name="trim_distance_end" value="0"/>
+            <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+            <Option type="QString" name="trim_distance_start" value="0"/>
+            <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+            <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+            <Option type="QString" name="use_custom_dash" value="0"/>
+            <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
           </Option>
           <effect type="effectStack" enabled="0">
             <effect type="dropShadow">
               <Option type="Map">
-                <Option type="QString" value="13" name="blend_mode"/>
-                <Option type="QString" value="2.645" name="blur_level"/>
-                <Option type="QString" value="MM" name="blur_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="blur_unit_scale"/>
-                <Option type="QString" value="0,0,0,255" name="color"/>
-                <Option type="QString" value="2" name="draw_mode"/>
-                <Option type="QString" value="0" name="enabled"/>
-                <Option type="QString" value="135" name="offset_angle"/>
-                <Option type="QString" value="2" name="offset_distance"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_unit_scale"/>
-                <Option type="QString" value="1" name="opacity"/>
+                <Option type="QString" name="blend_mode" value="13"/>
+                <Option type="QString" name="blur_level" value="2.645"/>
+                <Option type="QString" name="blur_unit" value="MM"/>
+                <Option type="QString" name="blur_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color" value="0,0,0,255"/>
+                <Option type="QString" name="draw_mode" value="2"/>
+                <Option type="QString" name="enabled" value="0"/>
+                <Option type="QString" name="offset_angle" value="135"/>
+                <Option type="QString" name="offset_distance" value="2"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="offset_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="opacity" value="1"/>
               </Option>
             </effect>
             <effect type="outerGlow">
               <Option type="Map">
-                <Option type="QString" value="0" name="blend_mode"/>
-                <Option type="QString" value="2.645" name="blur_level"/>
-                <Option type="QString" value="MM" name="blur_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="blur_unit_scale"/>
-                <Option type="QString" value="69,116,40,255" name="color1"/>
-                <Option type="QString" value="188,220,60,255" name="color2"/>
-                <Option type="QString" value="0" name="color_type"/>
-                <Option type="QString" value="ccw" name="direction"/>
-                <Option type="QString" value="0" name="discrete"/>
-                <Option type="QString" value="2" name="draw_mode"/>
-                <Option type="QString" value="1" name="enabled"/>
-                <Option type="QString" value="0.5" name="opacity"/>
-                <Option type="QString" value="gradient" name="rampType"/>
-                <Option type="QString" value="255,255,255,255" name="single_color"/>
-                <Option type="QString" value="rgb" name="spec"/>
-                <Option type="QString" value="2" name="spread"/>
-                <Option type="QString" value="MM" name="spread_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="spread_unit_scale"/>
+                <Option type="QString" name="blend_mode" value="0"/>
+                <Option type="QString" name="blur_level" value="2.645"/>
+                <Option type="QString" name="blur_unit" value="MM"/>
+                <Option type="QString" name="blur_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color1" value="69,116,40,255"/>
+                <Option type="QString" name="color2" value="188,220,60,255"/>
+                <Option type="QString" name="color_type" value="0"/>
+                <Option type="QString" name="direction" value="ccw"/>
+                <Option type="QString" name="discrete" value="0"/>
+                <Option type="QString" name="draw_mode" value="2"/>
+                <Option type="QString" name="enabled" value="1"/>
+                <Option type="QString" name="opacity" value="0.5"/>
+                <Option type="QString" name="rampType" value="gradient"/>
+                <Option type="QString" name="single_color" value="255,255,255,255"/>
+                <Option type="QString" name="spec" value="rgb"/>
+                <Option type="QString" name="spread" value="2"/>
+                <Option type="QString" name="spread_unit" value="MM"/>
+                <Option type="QString" name="spread_unit_scale" value="3x:0,0,0,0,0,0"/>
               </Option>
             </effect>
             <effect type="drawSource">
               <Option type="Map">
-                <Option type="QString" value="0" name="blend_mode"/>
-                <Option type="QString" value="2" name="draw_mode"/>
-                <Option type="QString" value="1" name="enabled"/>
-                <Option type="QString" value="1" name="opacity"/>
+                <Option type="QString" name="blend_mode" value="0"/>
+                <Option type="QString" name="draw_mode" value="2"/>
+                <Option type="QString" name="enabled" value="1"/>
+                <Option type="QString" name="opacity" value="1"/>
               </Option>
             </effect>
             <effect type="innerShadow">
               <Option type="Map">
-                <Option type="QString" value="13" name="blend_mode"/>
-                <Option type="QString" value="2.645" name="blur_level"/>
-                <Option type="QString" value="MM" name="blur_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="blur_unit_scale"/>
-                <Option type="QString" value="0,0,0,255" name="color"/>
-                <Option type="QString" value="2" name="draw_mode"/>
-                <Option type="QString" value="0" name="enabled"/>
-                <Option type="QString" value="135" name="offset_angle"/>
-                <Option type="QString" value="2" name="offset_distance"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_unit_scale"/>
-                <Option type="QString" value="1" name="opacity"/>
+                <Option type="QString" name="blend_mode" value="13"/>
+                <Option type="QString" name="blur_level" value="2.645"/>
+                <Option type="QString" name="blur_unit" value="MM"/>
+                <Option type="QString" name="blur_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color" value="0,0,0,255"/>
+                <Option type="QString" name="draw_mode" value="2"/>
+                <Option type="QString" name="enabled" value="0"/>
+                <Option type="QString" name="offset_angle" value="135"/>
+                <Option type="QString" name="offset_distance" value="2"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="offset_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="opacity" value="1"/>
               </Option>
             </effect>
             <effect type="innerGlow">
               <Option type="Map">
-                <Option type="QString" value="0" name="blend_mode"/>
-                <Option type="QString" value="2.645" name="blur_level"/>
-                <Option type="QString" value="MM" name="blur_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="blur_unit_scale"/>
-                <Option type="QString" value="69,116,40,255" name="color1"/>
-                <Option type="QString" value="188,220,60,255" name="color2"/>
-                <Option type="QString" value="0" name="color_type"/>
-                <Option type="QString" value="ccw" name="direction"/>
-                <Option type="QString" value="0" name="discrete"/>
-                <Option type="QString" value="2" name="draw_mode"/>
-                <Option type="QString" value="0" name="enabled"/>
-                <Option type="QString" value="0.5" name="opacity"/>
-                <Option type="QString" value="gradient" name="rampType"/>
-                <Option type="QString" value="255,255,255,255" name="single_color"/>
-                <Option type="QString" value="rgb" name="spec"/>
-                <Option type="QString" value="2" name="spread"/>
-                <Option type="QString" value="MM" name="spread_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="spread_unit_scale"/>
+                <Option type="QString" name="blend_mode" value="0"/>
+                <Option type="QString" name="blur_level" value="2.645"/>
+                <Option type="QString" name="blur_unit" value="MM"/>
+                <Option type="QString" name="blur_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color1" value="69,116,40,255"/>
+                <Option type="QString" name="color2" value="188,220,60,255"/>
+                <Option type="QString" name="color_type" value="0"/>
+                <Option type="QString" name="direction" value="ccw"/>
+                <Option type="QString" name="discrete" value="0"/>
+                <Option type="QString" name="draw_mode" value="2"/>
+                <Option type="QString" name="enabled" value="0"/>
+                <Option type="QString" name="opacity" value="0.5"/>
+                <Option type="QString" name="rampType" value="gradient"/>
+                <Option type="QString" name="single_color" value="255,255,255,255"/>
+                <Option type="QString" name="spec" value="rgb"/>
+                <Option type="QString" name="spread" value="2"/>
+                <Option type="QString" name="spread_unit" value="MM"/>
+                <Option type="QString" name="spread_unit_scale" value="3x:0,0,0,0,0,0"/>
               </Option>
             </effect>
           </effect>
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
         </layer>
@@ -696,46 +696,46 @@
       <symbol type="line" clip_to_extent="1" name="4" is_animated="0" alpha="1" force_rhr="0" frame_rate="10">
         <data_defined_properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data_defined_properties>
-        <layer pass="0" locked="0" class="SimpleLine" id="{e93f688b-bb8d-4146-a62e-39f70fac16ca}" enabled="1">
+        <layer class="SimpleLine" locked="0" enabled="1" id="{e93f688b-bb8d-4146-a62e-39f70fac16ca}" pass="0">
           <Option type="Map">
-            <Option type="QString" value="0" name="align_dash_pattern"/>
-            <Option type="QString" value="square" name="capstyle"/>
-            <Option type="QString" value="5;2" name="customdash"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-            <Option type="QString" value="MM" name="customdash_unit"/>
-            <Option type="QString" value="0" name="dash_pattern_offset"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-            <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-            <Option type="QString" value="0" name="draw_inside_polygon"/>
-            <Option type="QString" value="bevel" name="joinstyle"/>
-            <Option type="QString" value="225,89,137,255" name="line_color"/>
-            <Option type="QString" value="solid" name="line_style"/>
-            <Option type="QString" value="0.26" name="line_width"/>
-            <Option type="QString" value="MM" name="line_width_unit"/>
-            <Option type="QString" value="0" name="offset"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-            <Option type="QString" value="MM" name="offset_unit"/>
-            <Option type="QString" value="0" name="ring_filter"/>
-            <Option type="QString" value="0" name="trim_distance_end"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-            <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-            <Option type="QString" value="0" name="trim_distance_start"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-            <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-            <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-            <Option type="QString" value="0" name="use_custom_dash"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+            <Option type="QString" name="align_dash_pattern" value="0"/>
+            <Option type="QString" name="capstyle" value="square"/>
+            <Option type="QString" name="customdash" value="5;2"/>
+            <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="customdash_unit" value="MM"/>
+            <Option type="QString" name="dash_pattern_offset" value="0"/>
+            <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+            <Option type="QString" name="draw_inside_polygon" value="0"/>
+            <Option type="QString" name="joinstyle" value="bevel"/>
+            <Option type="QString" name="line_color" value="225,89,137,255"/>
+            <Option type="QString" name="line_style" value="solid"/>
+            <Option type="QString" name="line_width" value="0.26"/>
+            <Option type="QString" name="line_width_unit" value="MM"/>
+            <Option type="QString" name="offset" value="0"/>
+            <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="offset_unit" value="MM"/>
+            <Option type="QString" name="ring_filter" value="0"/>
+            <Option type="QString" name="trim_distance_end" value="0"/>
+            <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+            <Option type="QString" name="trim_distance_start" value="0"/>
+            <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+            <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+            <Option type="QString" name="use_custom_dash" value="0"/>
+            <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
           </Option>
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
         </layer>
@@ -744,86 +744,86 @@
     <effect type="effectStack" enabled="1">
       <effect type="dropShadow">
         <Option type="Map">
-          <Option type="QString" value="13" name="blend_mode"/>
-          <Option type="QString" value="2.645" name="blur_level"/>
-          <Option type="QString" value="MM" name="blur_unit"/>
-          <Option type="QString" value="3x:0,0,0,0,0,0" name="blur_unit_scale"/>
-          <Option type="QString" value="0,0,0,255" name="color"/>
-          <Option type="QString" value="2" name="draw_mode"/>
-          <Option type="QString" value="0" name="enabled"/>
-          <Option type="QString" value="135" name="offset_angle"/>
-          <Option type="QString" value="2" name="offset_distance"/>
-          <Option type="QString" value="MM" name="offset_unit"/>
-          <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_unit_scale"/>
-          <Option type="QString" value="1" name="opacity"/>
+          <Option type="QString" name="blend_mode" value="13"/>
+          <Option type="QString" name="blur_level" value="2.645"/>
+          <Option type="QString" name="blur_unit" value="MM"/>
+          <Option type="QString" name="blur_unit_scale" value="3x:0,0,0,0,0,0"/>
+          <Option type="QString" name="color" value="0,0,0,255"/>
+          <Option type="QString" name="draw_mode" value="2"/>
+          <Option type="QString" name="enabled" value="0"/>
+          <Option type="QString" name="offset_angle" value="135"/>
+          <Option type="QString" name="offset_distance" value="2"/>
+          <Option type="QString" name="offset_unit" value="MM"/>
+          <Option type="QString" name="offset_unit_scale" value="3x:0,0,0,0,0,0"/>
+          <Option type="QString" name="opacity" value="1"/>
         </Option>
       </effect>
       <effect type="outerGlow">
         <Option type="Map">
-          <Option type="QString" value="0" name="blend_mode"/>
-          <Option type="QString" value="1.845" name="blur_level"/>
-          <Option type="QString" value="MM" name="blur_unit"/>
-          <Option type="QString" value="3x:0,0,0,0,0,0" name="blur_unit_scale"/>
-          <Option type="QString" value="69,116,40,255" name="color1"/>
-          <Option type="QString" value="188,220,60,255" name="color2"/>
-          <Option type="QString" value="0" name="color_type"/>
-          <Option type="QString" value="ccw" name="direction"/>
-          <Option type="QString" value="0" name="discrete"/>
-          <Option type="QString" value="2" name="draw_mode"/>
-          <Option type="QString" value="1" name="enabled"/>
-          <Option type="QString" value="0.6" name="opacity"/>
-          <Option type="QString" value="gradient" name="rampType"/>
-          <Option type="QString" value="255,255,255,255" name="single_color"/>
-          <Option type="QString" value="rgb" name="spec"/>
-          <Option type="QString" value="1.4" name="spread"/>
-          <Option type="QString" value="MM" name="spread_unit"/>
-          <Option type="QString" value="3x:0,0,0,0,0,0" name="spread_unit_scale"/>
+          <Option type="QString" name="blend_mode" value="0"/>
+          <Option type="QString" name="blur_level" value="1.845"/>
+          <Option type="QString" name="blur_unit" value="MM"/>
+          <Option type="QString" name="blur_unit_scale" value="3x:0,0,0,0,0,0"/>
+          <Option type="QString" name="color1" value="69,116,40,255"/>
+          <Option type="QString" name="color2" value="188,220,60,255"/>
+          <Option type="QString" name="color_type" value="0"/>
+          <Option type="QString" name="direction" value="ccw"/>
+          <Option type="QString" name="discrete" value="0"/>
+          <Option type="QString" name="draw_mode" value="2"/>
+          <Option type="QString" name="enabled" value="1"/>
+          <Option type="QString" name="opacity" value="0.6"/>
+          <Option type="QString" name="rampType" value="gradient"/>
+          <Option type="QString" name="single_color" value="255,255,255,255"/>
+          <Option type="QString" name="spec" value="rgb"/>
+          <Option type="QString" name="spread" value="1.4"/>
+          <Option type="QString" name="spread_unit" value="MM"/>
+          <Option type="QString" name="spread_unit_scale" value="3x:0,0,0,0,0,0"/>
         </Option>
       </effect>
       <effect type="drawSource">
         <Option type="Map">
-          <Option type="QString" value="0" name="blend_mode"/>
-          <Option type="QString" value="2" name="draw_mode"/>
-          <Option type="QString" value="1" name="enabled"/>
-          <Option type="QString" value="1" name="opacity"/>
+          <Option type="QString" name="blend_mode" value="0"/>
+          <Option type="QString" name="draw_mode" value="2"/>
+          <Option type="QString" name="enabled" value="1"/>
+          <Option type="QString" name="opacity" value="1"/>
         </Option>
       </effect>
       <effect type="innerShadow">
         <Option type="Map">
-          <Option type="QString" value="13" name="blend_mode"/>
-          <Option type="QString" value="2.645" name="blur_level"/>
-          <Option type="QString" value="MM" name="blur_unit"/>
-          <Option type="QString" value="3x:0,0,0,0,0,0" name="blur_unit_scale"/>
-          <Option type="QString" value="0,0,0,255" name="color"/>
-          <Option type="QString" value="2" name="draw_mode"/>
-          <Option type="QString" value="0" name="enabled"/>
-          <Option type="QString" value="135" name="offset_angle"/>
-          <Option type="QString" value="2" name="offset_distance"/>
-          <Option type="QString" value="MM" name="offset_unit"/>
-          <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_unit_scale"/>
-          <Option type="QString" value="1" name="opacity"/>
+          <Option type="QString" name="blend_mode" value="13"/>
+          <Option type="QString" name="blur_level" value="2.645"/>
+          <Option type="QString" name="blur_unit" value="MM"/>
+          <Option type="QString" name="blur_unit_scale" value="3x:0,0,0,0,0,0"/>
+          <Option type="QString" name="color" value="0,0,0,255"/>
+          <Option type="QString" name="draw_mode" value="2"/>
+          <Option type="QString" name="enabled" value="0"/>
+          <Option type="QString" name="offset_angle" value="135"/>
+          <Option type="QString" name="offset_distance" value="2"/>
+          <Option type="QString" name="offset_unit" value="MM"/>
+          <Option type="QString" name="offset_unit_scale" value="3x:0,0,0,0,0,0"/>
+          <Option type="QString" name="opacity" value="1"/>
         </Option>
       </effect>
       <effect type="innerGlow">
         <Option type="Map">
-          <Option type="QString" value="0" name="blend_mode"/>
-          <Option type="QString" value="2.645" name="blur_level"/>
-          <Option type="QString" value="MM" name="blur_unit"/>
-          <Option type="QString" value="3x:0,0,0,0,0,0" name="blur_unit_scale"/>
-          <Option type="QString" value="69,116,40,255" name="color1"/>
-          <Option type="QString" value="188,220,60,255" name="color2"/>
-          <Option type="QString" value="0" name="color_type"/>
-          <Option type="QString" value="ccw" name="direction"/>
-          <Option type="QString" value="0" name="discrete"/>
-          <Option type="QString" value="2" name="draw_mode"/>
-          <Option type="QString" value="0" name="enabled"/>
-          <Option type="QString" value="0.5" name="opacity"/>
-          <Option type="QString" value="gradient" name="rampType"/>
-          <Option type="QString" value="255,255,255,255" name="single_color"/>
-          <Option type="QString" value="rgb" name="spec"/>
-          <Option type="QString" value="2" name="spread"/>
-          <Option type="QString" value="MM" name="spread_unit"/>
-          <Option type="QString" value="3x:0,0,0,0,0,0" name="spread_unit_scale"/>
+          <Option type="QString" name="blend_mode" value="0"/>
+          <Option type="QString" name="blur_level" value="2.645"/>
+          <Option type="QString" name="blur_unit" value="MM"/>
+          <Option type="QString" name="blur_unit_scale" value="3x:0,0,0,0,0,0"/>
+          <Option type="QString" name="color1" value="69,116,40,255"/>
+          <Option type="QString" name="color2" value="188,220,60,255"/>
+          <Option type="QString" name="color_type" value="0"/>
+          <Option type="QString" name="direction" value="ccw"/>
+          <Option type="QString" name="discrete" value="0"/>
+          <Option type="QString" name="draw_mode" value="2"/>
+          <Option type="QString" name="enabled" value="0"/>
+          <Option type="QString" name="opacity" value="0.5"/>
+          <Option type="QString" name="rampType" value="gradient"/>
+          <Option type="QString" name="single_color" value="255,255,255,255"/>
+          <Option type="QString" name="spec" value="rgb"/>
+          <Option type="QString" name="spread" value="2"/>
+          <Option type="QString" name="spread_unit" value="MM"/>
+          <Option type="QString" name="spread_unit_scale" value="3x:0,0,0,0,0,0"/>
         </Option>
       </effect>
     </effect>
@@ -834,46 +834,46 @@
       <symbol type="line" clip_to_extent="1" name="" is_animated="0" alpha="1" force_rhr="0" frame_rate="10">
         <data_defined_properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data_defined_properties>
-        <layer pass="0" locked="0" class="SimpleLine" id="{e1d9a5d4-9a85-47b9-ad34-a3fa51ba45e3}" enabled="1">
+        <layer class="SimpleLine" locked="0" enabled="1" id="{e1d9a5d4-9a85-47b9-ad34-a3fa51ba45e3}" pass="0">
           <Option type="Map">
-            <Option type="QString" value="0" name="align_dash_pattern"/>
-            <Option type="QString" value="square" name="capstyle"/>
-            <Option type="QString" value="5;2" name="customdash"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-            <Option type="QString" value="MM" name="customdash_unit"/>
-            <Option type="QString" value="0" name="dash_pattern_offset"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-            <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-            <Option type="QString" value="0" name="draw_inside_polygon"/>
-            <Option type="QString" value="bevel" name="joinstyle"/>
-            <Option type="QString" value="35,35,35,255" name="line_color"/>
-            <Option type="QString" value="solid" name="line_style"/>
-            <Option type="QString" value="0.26" name="line_width"/>
-            <Option type="QString" value="MM" name="line_width_unit"/>
-            <Option type="QString" value="0" name="offset"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-            <Option type="QString" value="MM" name="offset_unit"/>
-            <Option type="QString" value="0" name="ring_filter"/>
-            <Option type="QString" value="0" name="trim_distance_end"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-            <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-            <Option type="QString" value="0" name="trim_distance_start"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-            <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-            <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-            <Option type="QString" value="0" name="use_custom_dash"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+            <Option type="QString" name="align_dash_pattern" value="0"/>
+            <Option type="QString" name="capstyle" value="square"/>
+            <Option type="QString" name="customdash" value="5;2"/>
+            <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="customdash_unit" value="MM"/>
+            <Option type="QString" name="dash_pattern_offset" value="0"/>
+            <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+            <Option type="QString" name="draw_inside_polygon" value="0"/>
+            <Option type="QString" name="joinstyle" value="bevel"/>
+            <Option type="QString" name="line_color" value="35,35,35,255"/>
+            <Option type="QString" name="line_style" value="solid"/>
+            <Option type="QString" name="line_width" value="0.26"/>
+            <Option type="QString" name="line_width_unit" value="MM"/>
+            <Option type="QString" name="offset" value="0"/>
+            <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="offset_unit" value="MM"/>
+            <Option type="QString" name="ring_filter" value="0"/>
+            <Option type="QString" name="trim_distance_end" value="0"/>
+            <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+            <Option type="QString" name="trim_distance_start" value="0"/>
+            <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+            <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+            <Option type="QString" name="use_custom_dash" value="0"/>
+            <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
           </Option>
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
         </layer>
@@ -882,46 +882,46 @@
   </selection>
   <labeling type="simple">
     <settings calloutType="simple">
-      <text-style fontStrikeout="0" legendString="Aa" isExpression="0" multilineHeightUnit="Percentage" allowHtml="0" fontKerning="1" fontSize="10" fontWeight="75" useSubstitutions="0" fontWordSpacing="0" fieldName="Structure Type" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" namedStyle="Bold" fontItalic="0" textOpacity="1" forcedItalic="0" textColor="50,50,50,255" fontFamily="Arial Narrow" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedBold="0" fontSizeUnit="Point" blendMode="0" fontUnderline="0" multilineHeight="1" capitalization="0" textOrientation="horizontal">
+      <text-style fieldName="Structure Type" capitalization="0" fontSizeUnit="Point" fontWeight="75" textColor="50,50,50,255" isExpression="0" previewBkgrdColor="255,255,255,255" multilineHeightUnit="Percentage" textOrientation="horizontal" fontItalic="0" blendMode="0" namedStyle="Bold" textOpacity="1" forcedBold="0" fontKerning="1" useSubstitutions="0" fontLetterSpacing="0" legendString="Aa" fontStrikeout="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" fontSize="10" fontFamily="Arial Narrow" fontUnderline="0" multilineHeight="1" allowHtml="0">
         <families/>
-        <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="250,250,250,255" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="0.5" bufferDraw="1"/>
-        <text-mask maskedSymbolLayers="" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskSizeUnits="MM" maskEnabled="0" maskJoinStyle="128" maskType="0"/>
-        <background shapeRadiiX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeSizeType="0" shapeBlendMode="0" shapeOffsetUnit="Point" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeRotationType="0" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetY="0" shapeRadiiUnit="Point" shapeSizeUnit="Point" shapeJoinStyle="64" shapeBorderWidthUnit="Point" shapeSVGFile="" shapeOffsetX="0" shapeRadiiY="0" shapeDraw="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeFillColor="255,255,255,255">
+        <text-buffer bufferColor="250,250,250,255" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="0.5" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferDraw="1" bufferBlendMode="0" bufferJoinStyle="128"/>
+        <text-mask maskOpacity="1" maskSize="0" maskType="0" maskJoinStyle="128" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskedSymbolLayers=""/>
+        <background shapeOffsetX="0" shapeOffsetUnit="Point" shapeDraw="0" shapeRotationType="0" shapeJoinStyle="64" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="Point" shapeSizeY="0" shapeRadiiUnit="Point" shapeBlendMode="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSizeType="0" shapeType="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeBorderWidthUnit="Point">
           <symbol type="marker" clip_to_extent="1" name="markerSymbol" is_animated="0" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" locked="0" class="SimpleMarker" id="" enabled="1">
+            <layer class="SimpleMarker" locked="0" enabled="1" id="" pass="0">
               <Option type="Map">
-                <Option type="QString" value="0" name="angle"/>
-                <Option type="QString" value="square" name="cap_style"/>
-                <Option type="QString" value="133,182,111,255" name="color"/>
-                <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="circle" name="name"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="35,35,35,255" name="outline_color"/>
-                <Option type="QString" value="solid" name="outline_style"/>
-                <Option type="QString" value="0" name="outline_width"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="diameter" name="scale_method"/>
-                <Option type="QString" value="2" name="size"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                <Option type="QString" value="MM" name="size_unit"/>
-                <Option type="QString" value="1" name="vertical_anchor_point"/>
+                <Option type="QString" name="angle" value="0"/>
+                <Option type="QString" name="cap_style" value="square"/>
+                <Option type="QString" name="color" value="133,182,111,255"/>
+                <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="name" value="circle"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="35,35,35,255"/>
+                <Option type="QString" name="outline_style" value="solid"/>
+                <Option type="QString" name="outline_width" value="0"/>
+                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="scale_method" value="diameter"/>
+                <Option type="QString" name="size" value="2"/>
+                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="size_unit" value="MM"/>
+                <Option type="QString" name="vertical_anchor_point" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -929,77 +929,77 @@
           <symbol type="fill" clip_to_extent="1" name="fillSymbol" is_animated="0" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" locked="0" class="SimpleFill" id="" enabled="1">
+            <layer class="SimpleFill" locked="0" enabled="1" id="" pass="0">
               <Option type="Map">
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                <Option type="QString" value="255,255,255,255" name="color"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="128,128,128,255" name="outline_color"/>
-                <Option type="QString" value="no" name="outline_style"/>
-                <Option type="QString" value="0" name="outline_width"/>
-                <Option type="QString" value="Point" name="outline_width_unit"/>
-                <Option type="QString" value="solid" name="style"/>
+                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color" value="255,255,255,255"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                <Option type="QString" name="outline_style" value="no"/>
+                <Option type="QString" name="outline_width" value="0"/>
+                <Option type="QString" name="outline_width_unit" value="Point"/>
+                <Option type="QString" name="style" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </background>
-        <shadow shadowOffsetUnit="MM" shadowDraw="0" shadowRadiusUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetAngle="135" shadowScale="100" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+        <shadow shadowRadius="1.5" shadowScale="100" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowOffsetUnit="MM"/>
         <dd_properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </dd_properties>
         <substitutions/>
       </text-style>
-      <text-format addDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" formatNumbers="0" wrapChar="" multilineAlign="0" placeDirectionSymbol="0" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" leftDirectionSymbol="&lt;" decimals="3"/>
-      <placement geometryGenerator="" dist="5" overrunDistance="0" overrunDistanceUnit="MM" repeatDistance="0" priority="6" rotationAngle="0" xOffset="0" lineAnchorClipping="0" layerType="LineGeometry" centroidInside="0" quadOffset="4" maxCurvedCharAngleOut="-25" allowDegraded="0" geometryGeneratorEnabled="0" overlapHandling="PreventOverlap" maxCurvedCharAngleIn="25" placement="4" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" fitInPolygonOnly="0" offsetUnits="MM" lineAnchorType="0" lineAnchorPercent="1" offsetType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placementFlags="2" rotationUnit="AngleDegrees" polygonPlacementFlags="2" distMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" preserveRotation="1" distUnits="MM" repeatDistanceUnits="MM" lineAnchorTextPoint="StartOfText"/>
-      <rendering unplacedVisibility="0" zIndex="0" drawLabels="1" upsidedownLabels="0" scaleMax="1000" fontMinPixelSize="3" fontMaxPixelSize="10000" obstacle="1" labelPerPart="0" maxNumLabels="2000" obstacleType="1" mergeLines="0" fontLimitPixelSize="0" scaleMin="0" obstacleFactor="2" minFeatureSize="0" limitNumLabels="0" scaleVisibility="1"/>
+      <text-format wrapChar="" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" reverseDirectionSymbol="0" decimals="3" rightDirectionSymbol=">" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" multilineAlign="0" autoWrapLength="0" plussign="0"/>
+      <placement maxCurvedCharAngleIn="25" polygonPlacementFlags="2" fitInPolygonOnly="0" layerType="LineGeometry" placementFlags="2" preserveRotation="1" centroidWhole="0" rotationAngle="0" offsetType="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="1" overrunDistance="0" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-25" distUnits="MM" geometryGenerator="" rotationUnit="AngleDegrees" placement="4" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGeneratorEnabled="0" centroidInside="0" offsetUnits="MM" yOffset="0" priority="6" overlapHandling="PreventOverlap" allowDegraded="0" quadOffset="4" xOffset="0" repeatDistanceUnits="MM" geometryGeneratorType="PointGeometry" lineAnchorClipping="0" dist="5" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="StartOfText" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorType="0" overrunDistanceUnit="MM"/>
+      <rendering scaleMax="1750" fontLimitPixelSize="0" limitNumLabels="0" drawLabels="1" scaleMin="0" obstacle="1" mergeLines="0" unplacedVisibility="0" fontMaxPixelSize="10000" fontMinPixelSize="3" obstacleType="1" upsidedownLabels="0" maxNumLabels="2000" minFeatureSize="0" scaleVisibility="1" obstacleFactor="2" labelPerPart="0" zIndex="0"/>
       <dd_properties>
         <Option type="Map">
-          <Option type="QString" value="" name="name"/>
+          <Option type="QString" name="name" value=""/>
           <Option name="properties"/>
-          <Option type="QString" value="collection" name="type"/>
+          <Option type="QString" name="type" value="collection"/>
         </Option>
       </dd_properties>
       <callout type="simple">
         <Option type="Map">
-          <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
-          <Option type="int" value="0" name="blendMode"/>
+          <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
+          <Option type="int" name="blendMode" value="0"/>
           <Option type="Map" name="ddProperties">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
-          <Option type="bool" value="false" name="drawToAllParts"/>
-          <Option type="QString" value="0" name="enabled"/>
-          <Option type="QString" value="point_on_exterior" name="labelAnchorPoint"/>
-          <Option type="QString" value="&lt;symbol type=&quot;line&quot; clip_to_extent=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer pass=&quot;0&quot; locked=&quot;0&quot; class=&quot;SimpleLine&quot; id=&quot;{8a8d070c-47a7-4803-b448-656ee24c1ecc}&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;square&quot; name=&quot;capstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;5;2&quot; name=&quot;customdash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;customdash_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;bevel&quot; name=&quot;joinstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;60,60,60,255&quot; name=&quot;line_color&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;solid&quot; name=&quot;line_style&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0.3&quot; name=&quot;line_width&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;line_width_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;ring_filter&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_end&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_start&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;use_custom_dash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol"/>
-          <Option type="double" value="0" name="minLength"/>
-          <Option type="QString" value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale"/>
-          <Option type="QString" value="MM" name="minLengthUnit"/>
-          <Option type="double" value="0" name="offsetFromAnchor"/>
-          <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale"/>
-          <Option type="QString" value="MM" name="offsetFromAnchorUnit"/>
-          <Option type="double" value="0" name="offsetFromLabel"/>
-          <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale"/>
-          <Option type="QString" value="MM" name="offsetFromLabelUnit"/>
+          <Option type="bool" name="drawToAllParts" value="false"/>
+          <Option type="QString" name="enabled" value="0"/>
+          <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
+          <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; clip_to_extent=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; id=&quot;{8a8d070c-47a7-4803-b448-656ee24c1ecc}&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+          <Option type="double" name="minLength" value="0"/>
+          <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+          <Option type="QString" name="minLengthUnit" value="MM"/>
+          <Option type="double" name="offsetFromAnchor" value="0"/>
+          <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+          <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+          <Option type="double" name="offsetFromLabel" value="0"/>
+          <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+          <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
         </Option>
       </callout>
     </settings>
diff --git a/Symbology/qgis/QRiS/structure_points.qml b/Symbology/qgis/QRiS/structure_points.qml
index 12fbff9c..7b8705fe 100644
--- a/Symbology/qgis/QRiS/structure_points.qml
+++ b/Symbology/qgis/QRiS/structure_points.qml
@@ -1,165 +1,165 @@
 <!DOCTYPE qgis PUBLIC 'http://mrcc.com/qgis.dtd' 'SYSTEM'>
-<qgis styleCategories="Symbology|Labeling" labelsEnabled="1" version="3.34.8-Prizren">
+<qgis version="3.34.8-Prizren" styleCategories="Symbology|Labeling" labelsEnabled="1">
   <renderer-v2 type="RuleRenderer" referencescale="-1" symbollevels="0" enableorderby="0" forceraster="0">
     <rules key="{96719773-fe41-4558-9e9e-7ab5324a8915}">
-      <rule filter="&quot;Structure Type&quot; = 'BDA' or &quot;Structure Type&quot; = 'Primary BDA' or &quot;Structure Type&quot; = 'Secondary BDA' or  &quot;Structure Type&quot; = 'BDA Postless' or &quot;Structure Type&quot; = 'Tight PALS (BDA without sod)'  or &quot;Structure Type&quot; = 'Postline Wicker Weave'" label="BDA" key="{cca9b65a-15a2-42ac-8b4b-abc780450914}" symbol="0"/>
-      <rule filter="&quot;Structure Type&quot; = 'PALS' or &quot;Structure Type&quot; = 'PALS - Bank Attached' or &quot;Structure Type&quot; = 'PALS - Right Bank Attached' or &quot;Structure Type&quot; = 'PALS - Left Bank Attached' or &quot;Structure Type&quot; = 'PALS - Bank Blaster' or &quot;Structure Type&quot; = 'PALS - Constriction Jet' or &quot;Structure Type&quot; = 'PALS - Mid Channel' or &quot;Structure Type&quot; = 'PALS - Rhino' or &quot;Structure Type&quot; = 'PALS - Channel Spanning' or &quot;Structure Type&quot; = 'Rhino'  or &quot;Structure Type&quot; = 'Leaky Dam' or &quot;Structure Type&quot; = 'Post and Brush Plug'  or &quot;Structure Type&quot; = 'Wicker Weirs' " label="PALS" key="{12d2e893-432f-4022-8e6c-e2bf38820cda}" symbol="1"/>
-      <rule filter="&quot;Structure Type&quot; = 'ALS' or  &quot;Structure Type&quot; = 'ALS - Bank Attached' or  &quot;Structure Type&quot; = 'ALS - Bank Blaster' or  &quot;Structure Type&quot; = 'ALS - Mid Channel' or  &quot;Structure Type&quot; = 'ALS - Rhino' or  &quot;Structure Type&quot; = 'ALS - Channel Spanning' or  &quot;Structure Type&quot; = 'Wood Jam' or  &quot;Structure Type&quot; = 'Full Tree' or  &quot;Structure Type&quot; = 'Strategic Felling' or  &quot;Structure Type&quot; = 'Grip Hoist Tree' or  &quot;Structure Type&quot; = 'Fell Tree' or  &quot;Structure Type&quot; = 'Tree Dam' or  &quot;Structure Type&quot; = 'Tree Plug'" label="ALS" key="{993ba800-3983-4ef9-9bbf-f9f8ac3a5392}" symbol="2"/>
-      <rule filter="&quot;Structure Type&quot; = 'One Rock Dam' or &quot;Structure Type&quot; = 'Zuni Bowl' or &quot;Structure Type&quot; = 'Spreaders' or &quot;Structure Type&quot; = 'Floodplain BDA' or &quot;Structure Type&quot; = 'Sedge Plugs' or &quot;Structure Type&quot; = 'Headcut Treatment' or  &quot;Structure Type&quot; = 'Bag Plugs' or  &quot;Structure Type&quot; = 'Floodplain LWD' or  &quot;Structure Type&quot; = 'Vanes'" label="Other" key="{3ab4d842-fcd6-466c-a7c5-8b1ed99497f9}" symbol="3"/>
-      <rule filter="ELSE" key="{19a20747-8666-41df-af78-01add866d22e}" symbol="4"/>
+      <rule symbol="0" filter="&quot;Structure Type&quot; = 'BDA' or &quot;Structure Type&quot; = 'Primary BDA' or &quot;Structure Type&quot; = 'Secondary BDA' or  &quot;Structure Type&quot; = 'BDA Postless' or &quot;Structure Type&quot; = 'Tight PALS (BDA without sod)'  or &quot;Structure Type&quot; = 'Postline Wicker Weave'" label="BDA" key="{cca9b65a-15a2-42ac-8b4b-abc780450914}"/>
+      <rule symbol="1" filter="&quot;Structure Type&quot; = 'PALS' or &quot;Structure Type&quot; = 'PALS - Bank Attached' or &quot;Structure Type&quot; = 'PALS - Right Bank Attached' or &quot;Structure Type&quot; = 'PALS - Left Bank Attached' or &quot;Structure Type&quot; = 'PALS - Bank Blaster' or &quot;Structure Type&quot; = 'PALS - Constriction Jet' or &quot;Structure Type&quot; = 'PALS - Mid Channel' or &quot;Structure Type&quot; = 'PALS - Rhino' or &quot;Structure Type&quot; = 'PALS - Channel Spanning' or &quot;Structure Type&quot; = 'Rhino'  or &quot;Structure Type&quot; = 'Leaky Dam' or &quot;Structure Type&quot; = 'Post and Brush Plug'  or &quot;Structure Type&quot; = 'Wicker Weirs' " label="PALS" key="{12d2e893-432f-4022-8e6c-e2bf38820cda}"/>
+      <rule symbol="2" filter="&quot;Structure Type&quot; = 'ALS' or  &quot;Structure Type&quot; = 'ALS - Bank Attached' or  &quot;Structure Type&quot; = 'ALS - Bank Blaster' or  &quot;Structure Type&quot; = 'ALS - Mid Channel' or  &quot;Structure Type&quot; = 'ALS - Rhino' or  &quot;Structure Type&quot; = 'ALS - Channel Spanning' or  &quot;Structure Type&quot; = 'Wood Jam' or  &quot;Structure Type&quot; = 'Full Tree' or  &quot;Structure Type&quot; = 'Strategic Felling' or  &quot;Structure Type&quot; = 'Grip Hoist Tree' or  &quot;Structure Type&quot; = 'Fell Tree' or  &quot;Structure Type&quot; = 'Tree Dam' or  &quot;Structure Type&quot; = 'Tree Plug'" label="ALS" key="{993ba800-3983-4ef9-9bbf-f9f8ac3a5392}"/>
+      <rule symbol="3" filter="&quot;Structure Type&quot; = 'One Rock Dam' or &quot;Structure Type&quot; = 'Zuni Bowl' or &quot;Structure Type&quot; = 'Spreaders' or &quot;Structure Type&quot; = 'Floodplain BDA' or &quot;Structure Type&quot; = 'Sedge Plugs' or &quot;Structure Type&quot; = 'Headcut Treatment' or  &quot;Structure Type&quot; = 'Bag Plugs' or  &quot;Structure Type&quot; = 'Floodplain LWD' or  &quot;Structure Type&quot; = 'Vanes'" label="Other" key="{3ab4d842-fcd6-466c-a7c5-8b1ed99497f9}"/>
+      <rule symbol="4" filter="ELSE" key="{19a20747-8666-41df-af78-01add866d22e}"/>
     </rules>
     <symbols>
       <symbol type="marker" clip_to_extent="1" name="0" is_animated="0" alpha="1" force_rhr="0" frame_rate="10">
         <data_defined_properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data_defined_properties>
-        <layer pass="0" locked="0" class="SimpleMarker" id="{425d6e35-1f57-4c71-ad99-eb34bfa68483}" enabled="1">
+        <layer class="SimpleMarker" locked="0" enabled="1" id="{425d6e35-1f57-4c71-ad99-eb34bfa68483}" pass="0">
           <Option type="Map">
-            <Option type="QString" value="0" name="angle"/>
-            <Option type="QString" value="square" name="cap_style"/>
-            <Option type="QString" value="255,0,0,0" name="color"/>
-            <Option type="QString" value="1" name="horizontal_anchor_point"/>
-            <Option type="QString" value="bevel" name="joinstyle"/>
-            <Option type="QString" value="circle" name="name"/>
-            <Option type="QString" value="0,0" name="offset"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-            <Option type="QString" value="MM" name="offset_unit"/>
-            <Option type="QString" value="255,255,255,255" name="outline_color"/>
-            <Option type="QString" value="solid" name="outline_style"/>
-            <Option type="QString" value="0.6" name="outline_width"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-            <Option type="QString" value="MM" name="outline_width_unit"/>
-            <Option type="QString" value="diameter" name="scale_method"/>
-            <Option type="QString" value="2.2" name="size"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-            <Option type="QString" value="MM" name="size_unit"/>
-            <Option type="QString" value="1" name="vertical_anchor_point"/>
+            <Option type="QString" name="angle" value="0"/>
+            <Option type="QString" name="cap_style" value="square"/>
+            <Option type="QString" name="color" value="255,0,0,0"/>
+            <Option type="QString" name="horizontal_anchor_point" value="1"/>
+            <Option type="QString" name="joinstyle" value="bevel"/>
+            <Option type="QString" name="name" value="circle"/>
+            <Option type="QString" name="offset" value="0,0"/>
+            <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="offset_unit" value="MM"/>
+            <Option type="QString" name="outline_color" value="255,255,255,255"/>
+            <Option type="QString" name="outline_style" value="solid"/>
+            <Option type="QString" name="outline_width" value="0.6"/>
+            <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="outline_width_unit" value="MM"/>
+            <Option type="QString" name="scale_method" value="diameter"/>
+            <Option type="QString" name="size" value="2.2"/>
+            <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="size_unit" value="MM"/>
+            <Option type="QString" name="vertical_anchor_point" value="1"/>
           </Option>
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
         </layer>
-        <layer pass="0" locked="0" class="SimpleMarker" id="{0eeffe98-6d88-4530-8d36-86fe1bff0bdb}" enabled="1">
+        <layer class="SimpleMarker" locked="0" enabled="1" id="{0eeffe98-6d88-4530-8d36-86fe1bff0bdb}" pass="0">
           <Option type="Map">
-            <Option type="QString" value="0" name="angle"/>
-            <Option type="QString" value="square" name="cap_style"/>
-            <Option type="QString" value="43,131,186,255" name="color"/>
-            <Option type="QString" value="1" name="horizontal_anchor_point"/>
-            <Option type="QString" value="bevel" name="joinstyle"/>
-            <Option type="QString" value="circle" name="name"/>
-            <Option type="QString" value="0,0" name="offset"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-            <Option type="QString" value="MM" name="offset_unit"/>
-            <Option type="QString" value="43,131,186,255" name="outline_color"/>
-            <Option type="QString" value="solid" name="outline_style"/>
-            <Option type="QString" value="0.8" name="outline_width"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-            <Option type="QString" value="MM" name="outline_width_unit"/>
-            <Option type="QString" value="diameter" name="scale_method"/>
-            <Option type="QString" value="1.6" name="size"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-            <Option type="QString" value="MM" name="size_unit"/>
-            <Option type="QString" value="1" name="vertical_anchor_point"/>
+            <Option type="QString" name="angle" value="0"/>
+            <Option type="QString" name="cap_style" value="square"/>
+            <Option type="QString" name="color" value="43,131,186,255"/>
+            <Option type="QString" name="horizontal_anchor_point" value="1"/>
+            <Option type="QString" name="joinstyle" value="bevel"/>
+            <Option type="QString" name="name" value="circle"/>
+            <Option type="QString" name="offset" value="0,0"/>
+            <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="offset_unit" value="MM"/>
+            <Option type="QString" name="outline_color" value="43,131,186,255"/>
+            <Option type="QString" name="outline_style" value="solid"/>
+            <Option type="QString" name="outline_width" value="0.8"/>
+            <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="outline_width_unit" value="MM"/>
+            <Option type="QString" name="scale_method" value="diameter"/>
+            <Option type="QString" name="size" value="1.6"/>
+            <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="size_unit" value="MM"/>
+            <Option type="QString" name="vertical_anchor_point" value="1"/>
           </Option>
           <effect type="effectStack" enabled="0">
             <effect type="dropShadow">
               <Option type="Map">
-                <Option type="QString" value="13" name="blend_mode"/>
-                <Option type="QString" value="2.645" name="blur_level"/>
-                <Option type="QString" value="MM" name="blur_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="blur_unit_scale"/>
-                <Option type="QString" value="0,0,0,255" name="color"/>
-                <Option type="QString" value="2" name="draw_mode"/>
-                <Option type="QString" value="0" name="enabled"/>
-                <Option type="QString" value="135" name="offset_angle"/>
-                <Option type="QString" value="2" name="offset_distance"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_unit_scale"/>
-                <Option type="QString" value="1" name="opacity"/>
+                <Option type="QString" name="blend_mode" value="13"/>
+                <Option type="QString" name="blur_level" value="2.645"/>
+                <Option type="QString" name="blur_unit" value="MM"/>
+                <Option type="QString" name="blur_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color" value="0,0,0,255"/>
+                <Option type="QString" name="draw_mode" value="2"/>
+                <Option type="QString" name="enabled" value="0"/>
+                <Option type="QString" name="offset_angle" value="135"/>
+                <Option type="QString" name="offset_distance" value="2"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="offset_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="opacity" value="1"/>
               </Option>
             </effect>
             <effect type="outerGlow">
               <Option type="Map">
-                <Option type="QString" value="0" name="blend_mode"/>
-                <Option type="QString" value="2.645" name="blur_level"/>
-                <Option type="QString" value="MM" name="blur_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="blur_unit_scale"/>
-                <Option type="QString" value="69,116,40,255" name="color1"/>
-                <Option type="QString" value="188,220,60,255" name="color2"/>
-                <Option type="QString" value="0" name="color_type"/>
-                <Option type="QString" value="ccw" name="direction"/>
-                <Option type="QString" value="0" name="discrete"/>
-                <Option type="QString" value="2" name="draw_mode"/>
-                <Option type="QString" value="1" name="enabled"/>
-                <Option type="QString" value="0.5" name="opacity"/>
-                <Option type="QString" value="gradient" name="rampType"/>
-                <Option type="QString" value="255,255,255,255" name="single_color"/>
-                <Option type="QString" value="rgb" name="spec"/>
-                <Option type="QString" value="2" name="spread"/>
-                <Option type="QString" value="MM" name="spread_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="spread_unit_scale"/>
+                <Option type="QString" name="blend_mode" value="0"/>
+                <Option type="QString" name="blur_level" value="2.645"/>
+                <Option type="QString" name="blur_unit" value="MM"/>
+                <Option type="QString" name="blur_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color1" value="69,116,40,255"/>
+                <Option type="QString" name="color2" value="188,220,60,255"/>
+                <Option type="QString" name="color_type" value="0"/>
+                <Option type="QString" name="direction" value="ccw"/>
+                <Option type="QString" name="discrete" value="0"/>
+                <Option type="QString" name="draw_mode" value="2"/>
+                <Option type="QString" name="enabled" value="1"/>
+                <Option type="QString" name="opacity" value="0.5"/>
+                <Option type="QString" name="rampType" value="gradient"/>
+                <Option type="QString" name="single_color" value="255,255,255,255"/>
+                <Option type="QString" name="spec" value="rgb"/>
+                <Option type="QString" name="spread" value="2"/>
+                <Option type="QString" name="spread_unit" value="MM"/>
+                <Option type="QString" name="spread_unit_scale" value="3x:0,0,0,0,0,0"/>
               </Option>
             </effect>
             <effect type="drawSource">
               <Option type="Map">
-                <Option type="QString" value="0" name="blend_mode"/>
-                <Option type="QString" value="2" name="draw_mode"/>
-                <Option type="QString" value="1" name="enabled"/>
-                <Option type="QString" value="1" name="opacity"/>
+                <Option type="QString" name="blend_mode" value="0"/>
+                <Option type="QString" name="draw_mode" value="2"/>
+                <Option type="QString" name="enabled" value="1"/>
+                <Option type="QString" name="opacity" value="1"/>
               </Option>
             </effect>
             <effect type="innerShadow">
               <Option type="Map">
-                <Option type="QString" value="13" name="blend_mode"/>
-                <Option type="QString" value="2.645" name="blur_level"/>
-                <Option type="QString" value="MM" name="blur_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="blur_unit_scale"/>
-                <Option type="QString" value="0,0,0,255" name="color"/>
-                <Option type="QString" value="2" name="draw_mode"/>
-                <Option type="QString" value="0" name="enabled"/>
-                <Option type="QString" value="135" name="offset_angle"/>
-                <Option type="QString" value="2" name="offset_distance"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_unit_scale"/>
-                <Option type="QString" value="1" name="opacity"/>
+                <Option type="QString" name="blend_mode" value="13"/>
+                <Option type="QString" name="blur_level" value="2.645"/>
+                <Option type="QString" name="blur_unit" value="MM"/>
+                <Option type="QString" name="blur_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color" value="0,0,0,255"/>
+                <Option type="QString" name="draw_mode" value="2"/>
+                <Option type="QString" name="enabled" value="0"/>
+                <Option type="QString" name="offset_angle" value="135"/>
+                <Option type="QString" name="offset_distance" value="2"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="offset_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="opacity" value="1"/>
               </Option>
             </effect>
             <effect type="innerGlow">
               <Option type="Map">
-                <Option type="QString" value="0" name="blend_mode"/>
-                <Option type="QString" value="2.645" name="blur_level"/>
-                <Option type="QString" value="MM" name="blur_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="blur_unit_scale"/>
-                <Option type="QString" value="69,116,40,255" name="color1"/>
-                <Option type="QString" value="188,220,60,255" name="color2"/>
-                <Option type="QString" value="0" name="color_type"/>
-                <Option type="QString" value="ccw" name="direction"/>
-                <Option type="QString" value="0" name="discrete"/>
-                <Option type="QString" value="2" name="draw_mode"/>
-                <Option type="QString" value="0" name="enabled"/>
-                <Option type="QString" value="0.5" name="opacity"/>
-                <Option type="QString" value="gradient" name="rampType"/>
-                <Option type="QString" value="255,255,255,255" name="single_color"/>
-                <Option type="QString" value="rgb" name="spec"/>
-                <Option type="QString" value="2" name="spread"/>
-                <Option type="QString" value="MM" name="spread_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="spread_unit_scale"/>
+                <Option type="QString" name="blend_mode" value="0"/>
+                <Option type="QString" name="blur_level" value="2.645"/>
+                <Option type="QString" name="blur_unit" value="MM"/>
+                <Option type="QString" name="blur_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color1" value="69,116,40,255"/>
+                <Option type="QString" name="color2" value="188,220,60,255"/>
+                <Option type="QString" name="color_type" value="0"/>
+                <Option type="QString" name="direction" value="ccw"/>
+                <Option type="QString" name="discrete" value="0"/>
+                <Option type="QString" name="draw_mode" value="2"/>
+                <Option type="QString" name="enabled" value="0"/>
+                <Option type="QString" name="opacity" value="0.5"/>
+                <Option type="QString" name="rampType" value="gradient"/>
+                <Option type="QString" name="single_color" value="255,255,255,255"/>
+                <Option type="QString" name="spec" value="rgb"/>
+                <Option type="QString" name="spread" value="2"/>
+                <Option type="QString" name="spread_unit" value="MM"/>
+                <Option type="QString" name="spread_unit_scale" value="3x:0,0,0,0,0,0"/>
               </Option>
             </effect>
           </effect>
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
         </layer>
@@ -167,154 +167,154 @@
       <symbol type="marker" clip_to_extent="1" name="1" is_animated="0" alpha="1" force_rhr="0" frame_rate="10">
         <data_defined_properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data_defined_properties>
-        <layer pass="0" locked="0" class="SimpleMarker" id="{56845f12-6d05-4f49-8308-ca43ff6325af}" enabled="1">
+        <layer class="SimpleMarker" locked="0" enabled="1" id="{56845f12-6d05-4f49-8308-ca43ff6325af}" pass="0">
           <Option type="Map">
-            <Option type="QString" value="0" name="angle"/>
-            <Option type="QString" value="square" name="cap_style"/>
-            <Option type="QString" value="255,0,0,0" name="color"/>
-            <Option type="QString" value="1" name="horizontal_anchor_point"/>
-            <Option type="QString" value="bevel" name="joinstyle"/>
-            <Option type="QString" value="circle" name="name"/>
-            <Option type="QString" value="0,0" name="offset"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-            <Option type="QString" value="MM" name="offset_unit"/>
-            <Option type="QString" value="255,255,255,255" name="outline_color"/>
-            <Option type="QString" value="solid" name="outline_style"/>
-            <Option type="QString" value="0.6" name="outline_width"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-            <Option type="QString" value="MM" name="outline_width_unit"/>
-            <Option type="QString" value="diameter" name="scale_method"/>
-            <Option type="QString" value="2.2" name="size"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-            <Option type="QString" value="MM" name="size_unit"/>
-            <Option type="QString" value="1" name="vertical_anchor_point"/>
+            <Option type="QString" name="angle" value="0"/>
+            <Option type="QString" name="cap_style" value="square"/>
+            <Option type="QString" name="color" value="255,0,0,0"/>
+            <Option type="QString" name="horizontal_anchor_point" value="1"/>
+            <Option type="QString" name="joinstyle" value="bevel"/>
+            <Option type="QString" name="name" value="circle"/>
+            <Option type="QString" name="offset" value="0,0"/>
+            <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="offset_unit" value="MM"/>
+            <Option type="QString" name="outline_color" value="255,255,255,255"/>
+            <Option type="QString" name="outline_style" value="solid"/>
+            <Option type="QString" name="outline_width" value="0.6"/>
+            <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="outline_width_unit" value="MM"/>
+            <Option type="QString" name="scale_method" value="diameter"/>
+            <Option type="QString" name="size" value="2.2"/>
+            <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="size_unit" value="MM"/>
+            <Option type="QString" name="vertical_anchor_point" value="1"/>
           </Option>
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
         </layer>
-        <layer pass="0" locked="0" class="SimpleMarker" id="{188f537f-f2b2-4916-98b7-1a427820274a}" enabled="1">
+        <layer class="SimpleMarker" locked="0" enabled="1" id="{188f537f-f2b2-4916-98b7-1a427820274a}" pass="0">
           <Option type="Map">
-            <Option type="QString" value="0" name="angle"/>
-            <Option type="QString" value="square" name="cap_style"/>
-            <Option type="QString" value="179,88,6,255" name="color"/>
-            <Option type="QString" value="1" name="horizontal_anchor_point"/>
-            <Option type="QString" value="bevel" name="joinstyle"/>
-            <Option type="QString" value="circle" name="name"/>
-            <Option type="QString" value="0,0" name="offset"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-            <Option type="QString" value="MM" name="offset_unit"/>
-            <Option type="QString" value="179,88,6,255" name="outline_color"/>
-            <Option type="QString" value="solid" name="outline_style"/>
-            <Option type="QString" value="0.8" name="outline_width"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-            <Option type="QString" value="MM" name="outline_width_unit"/>
-            <Option type="QString" value="diameter" name="scale_method"/>
-            <Option type="QString" value="1.6" name="size"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-            <Option type="QString" value="MM" name="size_unit"/>
-            <Option type="QString" value="1" name="vertical_anchor_point"/>
+            <Option type="QString" name="angle" value="0"/>
+            <Option type="QString" name="cap_style" value="square"/>
+            <Option type="QString" name="color" value="179,88,6,255"/>
+            <Option type="QString" name="horizontal_anchor_point" value="1"/>
+            <Option type="QString" name="joinstyle" value="bevel"/>
+            <Option type="QString" name="name" value="circle"/>
+            <Option type="QString" name="offset" value="0,0"/>
+            <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="offset_unit" value="MM"/>
+            <Option type="QString" name="outline_color" value="179,88,6,255"/>
+            <Option type="QString" name="outline_style" value="solid"/>
+            <Option type="QString" name="outline_width" value="0.8"/>
+            <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="outline_width_unit" value="MM"/>
+            <Option type="QString" name="scale_method" value="diameter"/>
+            <Option type="QString" name="size" value="1.6"/>
+            <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="size_unit" value="MM"/>
+            <Option type="QString" name="vertical_anchor_point" value="1"/>
           </Option>
           <effect type="effectStack" enabled="0">
             <effect type="dropShadow">
               <Option type="Map">
-                <Option type="QString" value="13" name="blend_mode"/>
-                <Option type="QString" value="2.645" name="blur_level"/>
-                <Option type="QString" value="MM" name="blur_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="blur_unit_scale"/>
-                <Option type="QString" value="0,0,0,255" name="color"/>
-                <Option type="QString" value="2" name="draw_mode"/>
-                <Option type="QString" value="0" name="enabled"/>
-                <Option type="QString" value="135" name="offset_angle"/>
-                <Option type="QString" value="2" name="offset_distance"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_unit_scale"/>
-                <Option type="QString" value="1" name="opacity"/>
+                <Option type="QString" name="blend_mode" value="13"/>
+                <Option type="QString" name="blur_level" value="2.645"/>
+                <Option type="QString" name="blur_unit" value="MM"/>
+                <Option type="QString" name="blur_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color" value="0,0,0,255"/>
+                <Option type="QString" name="draw_mode" value="2"/>
+                <Option type="QString" name="enabled" value="0"/>
+                <Option type="QString" name="offset_angle" value="135"/>
+                <Option type="QString" name="offset_distance" value="2"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="offset_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="opacity" value="1"/>
               </Option>
             </effect>
             <effect type="outerGlow">
               <Option type="Map">
-                <Option type="QString" value="0" name="blend_mode"/>
-                <Option type="QString" value="2.645" name="blur_level"/>
-                <Option type="QString" value="MM" name="blur_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="blur_unit_scale"/>
-                <Option type="QString" value="69,116,40,255" name="color1"/>
-                <Option type="QString" value="188,220,60,255" name="color2"/>
-                <Option type="QString" value="0" name="color_type"/>
-                <Option type="QString" value="ccw" name="direction"/>
-                <Option type="QString" value="0" name="discrete"/>
-                <Option type="QString" value="2" name="draw_mode"/>
-                <Option type="QString" value="1" name="enabled"/>
-                <Option type="QString" value="0.5" name="opacity"/>
-                <Option type="QString" value="gradient" name="rampType"/>
-                <Option type="QString" value="255,255,255,255" name="single_color"/>
-                <Option type="QString" value="rgb" name="spec"/>
-                <Option type="QString" value="2" name="spread"/>
-                <Option type="QString" value="MM" name="spread_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="spread_unit_scale"/>
+                <Option type="QString" name="blend_mode" value="0"/>
+                <Option type="QString" name="blur_level" value="2.645"/>
+                <Option type="QString" name="blur_unit" value="MM"/>
+                <Option type="QString" name="blur_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color1" value="69,116,40,255"/>
+                <Option type="QString" name="color2" value="188,220,60,255"/>
+                <Option type="QString" name="color_type" value="0"/>
+                <Option type="QString" name="direction" value="ccw"/>
+                <Option type="QString" name="discrete" value="0"/>
+                <Option type="QString" name="draw_mode" value="2"/>
+                <Option type="QString" name="enabled" value="1"/>
+                <Option type="QString" name="opacity" value="0.5"/>
+                <Option type="QString" name="rampType" value="gradient"/>
+                <Option type="QString" name="single_color" value="255,255,255,255"/>
+                <Option type="QString" name="spec" value="rgb"/>
+                <Option type="QString" name="spread" value="2"/>
+                <Option type="QString" name="spread_unit" value="MM"/>
+                <Option type="QString" name="spread_unit_scale" value="3x:0,0,0,0,0,0"/>
               </Option>
             </effect>
             <effect type="drawSource">
               <Option type="Map">
-                <Option type="QString" value="0" name="blend_mode"/>
-                <Option type="QString" value="2" name="draw_mode"/>
-                <Option type="QString" value="1" name="enabled"/>
-                <Option type="QString" value="1" name="opacity"/>
+                <Option type="QString" name="blend_mode" value="0"/>
+                <Option type="QString" name="draw_mode" value="2"/>
+                <Option type="QString" name="enabled" value="1"/>
+                <Option type="QString" name="opacity" value="1"/>
               </Option>
             </effect>
             <effect type="innerShadow">
               <Option type="Map">
-                <Option type="QString" value="13" name="blend_mode"/>
-                <Option type="QString" value="2.645" name="blur_level"/>
-                <Option type="QString" value="MM" name="blur_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="blur_unit_scale"/>
-                <Option type="QString" value="0,0,0,255" name="color"/>
-                <Option type="QString" value="2" name="draw_mode"/>
-                <Option type="QString" value="0" name="enabled"/>
-                <Option type="QString" value="135" name="offset_angle"/>
-                <Option type="QString" value="2" name="offset_distance"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_unit_scale"/>
-                <Option type="QString" value="1" name="opacity"/>
+                <Option type="QString" name="blend_mode" value="13"/>
+                <Option type="QString" name="blur_level" value="2.645"/>
+                <Option type="QString" name="blur_unit" value="MM"/>
+                <Option type="QString" name="blur_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color" value="0,0,0,255"/>
+                <Option type="QString" name="draw_mode" value="2"/>
+                <Option type="QString" name="enabled" value="0"/>
+                <Option type="QString" name="offset_angle" value="135"/>
+                <Option type="QString" name="offset_distance" value="2"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="offset_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="opacity" value="1"/>
               </Option>
             </effect>
             <effect type="innerGlow">
               <Option type="Map">
-                <Option type="QString" value="0" name="blend_mode"/>
-                <Option type="QString" value="2.645" name="blur_level"/>
-                <Option type="QString" value="MM" name="blur_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="blur_unit_scale"/>
-                <Option type="QString" value="69,116,40,255" name="color1"/>
-                <Option type="QString" value="188,220,60,255" name="color2"/>
-                <Option type="QString" value="0" name="color_type"/>
-                <Option type="QString" value="ccw" name="direction"/>
-                <Option type="QString" value="0" name="discrete"/>
-                <Option type="QString" value="2" name="draw_mode"/>
-                <Option type="QString" value="0" name="enabled"/>
-                <Option type="QString" value="0.5" name="opacity"/>
-                <Option type="QString" value="gradient" name="rampType"/>
-                <Option type="QString" value="255,255,255,255" name="single_color"/>
-                <Option type="QString" value="rgb" name="spec"/>
-                <Option type="QString" value="2" name="spread"/>
-                <Option type="QString" value="MM" name="spread_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="spread_unit_scale"/>
+                <Option type="QString" name="blend_mode" value="0"/>
+                <Option type="QString" name="blur_level" value="2.645"/>
+                <Option type="QString" name="blur_unit" value="MM"/>
+                <Option type="QString" name="blur_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color1" value="69,116,40,255"/>
+                <Option type="QString" name="color2" value="188,220,60,255"/>
+                <Option type="QString" name="color_type" value="0"/>
+                <Option type="QString" name="direction" value="ccw"/>
+                <Option type="QString" name="discrete" value="0"/>
+                <Option type="QString" name="draw_mode" value="2"/>
+                <Option type="QString" name="enabled" value="0"/>
+                <Option type="QString" name="opacity" value="0.5"/>
+                <Option type="QString" name="rampType" value="gradient"/>
+                <Option type="QString" name="single_color" value="255,255,255,255"/>
+                <Option type="QString" name="spec" value="rgb"/>
+                <Option type="QString" name="spread" value="2"/>
+                <Option type="QString" name="spread_unit" value="MM"/>
+                <Option type="QString" name="spread_unit_scale" value="3x:0,0,0,0,0,0"/>
               </Option>
             </effect>
           </effect>
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
         </layer>
@@ -322,154 +322,154 @@
       <symbol type="marker" clip_to_extent="1" name="2" is_animated="0" alpha="1" force_rhr="0" frame_rate="10">
         <data_defined_properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data_defined_properties>
-        <layer pass="0" locked="0" class="SimpleMarker" id="{301cc9cb-53b6-4e57-b580-fa579a22f0f5}" enabled="1">
+        <layer class="SimpleMarker" locked="0" enabled="1" id="{301cc9cb-53b6-4e57-b580-fa579a22f0f5}" pass="0">
           <Option type="Map">
-            <Option type="QString" value="0" name="angle"/>
-            <Option type="QString" value="square" name="cap_style"/>
-            <Option type="QString" value="255,0,0,0" name="color"/>
-            <Option type="QString" value="1" name="horizontal_anchor_point"/>
-            <Option type="QString" value="bevel" name="joinstyle"/>
-            <Option type="QString" value="circle" name="name"/>
-            <Option type="QString" value="0,0" name="offset"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-            <Option type="QString" value="MM" name="offset_unit"/>
-            <Option type="QString" value="255,255,255,255" name="outline_color"/>
-            <Option type="QString" value="solid" name="outline_style"/>
-            <Option type="QString" value="0.6" name="outline_width"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-            <Option type="QString" value="MM" name="outline_width_unit"/>
-            <Option type="QString" value="diameter" name="scale_method"/>
-            <Option type="QString" value="2.2" name="size"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-            <Option type="QString" value="MM" name="size_unit"/>
-            <Option type="QString" value="1" name="vertical_anchor_point"/>
+            <Option type="QString" name="angle" value="0"/>
+            <Option type="QString" name="cap_style" value="square"/>
+            <Option type="QString" name="color" value="255,0,0,0"/>
+            <Option type="QString" name="horizontal_anchor_point" value="1"/>
+            <Option type="QString" name="joinstyle" value="bevel"/>
+            <Option type="QString" name="name" value="circle"/>
+            <Option type="QString" name="offset" value="0,0"/>
+            <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="offset_unit" value="MM"/>
+            <Option type="QString" name="outline_color" value="255,255,255,255"/>
+            <Option type="QString" name="outline_style" value="solid"/>
+            <Option type="QString" name="outline_width" value="0.6"/>
+            <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="outline_width_unit" value="MM"/>
+            <Option type="QString" name="scale_method" value="diameter"/>
+            <Option type="QString" name="size" value="2.2"/>
+            <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="size_unit" value="MM"/>
+            <Option type="QString" name="vertical_anchor_point" value="1"/>
           </Option>
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
         </layer>
-        <layer pass="0" locked="0" class="SimpleMarker" id="{0436de3d-2b6a-4139-9981-e2642e1e88d8}" enabled="1">
+        <layer class="SimpleMarker" locked="0" enabled="1" id="{0436de3d-2b6a-4139-9981-e2642e1e88d8}" pass="0">
           <Option type="Map">
-            <Option type="QString" value="0" name="angle"/>
-            <Option type="QString" value="square" name="cap_style"/>
-            <Option type="QString" value="106,106,106,255" name="color"/>
-            <Option type="QString" value="1" name="horizontal_anchor_point"/>
-            <Option type="QString" value="bevel" name="joinstyle"/>
-            <Option type="QString" value="circle" name="name"/>
-            <Option type="QString" value="0,0" name="offset"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-            <Option type="QString" value="MM" name="offset_unit"/>
-            <Option type="QString" value="106,106,106,255" name="outline_color"/>
-            <Option type="QString" value="solid" name="outline_style"/>
-            <Option type="QString" value="0.8" name="outline_width"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-            <Option type="QString" value="MM" name="outline_width_unit"/>
-            <Option type="QString" value="diameter" name="scale_method"/>
-            <Option type="QString" value="1.6" name="size"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-            <Option type="QString" value="MM" name="size_unit"/>
-            <Option type="QString" value="1" name="vertical_anchor_point"/>
+            <Option type="QString" name="angle" value="0"/>
+            <Option type="QString" name="cap_style" value="square"/>
+            <Option type="QString" name="color" value="106,106,106,255"/>
+            <Option type="QString" name="horizontal_anchor_point" value="1"/>
+            <Option type="QString" name="joinstyle" value="bevel"/>
+            <Option type="QString" name="name" value="circle"/>
+            <Option type="QString" name="offset" value="0,0"/>
+            <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="offset_unit" value="MM"/>
+            <Option type="QString" name="outline_color" value="106,106,106,255"/>
+            <Option type="QString" name="outline_style" value="solid"/>
+            <Option type="QString" name="outline_width" value="0.8"/>
+            <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="outline_width_unit" value="MM"/>
+            <Option type="QString" name="scale_method" value="diameter"/>
+            <Option type="QString" name="size" value="1.6"/>
+            <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="size_unit" value="MM"/>
+            <Option type="QString" name="vertical_anchor_point" value="1"/>
           </Option>
           <effect type="effectStack" enabled="0">
             <effect type="dropShadow">
               <Option type="Map">
-                <Option type="QString" value="13" name="blend_mode"/>
-                <Option type="QString" value="2.645" name="blur_level"/>
-                <Option type="QString" value="MM" name="blur_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="blur_unit_scale"/>
-                <Option type="QString" value="0,0,0,255" name="color"/>
-                <Option type="QString" value="2" name="draw_mode"/>
-                <Option type="QString" value="0" name="enabled"/>
-                <Option type="QString" value="135" name="offset_angle"/>
-                <Option type="QString" value="2" name="offset_distance"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_unit_scale"/>
-                <Option type="QString" value="1" name="opacity"/>
+                <Option type="QString" name="blend_mode" value="13"/>
+                <Option type="QString" name="blur_level" value="2.645"/>
+                <Option type="QString" name="blur_unit" value="MM"/>
+                <Option type="QString" name="blur_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color" value="0,0,0,255"/>
+                <Option type="QString" name="draw_mode" value="2"/>
+                <Option type="QString" name="enabled" value="0"/>
+                <Option type="QString" name="offset_angle" value="135"/>
+                <Option type="QString" name="offset_distance" value="2"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="offset_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="opacity" value="1"/>
               </Option>
             </effect>
             <effect type="outerGlow">
               <Option type="Map">
-                <Option type="QString" value="0" name="blend_mode"/>
-                <Option type="QString" value="2.645" name="blur_level"/>
-                <Option type="QString" value="MM" name="blur_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="blur_unit_scale"/>
-                <Option type="QString" value="69,116,40,255" name="color1"/>
-                <Option type="QString" value="188,220,60,255" name="color2"/>
-                <Option type="QString" value="0" name="color_type"/>
-                <Option type="QString" value="ccw" name="direction"/>
-                <Option type="QString" value="0" name="discrete"/>
-                <Option type="QString" value="2" name="draw_mode"/>
-                <Option type="QString" value="1" name="enabled"/>
-                <Option type="QString" value="0.5" name="opacity"/>
-                <Option type="QString" value="gradient" name="rampType"/>
-                <Option type="QString" value="255,255,255,255" name="single_color"/>
-                <Option type="QString" value="rgb" name="spec"/>
-                <Option type="QString" value="2" name="spread"/>
-                <Option type="QString" value="MM" name="spread_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="spread_unit_scale"/>
+                <Option type="QString" name="blend_mode" value="0"/>
+                <Option type="QString" name="blur_level" value="2.645"/>
+                <Option type="QString" name="blur_unit" value="MM"/>
+                <Option type="QString" name="blur_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color1" value="69,116,40,255"/>
+                <Option type="QString" name="color2" value="188,220,60,255"/>
+                <Option type="QString" name="color_type" value="0"/>
+                <Option type="QString" name="direction" value="ccw"/>
+                <Option type="QString" name="discrete" value="0"/>
+                <Option type="QString" name="draw_mode" value="2"/>
+                <Option type="QString" name="enabled" value="1"/>
+                <Option type="QString" name="opacity" value="0.5"/>
+                <Option type="QString" name="rampType" value="gradient"/>
+                <Option type="QString" name="single_color" value="255,255,255,255"/>
+                <Option type="QString" name="spec" value="rgb"/>
+                <Option type="QString" name="spread" value="2"/>
+                <Option type="QString" name="spread_unit" value="MM"/>
+                <Option type="QString" name="spread_unit_scale" value="3x:0,0,0,0,0,0"/>
               </Option>
             </effect>
             <effect type="drawSource">
               <Option type="Map">
-                <Option type="QString" value="0" name="blend_mode"/>
-                <Option type="QString" value="2" name="draw_mode"/>
-                <Option type="QString" value="1" name="enabled"/>
-                <Option type="QString" value="1" name="opacity"/>
+                <Option type="QString" name="blend_mode" value="0"/>
+                <Option type="QString" name="draw_mode" value="2"/>
+                <Option type="QString" name="enabled" value="1"/>
+                <Option type="QString" name="opacity" value="1"/>
               </Option>
             </effect>
             <effect type="innerShadow">
               <Option type="Map">
-                <Option type="QString" value="13" name="blend_mode"/>
-                <Option type="QString" value="2.645" name="blur_level"/>
-                <Option type="QString" value="MM" name="blur_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="blur_unit_scale"/>
-                <Option type="QString" value="0,0,0,255" name="color"/>
-                <Option type="QString" value="2" name="draw_mode"/>
-                <Option type="QString" value="0" name="enabled"/>
-                <Option type="QString" value="135" name="offset_angle"/>
-                <Option type="QString" value="2" name="offset_distance"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_unit_scale"/>
-                <Option type="QString" value="1" name="opacity"/>
+                <Option type="QString" name="blend_mode" value="13"/>
+                <Option type="QString" name="blur_level" value="2.645"/>
+                <Option type="QString" name="blur_unit" value="MM"/>
+                <Option type="QString" name="blur_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color" value="0,0,0,255"/>
+                <Option type="QString" name="draw_mode" value="2"/>
+                <Option type="QString" name="enabled" value="0"/>
+                <Option type="QString" name="offset_angle" value="135"/>
+                <Option type="QString" name="offset_distance" value="2"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="offset_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="opacity" value="1"/>
               </Option>
             </effect>
             <effect type="innerGlow">
               <Option type="Map">
-                <Option type="QString" value="0" name="blend_mode"/>
-                <Option type="QString" value="2.645" name="blur_level"/>
-                <Option type="QString" value="MM" name="blur_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="blur_unit_scale"/>
-                <Option type="QString" value="69,116,40,255" name="color1"/>
-                <Option type="QString" value="188,220,60,255" name="color2"/>
-                <Option type="QString" value="0" name="color_type"/>
-                <Option type="QString" value="ccw" name="direction"/>
-                <Option type="QString" value="0" name="discrete"/>
-                <Option type="QString" value="2" name="draw_mode"/>
-                <Option type="QString" value="0" name="enabled"/>
-                <Option type="QString" value="0.5" name="opacity"/>
-                <Option type="QString" value="gradient" name="rampType"/>
-                <Option type="QString" value="255,255,255,255" name="single_color"/>
-                <Option type="QString" value="rgb" name="spec"/>
-                <Option type="QString" value="2" name="spread"/>
-                <Option type="QString" value="MM" name="spread_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="spread_unit_scale"/>
+                <Option type="QString" name="blend_mode" value="0"/>
+                <Option type="QString" name="blur_level" value="2.645"/>
+                <Option type="QString" name="blur_unit" value="MM"/>
+                <Option type="QString" name="blur_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color1" value="69,116,40,255"/>
+                <Option type="QString" name="color2" value="188,220,60,255"/>
+                <Option type="QString" name="color_type" value="0"/>
+                <Option type="QString" name="direction" value="ccw"/>
+                <Option type="QString" name="discrete" value="0"/>
+                <Option type="QString" name="draw_mode" value="2"/>
+                <Option type="QString" name="enabled" value="0"/>
+                <Option type="QString" name="opacity" value="0.5"/>
+                <Option type="QString" name="rampType" value="gradient"/>
+                <Option type="QString" name="single_color" value="255,255,255,255"/>
+                <Option type="QString" name="spec" value="rgb"/>
+                <Option type="QString" name="spread" value="2"/>
+                <Option type="QString" name="spread_unit" value="MM"/>
+                <Option type="QString" name="spread_unit_scale" value="3x:0,0,0,0,0,0"/>
               </Option>
             </effect>
           </effect>
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
         </layer>
@@ -477,154 +477,154 @@
       <symbol type="marker" clip_to_extent="1" name="3" is_animated="0" alpha="1" force_rhr="0" frame_rate="10">
         <data_defined_properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data_defined_properties>
-        <layer pass="0" locked="0" class="SimpleMarker" id="{649ff247-cc01-4940-911f-644819f0ed68}" enabled="1">
+        <layer class="SimpleMarker" locked="0" enabled="1" id="{649ff247-cc01-4940-911f-644819f0ed68}" pass="0">
           <Option type="Map">
-            <Option type="QString" value="0" name="angle"/>
-            <Option type="QString" value="square" name="cap_style"/>
-            <Option type="QString" value="255,0,0,0" name="color"/>
-            <Option type="QString" value="1" name="horizontal_anchor_point"/>
-            <Option type="QString" value="bevel" name="joinstyle"/>
-            <Option type="QString" value="circle" name="name"/>
-            <Option type="QString" value="0,0" name="offset"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-            <Option type="QString" value="MM" name="offset_unit"/>
-            <Option type="QString" value="255,255,255,255" name="outline_color"/>
-            <Option type="QString" value="solid" name="outline_style"/>
-            <Option type="QString" value="0.6" name="outline_width"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-            <Option type="QString" value="MM" name="outline_width_unit"/>
-            <Option type="QString" value="diameter" name="scale_method"/>
-            <Option type="QString" value="2.2" name="size"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-            <Option type="QString" value="MM" name="size_unit"/>
-            <Option type="QString" value="1" name="vertical_anchor_point"/>
+            <Option type="QString" name="angle" value="0"/>
+            <Option type="QString" name="cap_style" value="square"/>
+            <Option type="QString" name="color" value="255,0,0,0"/>
+            <Option type="QString" name="horizontal_anchor_point" value="1"/>
+            <Option type="QString" name="joinstyle" value="bevel"/>
+            <Option type="QString" name="name" value="circle"/>
+            <Option type="QString" name="offset" value="0,0"/>
+            <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="offset_unit" value="MM"/>
+            <Option type="QString" name="outline_color" value="255,255,255,255"/>
+            <Option type="QString" name="outline_style" value="solid"/>
+            <Option type="QString" name="outline_width" value="0.6"/>
+            <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="outline_width_unit" value="MM"/>
+            <Option type="QString" name="scale_method" value="diameter"/>
+            <Option type="QString" name="size" value="2.2"/>
+            <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="size_unit" value="MM"/>
+            <Option type="QString" name="vertical_anchor_point" value="1"/>
           </Option>
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
         </layer>
-        <layer pass="0" locked="0" class="SimpleMarker" id="{7ffa385b-5772-44d2-b01e-ad2a85dcbb1e}" enabled="1">
+        <layer class="SimpleMarker" locked="0" enabled="1" id="{7ffa385b-5772-44d2-b01e-ad2a85dcbb1e}" pass="0">
           <Option type="Map">
-            <Option type="QString" value="0" name="angle"/>
-            <Option type="QString" value="square" name="cap_style"/>
-            <Option type="QString" value="134,186,85,255" name="color"/>
-            <Option type="QString" value="1" name="horizontal_anchor_point"/>
-            <Option type="QString" value="bevel" name="joinstyle"/>
-            <Option type="QString" value="circle" name="name"/>
-            <Option type="QString" value="0,0" name="offset"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-            <Option type="QString" value="MM" name="offset_unit"/>
-            <Option type="QString" value="134,186,85,255" name="outline_color"/>
-            <Option type="QString" value="solid" name="outline_style"/>
-            <Option type="QString" value="0.8" name="outline_width"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-            <Option type="QString" value="MM" name="outline_width_unit"/>
-            <Option type="QString" value="diameter" name="scale_method"/>
-            <Option type="QString" value="1.6" name="size"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-            <Option type="QString" value="MM" name="size_unit"/>
-            <Option type="QString" value="1" name="vertical_anchor_point"/>
+            <Option type="QString" name="angle" value="0"/>
+            <Option type="QString" name="cap_style" value="square"/>
+            <Option type="QString" name="color" value="134,186,85,255"/>
+            <Option type="QString" name="horizontal_anchor_point" value="1"/>
+            <Option type="QString" name="joinstyle" value="bevel"/>
+            <Option type="QString" name="name" value="circle"/>
+            <Option type="QString" name="offset" value="0,0"/>
+            <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="offset_unit" value="MM"/>
+            <Option type="QString" name="outline_color" value="134,186,85,255"/>
+            <Option type="QString" name="outline_style" value="solid"/>
+            <Option type="QString" name="outline_width" value="0.8"/>
+            <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="outline_width_unit" value="MM"/>
+            <Option type="QString" name="scale_method" value="diameter"/>
+            <Option type="QString" name="size" value="1.6"/>
+            <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="size_unit" value="MM"/>
+            <Option type="QString" name="vertical_anchor_point" value="1"/>
           </Option>
           <effect type="effectStack" enabled="0">
             <effect type="dropShadow">
               <Option type="Map">
-                <Option type="QString" value="13" name="blend_mode"/>
-                <Option type="QString" value="2.645" name="blur_level"/>
-                <Option type="QString" value="MM" name="blur_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="blur_unit_scale"/>
-                <Option type="QString" value="0,0,0,255" name="color"/>
-                <Option type="QString" value="2" name="draw_mode"/>
-                <Option type="QString" value="0" name="enabled"/>
-                <Option type="QString" value="135" name="offset_angle"/>
-                <Option type="QString" value="2" name="offset_distance"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_unit_scale"/>
-                <Option type="QString" value="1" name="opacity"/>
+                <Option type="QString" name="blend_mode" value="13"/>
+                <Option type="QString" name="blur_level" value="2.645"/>
+                <Option type="QString" name="blur_unit" value="MM"/>
+                <Option type="QString" name="blur_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color" value="0,0,0,255"/>
+                <Option type="QString" name="draw_mode" value="2"/>
+                <Option type="QString" name="enabled" value="0"/>
+                <Option type="QString" name="offset_angle" value="135"/>
+                <Option type="QString" name="offset_distance" value="2"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="offset_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="opacity" value="1"/>
               </Option>
             </effect>
             <effect type="outerGlow">
               <Option type="Map">
-                <Option type="QString" value="0" name="blend_mode"/>
-                <Option type="QString" value="2.645" name="blur_level"/>
-                <Option type="QString" value="MM" name="blur_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="blur_unit_scale"/>
-                <Option type="QString" value="69,116,40,255" name="color1"/>
-                <Option type="QString" value="188,220,60,255" name="color2"/>
-                <Option type="QString" value="0" name="color_type"/>
-                <Option type="QString" value="ccw" name="direction"/>
-                <Option type="QString" value="0" name="discrete"/>
-                <Option type="QString" value="2" name="draw_mode"/>
-                <Option type="QString" value="1" name="enabled"/>
-                <Option type="QString" value="0.5" name="opacity"/>
-                <Option type="QString" value="gradient" name="rampType"/>
-                <Option type="QString" value="255,255,255,255" name="single_color"/>
-                <Option type="QString" value="rgb" name="spec"/>
-                <Option type="QString" value="2" name="spread"/>
-                <Option type="QString" value="MM" name="spread_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="spread_unit_scale"/>
+                <Option type="QString" name="blend_mode" value="0"/>
+                <Option type="QString" name="blur_level" value="2.645"/>
+                <Option type="QString" name="blur_unit" value="MM"/>
+                <Option type="QString" name="blur_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color1" value="69,116,40,255"/>
+                <Option type="QString" name="color2" value="188,220,60,255"/>
+                <Option type="QString" name="color_type" value="0"/>
+                <Option type="QString" name="direction" value="ccw"/>
+                <Option type="QString" name="discrete" value="0"/>
+                <Option type="QString" name="draw_mode" value="2"/>
+                <Option type="QString" name="enabled" value="1"/>
+                <Option type="QString" name="opacity" value="0.5"/>
+                <Option type="QString" name="rampType" value="gradient"/>
+                <Option type="QString" name="single_color" value="255,255,255,255"/>
+                <Option type="QString" name="spec" value="rgb"/>
+                <Option type="QString" name="spread" value="2"/>
+                <Option type="QString" name="spread_unit" value="MM"/>
+                <Option type="QString" name="spread_unit_scale" value="3x:0,0,0,0,0,0"/>
               </Option>
             </effect>
             <effect type="drawSource">
               <Option type="Map">
-                <Option type="QString" value="0" name="blend_mode"/>
-                <Option type="QString" value="2" name="draw_mode"/>
-                <Option type="QString" value="1" name="enabled"/>
-                <Option type="QString" value="1" name="opacity"/>
+                <Option type="QString" name="blend_mode" value="0"/>
+                <Option type="QString" name="draw_mode" value="2"/>
+                <Option type="QString" name="enabled" value="1"/>
+                <Option type="QString" name="opacity" value="1"/>
               </Option>
             </effect>
             <effect type="innerShadow">
               <Option type="Map">
-                <Option type="QString" value="13" name="blend_mode"/>
-                <Option type="QString" value="2.645" name="blur_level"/>
-                <Option type="QString" value="MM" name="blur_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="blur_unit_scale"/>
-                <Option type="QString" value="0,0,0,255" name="color"/>
-                <Option type="QString" value="2" name="draw_mode"/>
-                <Option type="QString" value="0" name="enabled"/>
-                <Option type="QString" value="135" name="offset_angle"/>
-                <Option type="QString" value="2" name="offset_distance"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_unit_scale"/>
-                <Option type="QString" value="1" name="opacity"/>
+                <Option type="QString" name="blend_mode" value="13"/>
+                <Option type="QString" name="blur_level" value="2.645"/>
+                <Option type="QString" name="blur_unit" value="MM"/>
+                <Option type="QString" name="blur_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color" value="0,0,0,255"/>
+                <Option type="QString" name="draw_mode" value="2"/>
+                <Option type="QString" name="enabled" value="0"/>
+                <Option type="QString" name="offset_angle" value="135"/>
+                <Option type="QString" name="offset_distance" value="2"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="offset_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="opacity" value="1"/>
               </Option>
             </effect>
             <effect type="innerGlow">
               <Option type="Map">
-                <Option type="QString" value="0" name="blend_mode"/>
-                <Option type="QString" value="2.645" name="blur_level"/>
-                <Option type="QString" value="MM" name="blur_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="blur_unit_scale"/>
-                <Option type="QString" value="69,116,40,255" name="color1"/>
-                <Option type="QString" value="188,220,60,255" name="color2"/>
-                <Option type="QString" value="0" name="color_type"/>
-                <Option type="QString" value="ccw" name="direction"/>
-                <Option type="QString" value="0" name="discrete"/>
-                <Option type="QString" value="2" name="draw_mode"/>
-                <Option type="QString" value="0" name="enabled"/>
-                <Option type="QString" value="0.5" name="opacity"/>
-                <Option type="QString" value="gradient" name="rampType"/>
-                <Option type="QString" value="255,255,255,255" name="single_color"/>
-                <Option type="QString" value="rgb" name="spec"/>
-                <Option type="QString" value="2" name="spread"/>
-                <Option type="QString" value="MM" name="spread_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="spread_unit_scale"/>
+                <Option type="QString" name="blend_mode" value="0"/>
+                <Option type="QString" name="blur_level" value="2.645"/>
+                <Option type="QString" name="blur_unit" value="MM"/>
+                <Option type="QString" name="blur_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color1" value="69,116,40,255"/>
+                <Option type="QString" name="color2" value="188,220,60,255"/>
+                <Option type="QString" name="color_type" value="0"/>
+                <Option type="QString" name="direction" value="ccw"/>
+                <Option type="QString" name="discrete" value="0"/>
+                <Option type="QString" name="draw_mode" value="2"/>
+                <Option type="QString" name="enabled" value="0"/>
+                <Option type="QString" name="opacity" value="0.5"/>
+                <Option type="QString" name="rampType" value="gradient"/>
+                <Option type="QString" name="single_color" value="255,255,255,255"/>
+                <Option type="QString" name="spec" value="rgb"/>
+                <Option type="QString" name="spread" value="2"/>
+                <Option type="QString" name="spread_unit" value="MM"/>
+                <Option type="QString" name="spread_unit_scale" value="3x:0,0,0,0,0,0"/>
               </Option>
             </effect>
           </effect>
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
         </layer>
@@ -632,38 +632,38 @@
       <symbol type="marker" clip_to_extent="1" name="4" is_animated="0" alpha="1" force_rhr="0" frame_rate="10">
         <data_defined_properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data_defined_properties>
-        <layer pass="0" locked="0" class="SimpleMarker" id="{9d7980a9-9b5a-4d24-939c-bfdec188c428}" enabled="1">
+        <layer class="SimpleMarker" locked="0" enabled="1" id="{9d7980a9-9b5a-4d24-939c-bfdec188c428}" pass="0">
           <Option type="Map">
-            <Option type="QString" value="0" name="angle"/>
-            <Option type="QString" value="square" name="cap_style"/>
-            <Option type="QString" value="183,72,75,255" name="color"/>
-            <Option type="QString" value="1" name="horizontal_anchor_point"/>
-            <Option type="QString" value="bevel" name="joinstyle"/>
-            <Option type="QString" value="circle" name="name"/>
-            <Option type="QString" value="0,0" name="offset"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-            <Option type="QString" value="MM" name="offset_unit"/>
-            <Option type="QString" value="35,35,35,255" name="outline_color"/>
-            <Option type="QString" value="solid" name="outline_style"/>
-            <Option type="QString" value="0" name="outline_width"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-            <Option type="QString" value="MM" name="outline_width_unit"/>
-            <Option type="QString" value="diameter" name="scale_method"/>
-            <Option type="QString" value="2" name="size"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-            <Option type="QString" value="MM" name="size_unit"/>
-            <Option type="QString" value="1" name="vertical_anchor_point"/>
+            <Option type="QString" name="angle" value="0"/>
+            <Option type="QString" name="cap_style" value="square"/>
+            <Option type="QString" name="color" value="183,72,75,255"/>
+            <Option type="QString" name="horizontal_anchor_point" value="1"/>
+            <Option type="QString" name="joinstyle" value="bevel"/>
+            <Option type="QString" name="name" value="circle"/>
+            <Option type="QString" name="offset" value="0,0"/>
+            <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="offset_unit" value="MM"/>
+            <Option type="QString" name="outline_color" value="35,35,35,255"/>
+            <Option type="QString" name="outline_style" value="solid"/>
+            <Option type="QString" name="outline_width" value="0"/>
+            <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="outline_width_unit" value="MM"/>
+            <Option type="QString" name="scale_method" value="diameter"/>
+            <Option type="QString" name="size" value="2"/>
+            <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="size_unit" value="MM"/>
+            <Option type="QString" name="vertical_anchor_point" value="1"/>
           </Option>
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
         </layer>
@@ -672,86 +672,86 @@
     <effect type="effectStack" enabled="1">
       <effect type="dropShadow">
         <Option type="Map">
-          <Option type="QString" value="13" name="blend_mode"/>
-          <Option type="QString" value="2.645" name="blur_level"/>
-          <Option type="QString" value="MM" name="blur_unit"/>
-          <Option type="QString" value="3x:0,0,0,0,0,0" name="blur_unit_scale"/>
-          <Option type="QString" value="0,0,0,255" name="color"/>
-          <Option type="QString" value="2" name="draw_mode"/>
-          <Option type="QString" value="0" name="enabled"/>
-          <Option type="QString" value="135" name="offset_angle"/>
-          <Option type="QString" value="2" name="offset_distance"/>
-          <Option type="QString" value="MM" name="offset_unit"/>
-          <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_unit_scale"/>
-          <Option type="QString" value="1" name="opacity"/>
+          <Option type="QString" name="blend_mode" value="13"/>
+          <Option type="QString" name="blur_level" value="2.645"/>
+          <Option type="QString" name="blur_unit" value="MM"/>
+          <Option type="QString" name="blur_unit_scale" value="3x:0,0,0,0,0,0"/>
+          <Option type="QString" name="color" value="0,0,0,255"/>
+          <Option type="QString" name="draw_mode" value="2"/>
+          <Option type="QString" name="enabled" value="0"/>
+          <Option type="QString" name="offset_angle" value="135"/>
+          <Option type="QString" name="offset_distance" value="2"/>
+          <Option type="QString" name="offset_unit" value="MM"/>
+          <Option type="QString" name="offset_unit_scale" value="3x:0,0,0,0,0,0"/>
+          <Option type="QString" name="opacity" value="1"/>
         </Option>
       </effect>
       <effect type="outerGlow">
         <Option type="Map">
-          <Option type="QString" value="0" name="blend_mode"/>
-          <Option type="QString" value="1.845" name="blur_level"/>
-          <Option type="QString" value="MM" name="blur_unit"/>
-          <Option type="QString" value="3x:0,0,0,0,0,0" name="blur_unit_scale"/>
-          <Option type="QString" value="69,116,40,255" name="color1"/>
-          <Option type="QString" value="188,220,60,255" name="color2"/>
-          <Option type="QString" value="0" name="color_type"/>
-          <Option type="QString" value="ccw" name="direction"/>
-          <Option type="QString" value="0" name="discrete"/>
-          <Option type="QString" value="2" name="draw_mode"/>
-          <Option type="QString" value="1" name="enabled"/>
-          <Option type="QString" value="0.6" name="opacity"/>
-          <Option type="QString" value="gradient" name="rampType"/>
-          <Option type="QString" value="255,255,255,255" name="single_color"/>
-          <Option type="QString" value="rgb" name="spec"/>
-          <Option type="QString" value="1.4" name="spread"/>
-          <Option type="QString" value="MM" name="spread_unit"/>
-          <Option type="QString" value="3x:0,0,0,0,0,0" name="spread_unit_scale"/>
+          <Option type="QString" name="blend_mode" value="0"/>
+          <Option type="QString" name="blur_level" value="1.845"/>
+          <Option type="QString" name="blur_unit" value="MM"/>
+          <Option type="QString" name="blur_unit_scale" value="3x:0,0,0,0,0,0"/>
+          <Option type="QString" name="color1" value="69,116,40,255"/>
+          <Option type="QString" name="color2" value="188,220,60,255"/>
+          <Option type="QString" name="color_type" value="0"/>
+          <Option type="QString" name="direction" value="ccw"/>
+          <Option type="QString" name="discrete" value="0"/>
+          <Option type="QString" name="draw_mode" value="2"/>
+          <Option type="QString" name="enabled" value="1"/>
+          <Option type="QString" name="opacity" value="0.6"/>
+          <Option type="QString" name="rampType" value="gradient"/>
+          <Option type="QString" name="single_color" value="255,255,255,255"/>
+          <Option type="QString" name="spec" value="rgb"/>
+          <Option type="QString" name="spread" value="1.4"/>
+          <Option type="QString" name="spread_unit" value="MM"/>
+          <Option type="QString" name="spread_unit_scale" value="3x:0,0,0,0,0,0"/>
         </Option>
       </effect>
       <effect type="drawSource">
         <Option type="Map">
-          <Option type="QString" value="0" name="blend_mode"/>
-          <Option type="QString" value="2" name="draw_mode"/>
-          <Option type="QString" value="1" name="enabled"/>
-          <Option type="QString" value="1" name="opacity"/>
+          <Option type="QString" name="blend_mode" value="0"/>
+          <Option type="QString" name="draw_mode" value="2"/>
+          <Option type="QString" name="enabled" value="1"/>
+          <Option type="QString" name="opacity" value="1"/>
         </Option>
       </effect>
       <effect type="innerShadow">
         <Option type="Map">
-          <Option type="QString" value="13" name="blend_mode"/>
-          <Option type="QString" value="2.645" name="blur_level"/>
-          <Option type="QString" value="MM" name="blur_unit"/>
-          <Option type="QString" value="3x:0,0,0,0,0,0" name="blur_unit_scale"/>
-          <Option type="QString" value="0,0,0,255" name="color"/>
-          <Option type="QString" value="2" name="draw_mode"/>
-          <Option type="QString" value="0" name="enabled"/>
-          <Option type="QString" value="135" name="offset_angle"/>
-          <Option type="QString" value="2" name="offset_distance"/>
-          <Option type="QString" value="MM" name="offset_unit"/>
-          <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_unit_scale"/>
-          <Option type="QString" value="1" name="opacity"/>
+          <Option type="QString" name="blend_mode" value="13"/>
+          <Option type="QString" name="blur_level" value="2.645"/>
+          <Option type="QString" name="blur_unit" value="MM"/>
+          <Option type="QString" name="blur_unit_scale" value="3x:0,0,0,0,0,0"/>
+          <Option type="QString" name="color" value="0,0,0,255"/>
+          <Option type="QString" name="draw_mode" value="2"/>
+          <Option type="QString" name="enabled" value="0"/>
+          <Option type="QString" name="offset_angle" value="135"/>
+          <Option type="QString" name="offset_distance" value="2"/>
+          <Option type="QString" name="offset_unit" value="MM"/>
+          <Option type="QString" name="offset_unit_scale" value="3x:0,0,0,0,0,0"/>
+          <Option type="QString" name="opacity" value="1"/>
         </Option>
       </effect>
       <effect type="innerGlow">
         <Option type="Map">
-          <Option type="QString" value="0" name="blend_mode"/>
-          <Option type="QString" value="2.645" name="blur_level"/>
-          <Option type="QString" value="MM" name="blur_unit"/>
-          <Option type="QString" value="3x:0,0,0,0,0,0" name="blur_unit_scale"/>
-          <Option type="QString" value="69,116,40,255" name="color1"/>
-          <Option type="QString" value="188,220,60,255" name="color2"/>
-          <Option type="QString" value="0" name="color_type"/>
-          <Option type="QString" value="ccw" name="direction"/>
-          <Option type="QString" value="0" name="discrete"/>
-          <Option type="QString" value="2" name="draw_mode"/>
-          <Option type="QString" value="0" name="enabled"/>
-          <Option type="QString" value="0.5" name="opacity"/>
-          <Option type="QString" value="gradient" name="rampType"/>
-          <Option type="QString" value="255,255,255,255" name="single_color"/>
-          <Option type="QString" value="rgb" name="spec"/>
-          <Option type="QString" value="2" name="spread"/>
-          <Option type="QString" value="MM" name="spread_unit"/>
-          <Option type="QString" value="3x:0,0,0,0,0,0" name="spread_unit_scale"/>
+          <Option type="QString" name="blend_mode" value="0"/>
+          <Option type="QString" name="blur_level" value="2.645"/>
+          <Option type="QString" name="blur_unit" value="MM"/>
+          <Option type="QString" name="blur_unit_scale" value="3x:0,0,0,0,0,0"/>
+          <Option type="QString" name="color1" value="69,116,40,255"/>
+          <Option type="QString" name="color2" value="188,220,60,255"/>
+          <Option type="QString" name="color_type" value="0"/>
+          <Option type="QString" name="direction" value="ccw"/>
+          <Option type="QString" name="discrete" value="0"/>
+          <Option type="QString" name="draw_mode" value="2"/>
+          <Option type="QString" name="enabled" value="0"/>
+          <Option type="QString" name="opacity" value="0.5"/>
+          <Option type="QString" name="rampType" value="gradient"/>
+          <Option type="QString" name="single_color" value="255,255,255,255"/>
+          <Option type="QString" name="spec" value="rgb"/>
+          <Option type="QString" name="spread" value="2"/>
+          <Option type="QString" name="spread_unit" value="MM"/>
+          <Option type="QString" name="spread_unit_scale" value="3x:0,0,0,0,0,0"/>
         </Option>
       </effect>
     </effect>
@@ -762,38 +762,38 @@
       <symbol type="marker" clip_to_extent="1" name="" is_animated="0" alpha="1" force_rhr="0" frame_rate="10">
         <data_defined_properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data_defined_properties>
-        <layer pass="0" locked="0" class="SimpleMarker" id="{8421069b-8bd2-41c4-bda1-e09c8daacb97}" enabled="1">
+        <layer class="SimpleMarker" locked="0" enabled="1" id="{8421069b-8bd2-41c4-bda1-e09c8daacb97}" pass="0">
           <Option type="Map">
-            <Option type="QString" value="0" name="angle"/>
-            <Option type="QString" value="square" name="cap_style"/>
-            <Option type="QString" value="255,0,0,255" name="color"/>
-            <Option type="QString" value="1" name="horizontal_anchor_point"/>
-            <Option type="QString" value="bevel" name="joinstyle"/>
-            <Option type="QString" value="circle" name="name"/>
-            <Option type="QString" value="0,0" name="offset"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-            <Option type="QString" value="MM" name="offset_unit"/>
-            <Option type="QString" value="35,35,35,255" name="outline_color"/>
-            <Option type="QString" value="solid" name="outline_style"/>
-            <Option type="QString" value="0" name="outline_width"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-            <Option type="QString" value="MM" name="outline_width_unit"/>
-            <Option type="QString" value="diameter" name="scale_method"/>
-            <Option type="QString" value="2" name="size"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-            <Option type="QString" value="MM" name="size_unit"/>
-            <Option type="QString" value="1" name="vertical_anchor_point"/>
+            <Option type="QString" name="angle" value="0"/>
+            <Option type="QString" name="cap_style" value="square"/>
+            <Option type="QString" name="color" value="255,0,0,255"/>
+            <Option type="QString" name="horizontal_anchor_point" value="1"/>
+            <Option type="QString" name="joinstyle" value="bevel"/>
+            <Option type="QString" name="name" value="circle"/>
+            <Option type="QString" name="offset" value="0,0"/>
+            <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="offset_unit" value="MM"/>
+            <Option type="QString" name="outline_color" value="35,35,35,255"/>
+            <Option type="QString" name="outline_style" value="solid"/>
+            <Option type="QString" name="outline_width" value="0"/>
+            <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="outline_width_unit" value="MM"/>
+            <Option type="QString" name="scale_method" value="diameter"/>
+            <Option type="QString" name="size" value="2"/>
+            <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="size_unit" value="MM"/>
+            <Option type="QString" name="vertical_anchor_point" value="1"/>
           </Option>
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
         </layer>
@@ -802,46 +802,46 @@
   </selection>
   <labeling type="simple">
     <settings calloutType="simple">
-      <text-style fontStrikeout="0" legendString="Aa" isExpression="0" multilineHeightUnit="Percentage" allowHtml="0" fontKerning="1" fontSize="10" fontWeight="75" useSubstitutions="0" fontWordSpacing="0" fieldName="Structure Type" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" namedStyle="Bold" fontItalic="0" textOpacity="1" forcedItalic="0" textColor="50,50,50,255" fontFamily="Arial Narrow" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedBold="0" fontSizeUnit="Point" blendMode="0" fontUnderline="0" multilineHeight="1" capitalization="0" textOrientation="horizontal">
+      <text-style fieldName="Structure Type" capitalization="0" fontSizeUnit="Point" fontWeight="75" textColor="50,50,50,255" isExpression="0" previewBkgrdColor="255,255,255,255" multilineHeightUnit="Percentage" textOrientation="horizontal" fontItalic="0" blendMode="0" namedStyle="Bold" textOpacity="1" forcedBold="0" fontKerning="1" useSubstitutions="0" fontLetterSpacing="0" legendString="Aa" fontStrikeout="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" fontSize="10" fontFamily="Arial Narrow" fontUnderline="0" multilineHeight="1" allowHtml="0">
         <families/>
-        <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="250,250,250,255" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="0.5" bufferDraw="1"/>
-        <text-mask maskedSymbolLayers="" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskSizeUnits="MM" maskEnabled="0" maskJoinStyle="128" maskType="0"/>
-        <background shapeRadiiX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeSizeType="0" shapeBlendMode="0" shapeOffsetUnit="Point" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeRotationType="0" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetY="0" shapeRadiiUnit="Point" shapeSizeUnit="Point" shapeJoinStyle="64" shapeBorderWidthUnit="Point" shapeSVGFile="" shapeOffsetX="0" shapeRadiiY="0" shapeDraw="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeFillColor="255,255,255,255">
+        <text-buffer bufferColor="250,250,250,255" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="0.5" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferDraw="1" bufferBlendMode="0" bufferJoinStyle="128"/>
+        <text-mask maskOpacity="1" maskSize="0" maskType="0" maskJoinStyle="128" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskedSymbolLayers=""/>
+        <background shapeOffsetX="0" shapeOffsetUnit="Point" shapeDraw="0" shapeRotationType="0" shapeJoinStyle="64" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="Point" shapeSizeY="0" shapeRadiiUnit="Point" shapeBlendMode="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSizeType="0" shapeType="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeBorderWidthUnit="Point">
           <symbol type="marker" clip_to_extent="1" name="markerSymbol" is_animated="0" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" locked="0" class="SimpleMarker" id="" enabled="1">
+            <layer class="SimpleMarker" locked="0" enabled="1" id="" pass="0">
               <Option type="Map">
-                <Option type="QString" value="0" name="angle"/>
-                <Option type="QString" value="square" name="cap_style"/>
-                <Option type="QString" value="133,182,111,255" name="color"/>
-                <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="circle" name="name"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="35,35,35,255" name="outline_color"/>
-                <Option type="QString" value="solid" name="outline_style"/>
-                <Option type="QString" value="0" name="outline_width"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="diameter" name="scale_method"/>
-                <Option type="QString" value="2" name="size"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                <Option type="QString" value="MM" name="size_unit"/>
-                <Option type="QString" value="1" name="vertical_anchor_point"/>
+                <Option type="QString" name="angle" value="0"/>
+                <Option type="QString" name="cap_style" value="square"/>
+                <Option type="QString" name="color" value="133,182,111,255"/>
+                <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="name" value="circle"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="35,35,35,255"/>
+                <Option type="QString" name="outline_style" value="solid"/>
+                <Option type="QString" name="outline_width" value="0"/>
+                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="scale_method" value="diameter"/>
+                <Option type="QString" name="size" value="2"/>
+                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="size_unit" value="MM"/>
+                <Option type="QString" name="vertical_anchor_point" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -849,77 +849,77 @@
           <symbol type="fill" clip_to_extent="1" name="fillSymbol" is_animated="0" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" locked="0" class="SimpleFill" id="" enabled="1">
+            <layer class="SimpleFill" locked="0" enabled="1" id="" pass="0">
               <Option type="Map">
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                <Option type="QString" value="255,255,255,255" name="color"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="128,128,128,255" name="outline_color"/>
-                <Option type="QString" value="no" name="outline_style"/>
-                <Option type="QString" value="0" name="outline_width"/>
-                <Option type="QString" value="Point" name="outline_width_unit"/>
-                <Option type="QString" value="solid" name="style"/>
+                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color" value="255,255,255,255"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                <Option type="QString" name="outline_style" value="no"/>
+                <Option type="QString" name="outline_width" value="0"/>
+                <Option type="QString" name="outline_width_unit" value="Point"/>
+                <Option type="QString" name="style" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </background>
-        <shadow shadowOffsetUnit="MM" shadowDraw="0" shadowRadiusUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetAngle="135" shadowScale="100" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+        <shadow shadowRadius="1.5" shadowScale="100" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowOffsetUnit="MM"/>
         <dd_properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </dd_properties>
         <substitutions/>
       </text-style>
-      <text-format addDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" formatNumbers="0" wrapChar="" multilineAlign="3" placeDirectionSymbol="0" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" leftDirectionSymbol="&lt;" decimals="3"/>
-      <placement geometryGenerator="" dist="0" overrunDistance="0" overrunDistanceUnit="MM" repeatDistance="0" priority="5" rotationAngle="0" xOffset="0" lineAnchorClipping="0" layerType="PointGeometry" centroidInside="0" quadOffset="4" maxCurvedCharAngleOut="-25" allowDegraded="0" geometryGeneratorEnabled="0" overlapHandling="PreventOverlap" maxCurvedCharAngleIn="25" placement="6" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" fitInPolygonOnly="0" offsetUnits="MM" lineAnchorType="0" lineAnchorPercent="0.5" offsetType="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" rotationUnit="AngleDegrees" polygonPlacementFlags="2" distMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" preserveRotation="1" distUnits="MM" repeatDistanceUnits="MM" lineAnchorTextPoint="FollowPlacement"/>
-      <rendering unplacedVisibility="0" zIndex="0" drawLabels="1" upsidedownLabels="0" scaleMax="0" fontMinPixelSize="3" fontMaxPixelSize="10000" obstacle="1" labelPerPart="0" maxNumLabels="2000" obstacleType="1" mergeLines="0" fontLimitPixelSize="0" scaleMin="0" obstacleFactor="1" minFeatureSize="0" limitNumLabels="0" scaleVisibility="0"/>
+      <text-format wrapChar="" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" reverseDirectionSymbol="0" decimals="3" rightDirectionSymbol=">" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" multilineAlign="3" autoWrapLength="0" plussign="0"/>
+      <placement maxCurvedCharAngleIn="25" polygonPlacementFlags="2" fitInPolygonOnly="0" layerType="PointGeometry" placementFlags="10" preserveRotation="1" centroidWhole="0" rotationAngle="0" offsetType="1" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" overrunDistance="0" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-25" distUnits="MM" geometryGenerator="" rotationUnit="AngleDegrees" placement="6" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGeneratorEnabled="0" centroidInside="0" offsetUnits="MM" yOffset="0" priority="5" overlapHandling="PreventOverlap" allowDegraded="0" quadOffset="4" xOffset="0" repeatDistanceUnits="MM" geometryGeneratorType="PointGeometry" lineAnchorClipping="0" dist="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="FollowPlacement" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorType="0" overrunDistanceUnit="MM"/>
+      <rendering scaleMax="1750" fontLimitPixelSize="0" limitNumLabels="0" drawLabels="1" scaleMin="0" obstacle="1" mergeLines="0" unplacedVisibility="0" fontMaxPixelSize="10000" fontMinPixelSize="3" obstacleType="1" upsidedownLabels="0" maxNumLabels="2000" minFeatureSize="0" scaleVisibility="1" obstacleFactor="1" labelPerPart="0" zIndex="0"/>
       <dd_properties>
         <Option type="Map">
-          <Option type="QString" value="" name="name"/>
+          <Option type="QString" name="name" value=""/>
           <Option name="properties"/>
-          <Option type="QString" value="collection" name="type"/>
+          <Option type="QString" name="type" value="collection"/>
         </Option>
       </dd_properties>
       <callout type="simple">
         <Option type="Map">
-          <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
-          <Option type="int" value="0" name="blendMode"/>
+          <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
+          <Option type="int" name="blendMode" value="0"/>
           <Option type="Map" name="ddProperties">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
-          <Option type="bool" value="false" name="drawToAllParts"/>
-          <Option type="QString" value="0" name="enabled"/>
-          <Option type="QString" value="point_on_exterior" name="labelAnchorPoint"/>
-          <Option type="QString" value="&lt;symbol type=&quot;line&quot; clip_to_extent=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer pass=&quot;0&quot; locked=&quot;0&quot; class=&quot;SimpleLine&quot; id=&quot;{895ab115-9350-454f-86d3-7f2ba2cf2352}&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;square&quot; name=&quot;capstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;5;2&quot; name=&quot;customdash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;customdash_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;bevel&quot; name=&quot;joinstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;60,60,60,255&quot; name=&quot;line_color&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;solid&quot; name=&quot;line_style&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0.3&quot; name=&quot;line_width&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;line_width_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;ring_filter&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_end&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_start&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;use_custom_dash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol"/>
-          <Option type="double" value="0" name="minLength"/>
-          <Option type="QString" value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale"/>
-          <Option type="QString" value="MM" name="minLengthUnit"/>
-          <Option type="double" value="0" name="offsetFromAnchor"/>
-          <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale"/>
-          <Option type="QString" value="MM" name="offsetFromAnchorUnit"/>
-          <Option type="double" value="0" name="offsetFromLabel"/>
-          <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale"/>
-          <Option type="QString" value="MM" name="offsetFromLabelUnit"/>
+          <Option type="bool" name="drawToAllParts" value="false"/>
+          <Option type="QString" name="enabled" value="0"/>
+          <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
+          <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; clip_to_extent=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; id=&quot;{895ab115-9350-454f-86d3-7f2ba2cf2352}&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+          <Option type="double" name="minLength" value="0"/>
+          <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+          <Option type="QString" name="minLengthUnit" value="MM"/>
+          <Option type="double" name="offsetFromAnchor" value="0"/>
+          <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+          <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+          <Option type="double" name="offsetFromLabel" value="0"/>
+          <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+          <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
         </Option>
       </callout>
     </settings>
diff --git a/Symbology/qgis/RiverscapesStudio/dam_crests.qml b/Symbology/qgis/RiverscapesStudio/dam_crests.qml
index f83f2426..fcd0e9b9 100644
--- a/Symbology/qgis/RiverscapesStudio/dam_crests.qml
+++ b/Symbology/qgis/RiverscapesStudio/dam_crests.qml
@@ -1,874 +1,246 @@
 <!DOCTYPE qgis PUBLIC 'http://mrcc.com/qgis.dtd' 'SYSTEM'>
-<qgis version="3.22.3-Białowieża" styleCategories="Symbology|Legend">
-  <renderer-v2 type="categorizedSymbol" forceraster="0" attr="structure_source_id" symbollevels="0" referencescale="-1" enableorderby="0">
+<qgis version="3.34.8-Prizren" styleCategories="Symbology|Labeling" labelsEnabled="0">
+  <renderer-v2 type="categorizedSymbol" referencescale="-1" attr="Dam State" symbollevels="0" enableorderby="0" forceraster="0">
     <categories>
-      <category label="Natural" symbol="0" render="true" value="1"/>
-      <category label="Artificial" symbol="1" render="true" value="2"/>
-      <category label="Unknown" symbol="2" render="true" value="3"/>
+      <category type="string" uuid="{e441aab4-15a9-44bb-90f9-b5827ea5e338}" symbol="0" label="Blown Out" value="Blown Out" render="true"/>
+      <category type="string" uuid="{bb7d5c6a-f46a-40ac-b03c-1ba30188d518}" symbol="1" label="Breached" value="Breached" render="true"/>
+      <category type="string" uuid="{dd198cad-89a6-43ca-9327-78189b605780}" symbol="2" label="Intact" value="Intact" render="true"/>
+      <category type="string" uuid="{19167abc-7d47-4123-9bc6-d4ee567298f2}" symbol="3" label="" value="" render="true"/>
     </categories>
     <symbols>
-      <symbol name="0" type="line" clip_to_extent="1" force_rhr="0" alpha="1">
+      <symbol type="line" clip_to_extent="1" name="0" is_animated="0" alpha="1" force_rhr="0" frame_rate="10">
         <data_defined_properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data_defined_properties>
-        <layer locked="0" class="SimpleLine" pass="0" enabled="1">
+        <layer class="SimpleLine" locked="0" enabled="1" id="{c643dd5b-b33e-48cd-ae81-580b2c3c60be}" pass="0">
           <Option type="Map">
-            <Option name="align_dash_pattern" type="QString" value="0"/>
-            <Option name="capstyle" type="QString" value="round"/>
-            <Option name="customdash" type="QString" value="5;2"/>
-            <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-            <Option name="customdash_unit" type="QString" value="MM"/>
-            <Option name="dash_pattern_offset" type="QString" value="0"/>
-            <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-            <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-            <Option name="draw_inside_polygon" type="QString" value="0"/>
-            <Option name="joinstyle" type="QString" value="round"/>
-            <Option name="line_color" type="QString" value="183,72,75,255"/>
-            <Option name="line_style" type="QString" value="solid"/>
-            <Option name="line_width" type="QString" value="1"/>
-            <Option name="line_width_unit" type="QString" value="MM"/>
-            <Option name="offset" type="QString" value="0"/>
-            <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-            <Option name="offset_unit" type="QString" value="MM"/>
-            <Option name="ring_filter" type="QString" value="0"/>
-            <Option name="trim_distance_end" type="QString" value="0"/>
-            <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-            <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-            <Option name="trim_distance_start" type="QString" value="0"/>
-            <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-            <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-            <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-            <Option name="use_custom_dash" type="QString" value="0"/>
-            <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="align_dash_pattern" value="0"/>
+            <Option type="QString" name="capstyle" value="square"/>
+            <Option type="QString" name="customdash" value="0.5;1"/>
+            <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="customdash_unit" value="MM"/>
+            <Option type="QString" name="dash_pattern_offset" value="0"/>
+            <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+            <Option type="QString" name="draw_inside_polygon" value="0"/>
+            <Option type="QString" name="joinstyle" value="bevel"/>
+            <Option type="QString" name="line_color" value="215,25,28,255"/>
+            <Option type="QString" name="line_style" value="dot"/>
+            <Option type="QString" name="line_width" value="0.66"/>
+            <Option type="QString" name="line_width_unit" value="MM"/>
+            <Option type="QString" name="offset" value="0"/>
+            <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="offset_unit" value="MM"/>
+            <Option type="QString" name="ring_filter" value="0"/>
+            <Option type="QString" name="trim_distance_end" value="0"/>
+            <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+            <Option type="QString" name="trim_distance_start" value="0"/>
+            <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+            <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+            <Option type="QString" name="use_custom_dash" value="1"/>
+            <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
           </Option>
-          <prop k="align_dash_pattern" v="0"/>
-          <prop k="capstyle" v="round"/>
-          <prop k="customdash" v="5;2"/>
-          <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-          <prop k="customdash_unit" v="MM"/>
-          <prop k="dash_pattern_offset" v="0"/>
-          <prop k="dash_pattern_offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-          <prop k="dash_pattern_offset_unit" v="MM"/>
-          <prop k="draw_inside_polygon" v="0"/>
-          <prop k="joinstyle" v="round"/>
-          <prop k="line_color" v="183,72,75,255"/>
-          <prop k="line_style" v="solid"/>
-          <prop k="line_width" v="1"/>
-          <prop k="line_width_unit" v="MM"/>
-          <prop k="offset" v="0"/>
-          <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-          <prop k="offset_unit" v="MM"/>
-          <prop k="ring_filter" v="0"/>
-          <prop k="trim_distance_end" v="0"/>
-          <prop k="trim_distance_end_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-          <prop k="trim_distance_end_unit" v="MM"/>
-          <prop k="trim_distance_start" v="0"/>
-          <prop k="trim_distance_start_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-          <prop k="trim_distance_start_unit" v="MM"/>
-          <prop k="tweak_dash_pattern_on_corners" v="0"/>
-          <prop k="use_custom_dash" v="0"/>
-          <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-          <effect type="effectStack" enabled="1">
-            <effect type="dropShadow">
-              <Option type="Map">
-                <Option name="blend_mode" type="QString" value="13"/>
-                <Option name="blur_level" type="QString" value="1"/>
-                <Option name="blur_unit" type="QString" value="MM"/>
-                <Option name="blur_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="0,0,0,255"/>
-                <Option name="draw_mode" type="QString" value="2"/>
-                <Option name="enabled" type="QString" value="1"/>
-                <Option name="offset_angle" type="QString" value="135"/>
-                <Option name="offset_distance" type="QString" value="1"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="offset_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="opacity" type="QString" value="1"/>
-              </Option>
-              <prop k="blend_mode" v="13"/>
-              <prop k="blur_level" v="1"/>
-              <prop k="blur_unit" v="MM"/>
-              <prop k="blur_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="0,0,0,255"/>
-              <prop k="draw_mode" v="2"/>
-              <prop k="enabled" v="1"/>
-              <prop k="offset_angle" v="135"/>
-              <prop k="offset_distance" v="1"/>
-              <prop k="offset_unit" v="MM"/>
-              <prop k="offset_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="opacity" v="1"/>
-            </effect>
-            <effect type="outerGlow">
-              <Option type="Map">
-                <Option name="blend_mode" type="QString" value="0"/>
-                <Option name="blur_level" type="QString" value="2.645"/>
-                <Option name="blur_unit" type="QString" value="MM"/>
-                <Option name="blur_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color1" type="QString" value="69,116,40,255"/>
-                <Option name="color2" type="QString" value="188,220,60,255"/>
-                <Option name="color_type" type="QString" value="0"/>
-                <Option name="discrete" type="QString" value="0"/>
-                <Option name="draw_mode" type="QString" value="2"/>
-                <Option name="enabled" type="QString" value="0"/>
-                <Option name="opacity" type="QString" value="0.5"/>
-                <Option name="rampType" type="QString" value="gradient"/>
-                <Option name="single_color" type="QString" value="255,255,255,255"/>
-                <Option name="spread" type="QString" value="2"/>
-                <Option name="spread_unit" type="QString" value="MM"/>
-                <Option name="spread_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              </Option>
-              <prop k="blend_mode" v="0"/>
-              <prop k="blur_level" v="2.645"/>
-              <prop k="blur_unit" v="MM"/>
-              <prop k="blur_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color1" v="69,116,40,255"/>
-              <prop k="color2" v="188,220,60,255"/>
-              <prop k="color_type" v="0"/>
-              <prop k="discrete" v="0"/>
-              <prop k="draw_mode" v="2"/>
-              <prop k="enabled" v="0"/>
-              <prop k="opacity" v="0.5"/>
-              <prop k="rampType" v="gradient"/>
-              <prop k="single_color" v="255,255,255,255"/>
-              <prop k="spread" v="2"/>
-              <prop k="spread_unit" v="MM"/>
-              <prop k="spread_unit_scale" v="3x:0,0,0,0,0,0"/>
-            </effect>
-            <effect type="drawSource">
-              <Option type="Map">
-                <Option name="blend_mode" type="QString" value="0"/>
-                <Option name="draw_mode" type="QString" value="2"/>
-                <Option name="enabled" type="QString" value="1"/>
-                <Option name="opacity" type="QString" value="1"/>
-              </Option>
-              <prop k="blend_mode" v="0"/>
-              <prop k="draw_mode" v="2"/>
-              <prop k="enabled" v="1"/>
-              <prop k="opacity" v="1"/>
-            </effect>
-            <effect type="innerShadow">
-              <Option type="Map">
-                <Option name="blend_mode" type="QString" value="13"/>
-                <Option name="blur_level" type="QString" value="2.645"/>
-                <Option name="blur_unit" type="QString" value="MM"/>
-                <Option name="blur_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="0,0,0,255"/>
-                <Option name="draw_mode" type="QString" value="2"/>
-                <Option name="enabled" type="QString" value="0"/>
-                <Option name="offset_angle" type="QString" value="135"/>
-                <Option name="offset_distance" type="QString" value="2"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="offset_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="opacity" type="QString" value="1"/>
-              </Option>
-              <prop k="blend_mode" v="13"/>
-              <prop k="blur_level" v="2.645"/>
-              <prop k="blur_unit" v="MM"/>
-              <prop k="blur_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="0,0,0,255"/>
-              <prop k="draw_mode" v="2"/>
-              <prop k="enabled" v="0"/>
-              <prop k="offset_angle" v="135"/>
-              <prop k="offset_distance" v="2"/>
-              <prop k="offset_unit" v="MM"/>
-              <prop k="offset_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="opacity" v="1"/>
-            </effect>
-            <effect type="innerGlow">
-              <Option type="Map">
-                <Option name="blend_mode" type="QString" value="0"/>
-                <Option name="blur_level" type="QString" value="2.645"/>
-                <Option name="blur_unit" type="QString" value="MM"/>
-                <Option name="blur_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color1" type="QString" value="69,116,40,255"/>
-                <Option name="color2" type="QString" value="188,220,60,255"/>
-                <Option name="color_type" type="QString" value="0"/>
-                <Option name="discrete" type="QString" value="0"/>
-                <Option name="draw_mode" type="QString" value="2"/>
-                <Option name="enabled" type="QString" value="0"/>
-                <Option name="opacity" type="QString" value="0.5"/>
-                <Option name="rampType" type="QString" value="gradient"/>
-                <Option name="single_color" type="QString" value="255,255,255,255"/>
-                <Option name="spread" type="QString" value="2"/>
-                <Option name="spread_unit" type="QString" value="MM"/>
-                <Option name="spread_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              </Option>
-              <prop k="blend_mode" v="0"/>
-              <prop k="blur_level" v="2.645"/>
-              <prop k="blur_unit" v="MM"/>
-              <prop k="blur_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color1" v="69,116,40,255"/>
-              <prop k="color2" v="188,220,60,255"/>
-              <prop k="color_type" v="0"/>
-              <prop k="discrete" v="0"/>
-              <prop k="draw_mode" v="2"/>
-              <prop k="enabled" v="0"/>
-              <prop k="opacity" v="0.5"/>
-              <prop k="rampType" v="gradient"/>
-              <prop k="single_color" v="255,255,255,255"/>
-              <prop k="spread" v="2"/>
-              <prop k="spread_unit" v="MM"/>
-              <prop k="spread_unit_scale" v="3x:0,0,0,0,0,0"/>
-            </effect>
-          </effect>
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
         </layer>
       </symbol>
-      <symbol name="1" type="line" clip_to_extent="1" force_rhr="0" alpha="1">
+      <symbol type="line" clip_to_extent="1" name="1" is_animated="0" alpha="1" force_rhr="0" frame_rate="10">
         <data_defined_properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data_defined_properties>
-        <layer locked="0" class="SimpleLine" pass="0" enabled="1">
+        <layer class="SimpleLine" locked="0" enabled="1" id="{c643dd5b-b33e-48cd-ae81-580b2c3c60be}" pass="0">
           <Option type="Map">
-            <Option name="align_dash_pattern" type="QString" value="0"/>
-            <Option name="capstyle" type="QString" value="round"/>
-            <Option name="customdash" type="QString" value="5;2"/>
-            <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-            <Option name="customdash_unit" type="QString" value="MM"/>
-            <Option name="dash_pattern_offset" type="QString" value="0"/>
-            <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-            <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-            <Option name="draw_inside_polygon" type="QString" value="0"/>
-            <Option name="joinstyle" type="QString" value="round"/>
-            <Option name="line_color" type="QString" value="18,169,203,255"/>
-            <Option name="line_style" type="QString" value="solid"/>
-            <Option name="line_width" type="QString" value="1"/>
-            <Option name="line_width_unit" type="QString" value="MM"/>
-            <Option name="offset" type="QString" value="0"/>
-            <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-            <Option name="offset_unit" type="QString" value="MM"/>
-            <Option name="ring_filter" type="QString" value="0"/>
-            <Option name="trim_distance_end" type="QString" value="0"/>
-            <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-            <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-            <Option name="trim_distance_start" type="QString" value="0"/>
-            <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-            <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-            <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-            <Option name="use_custom_dash" type="QString" value="0"/>
-            <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="align_dash_pattern" value="0"/>
+            <Option type="QString" name="capstyle" value="square"/>
+            <Option type="QString" name="customdash" value="0.5;1"/>
+            <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="customdash_unit" value="MM"/>
+            <Option type="QString" name="dash_pattern_offset" value="0"/>
+            <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+            <Option type="QString" name="draw_inside_polygon" value="0"/>
+            <Option type="QString" name="joinstyle" value="bevel"/>
+            <Option type="QString" name="line_color" value="255,141,35,255"/>
+            <Option type="QString" name="line_style" value="dot"/>
+            <Option type="QString" name="line_width" value="0.66"/>
+            <Option type="QString" name="line_width_unit" value="MM"/>
+            <Option type="QString" name="offset" value="0"/>
+            <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="offset_unit" value="MM"/>
+            <Option type="QString" name="ring_filter" value="0"/>
+            <Option type="QString" name="trim_distance_end" value="0"/>
+            <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+            <Option type="QString" name="trim_distance_start" value="0"/>
+            <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+            <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+            <Option type="QString" name="use_custom_dash" value="1"/>
+            <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
           </Option>
-          <prop k="align_dash_pattern" v="0"/>
-          <prop k="capstyle" v="round"/>
-          <prop k="customdash" v="5;2"/>
-          <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-          <prop k="customdash_unit" v="MM"/>
-          <prop k="dash_pattern_offset" v="0"/>
-          <prop k="dash_pattern_offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-          <prop k="dash_pattern_offset_unit" v="MM"/>
-          <prop k="draw_inside_polygon" v="0"/>
-          <prop k="joinstyle" v="round"/>
-          <prop k="line_color" v="18,169,203,255"/>
-          <prop k="line_style" v="solid"/>
-          <prop k="line_width" v="1"/>
-          <prop k="line_width_unit" v="MM"/>
-          <prop k="offset" v="0"/>
-          <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-          <prop k="offset_unit" v="MM"/>
-          <prop k="ring_filter" v="0"/>
-          <prop k="trim_distance_end" v="0"/>
-          <prop k="trim_distance_end_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-          <prop k="trim_distance_end_unit" v="MM"/>
-          <prop k="trim_distance_start" v="0"/>
-          <prop k="trim_distance_start_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-          <prop k="trim_distance_start_unit" v="MM"/>
-          <prop k="tweak_dash_pattern_on_corners" v="0"/>
-          <prop k="use_custom_dash" v="0"/>
-          <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-          <effect type="effectStack" enabled="1">
-            <effect type="dropShadow">
-              <Option type="Map">
-                <Option name="blend_mode" type="QString" value="13"/>
-                <Option name="blur_level" type="QString" value="1"/>
-                <Option name="blur_unit" type="QString" value="MM"/>
-                <Option name="blur_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="0,0,0,255"/>
-                <Option name="draw_mode" type="QString" value="2"/>
-                <Option name="enabled" type="QString" value="1"/>
-                <Option name="offset_angle" type="QString" value="135"/>
-                <Option name="offset_distance" type="QString" value="1"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="offset_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="opacity" type="QString" value="1"/>
-              </Option>
-              <prop k="blend_mode" v="13"/>
-              <prop k="blur_level" v="1"/>
-              <prop k="blur_unit" v="MM"/>
-              <prop k="blur_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="0,0,0,255"/>
-              <prop k="draw_mode" v="2"/>
-              <prop k="enabled" v="1"/>
-              <prop k="offset_angle" v="135"/>
-              <prop k="offset_distance" v="1"/>
-              <prop k="offset_unit" v="MM"/>
-              <prop k="offset_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="opacity" v="1"/>
-            </effect>
-            <effect type="outerGlow">
-              <Option type="Map">
-                <Option name="blend_mode" type="QString" value="0"/>
-                <Option name="blur_level" type="QString" value="2.645"/>
-                <Option name="blur_unit" type="QString" value="MM"/>
-                <Option name="blur_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color1" type="QString" value="69,116,40,255"/>
-                <Option name="color2" type="QString" value="188,220,60,255"/>
-                <Option name="color_type" type="QString" value="0"/>
-                <Option name="discrete" type="QString" value="0"/>
-                <Option name="draw_mode" type="QString" value="2"/>
-                <Option name="enabled" type="QString" value="0"/>
-                <Option name="opacity" type="QString" value="0.5"/>
-                <Option name="rampType" type="QString" value="gradient"/>
-                <Option name="single_color" type="QString" value="255,255,255,255"/>
-                <Option name="spread" type="QString" value="2"/>
-                <Option name="spread_unit" type="QString" value="MM"/>
-                <Option name="spread_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              </Option>
-              <prop k="blend_mode" v="0"/>
-              <prop k="blur_level" v="2.645"/>
-              <prop k="blur_unit" v="MM"/>
-              <prop k="blur_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color1" v="69,116,40,255"/>
-              <prop k="color2" v="188,220,60,255"/>
-              <prop k="color_type" v="0"/>
-              <prop k="discrete" v="0"/>
-              <prop k="draw_mode" v="2"/>
-              <prop k="enabled" v="0"/>
-              <prop k="opacity" v="0.5"/>
-              <prop k="rampType" v="gradient"/>
-              <prop k="single_color" v="255,255,255,255"/>
-              <prop k="spread" v="2"/>
-              <prop k="spread_unit" v="MM"/>
-              <prop k="spread_unit_scale" v="3x:0,0,0,0,0,0"/>
-            </effect>
-            <effect type="drawSource">
-              <Option type="Map">
-                <Option name="blend_mode" type="QString" value="0"/>
-                <Option name="draw_mode" type="QString" value="2"/>
-                <Option name="enabled" type="QString" value="1"/>
-                <Option name="opacity" type="QString" value="1"/>
-              </Option>
-              <prop k="blend_mode" v="0"/>
-              <prop k="draw_mode" v="2"/>
-              <prop k="enabled" v="1"/>
-              <prop k="opacity" v="1"/>
-            </effect>
-            <effect type="innerShadow">
-              <Option type="Map">
-                <Option name="blend_mode" type="QString" value="13"/>
-                <Option name="blur_level" type="QString" value="2.645"/>
-                <Option name="blur_unit" type="QString" value="MM"/>
-                <Option name="blur_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="0,0,0,255"/>
-                <Option name="draw_mode" type="QString" value="2"/>
-                <Option name="enabled" type="QString" value="0"/>
-                <Option name="offset_angle" type="QString" value="135"/>
-                <Option name="offset_distance" type="QString" value="2"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="offset_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="opacity" type="QString" value="1"/>
-              </Option>
-              <prop k="blend_mode" v="13"/>
-              <prop k="blur_level" v="2.645"/>
-              <prop k="blur_unit" v="MM"/>
-              <prop k="blur_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="0,0,0,255"/>
-              <prop k="draw_mode" v="2"/>
-              <prop k="enabled" v="0"/>
-              <prop k="offset_angle" v="135"/>
-              <prop k="offset_distance" v="2"/>
-              <prop k="offset_unit" v="MM"/>
-              <prop k="offset_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="opacity" v="1"/>
-            </effect>
-            <effect type="innerGlow">
-              <Option type="Map">
-                <Option name="blend_mode" type="QString" value="0"/>
-                <Option name="blur_level" type="QString" value="2.645"/>
-                <Option name="blur_unit" type="QString" value="MM"/>
-                <Option name="blur_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color1" type="QString" value="69,116,40,255"/>
-                <Option name="color2" type="QString" value="188,220,60,255"/>
-                <Option name="color_type" type="QString" value="0"/>
-                <Option name="discrete" type="QString" value="0"/>
-                <Option name="draw_mode" type="QString" value="2"/>
-                <Option name="enabled" type="QString" value="0"/>
-                <Option name="opacity" type="QString" value="0.5"/>
-                <Option name="rampType" type="QString" value="gradient"/>
-                <Option name="single_color" type="QString" value="255,255,255,255"/>
-                <Option name="spread" type="QString" value="2"/>
-                <Option name="spread_unit" type="QString" value="MM"/>
-                <Option name="spread_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              </Option>
-              <prop k="blend_mode" v="0"/>
-              <prop k="blur_level" v="2.645"/>
-              <prop k="blur_unit" v="MM"/>
-              <prop k="blur_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color1" v="69,116,40,255"/>
-              <prop k="color2" v="188,220,60,255"/>
-              <prop k="color_type" v="0"/>
-              <prop k="discrete" v="0"/>
-              <prop k="draw_mode" v="2"/>
-              <prop k="enabled" v="0"/>
-              <prop k="opacity" v="0.5"/>
-              <prop k="rampType" v="gradient"/>
-              <prop k="single_color" v="255,255,255,255"/>
-              <prop k="spread" v="2"/>
-              <prop k="spread_unit" v="MM"/>
-              <prop k="spread_unit_scale" v="3x:0,0,0,0,0,0"/>
-            </effect>
-          </effect>
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
         </layer>
       </symbol>
-      <symbol name="2" type="line" clip_to_extent="1" force_rhr="0" alpha="1">
+      <symbol type="line" clip_to_extent="1" name="2" is_animated="0" alpha="1" force_rhr="0" frame_rate="10">
         <data_defined_properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data_defined_properties>
-        <layer locked="0" class="SimpleLine" pass="0" enabled="1">
+        <layer class="SimpleLine" locked="0" enabled="1" id="{c643dd5b-b33e-48cd-ae81-580b2c3c60be}" pass="0">
           <Option type="Map">
-            <Option name="align_dash_pattern" type="QString" value="0"/>
-            <Option name="capstyle" type="QString" value="round"/>
-            <Option name="customdash" type="QString" value="5;2"/>
-            <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-            <Option name="customdash_unit" type="QString" value="MM"/>
-            <Option name="dash_pattern_offset" type="QString" value="0"/>
-            <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-            <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-            <Option name="draw_inside_polygon" type="QString" value="0"/>
-            <Option name="joinstyle" type="QString" value="round"/>
-            <Option name="line_color" type="QString" value="190,102,234,255"/>
-            <Option name="line_style" type="QString" value="solid"/>
-            <Option name="line_width" type="QString" value="1"/>
-            <Option name="line_width_unit" type="QString" value="MM"/>
-            <Option name="offset" type="QString" value="0"/>
-            <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-            <Option name="offset_unit" type="QString" value="MM"/>
-            <Option name="ring_filter" type="QString" value="0"/>
-            <Option name="trim_distance_end" type="QString" value="0"/>
-            <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-            <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-            <Option name="trim_distance_start" type="QString" value="0"/>
-            <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-            <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-            <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-            <Option name="use_custom_dash" type="QString" value="0"/>
-            <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="align_dash_pattern" value="0"/>
+            <Option type="QString" name="capstyle" value="square"/>
+            <Option type="QString" name="customdash" value="0.5;1"/>
+            <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="customdash_unit" value="MM"/>
+            <Option type="QString" name="dash_pattern_offset" value="0"/>
+            <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+            <Option type="QString" name="draw_inside_polygon" value="0"/>
+            <Option type="QString" name="joinstyle" value="bevel"/>
+            <Option type="QString" name="line_color" value="25,215,38,255"/>
+            <Option type="QString" name="line_style" value="dot"/>
+            <Option type="QString" name="line_width" value="0.66"/>
+            <Option type="QString" name="line_width_unit" value="MM"/>
+            <Option type="QString" name="offset" value="0"/>
+            <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="offset_unit" value="MM"/>
+            <Option type="QString" name="ring_filter" value="0"/>
+            <Option type="QString" name="trim_distance_end" value="0"/>
+            <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+            <Option type="QString" name="trim_distance_start" value="0"/>
+            <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+            <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+            <Option type="QString" name="use_custom_dash" value="1"/>
+            <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
           </Option>
-          <prop k="align_dash_pattern" v="0"/>
-          <prop k="capstyle" v="round"/>
-          <prop k="customdash" v="5;2"/>
-          <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-          <prop k="customdash_unit" v="MM"/>
-          <prop k="dash_pattern_offset" v="0"/>
-          <prop k="dash_pattern_offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-          <prop k="dash_pattern_offset_unit" v="MM"/>
-          <prop k="draw_inside_polygon" v="0"/>
-          <prop k="joinstyle" v="round"/>
-          <prop k="line_color" v="190,102,234,255"/>
-          <prop k="line_style" v="solid"/>
-          <prop k="line_width" v="1"/>
-          <prop k="line_width_unit" v="MM"/>
-          <prop k="offset" v="0"/>
-          <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-          <prop k="offset_unit" v="MM"/>
-          <prop k="ring_filter" v="0"/>
-          <prop k="trim_distance_end" v="0"/>
-          <prop k="trim_distance_end_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-          <prop k="trim_distance_end_unit" v="MM"/>
-          <prop k="trim_distance_start" v="0"/>
-          <prop k="trim_distance_start_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-          <prop k="trim_distance_start_unit" v="MM"/>
-          <prop k="tweak_dash_pattern_on_corners" v="0"/>
-          <prop k="use_custom_dash" v="0"/>
-          <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-          <effect type="effectStack" enabled="1">
-            <effect type="dropShadow">
-              <Option type="Map">
-                <Option name="blend_mode" type="QString" value="13"/>
-                <Option name="blur_level" type="QString" value="1"/>
-                <Option name="blur_unit" type="QString" value="MM"/>
-                <Option name="blur_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="0,0,0,255"/>
-                <Option name="draw_mode" type="QString" value="2"/>
-                <Option name="enabled" type="QString" value="1"/>
-                <Option name="offset_angle" type="QString" value="135"/>
-                <Option name="offset_distance" type="QString" value="1"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="offset_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="opacity" type="QString" value="1"/>
-              </Option>
-              <prop k="blend_mode" v="13"/>
-              <prop k="blur_level" v="1"/>
-              <prop k="blur_unit" v="MM"/>
-              <prop k="blur_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="0,0,0,255"/>
-              <prop k="draw_mode" v="2"/>
-              <prop k="enabled" v="1"/>
-              <prop k="offset_angle" v="135"/>
-              <prop k="offset_distance" v="1"/>
-              <prop k="offset_unit" v="MM"/>
-              <prop k="offset_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="opacity" v="1"/>
-            </effect>
-            <effect type="outerGlow">
-              <Option type="Map">
-                <Option name="blend_mode" type="QString" value="0"/>
-                <Option name="blur_level" type="QString" value="2.645"/>
-                <Option name="blur_unit" type="QString" value="MM"/>
-                <Option name="blur_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color1" type="QString" value="69,116,40,255"/>
-                <Option name="color2" type="QString" value="188,220,60,255"/>
-                <Option name="color_type" type="QString" value="0"/>
-                <Option name="discrete" type="QString" value="0"/>
-                <Option name="draw_mode" type="QString" value="2"/>
-                <Option name="enabled" type="QString" value="0"/>
-                <Option name="opacity" type="QString" value="0.5"/>
-                <Option name="rampType" type="QString" value="gradient"/>
-                <Option name="single_color" type="QString" value="255,255,255,255"/>
-                <Option name="spread" type="QString" value="2"/>
-                <Option name="spread_unit" type="QString" value="MM"/>
-                <Option name="spread_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              </Option>
-              <prop k="blend_mode" v="0"/>
-              <prop k="blur_level" v="2.645"/>
-              <prop k="blur_unit" v="MM"/>
-              <prop k="blur_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color1" v="69,116,40,255"/>
-              <prop k="color2" v="188,220,60,255"/>
-              <prop k="color_type" v="0"/>
-              <prop k="discrete" v="0"/>
-              <prop k="draw_mode" v="2"/>
-              <prop k="enabled" v="0"/>
-              <prop k="opacity" v="0.5"/>
-              <prop k="rampType" v="gradient"/>
-              <prop k="single_color" v="255,255,255,255"/>
-              <prop k="spread" v="2"/>
-              <prop k="spread_unit" v="MM"/>
-              <prop k="spread_unit_scale" v="3x:0,0,0,0,0,0"/>
-            </effect>
-            <effect type="drawSource">
-              <Option type="Map">
-                <Option name="blend_mode" type="QString" value="0"/>
-                <Option name="draw_mode" type="QString" value="2"/>
-                <Option name="enabled" type="QString" value="1"/>
-                <Option name="opacity" type="QString" value="1"/>
-              </Option>
-              <prop k="blend_mode" v="0"/>
-              <prop k="draw_mode" v="2"/>
-              <prop k="enabled" v="1"/>
-              <prop k="opacity" v="1"/>
-            </effect>
-            <effect type="innerShadow">
-              <Option type="Map">
-                <Option name="blend_mode" type="QString" value="13"/>
-                <Option name="blur_level" type="QString" value="2.645"/>
-                <Option name="blur_unit" type="QString" value="MM"/>
-                <Option name="blur_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="0,0,0,255"/>
-                <Option name="draw_mode" type="QString" value="2"/>
-                <Option name="enabled" type="QString" value="0"/>
-                <Option name="offset_angle" type="QString" value="135"/>
-                <Option name="offset_distance" type="QString" value="2"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="offset_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="opacity" type="QString" value="1"/>
-              </Option>
-              <prop k="blend_mode" v="13"/>
-              <prop k="blur_level" v="2.645"/>
-              <prop k="blur_unit" v="MM"/>
-              <prop k="blur_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="0,0,0,255"/>
-              <prop k="draw_mode" v="2"/>
-              <prop k="enabled" v="0"/>
-              <prop k="offset_angle" v="135"/>
-              <prop k="offset_distance" v="2"/>
-              <prop k="offset_unit" v="MM"/>
-              <prop k="offset_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="opacity" v="1"/>
-            </effect>
-            <effect type="innerGlow">
-              <Option type="Map">
-                <Option name="blend_mode" type="QString" value="0"/>
-                <Option name="blur_level" type="QString" value="2.645"/>
-                <Option name="blur_unit" type="QString" value="MM"/>
-                <Option name="blur_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color1" type="QString" value="69,116,40,255"/>
-                <Option name="color2" type="QString" value="188,220,60,255"/>
-                <Option name="color_type" type="QString" value="0"/>
-                <Option name="discrete" type="QString" value="0"/>
-                <Option name="draw_mode" type="QString" value="2"/>
-                <Option name="enabled" type="QString" value="0"/>
-                <Option name="opacity" type="QString" value="0.5"/>
-                <Option name="rampType" type="QString" value="gradient"/>
-                <Option name="single_color" type="QString" value="255,255,255,255"/>
-                <Option name="spread" type="QString" value="2"/>
-                <Option name="spread_unit" type="QString" value="MM"/>
-                <Option name="spread_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              </Option>
-              <prop k="blend_mode" v="0"/>
-              <prop k="blur_level" v="2.645"/>
-              <prop k="blur_unit" v="MM"/>
-              <prop k="blur_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color1" v="69,116,40,255"/>
-              <prop k="color2" v="188,220,60,255"/>
-              <prop k="color_type" v="0"/>
-              <prop k="discrete" v="0"/>
-              <prop k="draw_mode" v="2"/>
-              <prop k="enabled" v="0"/>
-              <prop k="opacity" v="0.5"/>
-              <prop k="rampType" v="gradient"/>
-              <prop k="single_color" v="255,255,255,255"/>
-              <prop k="spread" v="2"/>
-              <prop k="spread_unit" v="MM"/>
-              <prop k="spread_unit_scale" v="3x:0,0,0,0,0,0"/>
-            </effect>
-          </effect>
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
+            </Option>
+          </data_defined_properties>
+        </layer>
+      </symbol>
+      <symbol type="line" clip_to_extent="1" name="3" is_animated="0" alpha="1" force_rhr="0" frame_rate="10">
+        <data_defined_properties>
+          <Option type="Map">
+            <Option type="QString" name="name" value=""/>
+            <Option name="properties"/>
+            <Option type="QString" name="type" value="collection"/>
+          </Option>
+        </data_defined_properties>
+        <layer class="SimpleLine" locked="0" enabled="1" id="{c643dd5b-b33e-48cd-ae81-580b2c3c60be}" pass="0">
+          <Option type="Map">
+            <Option type="QString" name="align_dash_pattern" value="0"/>
+            <Option type="QString" name="capstyle" value="square"/>
+            <Option type="QString" name="customdash" value="5;2"/>
+            <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="customdash_unit" value="MM"/>
+            <Option type="QString" name="dash_pattern_offset" value="0"/>
+            <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+            <Option type="QString" name="draw_inside_polygon" value="0"/>
+            <Option type="QString" name="joinstyle" value="bevel"/>
+            <Option type="QString" name="line_color" value="33,213,102,255"/>
+            <Option type="QString" name="line_style" value="solid"/>
+            <Option type="QString" name="line_width" value="0.26"/>
+            <Option type="QString" name="line_width_unit" value="MM"/>
+            <Option type="QString" name="offset" value="0"/>
+            <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="offset_unit" value="MM"/>
+            <Option type="QString" name="ring_filter" value="0"/>
+            <Option type="QString" name="trim_distance_end" value="0"/>
+            <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+            <Option type="QString" name="trim_distance_start" value="0"/>
+            <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+            <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+            <Option type="QString" name="use_custom_dash" value="0"/>
+            <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+          </Option>
+          <data_defined_properties>
+            <Option type="Map">
+              <Option type="QString" name="name" value=""/>
+              <Option name="properties"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
         </layer>
       </symbol>
     </symbols>
     <source-symbol>
-      <symbol name="0" type="line" clip_to_extent="1" force_rhr="0" alpha="1">
+      <symbol type="line" clip_to_extent="1" name="0" is_animated="0" alpha="1" force_rhr="0" frame_rate="10">
         <data_defined_properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data_defined_properties>
-        <layer locked="0" class="SimpleLine" pass="0" enabled="1">
+        <layer class="SimpleLine" locked="0" enabled="1" id="{c643dd5b-b33e-48cd-ae81-580b2c3c60be}" pass="0">
           <Option type="Map">
-            <Option name="align_dash_pattern" type="QString" value="0"/>
-            <Option name="capstyle" type="QString" value="round"/>
-            <Option name="customdash" type="QString" value="5;2"/>
-            <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-            <Option name="customdash_unit" type="QString" value="MM"/>
-            <Option name="dash_pattern_offset" type="QString" value="0"/>
-            <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-            <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-            <Option name="draw_inside_polygon" type="QString" value="0"/>
-            <Option name="joinstyle" type="QString" value="round"/>
-            <Option name="line_color" type="QString" value="133,182,111,255"/>
-            <Option name="line_style" type="QString" value="solid"/>
-            <Option name="line_width" type="QString" value="1"/>
-            <Option name="line_width_unit" type="QString" value="MM"/>
-            <Option name="offset" type="QString" value="0"/>
-            <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-            <Option name="offset_unit" type="QString" value="MM"/>
-            <Option name="ring_filter" type="QString" value="0"/>
-            <Option name="trim_distance_end" type="QString" value="0"/>
-            <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-            <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-            <Option name="trim_distance_start" type="QString" value="0"/>
-            <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-            <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-            <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-            <Option name="use_custom_dash" type="QString" value="0"/>
-            <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="align_dash_pattern" value="0"/>
+            <Option type="QString" name="capstyle" value="square"/>
+            <Option type="QString" name="customdash" value="5;2"/>
+            <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="customdash_unit" value="MM"/>
+            <Option type="QString" name="dash_pattern_offset" value="0"/>
+            <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+            <Option type="QString" name="draw_inside_polygon" value="0"/>
+            <Option type="QString" name="joinstyle" value="bevel"/>
+            <Option type="QString" name="line_color" value="164,113,88,255"/>
+            <Option type="QString" name="line_style" value="solid"/>
+            <Option type="QString" name="line_width" value="0.26"/>
+            <Option type="QString" name="line_width_unit" value="MM"/>
+            <Option type="QString" name="offset" value="0"/>
+            <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="offset_unit" value="MM"/>
+            <Option type="QString" name="ring_filter" value="0"/>
+            <Option type="QString" name="trim_distance_end" value="0"/>
+            <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+            <Option type="QString" name="trim_distance_start" value="0"/>
+            <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+            <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+            <Option type="QString" name="use_custom_dash" value="0"/>
+            <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
           </Option>
-          <prop k="align_dash_pattern" v="0"/>
-          <prop k="capstyle" v="round"/>
-          <prop k="customdash" v="5;2"/>
-          <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-          <prop k="customdash_unit" v="MM"/>
-          <prop k="dash_pattern_offset" v="0"/>
-          <prop k="dash_pattern_offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-          <prop k="dash_pattern_offset_unit" v="MM"/>
-          <prop k="draw_inside_polygon" v="0"/>
-          <prop k="joinstyle" v="round"/>
-          <prop k="line_color" v="133,182,111,255"/>
-          <prop k="line_style" v="solid"/>
-          <prop k="line_width" v="1"/>
-          <prop k="line_width_unit" v="MM"/>
-          <prop k="offset" v="0"/>
-          <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-          <prop k="offset_unit" v="MM"/>
-          <prop k="ring_filter" v="0"/>
-          <prop k="trim_distance_end" v="0"/>
-          <prop k="trim_distance_end_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-          <prop k="trim_distance_end_unit" v="MM"/>
-          <prop k="trim_distance_start" v="0"/>
-          <prop k="trim_distance_start_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-          <prop k="trim_distance_start_unit" v="MM"/>
-          <prop k="tweak_dash_pattern_on_corners" v="0"/>
-          <prop k="use_custom_dash" v="0"/>
-          <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-          <effect type="effectStack" enabled="1">
-            <effect type="dropShadow">
-              <Option type="Map">
-                <Option name="blend_mode" type="QString" value="13"/>
-                <Option name="blur_level" type="QString" value="1"/>
-                <Option name="blur_unit" type="QString" value="MM"/>
-                <Option name="blur_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="0,0,0,255"/>
-                <Option name="draw_mode" type="QString" value="2"/>
-                <Option name="enabled" type="QString" value="1"/>
-                <Option name="offset_angle" type="QString" value="135"/>
-                <Option name="offset_distance" type="QString" value="1"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="offset_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="opacity" type="QString" value="1"/>
-              </Option>
-              <prop k="blend_mode" v="13"/>
-              <prop k="blur_level" v="1"/>
-              <prop k="blur_unit" v="MM"/>
-              <prop k="blur_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="0,0,0,255"/>
-              <prop k="draw_mode" v="2"/>
-              <prop k="enabled" v="1"/>
-              <prop k="offset_angle" v="135"/>
-              <prop k="offset_distance" v="1"/>
-              <prop k="offset_unit" v="MM"/>
-              <prop k="offset_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="opacity" v="1"/>
-            </effect>
-            <effect type="outerGlow">
-              <Option type="Map">
-                <Option name="blend_mode" type="QString" value="0"/>
-                <Option name="blur_level" type="QString" value="2.645"/>
-                <Option name="blur_unit" type="QString" value="MM"/>
-                <Option name="blur_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color1" type="QString" value="69,116,40,255"/>
-                <Option name="color2" type="QString" value="188,220,60,255"/>
-                <Option name="color_type" type="QString" value="0"/>
-                <Option name="discrete" type="QString" value="0"/>
-                <Option name="draw_mode" type="QString" value="2"/>
-                <Option name="enabled" type="QString" value="0"/>
-                <Option name="opacity" type="QString" value="0.5"/>
-                <Option name="rampType" type="QString" value="gradient"/>
-                <Option name="single_color" type="QString" value="255,255,255,255"/>
-                <Option name="spread" type="QString" value="2"/>
-                <Option name="spread_unit" type="QString" value="MM"/>
-                <Option name="spread_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              </Option>
-              <prop k="blend_mode" v="0"/>
-              <prop k="blur_level" v="2.645"/>
-              <prop k="blur_unit" v="MM"/>
-              <prop k="blur_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color1" v="69,116,40,255"/>
-              <prop k="color2" v="188,220,60,255"/>
-              <prop k="color_type" v="0"/>
-              <prop k="discrete" v="0"/>
-              <prop k="draw_mode" v="2"/>
-              <prop k="enabled" v="0"/>
-              <prop k="opacity" v="0.5"/>
-              <prop k="rampType" v="gradient"/>
-              <prop k="single_color" v="255,255,255,255"/>
-              <prop k="spread" v="2"/>
-              <prop k="spread_unit" v="MM"/>
-              <prop k="spread_unit_scale" v="3x:0,0,0,0,0,0"/>
-            </effect>
-            <effect type="drawSource">
-              <Option type="Map">
-                <Option name="blend_mode" type="QString" value="0"/>
-                <Option name="draw_mode" type="QString" value="2"/>
-                <Option name="enabled" type="QString" value="1"/>
-                <Option name="opacity" type="QString" value="1"/>
-              </Option>
-              <prop k="blend_mode" v="0"/>
-              <prop k="draw_mode" v="2"/>
-              <prop k="enabled" v="1"/>
-              <prop k="opacity" v="1"/>
-            </effect>
-            <effect type="innerShadow">
-              <Option type="Map">
-                <Option name="blend_mode" type="QString" value="13"/>
-                <Option name="blur_level" type="QString" value="2.645"/>
-                <Option name="blur_unit" type="QString" value="MM"/>
-                <Option name="blur_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="0,0,0,255"/>
-                <Option name="draw_mode" type="QString" value="2"/>
-                <Option name="enabled" type="QString" value="0"/>
-                <Option name="offset_angle" type="QString" value="135"/>
-                <Option name="offset_distance" type="QString" value="2"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="offset_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="opacity" type="QString" value="1"/>
-              </Option>
-              <prop k="blend_mode" v="13"/>
-              <prop k="blur_level" v="2.645"/>
-              <prop k="blur_unit" v="MM"/>
-              <prop k="blur_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="0,0,0,255"/>
-              <prop k="draw_mode" v="2"/>
-              <prop k="enabled" v="0"/>
-              <prop k="offset_angle" v="135"/>
-              <prop k="offset_distance" v="2"/>
-              <prop k="offset_unit" v="MM"/>
-              <prop k="offset_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="opacity" v="1"/>
-            </effect>
-            <effect type="innerGlow">
-              <Option type="Map">
-                <Option name="blend_mode" type="QString" value="0"/>
-                <Option name="blur_level" type="QString" value="2.645"/>
-                <Option name="blur_unit" type="QString" value="MM"/>
-                <Option name="blur_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color1" type="QString" value="69,116,40,255"/>
-                <Option name="color2" type="QString" value="188,220,60,255"/>
-                <Option name="color_type" type="QString" value="0"/>
-                <Option name="discrete" type="QString" value="0"/>
-                <Option name="draw_mode" type="QString" value="2"/>
-                <Option name="enabled" type="QString" value="0"/>
-                <Option name="opacity" type="QString" value="0.5"/>
-                <Option name="rampType" type="QString" value="gradient"/>
-                <Option name="single_color" type="QString" value="255,255,255,255"/>
-                <Option name="spread" type="QString" value="2"/>
-                <Option name="spread_unit" type="QString" value="MM"/>
-                <Option name="spread_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              </Option>
-              <prop k="blend_mode" v="0"/>
-              <prop k="blur_level" v="2.645"/>
-              <prop k="blur_unit" v="MM"/>
-              <prop k="blur_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color1" v="69,116,40,255"/>
-              <prop k="color2" v="188,220,60,255"/>
-              <prop k="color_type" v="0"/>
-              <prop k="discrete" v="0"/>
-              <prop k="draw_mode" v="2"/>
-              <prop k="enabled" v="0"/>
-              <prop k="opacity" v="0.5"/>
-              <prop k="rampType" v="gradient"/>
-              <prop k="single_color" v="255,255,255,255"/>
-              <prop k="spread" v="2"/>
-              <prop k="spread_unit" v="MM"/>
-              <prop k="spread_unit_scale" v="3x:0,0,0,0,0,0"/>
-            </effect>
-          </effect>
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
         </layer>
@@ -877,8 +249,144 @@
     <rotation/>
     <sizescale/>
   </renderer-v2>
+  <selection mode="Default">
+    <selectionColor invalid="1"/>
+    <selectionSymbol>
+      <symbol type="line" clip_to_extent="1" name="" is_animated="0" alpha="1" force_rhr="0" frame_rate="10">
+        <data_defined_properties>
+          <Option type="Map">
+            <Option type="QString" name="name" value=""/>
+            <Option name="properties"/>
+            <Option type="QString" name="type" value="collection"/>
+          </Option>
+        </data_defined_properties>
+        <layer class="SimpleLine" locked="0" enabled="1" id="{374f04df-fcbd-48e7-b6b4-e96761c9cfab}" pass="0">
+          <Option type="Map">
+            <Option type="QString" name="align_dash_pattern" value="0"/>
+            <Option type="QString" name="capstyle" value="square"/>
+            <Option type="QString" name="customdash" value="5;2"/>
+            <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="customdash_unit" value="MM"/>
+            <Option type="QString" name="dash_pattern_offset" value="0"/>
+            <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+            <Option type="QString" name="draw_inside_polygon" value="0"/>
+            <Option type="QString" name="joinstyle" value="bevel"/>
+            <Option type="QString" name="line_color" value="35,35,35,255"/>
+            <Option type="QString" name="line_style" value="solid"/>
+            <Option type="QString" name="line_width" value="0.26"/>
+            <Option type="QString" name="line_width_unit" value="MM"/>
+            <Option type="QString" name="offset" value="0"/>
+            <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="offset_unit" value="MM"/>
+            <Option type="QString" name="ring_filter" value="0"/>
+            <Option type="QString" name="trim_distance_end" value="0"/>
+            <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+            <Option type="QString" name="trim_distance_start" value="0"/>
+            <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+            <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+            <Option type="QString" name="use_custom_dash" value="0"/>
+            <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+          </Option>
+          <data_defined_properties>
+            <Option type="Map">
+              <Option type="QString" name="name" value=""/>
+              <Option name="properties"/>
+              <Option type="QString" name="type" value="collection"/>
+            </Option>
+          </data_defined_properties>
+        </layer>
+      </symbol>
+    </selectionSymbol>
+  </selection>
+  <labeling type="simple">
+    <settings calloutType="simple">
+      <text-style fieldName="&quot;dam_state&quot;" capitalization="0" fontSizeUnit="Point" fontWeight="16" textColor="0,0,0,255" isExpression="1" previewBkgrdColor="255,255,255,255" multilineHeightUnit="Percentage" textOrientation="horizontal" fontItalic="0" blendMode="0" namedStyle="" textOpacity="1" forcedBold="0" fontKerning="1" useSubstitutions="0" fontLetterSpacing="0" legendString="Aa" fontStrikeout="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" fontSize="8" fontFamily="Arial" fontUnderline="0" multilineHeight="1" allowHtml="0">
+        <families/>
+        <text-buffer bufferColor="255,255,255,255" bufferSizeUnits="Point" bufferOpacity="1" bufferSize="2" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferDraw="0" bufferBlendMode="0" bufferJoinStyle="128"/>
+        <text-mask maskOpacity="1" maskSize="1.5" maskType="0" maskJoinStyle="128" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskedSymbolLayers=""/>
+        <background shapeOffsetX="0" shapeOffsetUnit="MM" shapeDraw="0" shapeRotationType="0" shapeJoinStyle="64" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeSizeY="0" shapeRadiiUnit="MM" shapeBlendMode="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSizeType="0" shapeType="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeBorderWidthUnit="MM">
+          <symbol type="fill" clip_to_extent="1" name="fillSymbol" is_animated="0" alpha="1" force_rhr="0" frame_rate="10">
+            <data_defined_properties>
+              <Option type="Map">
+                <Option type="QString" name="name" value=""/>
+                <Option name="properties"/>
+                <Option type="QString" name="type" value="collection"/>
+              </Option>
+            </data_defined_properties>
+            <layer class="SimpleFill" locked="0" enabled="1" id="" pass="0">
+              <Option type="Map">
+                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color" value="255,255,255,255"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                <Option type="QString" name="outline_style" value="no"/>
+                <Option type="QString" name="outline_width" value="0"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="style" value="solid"/>
+              </Option>
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option type="QString" name="name" value=""/>
+                  <Option name="properties"/>
+                  <Option type="QString" name="type" value="collection"/>
+                </Option>
+              </data_defined_properties>
+            </layer>
+          </symbol>
+        </background>
+        <shadow shadowRadius="1.5" shadowScale="100" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowOffsetUnit="MM"/>
+        <dd_properties>
+          <Option type="Map">
+            <Option type="QString" name="name" value=""/>
+            <Option name="properties"/>
+            <Option type="QString" name="type" value="collection"/>
+          </Option>
+        </dd_properties>
+        <substitutions/>
+      </text-style>
+      <text-format wrapChar="" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" reverseDirectionSymbol="0" decimals="3" rightDirectionSymbol=">" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" multilineAlign="1" autoWrapLength="0" plussign="0"/>
+      <placement maxCurvedCharAngleIn="25" polygonPlacementFlags="2" fitInPolygonOnly="0" layerType="UnknownGeometry" placementFlags="10" preserveRotation="1" centroidWhole="0" rotationAngle="0" offsetType="1" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" overrunDistance="0" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-25" distUnits="Point" geometryGenerator="" rotationUnit="AngleDegrees" placement="2" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGeneratorEnabled="0" centroidInside="0" offsetUnits="MM" yOffset="0" priority="2" overlapHandling="PreventOverlap" allowDegraded="0" quadOffset="4" xOffset="0" repeatDistanceUnits="MM" geometryGeneratorType="PointGeometry" lineAnchorClipping="0" dist="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorType="0" overrunDistanceUnit="MM"/>
+      <rendering scaleMax="0" fontLimitPixelSize="0" limitNumLabels="0" drawLabels="1" scaleMin="0" obstacle="0" mergeLines="0" unplacedVisibility="0" fontMaxPixelSize="10000" fontMinPixelSize="0" obstacleType="1" upsidedownLabels="0" maxNumLabels="2000" minFeatureSize="0" scaleVisibility="0" obstacleFactor="0" labelPerPart="0" zIndex="0"/>
+      <dd_properties>
+        <Option type="Map">
+          <Option type="QString" name="name" value=""/>
+          <Option name="properties"/>
+          <Option type="QString" name="type" value="collection"/>
+        </Option>
+      </dd_properties>
+      <callout type="simple">
+        <Option type="Map">
+          <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
+          <Option type="int" name="blendMode" value="0"/>
+          <Option type="Map" name="ddProperties">
+            <Option type="QString" name="name" value=""/>
+            <Option name="properties"/>
+            <Option type="QString" name="type" value="collection"/>
+          </Option>
+          <Option type="bool" name="drawToAllParts" value="false"/>
+          <Option type="QString" name="enabled" value="0"/>
+          <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
+          <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; clip_to_extent=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; id=&quot;{4de5e1d1-8807-4dc6-8da2-56cdca08942b}&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+          <Option type="double" name="minLength" value="0"/>
+          <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+          <Option type="QString" name="minLengthUnit" value="MM"/>
+          <Option type="double" name="offsetFromAnchor" value="0"/>
+          <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+          <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+          <Option type="double" name="offsetFromLabel" value="0"/>
+          <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+          <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
+        </Option>
+      </callout>
+    </settings>
+  </labeling>
   <blendMode>0</blendMode>
   <featureBlendMode>0</featureBlendMode>
-  <legend showLabelLegend="0" type="default-vector"/>
   <layerGeometryType>1</layerGeometryType>
 </qgis>
diff --git a/Symbology/qgis/RiverscapesStudio/risk_potential_lines.qml b/Symbology/qgis/RiverscapesStudio/risk_potential_lines.qml
index 90224ffc..b0f9edcb 100644
--- a/Symbology/qgis/RiverscapesStudio/risk_potential_lines.qml
+++ b/Symbology/qgis/RiverscapesStudio/risk_potential_lines.qml
@@ -1,56 +1,56 @@
 <!DOCTYPE qgis PUBLIC 'http://mrcc.com/qgis.dtd' 'SYSTEM'>
-<qgis styleCategories="Symbology" version="3.34.8-Prizren">
+<qgis version="3.34.8-Prizren" styleCategories="Symbology|Labeling" labelsEnabled="1">
   <renderer-v2 type="categorizedSymbol" referencescale="-1" attr="Risk" symbollevels="0" enableorderby="0" forceraster="0">
     <categories>
-      <category type="string" uuid="{246372a6-108a-4bf2-8fae-317ef6055d47}" value="High" label="High" render="true" symbol="0"/>
-      <category type="string" uuid="{b4140cf5-c8ee-41ac-a379-38e0445d887f}" value="Low" label="Low" render="true" symbol="1"/>
-      <category type="string" uuid="{618a54da-b58e-4b39-a8fb-3bf74f0307c4}" value="Medium" label="Medium" render="true" symbol="2"/>
-      <category type="string" uuid="{6d00e40e-6915-449a-9e68-f888036110b8}" value="" label="" render="true" symbol="3"/>
+      <category type="string" uuid="{246372a6-108a-4bf2-8fae-317ef6055d47}" symbol="0" label="High" value="High" render="true"/>
+      <category type="string" uuid="{b4140cf5-c8ee-41ac-a379-38e0445d887f}" symbol="1" label="Low" value="Low" render="true"/>
+      <category type="string" uuid="{618a54da-b58e-4b39-a8fb-3bf74f0307c4}" symbol="2" label="Medium" value="Medium" render="true"/>
+      <category type="string" uuid="{6d00e40e-6915-449a-9e68-f888036110b8}" symbol="3" label="" value="" render="true"/>
     </categories>
     <symbols>
       <symbol type="line" clip_to_extent="1" name="0" is_animated="0" alpha="1" force_rhr="0" frame_rate="10">
         <data_defined_properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data_defined_properties>
-        <layer pass="0" locked="0" class="SimpleLine" id="{a70bb4ab-07e3-47a9-9ef9-bdb23b4decc4}" enabled="1">
+        <layer class="SimpleLine" locked="0" enabled="1" id="{a70bb4ab-07e3-47a9-9ef9-bdb23b4decc4}" pass="0">
           <Option type="Map">
-            <Option type="QString" value="0" name="align_dash_pattern"/>
-            <Option type="QString" value="square" name="capstyle"/>
-            <Option type="QString" value="5;2" name="customdash"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-            <Option type="QString" value="MM" name="customdash_unit"/>
-            <Option type="QString" value="0" name="dash_pattern_offset"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-            <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-            <Option type="QString" value="0" name="draw_inside_polygon"/>
-            <Option type="QString" value="bevel" name="joinstyle"/>
-            <Option type="QString" value="192,0,0,255" name="line_color"/>
-            <Option type="QString" value="solid" name="line_style"/>
-            <Option type="QString" value="0.66" name="line_width"/>
-            <Option type="QString" value="MM" name="line_width_unit"/>
-            <Option type="QString" value="0" name="offset"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-            <Option type="QString" value="MM" name="offset_unit"/>
-            <Option type="QString" value="0" name="ring_filter"/>
-            <Option type="QString" value="0" name="trim_distance_end"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-            <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-            <Option type="QString" value="0" name="trim_distance_start"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-            <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-            <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-            <Option type="QString" value="0" name="use_custom_dash"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+            <Option type="QString" name="align_dash_pattern" value="0"/>
+            <Option type="QString" name="capstyle" value="square"/>
+            <Option type="QString" name="customdash" value="5;2"/>
+            <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="customdash_unit" value="MM"/>
+            <Option type="QString" name="dash_pattern_offset" value="0"/>
+            <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+            <Option type="QString" name="draw_inside_polygon" value="0"/>
+            <Option type="QString" name="joinstyle" value="bevel"/>
+            <Option type="QString" name="line_color" value="192,0,0,255"/>
+            <Option type="QString" name="line_style" value="solid"/>
+            <Option type="QString" name="line_width" value="0.66"/>
+            <Option type="QString" name="line_width_unit" value="MM"/>
+            <Option type="QString" name="offset" value="0"/>
+            <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="offset_unit" value="MM"/>
+            <Option type="QString" name="ring_filter" value="0"/>
+            <Option type="QString" name="trim_distance_end" value="0"/>
+            <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+            <Option type="QString" name="trim_distance_start" value="0"/>
+            <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+            <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+            <Option type="QString" name="use_custom_dash" value="0"/>
+            <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
           </Option>
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
         </layer>
@@ -58,46 +58,46 @@
       <symbol type="line" clip_to_extent="1" name="1" is_animated="0" alpha="1" force_rhr="0" frame_rate="10">
         <data_defined_properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data_defined_properties>
-        <layer pass="0" locked="0" class="SimpleLine" id="{a70bb4ab-07e3-47a9-9ef9-bdb23b4decc4}" enabled="1">
+        <layer class="SimpleLine" locked="0" enabled="1" id="{a70bb4ab-07e3-47a9-9ef9-bdb23b4decc4}" pass="0">
           <Option type="Map">
-            <Option type="QString" value="0" name="align_dash_pattern"/>
-            <Option type="QString" value="square" name="capstyle"/>
-            <Option type="QString" value="5;2" name="customdash"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-            <Option type="QString" value="MM" name="customdash_unit"/>
-            <Option type="QString" value="0" name="dash_pattern_offset"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-            <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-            <Option type="QString" value="0" name="draw_inside_polygon"/>
-            <Option type="QString" value="bevel" name="joinstyle"/>
-            <Option type="QString" value="0,176,80,255" name="line_color"/>
-            <Option type="QString" value="solid" name="line_style"/>
-            <Option type="QString" value="0.66" name="line_width"/>
-            <Option type="QString" value="MM" name="line_width_unit"/>
-            <Option type="QString" value="0" name="offset"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-            <Option type="QString" value="MM" name="offset_unit"/>
-            <Option type="QString" value="0" name="ring_filter"/>
-            <Option type="QString" value="0" name="trim_distance_end"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-            <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-            <Option type="QString" value="0" name="trim_distance_start"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-            <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-            <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-            <Option type="QString" value="0" name="use_custom_dash"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+            <Option type="QString" name="align_dash_pattern" value="0"/>
+            <Option type="QString" name="capstyle" value="square"/>
+            <Option type="QString" name="customdash" value="5;2"/>
+            <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="customdash_unit" value="MM"/>
+            <Option type="QString" name="dash_pattern_offset" value="0"/>
+            <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+            <Option type="QString" name="draw_inside_polygon" value="0"/>
+            <Option type="QString" name="joinstyle" value="bevel"/>
+            <Option type="QString" name="line_color" value="0,176,80,255"/>
+            <Option type="QString" name="line_style" value="solid"/>
+            <Option type="QString" name="line_width" value="0.66"/>
+            <Option type="QString" name="line_width_unit" value="MM"/>
+            <Option type="QString" name="offset" value="0"/>
+            <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="offset_unit" value="MM"/>
+            <Option type="QString" name="ring_filter" value="0"/>
+            <Option type="QString" name="trim_distance_end" value="0"/>
+            <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+            <Option type="QString" name="trim_distance_start" value="0"/>
+            <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+            <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+            <Option type="QString" name="use_custom_dash" value="0"/>
+            <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
           </Option>
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
         </layer>
@@ -105,46 +105,46 @@
       <symbol type="line" clip_to_extent="1" name="2" is_animated="0" alpha="1" force_rhr="0" frame_rate="10">
         <data_defined_properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data_defined_properties>
-        <layer pass="0" locked="0" class="SimpleLine" id="{a70bb4ab-07e3-47a9-9ef9-bdb23b4decc4}" enabled="1">
+        <layer class="SimpleLine" locked="0" enabled="1" id="{a70bb4ab-07e3-47a9-9ef9-bdb23b4decc4}" pass="0">
           <Option type="Map">
-            <Option type="QString" value="0" name="align_dash_pattern"/>
-            <Option type="QString" value="square" name="capstyle"/>
-            <Option type="QString" value="5;2" name="customdash"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-            <Option type="QString" value="MM" name="customdash_unit"/>
-            <Option type="QString" value="0" name="dash_pattern_offset"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-            <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-            <Option type="QString" value="0" name="draw_inside_polygon"/>
-            <Option type="QString" value="bevel" name="joinstyle"/>
-            <Option type="QString" value="255,255,0,255" name="line_color"/>
-            <Option type="QString" value="solid" name="line_style"/>
-            <Option type="QString" value="0.66" name="line_width"/>
-            <Option type="QString" value="MM" name="line_width_unit"/>
-            <Option type="QString" value="0" name="offset"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-            <Option type="QString" value="MM" name="offset_unit"/>
-            <Option type="QString" value="0" name="ring_filter"/>
-            <Option type="QString" value="0" name="trim_distance_end"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-            <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-            <Option type="QString" value="0" name="trim_distance_start"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-            <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-            <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-            <Option type="QString" value="0" name="use_custom_dash"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+            <Option type="QString" name="align_dash_pattern" value="0"/>
+            <Option type="QString" name="capstyle" value="square"/>
+            <Option type="QString" name="customdash" value="5;2"/>
+            <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="customdash_unit" value="MM"/>
+            <Option type="QString" name="dash_pattern_offset" value="0"/>
+            <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+            <Option type="QString" name="draw_inside_polygon" value="0"/>
+            <Option type="QString" name="joinstyle" value="bevel"/>
+            <Option type="QString" name="line_color" value="255,255,0,255"/>
+            <Option type="QString" name="line_style" value="solid"/>
+            <Option type="QString" name="line_width" value="0.66"/>
+            <Option type="QString" name="line_width_unit" value="MM"/>
+            <Option type="QString" name="offset" value="0"/>
+            <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="offset_unit" value="MM"/>
+            <Option type="QString" name="ring_filter" value="0"/>
+            <Option type="QString" name="trim_distance_end" value="0"/>
+            <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+            <Option type="QString" name="trim_distance_start" value="0"/>
+            <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+            <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+            <Option type="QString" name="use_custom_dash" value="0"/>
+            <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
           </Option>
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
         </layer>
@@ -152,46 +152,46 @@
       <symbol type="line" clip_to_extent="1" name="3" is_animated="0" alpha="1" force_rhr="0" frame_rate="10">
         <data_defined_properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data_defined_properties>
-        <layer pass="0" locked="0" class="SimpleLine" id="{a70bb4ab-07e3-47a9-9ef9-bdb23b4decc4}" enabled="1">
+        <layer class="SimpleLine" locked="0" enabled="1" id="{a70bb4ab-07e3-47a9-9ef9-bdb23b4decc4}" pass="0">
           <Option type="Map">
-            <Option type="QString" value="0" name="align_dash_pattern"/>
-            <Option type="QString" value="square" name="capstyle"/>
-            <Option type="QString" value="5;2" name="customdash"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-            <Option type="QString" value="MM" name="customdash_unit"/>
-            <Option type="QString" value="0" name="dash_pattern_offset"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-            <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-            <Option type="QString" value="0" name="draw_inside_polygon"/>
-            <Option type="QString" value="bevel" name="joinstyle"/>
-            <Option type="QString" value="237,27,191,255" name="line_color"/>
-            <Option type="QString" value="solid" name="line_style"/>
-            <Option type="QString" value="0.66" name="line_width"/>
-            <Option type="QString" value="MM" name="line_width_unit"/>
-            <Option type="QString" value="0" name="offset"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-            <Option type="QString" value="MM" name="offset_unit"/>
-            <Option type="QString" value="0" name="ring_filter"/>
-            <Option type="QString" value="0" name="trim_distance_end"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-            <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-            <Option type="QString" value="0" name="trim_distance_start"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-            <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-            <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-            <Option type="QString" value="0" name="use_custom_dash"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+            <Option type="QString" name="align_dash_pattern" value="0"/>
+            <Option type="QString" name="capstyle" value="square"/>
+            <Option type="QString" name="customdash" value="5;2"/>
+            <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="customdash_unit" value="MM"/>
+            <Option type="QString" name="dash_pattern_offset" value="0"/>
+            <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+            <Option type="QString" name="draw_inside_polygon" value="0"/>
+            <Option type="QString" name="joinstyle" value="bevel"/>
+            <Option type="QString" name="line_color" value="237,27,191,255"/>
+            <Option type="QString" name="line_style" value="solid"/>
+            <Option type="QString" name="line_width" value="0.66"/>
+            <Option type="QString" name="line_width_unit" value="MM"/>
+            <Option type="QString" name="offset" value="0"/>
+            <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="offset_unit" value="MM"/>
+            <Option type="QString" name="ring_filter" value="0"/>
+            <Option type="QString" name="trim_distance_end" value="0"/>
+            <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+            <Option type="QString" name="trim_distance_start" value="0"/>
+            <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+            <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+            <Option type="QString" name="use_custom_dash" value="0"/>
+            <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
           </Option>
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
         </layer>
@@ -201,54 +201,51 @@
       <symbol type="line" clip_to_extent="1" name="0" is_animated="0" alpha="1" force_rhr="0" frame_rate="10">
         <data_defined_properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data_defined_properties>
-        <layer pass="0" locked="0" class="SimpleLine" id="{a70bb4ab-07e3-47a9-9ef9-bdb23b4decc4}" enabled="1">
+        <layer class="SimpleLine" locked="0" enabled="1" id="{a70bb4ab-07e3-47a9-9ef9-bdb23b4decc4}" pass="0">
           <Option type="Map">
-            <Option type="QString" value="0" name="align_dash_pattern"/>
-            <Option type="QString" value="square" name="capstyle"/>
-            <Option type="QString" value="5;2" name="customdash"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-            <Option type="QString" value="MM" name="customdash_unit"/>
-            <Option type="QString" value="0" name="dash_pattern_offset"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-            <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-            <Option type="QString" value="0" name="draw_inside_polygon"/>
-            <Option type="QString" value="bevel" name="joinstyle"/>
-            <Option type="QString" value="190,207,80,255" name="line_color"/>
-            <Option type="QString" value="solid" name="line_style"/>
-            <Option type="QString" value="0.66" name="line_width"/>
-            <Option type="QString" value="MM" name="line_width_unit"/>
-            <Option type="QString" value="0" name="offset"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-            <Option type="QString" value="MM" name="offset_unit"/>
-            <Option type="QString" value="0" name="ring_filter"/>
-            <Option type="QString" value="0" name="trim_distance_end"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-            <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-            <Option type="QString" value="0" name="trim_distance_start"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-            <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-            <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-            <Option type="QString" value="0" name="use_custom_dash"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+            <Option type="QString" name="align_dash_pattern" value="0"/>
+            <Option type="QString" name="capstyle" value="square"/>
+            <Option type="QString" name="customdash" value="5;2"/>
+            <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="customdash_unit" value="MM"/>
+            <Option type="QString" name="dash_pattern_offset" value="0"/>
+            <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+            <Option type="QString" name="draw_inside_polygon" value="0"/>
+            <Option type="QString" name="joinstyle" value="bevel"/>
+            <Option type="QString" name="line_color" value="190,207,80,255"/>
+            <Option type="QString" name="line_style" value="solid"/>
+            <Option type="QString" name="line_width" value="0.66"/>
+            <Option type="QString" name="line_width_unit" value="MM"/>
+            <Option type="QString" name="offset" value="0"/>
+            <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="offset_unit" value="MM"/>
+            <Option type="QString" name="ring_filter" value="0"/>
+            <Option type="QString" name="trim_distance_end" value="0"/>
+            <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+            <Option type="QString" name="trim_distance_start" value="0"/>
+            <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+            <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+            <Option type="QString" name="use_custom_dash" value="0"/>
+            <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
           </Option>
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
         </layer>
       </symbol>
     </source-symbol>
-    <colorramp type="randomcolors" name="[source]">
-      <Option/>
-    </colorramp>
     <rotation/>
     <sizescale/>
   </renderer-v2>
@@ -258,52 +255,176 @@
       <symbol type="line" clip_to_extent="1" name="" is_animated="0" alpha="1" force_rhr="0" frame_rate="10">
         <data_defined_properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data_defined_properties>
-        <layer pass="0" locked="0" class="SimpleLine" id="{689c086c-fbb2-4ccc-955b-cdaf78e60bcb}" enabled="1">
+        <layer class="SimpleLine" locked="0" enabled="1" id="{689c086c-fbb2-4ccc-955b-cdaf78e60bcb}" pass="0">
           <Option type="Map">
-            <Option type="QString" value="0" name="align_dash_pattern"/>
-            <Option type="QString" value="square" name="capstyle"/>
-            <Option type="QString" value="5;2" name="customdash"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-            <Option type="QString" value="MM" name="customdash_unit"/>
-            <Option type="QString" value="0" name="dash_pattern_offset"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-            <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-            <Option type="QString" value="0" name="draw_inside_polygon"/>
-            <Option type="QString" value="bevel" name="joinstyle"/>
-            <Option type="QString" value="35,35,35,255" name="line_color"/>
-            <Option type="QString" value="solid" name="line_style"/>
-            <Option type="QString" value="0.26" name="line_width"/>
-            <Option type="QString" value="MM" name="line_width_unit"/>
-            <Option type="QString" value="0" name="offset"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-            <Option type="QString" value="MM" name="offset_unit"/>
-            <Option type="QString" value="0" name="ring_filter"/>
-            <Option type="QString" value="0" name="trim_distance_end"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-            <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-            <Option type="QString" value="0" name="trim_distance_start"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-            <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-            <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-            <Option type="QString" value="0" name="use_custom_dash"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+            <Option type="QString" name="align_dash_pattern" value="0"/>
+            <Option type="QString" name="capstyle" value="square"/>
+            <Option type="QString" name="customdash" value="5;2"/>
+            <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="customdash_unit" value="MM"/>
+            <Option type="QString" name="dash_pattern_offset" value="0"/>
+            <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+            <Option type="QString" name="draw_inside_polygon" value="0"/>
+            <Option type="QString" name="joinstyle" value="bevel"/>
+            <Option type="QString" name="line_color" value="35,35,35,255"/>
+            <Option type="QString" name="line_style" value="solid"/>
+            <Option type="QString" name="line_width" value="0.26"/>
+            <Option type="QString" name="line_width_unit" value="MM"/>
+            <Option type="QString" name="offset" value="0"/>
+            <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="offset_unit" value="MM"/>
+            <Option type="QString" name="ring_filter" value="0"/>
+            <Option type="QString" name="trim_distance_end" value="0"/>
+            <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+            <Option type="QString" name="trim_distance_start" value="0"/>
+            <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+            <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+            <Option type="QString" name="use_custom_dash" value="0"/>
+            <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
           </Option>
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
         </layer>
       </symbol>
     </selectionSymbol>
   </selection>
+  <labeling type="simple">
+    <settings calloutType="simple">
+      <text-style fieldName="Type" capitalization="0" fontSizeUnit="Point" fontWeight="50" textColor="50,50,50,255" isExpression="0" previewBkgrdColor="255,255,255,255" multilineHeightUnit="Percentage" textOrientation="horizontal" fontItalic="0" blendMode="0" namedStyle="Regular" textOpacity="1" forcedBold="0" fontKerning="1" useSubstitutions="0" fontLetterSpacing="0" legendString="Aa" fontStrikeout="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" fontSize="10" fontFamily="Open Sans" fontUnderline="0" multilineHeight="1" allowHtml="0">
+        <families/>
+        <text-buffer bufferColor="250,250,250,255" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="0.5" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferDraw="1" bufferBlendMode="0" bufferJoinStyle="128"/>
+        <text-mask maskOpacity="1" maskSize="0" maskType="0" maskJoinStyle="128" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskedSymbolLayers=""/>
+        <background shapeOffsetX="0" shapeOffsetUnit="Point" shapeDraw="0" shapeRotationType="0" shapeJoinStyle="64" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="Point" shapeSizeY="0" shapeRadiiUnit="Point" shapeBlendMode="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSizeType="0" shapeType="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeBorderWidthUnit="Point">
+          <symbol type="marker" clip_to_extent="1" name="markerSymbol" is_animated="0" alpha="1" force_rhr="0" frame_rate="10">
+            <data_defined_properties>
+              <Option type="Map">
+                <Option type="QString" name="name" value=""/>
+                <Option name="properties"/>
+                <Option type="QString" name="type" value="collection"/>
+              </Option>
+            </data_defined_properties>
+            <layer class="SimpleMarker" locked="0" enabled="1" id="" pass="0">
+              <Option type="Map">
+                <Option type="QString" name="angle" value="0"/>
+                <Option type="QString" name="cap_style" value="square"/>
+                <Option type="QString" name="color" value="229,182,54,255"/>
+                <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="name" value="circle"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="35,35,35,255"/>
+                <Option type="QString" name="outline_style" value="solid"/>
+                <Option type="QString" name="outline_width" value="0"/>
+                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="scale_method" value="diameter"/>
+                <Option type="QString" name="size" value="2"/>
+                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="size_unit" value="MM"/>
+                <Option type="QString" name="vertical_anchor_point" value="1"/>
+              </Option>
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option type="QString" name="name" value=""/>
+                  <Option name="properties"/>
+                  <Option type="QString" name="type" value="collection"/>
+                </Option>
+              </data_defined_properties>
+            </layer>
+          </symbol>
+          <symbol type="fill" clip_to_extent="1" name="fillSymbol" is_animated="0" alpha="1" force_rhr="0" frame_rate="10">
+            <data_defined_properties>
+              <Option type="Map">
+                <Option type="QString" name="name" value=""/>
+                <Option name="properties"/>
+                <Option type="QString" name="type" value="collection"/>
+              </Option>
+            </data_defined_properties>
+            <layer class="SimpleFill" locked="0" enabled="1" id="" pass="0">
+              <Option type="Map">
+                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color" value="255,255,255,255"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                <Option type="QString" name="outline_style" value="no"/>
+                <Option type="QString" name="outline_width" value="0"/>
+                <Option type="QString" name="outline_width_unit" value="Point"/>
+                <Option type="QString" name="style" value="solid"/>
+              </Option>
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option type="QString" name="name" value=""/>
+                  <Option name="properties"/>
+                  <Option type="QString" name="type" value="collection"/>
+                </Option>
+              </data_defined_properties>
+            </layer>
+          </symbol>
+        </background>
+        <shadow shadowRadius="1.5" shadowScale="100" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="1" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowOffsetUnit="MM"/>
+        <dd_properties>
+          <Option type="Map">
+            <Option type="QString" name="name" value=""/>
+            <Option name="properties"/>
+            <Option type="QString" name="type" value="collection"/>
+          </Option>
+        </dd_properties>
+        <substitutions/>
+      </text-style>
+      <text-format wrapChar="" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" reverseDirectionSymbol="0" decimals="3" rightDirectionSymbol=">" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" multilineAlign="0" autoWrapLength="0" plussign="0"/>
+      <placement maxCurvedCharAngleIn="25" polygonPlacementFlags="2" fitInPolygonOnly="0" layerType="LineGeometry" placementFlags="10" preserveRotation="1" centroidWhole="0" rotationAngle="0" offsetType="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="1" overrunDistance="0" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-25" distUnits="MM" geometryGenerator="" rotationUnit="AngleDegrees" placement="4" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGeneratorEnabled="0" centroidInside="0" offsetUnits="MM" yOffset="0" priority="5" overlapHandling="PreventOverlap" allowDegraded="0" quadOffset="4" xOffset="0" repeatDistanceUnits="MM" geometryGeneratorType="PointGeometry" lineAnchorClipping="0" dist="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="StartOfText" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorType="0" overrunDistanceUnit="MM"/>
+      <rendering scaleMax="20000" fontLimitPixelSize="0" limitNumLabels="0" drawLabels="1" scaleMin="0" obstacle="1" mergeLines="0" unplacedVisibility="0" fontMaxPixelSize="10000" fontMinPixelSize="3" obstacleType="1" upsidedownLabels="0" maxNumLabels="2000" minFeatureSize="0" scaleVisibility="1" obstacleFactor="2" labelPerPart="0" zIndex="0"/>
+      <dd_properties>
+        <Option type="Map">
+          <Option type="QString" name="name" value=""/>
+          <Option name="properties"/>
+          <Option type="QString" name="type" value="collection"/>
+        </Option>
+      </dd_properties>
+      <callout type="simple">
+        <Option type="Map">
+          <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
+          <Option type="int" name="blendMode" value="0"/>
+          <Option type="Map" name="ddProperties">
+            <Option type="QString" name="name" value=""/>
+            <Option name="properties"/>
+            <Option type="QString" name="type" value="collection"/>
+          </Option>
+          <Option type="bool" name="drawToAllParts" value="false"/>
+          <Option type="QString" name="enabled" value="0"/>
+          <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
+          <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; clip_to_extent=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; id=&quot;{23810b94-281f-44af-a451-312bad834917}&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+          <Option type="double" name="minLength" value="0"/>
+          <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+          <Option type="QString" name="minLengthUnit" value="MM"/>
+          <Option type="double" name="offsetFromAnchor" value="0"/>
+          <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+          <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+          <Option type="double" name="offsetFromLabel" value="0"/>
+          <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+          <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
+        </Option>
+      </callout>
+    </settings>
+  </labeling>
   <blendMode>0</blendMode>
   <featureBlendMode>0</featureBlendMode>
   <layerGeometryType>1</layerGeometryType>
diff --git a/Symbology/qgis/RiverscapesStudio/risk_potential_points.qml b/Symbology/qgis/RiverscapesStudio/risk_potential_points.qml
index c2ebfd04..3dcccd85 100644
--- a/Symbology/qgis/RiverscapesStudio/risk_potential_points.qml
+++ b/Symbology/qgis/RiverscapesStudio/risk_potential_points.qml
@@ -1,48 +1,48 @@
 <!DOCTYPE qgis PUBLIC 'http://mrcc.com/qgis.dtd' 'SYSTEM'>
-<qgis styleCategories="Symbology" version="3.34.8-Prizren">
+<qgis version="3.34.8-Prizren" styleCategories="Symbology|Labeling" labelsEnabled="1">
   <renderer-v2 type="categorizedSymbol" referencescale="-1" attr="Risk" symbollevels="0" enableorderby="0" forceraster="0">
     <categories>
-      <category type="string" uuid="{93e49bbd-578a-435a-a62b-f080b8a5a0b1}" value="High" label="High" render="true" symbol="0"/>
-      <category type="string" uuid="{6303580c-cecf-483d-986d-0d5763bc3925}" value="Low" label="Low" render="true" symbol="1"/>
-      <category type="string" uuid="{8d204a6d-d323-4df4-8c6f-df41b5f1ada5}" value="Medium" label="Medium" render="true" symbol="2"/>
-      <category type="string" uuid="{223fceac-5049-46ad-939e-cc4133d7b778}" value="" label="" render="true" symbol="3"/>
+      <category type="string" uuid="{93e49bbd-578a-435a-a62b-f080b8a5a0b1}" symbol="0" label="High" value="High" render="true"/>
+      <category type="string" uuid="{6303580c-cecf-483d-986d-0d5763bc3925}" symbol="1" label="Low" value="Low" render="true"/>
+      <category type="string" uuid="{8d204a6d-d323-4df4-8c6f-df41b5f1ada5}" symbol="2" label="Medium" value="Medium" render="true"/>
+      <category type="string" uuid="{223fceac-5049-46ad-939e-cc4133d7b778}" symbol="3" label="" value="" render="true"/>
     </categories>
     <symbols>
       <symbol type="marker" clip_to_extent="1" name="0" is_animated="0" alpha="1" force_rhr="0" frame_rate="10">
         <data_defined_properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data_defined_properties>
-        <layer pass="0" locked="0" class="SimpleMarker" id="{b97a7e1b-1386-4bd7-a1fc-56e8dc8a8060}" enabled="1">
+        <layer class="SimpleMarker" locked="0" enabled="1" id="{b97a7e1b-1386-4bd7-a1fc-56e8dc8a8060}" pass="0">
           <Option type="Map">
-            <Option type="QString" value="0" name="angle"/>
-            <Option type="QString" value="square" name="cap_style"/>
-            <Option type="QString" value="192,0,0,255" name="color"/>
-            <Option type="QString" value="1" name="horizontal_anchor_point"/>
-            <Option type="QString" value="bevel" name="joinstyle"/>
-            <Option type="QString" value="circle" name="name"/>
-            <Option type="QString" value="0,0" name="offset"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-            <Option type="QString" value="MM" name="offset_unit"/>
-            <Option type="QString" value="35,35,35,255" name="outline_color"/>
-            <Option type="QString" value="solid" name="outline_style"/>
-            <Option type="QString" value="0" name="outline_width"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-            <Option type="QString" value="MM" name="outline_width_unit"/>
-            <Option type="QString" value="diameter" name="scale_method"/>
-            <Option type="QString" value="2" name="size"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-            <Option type="QString" value="MM" name="size_unit"/>
-            <Option type="QString" value="1" name="vertical_anchor_point"/>
+            <Option type="QString" name="angle" value="0"/>
+            <Option type="QString" name="cap_style" value="square"/>
+            <Option type="QString" name="color" value="192,0,0,255"/>
+            <Option type="QString" name="horizontal_anchor_point" value="1"/>
+            <Option type="QString" name="joinstyle" value="bevel"/>
+            <Option type="QString" name="name" value="circle"/>
+            <Option type="QString" name="offset" value="0,0"/>
+            <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="offset_unit" value="MM"/>
+            <Option type="QString" name="outline_color" value="35,35,35,255"/>
+            <Option type="QString" name="outline_style" value="solid"/>
+            <Option type="QString" name="outline_width" value="0"/>
+            <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="outline_width_unit" value="MM"/>
+            <Option type="QString" name="scale_method" value="diameter"/>
+            <Option type="QString" name="size" value="2"/>
+            <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="size_unit" value="MM"/>
+            <Option type="QString" name="vertical_anchor_point" value="1"/>
           </Option>
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
         </layer>
@@ -50,38 +50,38 @@
       <symbol type="marker" clip_to_extent="1" name="1" is_animated="0" alpha="1" force_rhr="0" frame_rate="10">
         <data_defined_properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data_defined_properties>
-        <layer pass="0" locked="0" class="SimpleMarker" id="{b97a7e1b-1386-4bd7-a1fc-56e8dc8a8060}" enabled="1">
+        <layer class="SimpleMarker" locked="0" enabled="1" id="{b97a7e1b-1386-4bd7-a1fc-56e8dc8a8060}" pass="0">
           <Option type="Map">
-            <Option type="QString" value="0" name="angle"/>
-            <Option type="QString" value="square" name="cap_style"/>
-            <Option type="QString" value="0,176,80,255" name="color"/>
-            <Option type="QString" value="1" name="horizontal_anchor_point"/>
-            <Option type="QString" value="bevel" name="joinstyle"/>
-            <Option type="QString" value="circle" name="name"/>
-            <Option type="QString" value="0,0" name="offset"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-            <Option type="QString" value="MM" name="offset_unit"/>
-            <Option type="QString" value="35,35,35,255" name="outline_color"/>
-            <Option type="QString" value="solid" name="outline_style"/>
-            <Option type="QString" value="0" name="outline_width"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-            <Option type="QString" value="MM" name="outline_width_unit"/>
-            <Option type="QString" value="diameter" name="scale_method"/>
-            <Option type="QString" value="2" name="size"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-            <Option type="QString" value="MM" name="size_unit"/>
-            <Option type="QString" value="1" name="vertical_anchor_point"/>
+            <Option type="QString" name="angle" value="0"/>
+            <Option type="QString" name="cap_style" value="square"/>
+            <Option type="QString" name="color" value="0,176,80,255"/>
+            <Option type="QString" name="horizontal_anchor_point" value="1"/>
+            <Option type="QString" name="joinstyle" value="bevel"/>
+            <Option type="QString" name="name" value="circle"/>
+            <Option type="QString" name="offset" value="0,0"/>
+            <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="offset_unit" value="MM"/>
+            <Option type="QString" name="outline_color" value="35,35,35,255"/>
+            <Option type="QString" name="outline_style" value="solid"/>
+            <Option type="QString" name="outline_width" value="0"/>
+            <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="outline_width_unit" value="MM"/>
+            <Option type="QString" name="scale_method" value="diameter"/>
+            <Option type="QString" name="size" value="2"/>
+            <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="size_unit" value="MM"/>
+            <Option type="QString" name="vertical_anchor_point" value="1"/>
           </Option>
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
         </layer>
@@ -89,38 +89,38 @@
       <symbol type="marker" clip_to_extent="1" name="2" is_animated="0" alpha="1" force_rhr="0" frame_rate="10">
         <data_defined_properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data_defined_properties>
-        <layer pass="0" locked="0" class="SimpleMarker" id="{b97a7e1b-1386-4bd7-a1fc-56e8dc8a8060}" enabled="1">
+        <layer class="SimpleMarker" locked="0" enabled="1" id="{b97a7e1b-1386-4bd7-a1fc-56e8dc8a8060}" pass="0">
           <Option type="Map">
-            <Option type="QString" value="0" name="angle"/>
-            <Option type="QString" value="square" name="cap_style"/>
-            <Option type="QString" value="255,255,0,255" name="color"/>
-            <Option type="QString" value="1" name="horizontal_anchor_point"/>
-            <Option type="QString" value="bevel" name="joinstyle"/>
-            <Option type="QString" value="circle" name="name"/>
-            <Option type="QString" value="0,0" name="offset"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-            <Option type="QString" value="MM" name="offset_unit"/>
-            <Option type="QString" value="35,35,35,255" name="outline_color"/>
-            <Option type="QString" value="solid" name="outline_style"/>
-            <Option type="QString" value="0" name="outline_width"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-            <Option type="QString" value="MM" name="outline_width_unit"/>
-            <Option type="QString" value="diameter" name="scale_method"/>
-            <Option type="QString" value="2" name="size"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-            <Option type="QString" value="MM" name="size_unit"/>
-            <Option type="QString" value="1" name="vertical_anchor_point"/>
+            <Option type="QString" name="angle" value="0"/>
+            <Option type="QString" name="cap_style" value="square"/>
+            <Option type="QString" name="color" value="255,255,0,255"/>
+            <Option type="QString" name="horizontal_anchor_point" value="1"/>
+            <Option type="QString" name="joinstyle" value="bevel"/>
+            <Option type="QString" name="name" value="circle"/>
+            <Option type="QString" name="offset" value="0,0"/>
+            <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="offset_unit" value="MM"/>
+            <Option type="QString" name="outline_color" value="35,35,35,255"/>
+            <Option type="QString" name="outline_style" value="solid"/>
+            <Option type="QString" name="outline_width" value="0"/>
+            <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="outline_width_unit" value="MM"/>
+            <Option type="QString" name="scale_method" value="diameter"/>
+            <Option type="QString" name="size" value="2"/>
+            <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="size_unit" value="MM"/>
+            <Option type="QString" name="vertical_anchor_point" value="1"/>
           </Option>
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
         </layer>
@@ -128,38 +128,38 @@
       <symbol type="marker" clip_to_extent="1" name="3" is_animated="0" alpha="1" force_rhr="0" frame_rate="10">
         <data_defined_properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data_defined_properties>
-        <layer pass="0" locked="0" class="SimpleMarker" id="{b97a7e1b-1386-4bd7-a1fc-56e8dc8a8060}" enabled="1">
+        <layer class="SimpleMarker" locked="0" enabled="1" id="{b97a7e1b-1386-4bd7-a1fc-56e8dc8a8060}" pass="0">
           <Option type="Map">
-            <Option type="QString" value="0" name="angle"/>
-            <Option type="QString" value="square" name="cap_style"/>
-            <Option type="QString" value="29,200,154,255" name="color"/>
-            <Option type="QString" value="1" name="horizontal_anchor_point"/>
-            <Option type="QString" value="bevel" name="joinstyle"/>
-            <Option type="QString" value="circle" name="name"/>
-            <Option type="QString" value="0,0" name="offset"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-            <Option type="QString" value="MM" name="offset_unit"/>
-            <Option type="QString" value="35,35,35,255" name="outline_color"/>
-            <Option type="QString" value="solid" name="outline_style"/>
-            <Option type="QString" value="0" name="outline_width"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-            <Option type="QString" value="MM" name="outline_width_unit"/>
-            <Option type="QString" value="diameter" name="scale_method"/>
-            <Option type="QString" value="2" name="size"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-            <Option type="QString" value="MM" name="size_unit"/>
-            <Option type="QString" value="1" name="vertical_anchor_point"/>
+            <Option type="QString" name="angle" value="0"/>
+            <Option type="QString" name="cap_style" value="square"/>
+            <Option type="QString" name="color" value="29,200,154,255"/>
+            <Option type="QString" name="horizontal_anchor_point" value="1"/>
+            <Option type="QString" name="joinstyle" value="bevel"/>
+            <Option type="QString" name="name" value="circle"/>
+            <Option type="QString" name="offset" value="0,0"/>
+            <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="offset_unit" value="MM"/>
+            <Option type="QString" name="outline_color" value="35,35,35,255"/>
+            <Option type="QString" name="outline_style" value="solid"/>
+            <Option type="QString" name="outline_width" value="0"/>
+            <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="outline_width_unit" value="MM"/>
+            <Option type="QString" name="scale_method" value="diameter"/>
+            <Option type="QString" name="size" value="2"/>
+            <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="size_unit" value="MM"/>
+            <Option type="QString" name="vertical_anchor_point" value="1"/>
           </Option>
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
         </layer>
@@ -169,46 +169,43 @@
       <symbol type="marker" clip_to_extent="1" name="0" is_animated="0" alpha="1" force_rhr="0" frame_rate="10">
         <data_defined_properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data_defined_properties>
-        <layer pass="0" locked="0" class="SimpleMarker" id="{b97a7e1b-1386-4bd7-a1fc-56e8dc8a8060}" enabled="1">
+        <layer class="SimpleMarker" locked="0" enabled="1" id="{b97a7e1b-1386-4bd7-a1fc-56e8dc8a8060}" pass="0">
           <Option type="Map">
-            <Option type="QString" value="0" name="angle"/>
-            <Option type="QString" value="square" name="cap_style"/>
-            <Option type="QString" value="229,182,54,255" name="color"/>
-            <Option type="QString" value="1" name="horizontal_anchor_point"/>
-            <Option type="QString" value="bevel" name="joinstyle"/>
-            <Option type="QString" value="circle" name="name"/>
-            <Option type="QString" value="0,0" name="offset"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-            <Option type="QString" value="MM" name="offset_unit"/>
-            <Option type="QString" value="35,35,35,255" name="outline_color"/>
-            <Option type="QString" value="solid" name="outline_style"/>
-            <Option type="QString" value="0" name="outline_width"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-            <Option type="QString" value="MM" name="outline_width_unit"/>
-            <Option type="QString" value="diameter" name="scale_method"/>
-            <Option type="QString" value="2" name="size"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-            <Option type="QString" value="MM" name="size_unit"/>
-            <Option type="QString" value="1" name="vertical_anchor_point"/>
+            <Option type="QString" name="angle" value="0"/>
+            <Option type="QString" name="cap_style" value="square"/>
+            <Option type="QString" name="color" value="229,182,54,255"/>
+            <Option type="QString" name="horizontal_anchor_point" value="1"/>
+            <Option type="QString" name="joinstyle" value="bevel"/>
+            <Option type="QString" name="name" value="circle"/>
+            <Option type="QString" name="offset" value="0,0"/>
+            <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="offset_unit" value="MM"/>
+            <Option type="QString" name="outline_color" value="35,35,35,255"/>
+            <Option type="QString" name="outline_style" value="solid"/>
+            <Option type="QString" name="outline_width" value="0"/>
+            <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="outline_width_unit" value="MM"/>
+            <Option type="QString" name="scale_method" value="diameter"/>
+            <Option type="QString" name="size" value="2"/>
+            <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="size_unit" value="MM"/>
+            <Option type="QString" name="vertical_anchor_point" value="1"/>
           </Option>
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
         </layer>
       </symbol>
     </source-symbol>
-    <colorramp type="randomcolors" name="[source]">
-      <Option/>
-    </colorramp>
     <rotation/>
     <sizescale/>
   </renderer-v2>
@@ -218,44 +215,168 @@
       <symbol type="marker" clip_to_extent="1" name="" is_animated="0" alpha="1" force_rhr="0" frame_rate="10">
         <data_defined_properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data_defined_properties>
-        <layer pass="0" locked="0" class="SimpleMarker" id="{d44b88e7-3f50-4ac0-908e-2b97910c1507}" enabled="1">
+        <layer class="SimpleMarker" locked="0" enabled="1" id="{d44b88e7-3f50-4ac0-908e-2b97910c1507}" pass="0">
           <Option type="Map">
-            <Option type="QString" value="0" name="angle"/>
-            <Option type="QString" value="square" name="cap_style"/>
-            <Option type="QString" value="255,0,0,255" name="color"/>
-            <Option type="QString" value="1" name="horizontal_anchor_point"/>
-            <Option type="QString" value="bevel" name="joinstyle"/>
-            <Option type="QString" value="circle" name="name"/>
-            <Option type="QString" value="0,0" name="offset"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-            <Option type="QString" value="MM" name="offset_unit"/>
-            <Option type="QString" value="35,35,35,255" name="outline_color"/>
-            <Option type="QString" value="solid" name="outline_style"/>
-            <Option type="QString" value="0" name="outline_width"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-            <Option type="QString" value="MM" name="outline_width_unit"/>
-            <Option type="QString" value="diameter" name="scale_method"/>
-            <Option type="QString" value="2" name="size"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-            <Option type="QString" value="MM" name="size_unit"/>
-            <Option type="QString" value="1" name="vertical_anchor_point"/>
+            <Option type="QString" name="angle" value="0"/>
+            <Option type="QString" name="cap_style" value="square"/>
+            <Option type="QString" name="color" value="255,0,0,255"/>
+            <Option type="QString" name="horizontal_anchor_point" value="1"/>
+            <Option type="QString" name="joinstyle" value="bevel"/>
+            <Option type="QString" name="name" value="circle"/>
+            <Option type="QString" name="offset" value="0,0"/>
+            <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="offset_unit" value="MM"/>
+            <Option type="QString" name="outline_color" value="35,35,35,255"/>
+            <Option type="QString" name="outline_style" value="solid"/>
+            <Option type="QString" name="outline_width" value="0"/>
+            <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="outline_width_unit" value="MM"/>
+            <Option type="QString" name="scale_method" value="diameter"/>
+            <Option type="QString" name="size" value="2"/>
+            <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="size_unit" value="MM"/>
+            <Option type="QString" name="vertical_anchor_point" value="1"/>
           </Option>
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
         </layer>
       </symbol>
     </selectionSymbol>
   </selection>
+  <labeling type="simple">
+    <settings calloutType="simple">
+      <text-style fieldName="Type" capitalization="0" fontSizeUnit="Point" fontWeight="50" textColor="50,50,50,255" isExpression="0" previewBkgrdColor="255,255,255,255" multilineHeightUnit="Percentage" textOrientation="horizontal" fontItalic="0" blendMode="0" namedStyle="Regular" textOpacity="1" forcedBold="0" fontKerning="1" useSubstitutions="0" fontLetterSpacing="0" legendString="Aa" fontStrikeout="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" fontSize="10" fontFamily="Open Sans" fontUnderline="0" multilineHeight="1" allowHtml="0">
+        <families/>
+        <text-buffer bufferColor="250,250,250,255" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="0.5" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferDraw="1" bufferBlendMode="0" bufferJoinStyle="128"/>
+        <text-mask maskOpacity="1" maskSize="0" maskType="0" maskJoinStyle="128" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskedSymbolLayers=""/>
+        <background shapeOffsetX="0" shapeOffsetUnit="Point" shapeDraw="0" shapeRotationType="0" shapeJoinStyle="64" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="Point" shapeSizeY="0" shapeRadiiUnit="Point" shapeBlendMode="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSizeType="0" shapeType="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeBorderWidthUnit="Point">
+          <symbol type="marker" clip_to_extent="1" name="markerSymbol" is_animated="0" alpha="1" force_rhr="0" frame_rate="10">
+            <data_defined_properties>
+              <Option type="Map">
+                <Option type="QString" name="name" value=""/>
+                <Option name="properties"/>
+                <Option type="QString" name="type" value="collection"/>
+              </Option>
+            </data_defined_properties>
+            <layer class="SimpleMarker" locked="0" enabled="1" id="" pass="0">
+              <Option type="Map">
+                <Option type="QString" name="angle" value="0"/>
+                <Option type="QString" name="cap_style" value="square"/>
+                <Option type="QString" name="color" value="232,113,141,255"/>
+                <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="name" value="circle"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="35,35,35,255"/>
+                <Option type="QString" name="outline_style" value="solid"/>
+                <Option type="QString" name="outline_width" value="0"/>
+                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="scale_method" value="diameter"/>
+                <Option type="QString" name="size" value="2"/>
+                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="size_unit" value="MM"/>
+                <Option type="QString" name="vertical_anchor_point" value="1"/>
+              </Option>
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option type="QString" name="name" value=""/>
+                  <Option name="properties"/>
+                  <Option type="QString" name="type" value="collection"/>
+                </Option>
+              </data_defined_properties>
+            </layer>
+          </symbol>
+          <symbol type="fill" clip_to_extent="1" name="fillSymbol" is_animated="0" alpha="1" force_rhr="0" frame_rate="10">
+            <data_defined_properties>
+              <Option type="Map">
+                <Option type="QString" name="name" value=""/>
+                <Option name="properties"/>
+                <Option type="QString" name="type" value="collection"/>
+              </Option>
+            </data_defined_properties>
+            <layer class="SimpleFill" locked="0" enabled="1" id="" pass="0">
+              <Option type="Map">
+                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color" value="255,255,255,255"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                <Option type="QString" name="outline_style" value="no"/>
+                <Option type="QString" name="outline_width" value="0"/>
+                <Option type="QString" name="outline_width_unit" value="Point"/>
+                <Option type="QString" name="style" value="solid"/>
+              </Option>
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option type="QString" name="name" value=""/>
+                  <Option name="properties"/>
+                  <Option type="QString" name="type" value="collection"/>
+                </Option>
+              </data_defined_properties>
+            </layer>
+          </symbol>
+        </background>
+        <shadow shadowRadius="1.5" shadowScale="100" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="1" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowOffsetUnit="MM"/>
+        <dd_properties>
+          <Option type="Map">
+            <Option type="QString" name="name" value=""/>
+            <Option name="properties"/>
+            <Option type="QString" name="type" value="collection"/>
+          </Option>
+        </dd_properties>
+        <substitutions/>
+      </text-style>
+      <text-format wrapChar="" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" reverseDirectionSymbol="0" decimals="3" rightDirectionSymbol=">" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" multilineAlign="3" autoWrapLength="0" plussign="0"/>
+      <placement maxCurvedCharAngleIn="25" polygonPlacementFlags="2" fitInPolygonOnly="0" layerType="PointGeometry" placementFlags="10" preserveRotation="1" centroidWhole="0" rotationAngle="0" offsetType="1" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" overrunDistance="0" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-25" distUnits="MM" geometryGenerator="" rotationUnit="AngleDegrees" placement="6" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGeneratorEnabled="0" centroidInside="0" offsetUnits="MM" yOffset="0" priority="5" overlapHandling="PreventOverlap" allowDegraded="0" quadOffset="4" xOffset="0" repeatDistanceUnits="MM" geometryGeneratorType="PointGeometry" lineAnchorClipping="0" dist="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="FollowPlacement" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorType="0" overrunDistanceUnit="MM"/>
+      <rendering scaleMax="20000" fontLimitPixelSize="0" limitNumLabels="0" drawLabels="1" scaleMin="0" obstacle="1" mergeLines="0" unplacedVisibility="0" fontMaxPixelSize="10000" fontMinPixelSize="3" obstacleType="1" upsidedownLabels="0" maxNumLabels="2000" minFeatureSize="0" scaleVisibility="1" obstacleFactor="1" labelPerPart="0" zIndex="0"/>
+      <dd_properties>
+        <Option type="Map">
+          <Option type="QString" name="name" value=""/>
+          <Option name="properties"/>
+          <Option type="QString" name="type" value="collection"/>
+        </Option>
+      </dd_properties>
+      <callout type="simple">
+        <Option type="Map">
+          <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
+          <Option type="int" name="blendMode" value="0"/>
+          <Option type="Map" name="ddProperties">
+            <Option type="QString" name="name" value=""/>
+            <Option name="properties"/>
+            <Option type="QString" name="type" value="collection"/>
+          </Option>
+          <Option type="bool" name="drawToAllParts" value="false"/>
+          <Option type="QString" name="enabled" value="0"/>
+          <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
+          <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; clip_to_extent=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; id=&quot;{370a7c76-ac83-442a-9b30-65552f7ef2dd}&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+          <Option type="double" name="minLength" value="0"/>
+          <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+          <Option type="QString" name="minLengthUnit" value="MM"/>
+          <Option type="double" name="offsetFromAnchor" value="0"/>
+          <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+          <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+          <Option type="double" name="offsetFromLabel" value="0"/>
+          <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+          <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
+        </Option>
+      </callout>
+    </settings>
+  </labeling>
   <blendMode>0</blendMode>
   <featureBlendMode>0</featureBlendMode>
   <layerGeometryType>0</layerGeometryType>
diff --git a/Symbology/qgis/RiverscapesStudio/risk_potential_polygons.qml b/Symbology/qgis/RiverscapesStudio/risk_potential_polygons.qml
index f2098c72..ace8a751 100644
--- a/Symbology/qgis/RiverscapesStudio/risk_potential_polygons.qml
+++ b/Symbology/qgis/RiverscapesStudio/risk_potential_polygons.qml
@@ -1,40 +1,40 @@
 <!DOCTYPE qgis PUBLIC 'http://mrcc.com/qgis.dtd' 'SYSTEM'>
-<qgis styleCategories="Symbology" version="3.34.8-Prizren">
+<qgis version="3.34.8-Prizren" styleCategories="Symbology|Labeling" labelsEnabled="1">
   <renderer-v2 type="categorizedSymbol" referencescale="-1" attr="Risk" symbollevels="0" enableorderby="0" forceraster="0">
     <categories>
-      <category type="string" uuid="{ab0adaf1-e994-4c9b-8053-b5e82ce59e49}" value="High" label="High" render="true" symbol="0"/>
-      <category type="string" uuid="{6eeef180-571e-4b3c-9fae-e8a0e7f3f7c9}" value="Low" label="Low" render="true" symbol="1"/>
-      <category type="string" uuid="{e92198d3-a4f3-48fe-b016-434b5e75a43a}" value="Medium" label="Medium" render="true" symbol="2"/>
-      <category type="string" uuid="{30cc77a2-5cca-412a-a103-0d63ad59414e}" value="" label="" render="true" symbol="3"/>
+      <category type="string" uuid="{ab0adaf1-e994-4c9b-8053-b5e82ce59e49}" symbol="0" label="High" value="High" render="true"/>
+      <category type="string" uuid="{6eeef180-571e-4b3c-9fae-e8a0e7f3f7c9}" symbol="1" label="Low" value="Low" render="true"/>
+      <category type="string" uuid="{e92198d3-a4f3-48fe-b016-434b5e75a43a}" symbol="2" label="Medium" value="Medium" render="true"/>
+      <category type="string" uuid="{30cc77a2-5cca-412a-a103-0d63ad59414e}" symbol="3" label="" value="" render="true"/>
     </categories>
     <symbols>
       <symbol type="fill" clip_to_extent="1" name="0" is_animated="0" alpha="1" force_rhr="0" frame_rate="10">
         <data_defined_properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data_defined_properties>
-        <layer pass="0" locked="0" class="SimpleFill" id="{ef3d1fb5-c9bf-4cda-9136-60fd988883e3}" enabled="1">
+        <layer class="SimpleFill" locked="0" enabled="1" id="{ef3d1fb5-c9bf-4cda-9136-60fd988883e3}" pass="0">
           <Option type="Map">
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-            <Option type="QString" value="192,0,0,255" name="color"/>
-            <Option type="QString" value="bevel" name="joinstyle"/>
-            <Option type="QString" value="0,0" name="offset"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-            <Option type="QString" value="MM" name="offset_unit"/>
-            <Option type="QString" value="35,35,35,255" name="outline_color"/>
-            <Option type="QString" value="solid" name="outline_style"/>
-            <Option type="QString" value="0.26" name="outline_width"/>
-            <Option type="QString" value="MM" name="outline_width_unit"/>
-            <Option type="QString" value="solid" name="style"/>
+            <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="color" value="192,0,0,255"/>
+            <Option type="QString" name="joinstyle" value="bevel"/>
+            <Option type="QString" name="offset" value="0,0"/>
+            <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="offset_unit" value="MM"/>
+            <Option type="QString" name="outline_color" value="35,35,35,255"/>
+            <Option type="QString" name="outline_style" value="solid"/>
+            <Option type="QString" name="outline_width" value="0.26"/>
+            <Option type="QString" name="outline_width_unit" value="MM"/>
+            <Option type="QString" name="style" value="solid"/>
           </Option>
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
         </layer>
@@ -42,30 +42,30 @@
       <symbol type="fill" clip_to_extent="1" name="1" is_animated="0" alpha="1" force_rhr="0" frame_rate="10">
         <data_defined_properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data_defined_properties>
-        <layer pass="0" locked="0" class="SimpleFill" id="{ef3d1fb5-c9bf-4cda-9136-60fd988883e3}" enabled="1">
+        <layer class="SimpleFill" locked="0" enabled="1" id="{ef3d1fb5-c9bf-4cda-9136-60fd988883e3}" pass="0">
           <Option type="Map">
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-            <Option type="QString" value="0,176,80,255" name="color"/>
-            <Option type="QString" value="bevel" name="joinstyle"/>
-            <Option type="QString" value="0,0" name="offset"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-            <Option type="QString" value="MM" name="offset_unit"/>
-            <Option type="QString" value="35,35,35,255" name="outline_color"/>
-            <Option type="QString" value="solid" name="outline_style"/>
-            <Option type="QString" value="0.26" name="outline_width"/>
-            <Option type="QString" value="MM" name="outline_width_unit"/>
-            <Option type="QString" value="solid" name="style"/>
+            <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="color" value="0,176,80,255"/>
+            <Option type="QString" name="joinstyle" value="bevel"/>
+            <Option type="QString" name="offset" value="0,0"/>
+            <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="offset_unit" value="MM"/>
+            <Option type="QString" name="outline_color" value="35,35,35,255"/>
+            <Option type="QString" name="outline_style" value="solid"/>
+            <Option type="QString" name="outline_width" value="0.26"/>
+            <Option type="QString" name="outline_width_unit" value="MM"/>
+            <Option type="QString" name="style" value="solid"/>
           </Option>
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
         </layer>
@@ -73,30 +73,30 @@
       <symbol type="fill" clip_to_extent="1" name="2" is_animated="0" alpha="1" force_rhr="0" frame_rate="10">
         <data_defined_properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data_defined_properties>
-        <layer pass="0" locked="0" class="SimpleFill" id="{ef3d1fb5-c9bf-4cda-9136-60fd988883e3}" enabled="1">
+        <layer class="SimpleFill" locked="0" enabled="1" id="{ef3d1fb5-c9bf-4cda-9136-60fd988883e3}" pass="0">
           <Option type="Map">
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-            <Option type="QString" value="255,255,0,255" name="color"/>
-            <Option type="QString" value="bevel" name="joinstyle"/>
-            <Option type="QString" value="0,0" name="offset"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-            <Option type="QString" value="MM" name="offset_unit"/>
-            <Option type="QString" value="35,35,35,255" name="outline_color"/>
-            <Option type="QString" value="solid" name="outline_style"/>
-            <Option type="QString" value="0.26" name="outline_width"/>
-            <Option type="QString" value="MM" name="outline_width_unit"/>
-            <Option type="QString" value="solid" name="style"/>
+            <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="color" value="255,255,0,255"/>
+            <Option type="QString" name="joinstyle" value="bevel"/>
+            <Option type="QString" name="offset" value="0,0"/>
+            <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="offset_unit" value="MM"/>
+            <Option type="QString" name="outline_color" value="35,35,35,255"/>
+            <Option type="QString" name="outline_style" value="solid"/>
+            <Option type="QString" name="outline_width" value="0.26"/>
+            <Option type="QString" name="outline_width_unit" value="MM"/>
+            <Option type="QString" name="style" value="solid"/>
           </Option>
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
         </layer>
@@ -104,30 +104,30 @@
       <symbol type="fill" clip_to_extent="1" name="3" is_animated="0" alpha="1" force_rhr="0" frame_rate="10">
         <data_defined_properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data_defined_properties>
-        <layer pass="0" locked="0" class="SimpleFill" id="{ef3d1fb5-c9bf-4cda-9136-60fd988883e3}" enabled="1">
+        <layer class="SimpleFill" locked="0" enabled="1" id="{ef3d1fb5-c9bf-4cda-9136-60fd988883e3}" pass="0">
           <Option type="Map">
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-            <Option type="QString" value="87,128,232,255" name="color"/>
-            <Option type="QString" value="bevel" name="joinstyle"/>
-            <Option type="QString" value="0,0" name="offset"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-            <Option type="QString" value="MM" name="offset_unit"/>
-            <Option type="QString" value="35,35,35,255" name="outline_color"/>
-            <Option type="QString" value="solid" name="outline_style"/>
-            <Option type="QString" value="0.26" name="outline_width"/>
-            <Option type="QString" value="MM" name="outline_width_unit"/>
-            <Option type="QString" value="solid" name="style"/>
+            <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="color" value="87,128,232,255"/>
+            <Option type="QString" name="joinstyle" value="bevel"/>
+            <Option type="QString" name="offset" value="0,0"/>
+            <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="offset_unit" value="MM"/>
+            <Option type="QString" name="outline_color" value="35,35,35,255"/>
+            <Option type="QString" name="outline_style" value="solid"/>
+            <Option type="QString" name="outline_width" value="0.26"/>
+            <Option type="QString" name="outline_width_unit" value="MM"/>
+            <Option type="QString" name="style" value="solid"/>
           </Option>
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
         </layer>
@@ -137,38 +137,35 @@
       <symbol type="fill" clip_to_extent="1" name="0" is_animated="0" alpha="1" force_rhr="0" frame_rate="10">
         <data_defined_properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data_defined_properties>
-        <layer pass="0" locked="0" class="SimpleFill" id="{ef3d1fb5-c9bf-4cda-9136-60fd988883e3}" enabled="1">
+        <layer class="SimpleFill" locked="0" enabled="1" id="{ef3d1fb5-c9bf-4cda-9136-60fd988883e3}" pass="0">
           <Option type="Map">
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-            <Option type="QString" value="190,178,151,255" name="color"/>
-            <Option type="QString" value="bevel" name="joinstyle"/>
-            <Option type="QString" value="0,0" name="offset"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-            <Option type="QString" value="MM" name="offset_unit"/>
-            <Option type="QString" value="35,35,35,255" name="outline_color"/>
-            <Option type="QString" value="solid" name="outline_style"/>
-            <Option type="QString" value="0.26" name="outline_width"/>
-            <Option type="QString" value="MM" name="outline_width_unit"/>
-            <Option type="QString" value="solid" name="style"/>
+            <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="color" value="190,178,151,255"/>
+            <Option type="QString" name="joinstyle" value="bevel"/>
+            <Option type="QString" name="offset" value="0,0"/>
+            <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="offset_unit" value="MM"/>
+            <Option type="QString" name="outline_color" value="35,35,35,255"/>
+            <Option type="QString" name="outline_style" value="solid"/>
+            <Option type="QString" name="outline_width" value="0.26"/>
+            <Option type="QString" name="outline_width_unit" value="MM"/>
+            <Option type="QString" name="style" value="solid"/>
           </Option>
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
         </layer>
       </symbol>
     </source-symbol>
-    <colorramp type="randomcolors" name="[source]">
-      <Option/>
-    </colorramp>
     <rotation/>
     <sizescale/>
   </renderer-v2>
@@ -178,36 +175,160 @@
       <symbol type="fill" clip_to_extent="1" name="" is_animated="0" alpha="1" force_rhr="0" frame_rate="10">
         <data_defined_properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data_defined_properties>
-        <layer pass="0" locked="0" class="SimpleFill" id="{83024c32-ba84-4b79-b8ee-13d2a215a8bd}" enabled="1">
+        <layer class="SimpleFill" locked="0" enabled="1" id="{83024c32-ba84-4b79-b8ee-13d2a215a8bd}" pass="0">
           <Option type="Map">
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-            <Option type="QString" value="0,0,255,255" name="color"/>
-            <Option type="QString" value="bevel" name="joinstyle"/>
-            <Option type="QString" value="0,0" name="offset"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-            <Option type="QString" value="MM" name="offset_unit"/>
-            <Option type="QString" value="35,35,35,255" name="outline_color"/>
-            <Option type="QString" value="solid" name="outline_style"/>
-            <Option type="QString" value="0.26" name="outline_width"/>
-            <Option type="QString" value="MM" name="outline_width_unit"/>
-            <Option type="QString" value="solid" name="style"/>
+            <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="color" value="0,0,255,255"/>
+            <Option type="QString" name="joinstyle" value="bevel"/>
+            <Option type="QString" name="offset" value="0,0"/>
+            <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="offset_unit" value="MM"/>
+            <Option type="QString" name="outline_color" value="35,35,35,255"/>
+            <Option type="QString" name="outline_style" value="solid"/>
+            <Option type="QString" name="outline_width" value="0.26"/>
+            <Option type="QString" name="outline_width_unit" value="MM"/>
+            <Option type="QString" name="style" value="solid"/>
           </Option>
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
         </layer>
       </symbol>
     </selectionSymbol>
   </selection>
+  <labeling type="simple">
+    <settings calloutType="simple">
+      <text-style fieldName="Type" capitalization="0" fontSizeUnit="Point" fontWeight="50" textColor="50,50,50,255" isExpression="0" previewBkgrdColor="255,255,255,255" multilineHeightUnit="Percentage" textOrientation="horizontal" fontItalic="0" blendMode="0" namedStyle="Regular" textOpacity="1" forcedBold="0" fontKerning="1" useSubstitutions="0" fontLetterSpacing="0" legendString="Aa" fontStrikeout="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" fontSize="10" fontFamily="Open Sans" fontUnderline="0" multilineHeight="1" allowHtml="0">
+        <families/>
+        <text-buffer bufferColor="250,250,250,255" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="0.5" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferDraw="1" bufferBlendMode="0" bufferJoinStyle="128"/>
+        <text-mask maskOpacity="1" maskSize="0" maskType="0" maskJoinStyle="128" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskedSymbolLayers=""/>
+        <background shapeOffsetX="0" shapeOffsetUnit="Point" shapeDraw="0" shapeRotationType="0" shapeJoinStyle="64" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="Point" shapeSizeY="0" shapeRadiiUnit="Point" shapeBlendMode="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSizeType="0" shapeType="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeBorderWidthUnit="Point">
+          <symbol type="marker" clip_to_extent="1" name="markerSymbol" is_animated="0" alpha="1" force_rhr="0" frame_rate="10">
+            <data_defined_properties>
+              <Option type="Map">
+                <Option type="QString" name="name" value=""/>
+                <Option name="properties"/>
+                <Option type="QString" name="type" value="collection"/>
+              </Option>
+            </data_defined_properties>
+            <layer class="SimpleMarker" locked="0" enabled="1" id="" pass="0">
+              <Option type="Map">
+                <Option type="QString" name="angle" value="0"/>
+                <Option type="QString" name="cap_style" value="square"/>
+                <Option type="QString" name="color" value="213,180,60,255"/>
+                <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="name" value="circle"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="35,35,35,255"/>
+                <Option type="QString" name="outline_style" value="solid"/>
+                <Option type="QString" name="outline_width" value="0"/>
+                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="scale_method" value="diameter"/>
+                <Option type="QString" name="size" value="2"/>
+                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="size_unit" value="MM"/>
+                <Option type="QString" name="vertical_anchor_point" value="1"/>
+              </Option>
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option type="QString" name="name" value=""/>
+                  <Option name="properties"/>
+                  <Option type="QString" name="type" value="collection"/>
+                </Option>
+              </data_defined_properties>
+            </layer>
+          </symbol>
+          <symbol type="fill" clip_to_extent="1" name="fillSymbol" is_animated="0" alpha="1" force_rhr="0" frame_rate="10">
+            <data_defined_properties>
+              <Option type="Map">
+                <Option type="QString" name="name" value=""/>
+                <Option name="properties"/>
+                <Option type="QString" name="type" value="collection"/>
+              </Option>
+            </data_defined_properties>
+            <layer class="SimpleFill" locked="0" enabled="1" id="" pass="0">
+              <Option type="Map">
+                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color" value="255,255,255,255"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                <Option type="QString" name="outline_style" value="no"/>
+                <Option type="QString" name="outline_width" value="0"/>
+                <Option type="QString" name="outline_width_unit" value="Point"/>
+                <Option type="QString" name="style" value="solid"/>
+              </Option>
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option type="QString" name="name" value=""/>
+                  <Option name="properties"/>
+                  <Option type="QString" name="type" value="collection"/>
+                </Option>
+              </data_defined_properties>
+            </layer>
+          </symbol>
+        </background>
+        <shadow shadowRadius="1.5" shadowScale="100" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="1" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowOffsetUnit="MM"/>
+        <dd_properties>
+          <Option type="Map">
+            <Option type="QString" name="name" value=""/>
+            <Option name="properties"/>
+            <Option type="QString" name="type" value="collection"/>
+          </Option>
+        </dd_properties>
+        <substitutions/>
+      </text-style>
+      <text-format wrapChar="" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" reverseDirectionSymbol="0" decimals="3" rightDirectionSymbol=">" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" multilineAlign="3" autoWrapLength="0" plussign="0"/>
+      <placement maxCurvedCharAngleIn="25" polygonPlacementFlags="2" fitInPolygonOnly="0" layerType="PolygonGeometry" placementFlags="10" preserveRotation="1" centroidWhole="0" rotationAngle="0" offsetType="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" overrunDistance="0" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-25" distUnits="MM" geometryGenerator="" rotationUnit="AngleDegrees" placement="0" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGeneratorEnabled="0" centroidInside="0" offsetUnits="MM" yOffset="0" priority="5" overlapHandling="PreventOverlap" allowDegraded="0" quadOffset="4" xOffset="0" repeatDistanceUnits="MM" geometryGeneratorType="PointGeometry" lineAnchorClipping="0" dist="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="FollowPlacement" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorType="0" overrunDistanceUnit="MM"/>
+      <rendering scaleMax="20000" fontLimitPixelSize="0" limitNumLabels="0" drawLabels="1" scaleMin="0" obstacle="1" mergeLines="0" unplacedVisibility="0" fontMaxPixelSize="10000" fontMinPixelSize="3" obstacleType="1" upsidedownLabels="0" maxNumLabels="2000" minFeatureSize="0" scaleVisibility="1" obstacleFactor="1" labelPerPart="0" zIndex="0"/>
+      <dd_properties>
+        <Option type="Map">
+          <Option type="QString" name="name" value=""/>
+          <Option name="properties"/>
+          <Option type="QString" name="type" value="collection"/>
+        </Option>
+      </dd_properties>
+      <callout type="simple">
+        <Option type="Map">
+          <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
+          <Option type="int" name="blendMode" value="0"/>
+          <Option type="Map" name="ddProperties">
+            <Option type="QString" name="name" value=""/>
+            <Option name="properties"/>
+            <Option type="QString" name="type" value="collection"/>
+          </Option>
+          <Option type="bool" name="drawToAllParts" value="false"/>
+          <Option type="QString" name="enabled" value="0"/>
+          <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
+          <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; clip_to_extent=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; id=&quot;{34099c95-5f6e-4b95-ac00-592f7eee1a27}&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+          <Option type="double" name="minLength" value="0"/>
+          <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+          <Option type="QString" name="minLengthUnit" value="MM"/>
+          <Option type="double" name="offsetFromAnchor" value="0"/>
+          <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+          <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+          <Option type="double" name="offsetFromLabel" value="0"/>
+          <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+          <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
+        </Option>
+      </callout>
+    </settings>
+  </labeling>
   <blendMode>0</blendMode>
   <featureBlendMode>0</featureBlendMode>
   <layerGeometryType>2</layerGeometryType>
diff --git a/Symbology/qgis/RiverscapesStudio/structure_lines.qml b/Symbology/qgis/RiverscapesStudio/structure_lines.qml
index c640bb77..360c130c 100644
--- a/Symbology/qgis/RiverscapesStudio/structure_lines.qml
+++ b/Symbology/qgis/RiverscapesStudio/structure_lines.qml
@@ -1,181 +1,181 @@
 <!DOCTYPE qgis PUBLIC 'http://mrcc.com/qgis.dtd' 'SYSTEM'>
-<qgis styleCategories="Symbology|Labeling" labelsEnabled="1" version="3.34.8-Prizren">
+<qgis version="3.34.8-Prizren" styleCategories="Symbology|Labeling" labelsEnabled="1">
   <renderer-v2 type="RuleRenderer" referencescale="-1" symbollevels="0" enableorderby="0" forceraster="0">
     <rules key="{ff32fc76-302d-47a7-ab2b-2f9253988f06}">
-      <rule filter="&quot;Structure Type&quot; = 'BDA' or &quot;Structure Type&quot; = 'Primary BDA' or &quot;Structure Type&quot; = 'Secondary BDA' or  &quot;Structure Type&quot; = 'BDA Postless' or &quot;Structure Type&quot; = 'Tight PALS (BDA without sod)'  or &quot;Structure Type&quot; = 'Postline Wicker Weave'" label="BDA" key="{f5185101-7ec5-448d-b2e1-3a474e6dce11}" symbol="0"/>
-      <rule filter="&quot;Structure Type&quot; = 'PALS' or &quot;Structure Type&quot; = 'PALS - Bank Attached' or &quot;Structure Type&quot; = 'PALS - Right Bank Attached' or &quot;Structure Type&quot; = 'PALS - Left Bank Attached' or &quot;Structure Type&quot; = 'PALS - Bank Blaster' or &quot;Structure Type&quot; = 'PALS - Constriction Jet' or &quot;Structure Type&quot; = 'PALS - Mid Channel' or &quot;Structure Type&quot; = 'PALS - Rhino' or &quot;Structure Type&quot; = 'PALS - Channel Spanning' or &quot;Structure Type&quot; = 'Rhino'  or &quot;Structure Type&quot; = 'Leaky Dam' or &quot;Structure Type&quot; = 'Post and Brush Plug'  or &quot;Structure Type&quot; = 'Wicker Weirs' " label="PALS" key="{f6676c63-23b4-44fb-b592-e7cb02b9b7c6}" symbol="1"/>
-      <rule filter="&quot;Structure Type&quot; = 'ALS' or  &quot;Structure Type&quot; = 'ALS - Bank Attached' or  &quot;Structure Type&quot; = 'ALS - Bank Blaster' or  &quot;Structure Type&quot; = 'ALS - Mid Channel' or  &quot;Structure Type&quot; = 'ALS - Rhino' or  &quot;Structure Type&quot; = 'ALS - Channel Spanning' or  &quot;Structure Type&quot; = 'Wood Jam' or  &quot;Structure Type&quot; = 'Full Tree' or  &quot;Structure Type&quot; = 'Strategic Felling' or  &quot;Structure Type&quot; = 'Grip Hoist Tree' or  &quot;Structure Type&quot; = 'Fell Tree' or  &quot;Structure Type&quot; = 'Tree Dam' or  &quot;Structure Type&quot; = 'Tree Plug'" label="ALS" key="{ee37a95b-4b89-478d-bae6-d647a810b72d}" symbol="2"/>
-      <rule filter="&quot;Structure Type&quot; = 'One Rock Dam' or &quot;Structure Type&quot; = 'Zuni Bowl' or &quot;Structure Type&quot; = 'Spreaders' or &quot;Structure Type&quot; = 'Floodplain BDA' or &quot;Structure Type&quot; = 'Sedge Plugs' or &quot;Structure Type&quot; = 'Headcut Treatment' or  &quot;Structure Type&quot; = 'Bag Plugs' or  &quot;Structure Type&quot; = 'Floodplain LWD' or  &quot;Structure Type&quot; = 'Vanes'" label="Other" key="{378b0370-892b-4d36-8191-d661a195830a}" symbol="3"/>
-      <rule filter="ELSE" key="{933751e9-a5d5-4360-ab12-0ace17227c49}" symbol="4"/>
+      <rule symbol="0" filter="&quot;Structure Type&quot; = 'BDA' or &quot;Structure Type&quot; = 'Primary BDA' or &quot;Structure Type&quot; = 'Secondary BDA' or  &quot;Structure Type&quot; = 'BDA Postless' or &quot;Structure Type&quot; = 'Tight PALS (BDA without sod)'  or &quot;Structure Type&quot; = 'Postline Wicker Weave'" label="BDA" key="{f5185101-7ec5-448d-b2e1-3a474e6dce11}"/>
+      <rule symbol="1" filter="&quot;Structure Type&quot; = 'PALS' or &quot;Structure Type&quot; = 'PALS - Bank Attached' or &quot;Structure Type&quot; = 'PALS - Right Bank Attached' or &quot;Structure Type&quot; = 'PALS - Left Bank Attached' or &quot;Structure Type&quot; = 'PALS - Bank Blaster' or &quot;Structure Type&quot; = 'PALS - Constriction Jet' or &quot;Structure Type&quot; = 'PALS - Mid Channel' or &quot;Structure Type&quot; = 'PALS - Rhino' or &quot;Structure Type&quot; = 'PALS - Channel Spanning' or &quot;Structure Type&quot; = 'Rhino'  or &quot;Structure Type&quot; = 'Leaky Dam' or &quot;Structure Type&quot; = 'Post and Brush Plug'  or &quot;Structure Type&quot; = 'Wicker Weirs' " label="PALS" key="{f6676c63-23b4-44fb-b592-e7cb02b9b7c6}"/>
+      <rule symbol="2" filter="&quot;Structure Type&quot; = 'ALS' or  &quot;Structure Type&quot; = 'ALS - Bank Attached' or  &quot;Structure Type&quot; = 'ALS - Bank Blaster' or  &quot;Structure Type&quot; = 'ALS - Mid Channel' or  &quot;Structure Type&quot; = 'ALS - Rhino' or  &quot;Structure Type&quot; = 'ALS - Channel Spanning' or  &quot;Structure Type&quot; = 'Wood Jam' or  &quot;Structure Type&quot; = 'Full Tree' or  &quot;Structure Type&quot; = 'Strategic Felling' or  &quot;Structure Type&quot; = 'Grip Hoist Tree' or  &quot;Structure Type&quot; = 'Fell Tree' or  &quot;Structure Type&quot; = 'Tree Dam' or  &quot;Structure Type&quot; = 'Tree Plug'" label="ALS" key="{ee37a95b-4b89-478d-bae6-d647a810b72d}"/>
+      <rule symbol="3" filter="&quot;Structure Type&quot; = 'One Rock Dam' or &quot;Structure Type&quot; = 'Zuni Bowl' or &quot;Structure Type&quot; = 'Spreaders' or &quot;Structure Type&quot; = 'Floodplain BDA' or &quot;Structure Type&quot; = 'Sedge Plugs' or &quot;Structure Type&quot; = 'Headcut Treatment' or  &quot;Structure Type&quot; = 'Bag Plugs' or  &quot;Structure Type&quot; = 'Floodplain LWD' or  &quot;Structure Type&quot; = 'Vanes'" label="Other" key="{378b0370-892b-4d36-8191-d661a195830a}"/>
+      <rule symbol="4" filter="ELSE" key="{933751e9-a5d5-4360-ab12-0ace17227c49}"/>
     </rules>
     <symbols>
       <symbol type="line" clip_to_extent="1" name="0" is_animated="0" alpha="1" force_rhr="0" frame_rate="10">
         <data_defined_properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data_defined_properties>
-        <layer pass="0" locked="0" class="SimpleLine" id="{969e4a7b-89e5-4198-ac5c-569c3bed15e1}" enabled="1">
+        <layer class="SimpleLine" locked="0" enabled="1" id="{969e4a7b-89e5-4198-ac5c-569c3bed15e1}" pass="0">
           <Option type="Map">
-            <Option type="QString" value="0" name="align_dash_pattern"/>
-            <Option type="QString" value="square" name="capstyle"/>
-            <Option type="QString" value="5;2" name="customdash"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-            <Option type="QString" value="MM" name="customdash_unit"/>
-            <Option type="QString" value="0" name="dash_pattern_offset"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-            <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-            <Option type="QString" value="0" name="draw_inside_polygon"/>
-            <Option type="QString" value="bevel" name="joinstyle"/>
-            <Option type="QString" value="255,255,255,255" name="line_color"/>
-            <Option type="QString" value="solid" name="line_style"/>
-            <Option type="QString" value="1" name="line_width"/>
-            <Option type="QString" value="MM" name="line_width_unit"/>
-            <Option type="QString" value="0" name="offset"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-            <Option type="QString" value="MM" name="offset_unit"/>
-            <Option type="QString" value="0" name="ring_filter"/>
-            <Option type="QString" value="0" name="trim_distance_end"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-            <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-            <Option type="QString" value="0" name="trim_distance_start"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-            <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-            <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-            <Option type="QString" value="0" name="use_custom_dash"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+            <Option type="QString" name="align_dash_pattern" value="0"/>
+            <Option type="QString" name="capstyle" value="square"/>
+            <Option type="QString" name="customdash" value="5;2"/>
+            <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="customdash_unit" value="MM"/>
+            <Option type="QString" name="dash_pattern_offset" value="0"/>
+            <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+            <Option type="QString" name="draw_inside_polygon" value="0"/>
+            <Option type="QString" name="joinstyle" value="bevel"/>
+            <Option type="QString" name="line_color" value="255,255,255,255"/>
+            <Option type="QString" name="line_style" value="solid"/>
+            <Option type="QString" name="line_width" value="1"/>
+            <Option type="QString" name="line_width_unit" value="MM"/>
+            <Option type="QString" name="offset" value="0"/>
+            <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="offset_unit" value="MM"/>
+            <Option type="QString" name="ring_filter" value="0"/>
+            <Option type="QString" name="trim_distance_end" value="0"/>
+            <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+            <Option type="QString" name="trim_distance_start" value="0"/>
+            <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+            <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+            <Option type="QString" name="use_custom_dash" value="0"/>
+            <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
           </Option>
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
         </layer>
-        <layer pass="1" locked="0" class="SimpleLine" id="{1f4a534b-0bae-4609-98e0-5c6ad46c20fc}" enabled="1">
+        <layer class="SimpleLine" locked="0" enabled="1" id="{1f4a534b-0bae-4609-98e0-5c6ad46c20fc}" pass="1">
           <Option type="Map">
-            <Option type="QString" value="0" name="align_dash_pattern"/>
-            <Option type="QString" value="round" name="capstyle"/>
-            <Option type="QString" value="5;2" name="customdash"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-            <Option type="QString" value="MM" name="customdash_unit"/>
-            <Option type="QString" value="-5.55112e-17" name="dash_pattern_offset"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-            <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-            <Option type="QString" value="0" name="draw_inside_polygon"/>
-            <Option type="QString" value="round" name="joinstyle"/>
-            <Option type="QString" value="43,131,186,255" name="line_color"/>
-            <Option type="QString" value="solid" name="line_style"/>
-            <Option type="QString" value="0.8" name="line_width"/>
-            <Option type="QString" value="MM" name="line_width_unit"/>
-            <Option type="QString" value="0" name="offset"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-            <Option type="QString" value="MM" name="offset_unit"/>
-            <Option type="QString" value="0" name="ring_filter"/>
-            <Option type="QString" value="0" name="trim_distance_end"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-            <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-            <Option type="QString" value="0" name="trim_distance_start"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-            <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-            <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-            <Option type="QString" value="0" name="use_custom_dash"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+            <Option type="QString" name="align_dash_pattern" value="0"/>
+            <Option type="QString" name="capstyle" value="round"/>
+            <Option type="QString" name="customdash" value="5;2"/>
+            <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="customdash_unit" value="MM"/>
+            <Option type="QString" name="dash_pattern_offset" value="-5.55112e-17"/>
+            <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+            <Option type="QString" name="draw_inside_polygon" value="0"/>
+            <Option type="QString" name="joinstyle" value="round"/>
+            <Option type="QString" name="line_color" value="43,131,186,255"/>
+            <Option type="QString" name="line_style" value="solid"/>
+            <Option type="QString" name="line_width" value="0.8"/>
+            <Option type="QString" name="line_width_unit" value="MM"/>
+            <Option type="QString" name="offset" value="0"/>
+            <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="offset_unit" value="MM"/>
+            <Option type="QString" name="ring_filter" value="0"/>
+            <Option type="QString" name="trim_distance_end" value="0"/>
+            <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+            <Option type="QString" name="trim_distance_start" value="0"/>
+            <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+            <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+            <Option type="QString" name="use_custom_dash" value="0"/>
+            <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
           </Option>
           <effect type="effectStack" enabled="0">
             <effect type="dropShadow">
               <Option type="Map">
-                <Option type="QString" value="13" name="blend_mode"/>
-                <Option type="QString" value="2.645" name="blur_level"/>
-                <Option type="QString" value="MM" name="blur_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="blur_unit_scale"/>
-                <Option type="QString" value="0,0,0,255" name="color"/>
-                <Option type="QString" value="2" name="draw_mode"/>
-                <Option type="QString" value="0" name="enabled"/>
-                <Option type="QString" value="135" name="offset_angle"/>
-                <Option type="QString" value="2" name="offset_distance"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_unit_scale"/>
-                <Option type="QString" value="1" name="opacity"/>
+                <Option type="QString" name="blend_mode" value="13"/>
+                <Option type="QString" name="blur_level" value="2.645"/>
+                <Option type="QString" name="blur_unit" value="MM"/>
+                <Option type="QString" name="blur_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color" value="0,0,0,255"/>
+                <Option type="QString" name="draw_mode" value="2"/>
+                <Option type="QString" name="enabled" value="0"/>
+                <Option type="QString" name="offset_angle" value="135"/>
+                <Option type="QString" name="offset_distance" value="2"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="offset_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="opacity" value="1"/>
               </Option>
             </effect>
             <effect type="outerGlow">
               <Option type="Map">
-                <Option type="QString" value="0" name="blend_mode"/>
-                <Option type="QString" value="2.645" name="blur_level"/>
-                <Option type="QString" value="MM" name="blur_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="blur_unit_scale"/>
-                <Option type="QString" value="69,116,40,255" name="color1"/>
-                <Option type="QString" value="188,220,60,255" name="color2"/>
-                <Option type="QString" value="0" name="color_type"/>
-                <Option type="QString" value="ccw" name="direction"/>
-                <Option type="QString" value="0" name="discrete"/>
-                <Option type="QString" value="2" name="draw_mode"/>
-                <Option type="QString" value="1" name="enabled"/>
-                <Option type="QString" value="0.5" name="opacity"/>
-                <Option type="QString" value="gradient" name="rampType"/>
-                <Option type="QString" value="255,255,255,255" name="single_color"/>
-                <Option type="QString" value="rgb" name="spec"/>
-                <Option type="QString" value="2" name="spread"/>
-                <Option type="QString" value="MM" name="spread_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="spread_unit_scale"/>
+                <Option type="QString" name="blend_mode" value="0"/>
+                <Option type="QString" name="blur_level" value="2.645"/>
+                <Option type="QString" name="blur_unit" value="MM"/>
+                <Option type="QString" name="blur_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color1" value="69,116,40,255"/>
+                <Option type="QString" name="color2" value="188,220,60,255"/>
+                <Option type="QString" name="color_type" value="0"/>
+                <Option type="QString" name="direction" value="ccw"/>
+                <Option type="QString" name="discrete" value="0"/>
+                <Option type="QString" name="draw_mode" value="2"/>
+                <Option type="QString" name="enabled" value="1"/>
+                <Option type="QString" name="opacity" value="0.5"/>
+                <Option type="QString" name="rampType" value="gradient"/>
+                <Option type="QString" name="single_color" value="255,255,255,255"/>
+                <Option type="QString" name="spec" value="rgb"/>
+                <Option type="QString" name="spread" value="2"/>
+                <Option type="QString" name="spread_unit" value="MM"/>
+                <Option type="QString" name="spread_unit_scale" value="3x:0,0,0,0,0,0"/>
               </Option>
             </effect>
             <effect type="drawSource">
               <Option type="Map">
-                <Option type="QString" value="0" name="blend_mode"/>
-                <Option type="QString" value="2" name="draw_mode"/>
-                <Option type="QString" value="1" name="enabled"/>
-                <Option type="QString" value="1" name="opacity"/>
+                <Option type="QString" name="blend_mode" value="0"/>
+                <Option type="QString" name="draw_mode" value="2"/>
+                <Option type="QString" name="enabled" value="1"/>
+                <Option type="QString" name="opacity" value="1"/>
               </Option>
             </effect>
             <effect type="innerShadow">
               <Option type="Map">
-                <Option type="QString" value="13" name="blend_mode"/>
-                <Option type="QString" value="2.645" name="blur_level"/>
-                <Option type="QString" value="MM" name="blur_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="blur_unit_scale"/>
-                <Option type="QString" value="0,0,0,255" name="color"/>
-                <Option type="QString" value="2" name="draw_mode"/>
-                <Option type="QString" value="0" name="enabled"/>
-                <Option type="QString" value="135" name="offset_angle"/>
-                <Option type="QString" value="2" name="offset_distance"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_unit_scale"/>
-                <Option type="QString" value="1" name="opacity"/>
+                <Option type="QString" name="blend_mode" value="13"/>
+                <Option type="QString" name="blur_level" value="2.645"/>
+                <Option type="QString" name="blur_unit" value="MM"/>
+                <Option type="QString" name="blur_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color" value="0,0,0,255"/>
+                <Option type="QString" name="draw_mode" value="2"/>
+                <Option type="QString" name="enabled" value="0"/>
+                <Option type="QString" name="offset_angle" value="135"/>
+                <Option type="QString" name="offset_distance" value="2"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="offset_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="opacity" value="1"/>
               </Option>
             </effect>
             <effect type="innerGlow">
               <Option type="Map">
-                <Option type="QString" value="0" name="blend_mode"/>
-                <Option type="QString" value="2.645" name="blur_level"/>
-                <Option type="QString" value="MM" name="blur_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="blur_unit_scale"/>
-                <Option type="QString" value="69,116,40,255" name="color1"/>
-                <Option type="QString" value="188,220,60,255" name="color2"/>
-                <Option type="QString" value="0" name="color_type"/>
-                <Option type="QString" value="ccw" name="direction"/>
-                <Option type="QString" value="0" name="discrete"/>
-                <Option type="QString" value="2" name="draw_mode"/>
-                <Option type="QString" value="0" name="enabled"/>
-                <Option type="QString" value="0.5" name="opacity"/>
-                <Option type="QString" value="gradient" name="rampType"/>
-                <Option type="QString" value="255,255,255,255" name="single_color"/>
-                <Option type="QString" value="rgb" name="spec"/>
-                <Option type="QString" value="2" name="spread"/>
-                <Option type="QString" value="MM" name="spread_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="spread_unit_scale"/>
+                <Option type="QString" name="blend_mode" value="0"/>
+                <Option type="QString" name="blur_level" value="2.645"/>
+                <Option type="QString" name="blur_unit" value="MM"/>
+                <Option type="QString" name="blur_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color1" value="69,116,40,255"/>
+                <Option type="QString" name="color2" value="188,220,60,255"/>
+                <Option type="QString" name="color_type" value="0"/>
+                <Option type="QString" name="direction" value="ccw"/>
+                <Option type="QString" name="discrete" value="0"/>
+                <Option type="QString" name="draw_mode" value="2"/>
+                <Option type="QString" name="enabled" value="0"/>
+                <Option type="QString" name="opacity" value="0.5"/>
+                <Option type="QString" name="rampType" value="gradient"/>
+                <Option type="QString" name="single_color" value="255,255,255,255"/>
+                <Option type="QString" name="spec" value="rgb"/>
+                <Option type="QString" name="spread" value="2"/>
+                <Option type="QString" name="spread_unit" value="MM"/>
+                <Option type="QString" name="spread_unit_scale" value="3x:0,0,0,0,0,0"/>
               </Option>
             </effect>
           </effect>
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
         </layer>
@@ -183,170 +183,170 @@
       <symbol type="line" clip_to_extent="1" name="1" is_animated="0" alpha="1" force_rhr="0" frame_rate="10">
         <data_defined_properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data_defined_properties>
-        <layer pass="0" locked="0" class="SimpleLine" id="{15392395-9868-45ab-a7ac-31f9f7f4c813}" enabled="1">
+        <layer class="SimpleLine" locked="0" enabled="1" id="{15392395-9868-45ab-a7ac-31f9f7f4c813}" pass="0">
           <Option type="Map">
-            <Option type="QString" value="0" name="align_dash_pattern"/>
-            <Option type="QString" value="square" name="capstyle"/>
-            <Option type="QString" value="5;2" name="customdash"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-            <Option type="QString" value="MM" name="customdash_unit"/>
-            <Option type="QString" value="0" name="dash_pattern_offset"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-            <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-            <Option type="QString" value="0" name="draw_inside_polygon"/>
-            <Option type="QString" value="bevel" name="joinstyle"/>
-            <Option type="QString" value="255,255,255,255" name="line_color"/>
-            <Option type="QString" value="solid" name="line_style"/>
-            <Option type="QString" value="1" name="line_width"/>
-            <Option type="QString" value="MM" name="line_width_unit"/>
-            <Option type="QString" value="0" name="offset"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-            <Option type="QString" value="MM" name="offset_unit"/>
-            <Option type="QString" value="0" name="ring_filter"/>
-            <Option type="QString" value="0" name="trim_distance_end"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-            <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-            <Option type="QString" value="0" name="trim_distance_start"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-            <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-            <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-            <Option type="QString" value="0" name="use_custom_dash"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+            <Option type="QString" name="align_dash_pattern" value="0"/>
+            <Option type="QString" name="capstyle" value="square"/>
+            <Option type="QString" name="customdash" value="5;2"/>
+            <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="customdash_unit" value="MM"/>
+            <Option type="QString" name="dash_pattern_offset" value="0"/>
+            <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+            <Option type="QString" name="draw_inside_polygon" value="0"/>
+            <Option type="QString" name="joinstyle" value="bevel"/>
+            <Option type="QString" name="line_color" value="255,255,255,255"/>
+            <Option type="QString" name="line_style" value="solid"/>
+            <Option type="QString" name="line_width" value="1"/>
+            <Option type="QString" name="line_width_unit" value="MM"/>
+            <Option type="QString" name="offset" value="0"/>
+            <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="offset_unit" value="MM"/>
+            <Option type="QString" name="ring_filter" value="0"/>
+            <Option type="QString" name="trim_distance_end" value="0"/>
+            <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+            <Option type="QString" name="trim_distance_start" value="0"/>
+            <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+            <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+            <Option type="QString" name="use_custom_dash" value="0"/>
+            <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
           </Option>
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
         </layer>
-        <layer pass="0" locked="0" class="SimpleLine" id="{15506160-b456-4330-ad70-71f8aa2ab067}" enabled="1">
+        <layer class="SimpleLine" locked="0" enabled="1" id="{15506160-b456-4330-ad70-71f8aa2ab067}" pass="0">
           <Option type="Map">
-            <Option type="QString" value="0" name="align_dash_pattern"/>
-            <Option type="QString" value="round" name="capstyle"/>
-            <Option type="QString" value="5;2" name="customdash"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-            <Option type="QString" value="MM" name="customdash_unit"/>
-            <Option type="QString" value="-5.55112e-17" name="dash_pattern_offset"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-            <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-            <Option type="QString" value="0" name="draw_inside_polygon"/>
-            <Option type="QString" value="round" name="joinstyle"/>
-            <Option type="QString" value="166,97,26,255" name="line_color"/>
-            <Option type="QString" value="solid" name="line_style"/>
-            <Option type="QString" value="0.8" name="line_width"/>
-            <Option type="QString" value="MM" name="line_width_unit"/>
-            <Option type="QString" value="0" name="offset"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-            <Option type="QString" value="MM" name="offset_unit"/>
-            <Option type="QString" value="0" name="ring_filter"/>
-            <Option type="QString" value="0" name="trim_distance_end"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-            <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-            <Option type="QString" value="0" name="trim_distance_start"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-            <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-            <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-            <Option type="QString" value="0" name="use_custom_dash"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+            <Option type="QString" name="align_dash_pattern" value="0"/>
+            <Option type="QString" name="capstyle" value="round"/>
+            <Option type="QString" name="customdash" value="5;2"/>
+            <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="customdash_unit" value="MM"/>
+            <Option type="QString" name="dash_pattern_offset" value="-5.55112e-17"/>
+            <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+            <Option type="QString" name="draw_inside_polygon" value="0"/>
+            <Option type="QString" name="joinstyle" value="round"/>
+            <Option type="QString" name="line_color" value="166,97,26,255"/>
+            <Option type="QString" name="line_style" value="solid"/>
+            <Option type="QString" name="line_width" value="0.8"/>
+            <Option type="QString" name="line_width_unit" value="MM"/>
+            <Option type="QString" name="offset" value="0"/>
+            <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="offset_unit" value="MM"/>
+            <Option type="QString" name="ring_filter" value="0"/>
+            <Option type="QString" name="trim_distance_end" value="0"/>
+            <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+            <Option type="QString" name="trim_distance_start" value="0"/>
+            <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+            <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+            <Option type="QString" name="use_custom_dash" value="0"/>
+            <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
           </Option>
           <effect type="effectStack" enabled="0">
             <effect type="dropShadow">
               <Option type="Map">
-                <Option type="QString" value="13" name="blend_mode"/>
-                <Option type="QString" value="2.645" name="blur_level"/>
-                <Option type="QString" value="MM" name="blur_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="blur_unit_scale"/>
-                <Option type="QString" value="0,0,0,255" name="color"/>
-                <Option type="QString" value="2" name="draw_mode"/>
-                <Option type="QString" value="0" name="enabled"/>
-                <Option type="QString" value="135" name="offset_angle"/>
-                <Option type="QString" value="2" name="offset_distance"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_unit_scale"/>
-                <Option type="QString" value="1" name="opacity"/>
+                <Option type="QString" name="blend_mode" value="13"/>
+                <Option type="QString" name="blur_level" value="2.645"/>
+                <Option type="QString" name="blur_unit" value="MM"/>
+                <Option type="QString" name="blur_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color" value="0,0,0,255"/>
+                <Option type="QString" name="draw_mode" value="2"/>
+                <Option type="QString" name="enabled" value="0"/>
+                <Option type="QString" name="offset_angle" value="135"/>
+                <Option type="QString" name="offset_distance" value="2"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="offset_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="opacity" value="1"/>
               </Option>
             </effect>
             <effect type="outerGlow">
               <Option type="Map">
-                <Option type="QString" value="0" name="blend_mode"/>
-                <Option type="QString" value="2.645" name="blur_level"/>
-                <Option type="QString" value="MM" name="blur_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="blur_unit_scale"/>
-                <Option type="QString" value="69,116,40,255" name="color1"/>
-                <Option type="QString" value="188,220,60,255" name="color2"/>
-                <Option type="QString" value="0" name="color_type"/>
-                <Option type="QString" value="ccw" name="direction"/>
-                <Option type="QString" value="0" name="discrete"/>
-                <Option type="QString" value="2" name="draw_mode"/>
-                <Option type="QString" value="1" name="enabled"/>
-                <Option type="QString" value="0.5" name="opacity"/>
-                <Option type="QString" value="gradient" name="rampType"/>
-                <Option type="QString" value="255,255,255,255" name="single_color"/>
-                <Option type="QString" value="rgb" name="spec"/>
-                <Option type="QString" value="2" name="spread"/>
-                <Option type="QString" value="MM" name="spread_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="spread_unit_scale"/>
+                <Option type="QString" name="blend_mode" value="0"/>
+                <Option type="QString" name="blur_level" value="2.645"/>
+                <Option type="QString" name="blur_unit" value="MM"/>
+                <Option type="QString" name="blur_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color1" value="69,116,40,255"/>
+                <Option type="QString" name="color2" value="188,220,60,255"/>
+                <Option type="QString" name="color_type" value="0"/>
+                <Option type="QString" name="direction" value="ccw"/>
+                <Option type="QString" name="discrete" value="0"/>
+                <Option type="QString" name="draw_mode" value="2"/>
+                <Option type="QString" name="enabled" value="1"/>
+                <Option type="QString" name="opacity" value="0.5"/>
+                <Option type="QString" name="rampType" value="gradient"/>
+                <Option type="QString" name="single_color" value="255,255,255,255"/>
+                <Option type="QString" name="spec" value="rgb"/>
+                <Option type="QString" name="spread" value="2"/>
+                <Option type="QString" name="spread_unit" value="MM"/>
+                <Option type="QString" name="spread_unit_scale" value="3x:0,0,0,0,0,0"/>
               </Option>
             </effect>
             <effect type="drawSource">
               <Option type="Map">
-                <Option type="QString" value="0" name="blend_mode"/>
-                <Option type="QString" value="2" name="draw_mode"/>
-                <Option type="QString" value="1" name="enabled"/>
-                <Option type="QString" value="1" name="opacity"/>
+                <Option type="QString" name="blend_mode" value="0"/>
+                <Option type="QString" name="draw_mode" value="2"/>
+                <Option type="QString" name="enabled" value="1"/>
+                <Option type="QString" name="opacity" value="1"/>
               </Option>
             </effect>
             <effect type="innerShadow">
               <Option type="Map">
-                <Option type="QString" value="13" name="blend_mode"/>
-                <Option type="QString" value="2.645" name="blur_level"/>
-                <Option type="QString" value="MM" name="blur_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="blur_unit_scale"/>
-                <Option type="QString" value="0,0,0,255" name="color"/>
-                <Option type="QString" value="2" name="draw_mode"/>
-                <Option type="QString" value="0" name="enabled"/>
-                <Option type="QString" value="135" name="offset_angle"/>
-                <Option type="QString" value="2" name="offset_distance"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_unit_scale"/>
-                <Option type="QString" value="1" name="opacity"/>
+                <Option type="QString" name="blend_mode" value="13"/>
+                <Option type="QString" name="blur_level" value="2.645"/>
+                <Option type="QString" name="blur_unit" value="MM"/>
+                <Option type="QString" name="blur_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color" value="0,0,0,255"/>
+                <Option type="QString" name="draw_mode" value="2"/>
+                <Option type="QString" name="enabled" value="0"/>
+                <Option type="QString" name="offset_angle" value="135"/>
+                <Option type="QString" name="offset_distance" value="2"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="offset_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="opacity" value="1"/>
               </Option>
             </effect>
             <effect type="innerGlow">
               <Option type="Map">
-                <Option type="QString" value="0" name="blend_mode"/>
-                <Option type="QString" value="2.645" name="blur_level"/>
-                <Option type="QString" value="MM" name="blur_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="blur_unit_scale"/>
-                <Option type="QString" value="69,116,40,255" name="color1"/>
-                <Option type="QString" value="188,220,60,255" name="color2"/>
-                <Option type="QString" value="0" name="color_type"/>
-                <Option type="QString" value="ccw" name="direction"/>
-                <Option type="QString" value="0" name="discrete"/>
-                <Option type="QString" value="2" name="draw_mode"/>
-                <Option type="QString" value="0" name="enabled"/>
-                <Option type="QString" value="0.5" name="opacity"/>
-                <Option type="QString" value="gradient" name="rampType"/>
-                <Option type="QString" value="255,255,255,255" name="single_color"/>
-                <Option type="QString" value="rgb" name="spec"/>
-                <Option type="QString" value="2" name="spread"/>
-                <Option type="QString" value="MM" name="spread_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="spread_unit_scale"/>
+                <Option type="QString" name="blend_mode" value="0"/>
+                <Option type="QString" name="blur_level" value="2.645"/>
+                <Option type="QString" name="blur_unit" value="MM"/>
+                <Option type="QString" name="blur_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color1" value="69,116,40,255"/>
+                <Option type="QString" name="color2" value="188,220,60,255"/>
+                <Option type="QString" name="color_type" value="0"/>
+                <Option type="QString" name="direction" value="ccw"/>
+                <Option type="QString" name="discrete" value="0"/>
+                <Option type="QString" name="draw_mode" value="2"/>
+                <Option type="QString" name="enabled" value="0"/>
+                <Option type="QString" name="opacity" value="0.5"/>
+                <Option type="QString" name="rampType" value="gradient"/>
+                <Option type="QString" name="single_color" value="255,255,255,255"/>
+                <Option type="QString" name="spec" value="rgb"/>
+                <Option type="QString" name="spread" value="2"/>
+                <Option type="QString" name="spread_unit" value="MM"/>
+                <Option type="QString" name="spread_unit_scale" value="3x:0,0,0,0,0,0"/>
               </Option>
             </effect>
           </effect>
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
         </layer>
@@ -354,170 +354,170 @@
       <symbol type="line" clip_to_extent="1" name="2" is_animated="0" alpha="1" force_rhr="0" frame_rate="10">
         <data_defined_properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data_defined_properties>
-        <layer pass="0" locked="0" class="SimpleLine" id="{7404dc09-c5e3-4f28-a06f-e8e9a7cff1c1}" enabled="1">
+        <layer class="SimpleLine" locked="0" enabled="1" id="{7404dc09-c5e3-4f28-a06f-e8e9a7cff1c1}" pass="0">
           <Option type="Map">
-            <Option type="QString" value="0" name="align_dash_pattern"/>
-            <Option type="QString" value="square" name="capstyle"/>
-            <Option type="QString" value="5;2" name="customdash"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-            <Option type="QString" value="MM" name="customdash_unit"/>
-            <Option type="QString" value="0" name="dash_pattern_offset"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-            <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-            <Option type="QString" value="0" name="draw_inside_polygon"/>
-            <Option type="QString" value="bevel" name="joinstyle"/>
-            <Option type="QString" value="255,255,255,255" name="line_color"/>
-            <Option type="QString" value="solid" name="line_style"/>
-            <Option type="QString" value="1" name="line_width"/>
-            <Option type="QString" value="MM" name="line_width_unit"/>
-            <Option type="QString" value="0" name="offset"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-            <Option type="QString" value="MM" name="offset_unit"/>
-            <Option type="QString" value="0" name="ring_filter"/>
-            <Option type="QString" value="0" name="trim_distance_end"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-            <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-            <Option type="QString" value="0" name="trim_distance_start"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-            <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-            <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-            <Option type="QString" value="0" name="use_custom_dash"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+            <Option type="QString" name="align_dash_pattern" value="0"/>
+            <Option type="QString" name="capstyle" value="square"/>
+            <Option type="QString" name="customdash" value="5;2"/>
+            <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="customdash_unit" value="MM"/>
+            <Option type="QString" name="dash_pattern_offset" value="0"/>
+            <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+            <Option type="QString" name="draw_inside_polygon" value="0"/>
+            <Option type="QString" name="joinstyle" value="bevel"/>
+            <Option type="QString" name="line_color" value="255,255,255,255"/>
+            <Option type="QString" name="line_style" value="solid"/>
+            <Option type="QString" name="line_width" value="1"/>
+            <Option type="QString" name="line_width_unit" value="MM"/>
+            <Option type="QString" name="offset" value="0"/>
+            <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="offset_unit" value="MM"/>
+            <Option type="QString" name="ring_filter" value="0"/>
+            <Option type="QString" name="trim_distance_end" value="0"/>
+            <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+            <Option type="QString" name="trim_distance_start" value="0"/>
+            <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+            <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+            <Option type="QString" name="use_custom_dash" value="0"/>
+            <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
           </Option>
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
         </layer>
-        <layer pass="0" locked="0" class="SimpleLine" id="{986eef26-4bc3-4403-8a58-da665651942c}" enabled="1">
+        <layer class="SimpleLine" locked="0" enabled="1" id="{986eef26-4bc3-4403-8a58-da665651942c}" pass="0">
           <Option type="Map">
-            <Option type="QString" value="0" name="align_dash_pattern"/>
-            <Option type="QString" value="round" name="capstyle"/>
-            <Option type="QString" value="5;2" name="customdash"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-            <Option type="QString" value="MM" name="customdash_unit"/>
-            <Option type="QString" value="-5.55112e-17" name="dash_pattern_offset"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-            <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-            <Option type="QString" value="0" name="draw_inside_polygon"/>
-            <Option type="QString" value="round" name="joinstyle"/>
-            <Option type="QString" value="106,106,106,255" name="line_color"/>
-            <Option type="QString" value="solid" name="line_style"/>
-            <Option type="QString" value="0.8" name="line_width"/>
-            <Option type="QString" value="MM" name="line_width_unit"/>
-            <Option type="QString" value="0" name="offset"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-            <Option type="QString" value="MM" name="offset_unit"/>
-            <Option type="QString" value="0" name="ring_filter"/>
-            <Option type="QString" value="0" name="trim_distance_end"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-            <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-            <Option type="QString" value="0" name="trim_distance_start"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-            <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-            <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-            <Option type="QString" value="0" name="use_custom_dash"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+            <Option type="QString" name="align_dash_pattern" value="0"/>
+            <Option type="QString" name="capstyle" value="round"/>
+            <Option type="QString" name="customdash" value="5;2"/>
+            <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="customdash_unit" value="MM"/>
+            <Option type="QString" name="dash_pattern_offset" value="-5.55112e-17"/>
+            <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+            <Option type="QString" name="draw_inside_polygon" value="0"/>
+            <Option type="QString" name="joinstyle" value="round"/>
+            <Option type="QString" name="line_color" value="106,106,106,255"/>
+            <Option type="QString" name="line_style" value="solid"/>
+            <Option type="QString" name="line_width" value="0.8"/>
+            <Option type="QString" name="line_width_unit" value="MM"/>
+            <Option type="QString" name="offset" value="0"/>
+            <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="offset_unit" value="MM"/>
+            <Option type="QString" name="ring_filter" value="0"/>
+            <Option type="QString" name="trim_distance_end" value="0"/>
+            <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+            <Option type="QString" name="trim_distance_start" value="0"/>
+            <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+            <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+            <Option type="QString" name="use_custom_dash" value="0"/>
+            <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
           </Option>
           <effect type="effectStack" enabled="0">
             <effect type="dropShadow">
               <Option type="Map">
-                <Option type="QString" value="13" name="blend_mode"/>
-                <Option type="QString" value="2.645" name="blur_level"/>
-                <Option type="QString" value="MM" name="blur_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="blur_unit_scale"/>
-                <Option type="QString" value="0,0,0,255" name="color"/>
-                <Option type="QString" value="2" name="draw_mode"/>
-                <Option type="QString" value="0" name="enabled"/>
-                <Option type="QString" value="135" name="offset_angle"/>
-                <Option type="QString" value="2" name="offset_distance"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_unit_scale"/>
-                <Option type="QString" value="1" name="opacity"/>
+                <Option type="QString" name="blend_mode" value="13"/>
+                <Option type="QString" name="blur_level" value="2.645"/>
+                <Option type="QString" name="blur_unit" value="MM"/>
+                <Option type="QString" name="blur_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color" value="0,0,0,255"/>
+                <Option type="QString" name="draw_mode" value="2"/>
+                <Option type="QString" name="enabled" value="0"/>
+                <Option type="QString" name="offset_angle" value="135"/>
+                <Option type="QString" name="offset_distance" value="2"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="offset_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="opacity" value="1"/>
               </Option>
             </effect>
             <effect type="outerGlow">
               <Option type="Map">
-                <Option type="QString" value="0" name="blend_mode"/>
-                <Option type="QString" value="2.645" name="blur_level"/>
-                <Option type="QString" value="MM" name="blur_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="blur_unit_scale"/>
-                <Option type="QString" value="69,116,40,255" name="color1"/>
-                <Option type="QString" value="188,220,60,255" name="color2"/>
-                <Option type="QString" value="0" name="color_type"/>
-                <Option type="QString" value="ccw" name="direction"/>
-                <Option type="QString" value="0" name="discrete"/>
-                <Option type="QString" value="2" name="draw_mode"/>
-                <Option type="QString" value="1" name="enabled"/>
-                <Option type="QString" value="0.5" name="opacity"/>
-                <Option type="QString" value="gradient" name="rampType"/>
-                <Option type="QString" value="255,255,255,255" name="single_color"/>
-                <Option type="QString" value="rgb" name="spec"/>
-                <Option type="QString" value="2" name="spread"/>
-                <Option type="QString" value="MM" name="spread_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="spread_unit_scale"/>
+                <Option type="QString" name="blend_mode" value="0"/>
+                <Option type="QString" name="blur_level" value="2.645"/>
+                <Option type="QString" name="blur_unit" value="MM"/>
+                <Option type="QString" name="blur_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color1" value="69,116,40,255"/>
+                <Option type="QString" name="color2" value="188,220,60,255"/>
+                <Option type="QString" name="color_type" value="0"/>
+                <Option type="QString" name="direction" value="ccw"/>
+                <Option type="QString" name="discrete" value="0"/>
+                <Option type="QString" name="draw_mode" value="2"/>
+                <Option type="QString" name="enabled" value="1"/>
+                <Option type="QString" name="opacity" value="0.5"/>
+                <Option type="QString" name="rampType" value="gradient"/>
+                <Option type="QString" name="single_color" value="255,255,255,255"/>
+                <Option type="QString" name="spec" value="rgb"/>
+                <Option type="QString" name="spread" value="2"/>
+                <Option type="QString" name="spread_unit" value="MM"/>
+                <Option type="QString" name="spread_unit_scale" value="3x:0,0,0,0,0,0"/>
               </Option>
             </effect>
             <effect type="drawSource">
               <Option type="Map">
-                <Option type="QString" value="0" name="blend_mode"/>
-                <Option type="QString" value="2" name="draw_mode"/>
-                <Option type="QString" value="1" name="enabled"/>
-                <Option type="QString" value="1" name="opacity"/>
+                <Option type="QString" name="blend_mode" value="0"/>
+                <Option type="QString" name="draw_mode" value="2"/>
+                <Option type="QString" name="enabled" value="1"/>
+                <Option type="QString" name="opacity" value="1"/>
               </Option>
             </effect>
             <effect type="innerShadow">
               <Option type="Map">
-                <Option type="QString" value="13" name="blend_mode"/>
-                <Option type="QString" value="2.645" name="blur_level"/>
-                <Option type="QString" value="MM" name="blur_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="blur_unit_scale"/>
-                <Option type="QString" value="0,0,0,255" name="color"/>
-                <Option type="QString" value="2" name="draw_mode"/>
-                <Option type="QString" value="0" name="enabled"/>
-                <Option type="QString" value="135" name="offset_angle"/>
-                <Option type="QString" value="2" name="offset_distance"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_unit_scale"/>
-                <Option type="QString" value="1" name="opacity"/>
+                <Option type="QString" name="blend_mode" value="13"/>
+                <Option type="QString" name="blur_level" value="2.645"/>
+                <Option type="QString" name="blur_unit" value="MM"/>
+                <Option type="QString" name="blur_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color" value="0,0,0,255"/>
+                <Option type="QString" name="draw_mode" value="2"/>
+                <Option type="QString" name="enabled" value="0"/>
+                <Option type="QString" name="offset_angle" value="135"/>
+                <Option type="QString" name="offset_distance" value="2"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="offset_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="opacity" value="1"/>
               </Option>
             </effect>
             <effect type="innerGlow">
               <Option type="Map">
-                <Option type="QString" value="0" name="blend_mode"/>
-                <Option type="QString" value="2.645" name="blur_level"/>
-                <Option type="QString" value="MM" name="blur_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="blur_unit_scale"/>
-                <Option type="QString" value="69,116,40,255" name="color1"/>
-                <Option type="QString" value="188,220,60,255" name="color2"/>
-                <Option type="QString" value="0" name="color_type"/>
-                <Option type="QString" value="ccw" name="direction"/>
-                <Option type="QString" value="0" name="discrete"/>
-                <Option type="QString" value="2" name="draw_mode"/>
-                <Option type="QString" value="0" name="enabled"/>
-                <Option type="QString" value="0.5" name="opacity"/>
-                <Option type="QString" value="gradient" name="rampType"/>
-                <Option type="QString" value="255,255,255,255" name="single_color"/>
-                <Option type="QString" value="rgb" name="spec"/>
-                <Option type="QString" value="2" name="spread"/>
-                <Option type="QString" value="MM" name="spread_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="spread_unit_scale"/>
+                <Option type="QString" name="blend_mode" value="0"/>
+                <Option type="QString" name="blur_level" value="2.645"/>
+                <Option type="QString" name="blur_unit" value="MM"/>
+                <Option type="QString" name="blur_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color1" value="69,116,40,255"/>
+                <Option type="QString" name="color2" value="188,220,60,255"/>
+                <Option type="QString" name="color_type" value="0"/>
+                <Option type="QString" name="direction" value="ccw"/>
+                <Option type="QString" name="discrete" value="0"/>
+                <Option type="QString" name="draw_mode" value="2"/>
+                <Option type="QString" name="enabled" value="0"/>
+                <Option type="QString" name="opacity" value="0.5"/>
+                <Option type="QString" name="rampType" value="gradient"/>
+                <Option type="QString" name="single_color" value="255,255,255,255"/>
+                <Option type="QString" name="spec" value="rgb"/>
+                <Option type="QString" name="spread" value="2"/>
+                <Option type="QString" name="spread_unit" value="MM"/>
+                <Option type="QString" name="spread_unit_scale" value="3x:0,0,0,0,0,0"/>
               </Option>
             </effect>
           </effect>
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
         </layer>
@@ -525,170 +525,170 @@
       <symbol type="line" clip_to_extent="1" name="3" is_animated="0" alpha="1" force_rhr="0" frame_rate="10">
         <data_defined_properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data_defined_properties>
-        <layer pass="0" locked="0" class="SimpleLine" id="{39dcde25-c6c8-449f-ad79-450f60b94500}" enabled="1">
+        <layer class="SimpleLine" locked="0" enabled="1" id="{39dcde25-c6c8-449f-ad79-450f60b94500}" pass="0">
           <Option type="Map">
-            <Option type="QString" value="0" name="align_dash_pattern"/>
-            <Option type="QString" value="square" name="capstyle"/>
-            <Option type="QString" value="5;2" name="customdash"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-            <Option type="QString" value="MM" name="customdash_unit"/>
-            <Option type="QString" value="0" name="dash_pattern_offset"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-            <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-            <Option type="QString" value="0" name="draw_inside_polygon"/>
-            <Option type="QString" value="bevel" name="joinstyle"/>
-            <Option type="QString" value="255,255,255,255" name="line_color"/>
-            <Option type="QString" value="solid" name="line_style"/>
-            <Option type="QString" value="1" name="line_width"/>
-            <Option type="QString" value="MM" name="line_width_unit"/>
-            <Option type="QString" value="0" name="offset"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-            <Option type="QString" value="MM" name="offset_unit"/>
-            <Option type="QString" value="0" name="ring_filter"/>
-            <Option type="QString" value="0" name="trim_distance_end"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-            <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-            <Option type="QString" value="0" name="trim_distance_start"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-            <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-            <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-            <Option type="QString" value="0" name="use_custom_dash"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+            <Option type="QString" name="align_dash_pattern" value="0"/>
+            <Option type="QString" name="capstyle" value="square"/>
+            <Option type="QString" name="customdash" value="5;2"/>
+            <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="customdash_unit" value="MM"/>
+            <Option type="QString" name="dash_pattern_offset" value="0"/>
+            <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+            <Option type="QString" name="draw_inside_polygon" value="0"/>
+            <Option type="QString" name="joinstyle" value="bevel"/>
+            <Option type="QString" name="line_color" value="255,255,255,255"/>
+            <Option type="QString" name="line_style" value="solid"/>
+            <Option type="QString" name="line_width" value="1"/>
+            <Option type="QString" name="line_width_unit" value="MM"/>
+            <Option type="QString" name="offset" value="0"/>
+            <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="offset_unit" value="MM"/>
+            <Option type="QString" name="ring_filter" value="0"/>
+            <Option type="QString" name="trim_distance_end" value="0"/>
+            <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+            <Option type="QString" name="trim_distance_start" value="0"/>
+            <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+            <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+            <Option type="QString" name="use_custom_dash" value="0"/>
+            <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
           </Option>
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
         </layer>
-        <layer pass="0" locked="0" class="SimpleLine" id="{fb273714-20f8-4e93-9d66-94381421ca76}" enabled="1">
+        <layer class="SimpleLine" locked="0" enabled="1" id="{fb273714-20f8-4e93-9d66-94381421ca76}" pass="0">
           <Option type="Map">
-            <Option type="QString" value="0" name="align_dash_pattern"/>
-            <Option type="QString" value="round" name="capstyle"/>
-            <Option type="QString" value="5;2" name="customdash"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-            <Option type="QString" value="MM" name="customdash_unit"/>
-            <Option type="QString" value="-5.55112e-17" name="dash_pattern_offset"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-            <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-            <Option type="QString" value="0" name="draw_inside_polygon"/>
-            <Option type="QString" value="round" name="joinstyle"/>
-            <Option type="QString" value="166,217,106,255" name="line_color"/>
-            <Option type="QString" value="solid" name="line_style"/>
-            <Option type="QString" value="0.8" name="line_width"/>
-            <Option type="QString" value="MM" name="line_width_unit"/>
-            <Option type="QString" value="0" name="offset"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-            <Option type="QString" value="MM" name="offset_unit"/>
-            <Option type="QString" value="0" name="ring_filter"/>
-            <Option type="QString" value="0" name="trim_distance_end"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-            <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-            <Option type="QString" value="0" name="trim_distance_start"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-            <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-            <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-            <Option type="QString" value="0" name="use_custom_dash"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+            <Option type="QString" name="align_dash_pattern" value="0"/>
+            <Option type="QString" name="capstyle" value="round"/>
+            <Option type="QString" name="customdash" value="5;2"/>
+            <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="customdash_unit" value="MM"/>
+            <Option type="QString" name="dash_pattern_offset" value="-5.55112e-17"/>
+            <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+            <Option type="QString" name="draw_inside_polygon" value="0"/>
+            <Option type="QString" name="joinstyle" value="round"/>
+            <Option type="QString" name="line_color" value="166,217,106,255"/>
+            <Option type="QString" name="line_style" value="solid"/>
+            <Option type="QString" name="line_width" value="0.8"/>
+            <Option type="QString" name="line_width_unit" value="MM"/>
+            <Option type="QString" name="offset" value="0"/>
+            <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="offset_unit" value="MM"/>
+            <Option type="QString" name="ring_filter" value="0"/>
+            <Option type="QString" name="trim_distance_end" value="0"/>
+            <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+            <Option type="QString" name="trim_distance_start" value="0"/>
+            <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+            <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+            <Option type="QString" name="use_custom_dash" value="0"/>
+            <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
           </Option>
           <effect type="effectStack" enabled="0">
             <effect type="dropShadow">
               <Option type="Map">
-                <Option type="QString" value="13" name="blend_mode"/>
-                <Option type="QString" value="2.645" name="blur_level"/>
-                <Option type="QString" value="MM" name="blur_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="blur_unit_scale"/>
-                <Option type="QString" value="0,0,0,255" name="color"/>
-                <Option type="QString" value="2" name="draw_mode"/>
-                <Option type="QString" value="0" name="enabled"/>
-                <Option type="QString" value="135" name="offset_angle"/>
-                <Option type="QString" value="2" name="offset_distance"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_unit_scale"/>
-                <Option type="QString" value="1" name="opacity"/>
+                <Option type="QString" name="blend_mode" value="13"/>
+                <Option type="QString" name="blur_level" value="2.645"/>
+                <Option type="QString" name="blur_unit" value="MM"/>
+                <Option type="QString" name="blur_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color" value="0,0,0,255"/>
+                <Option type="QString" name="draw_mode" value="2"/>
+                <Option type="QString" name="enabled" value="0"/>
+                <Option type="QString" name="offset_angle" value="135"/>
+                <Option type="QString" name="offset_distance" value="2"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="offset_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="opacity" value="1"/>
               </Option>
             </effect>
             <effect type="outerGlow">
               <Option type="Map">
-                <Option type="QString" value="0" name="blend_mode"/>
-                <Option type="QString" value="2.645" name="blur_level"/>
-                <Option type="QString" value="MM" name="blur_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="blur_unit_scale"/>
-                <Option type="QString" value="69,116,40,255" name="color1"/>
-                <Option type="QString" value="188,220,60,255" name="color2"/>
-                <Option type="QString" value="0" name="color_type"/>
-                <Option type="QString" value="ccw" name="direction"/>
-                <Option type="QString" value="0" name="discrete"/>
-                <Option type="QString" value="2" name="draw_mode"/>
-                <Option type="QString" value="1" name="enabled"/>
-                <Option type="QString" value="0.5" name="opacity"/>
-                <Option type="QString" value="gradient" name="rampType"/>
-                <Option type="QString" value="255,255,255,255" name="single_color"/>
-                <Option type="QString" value="rgb" name="spec"/>
-                <Option type="QString" value="2" name="spread"/>
-                <Option type="QString" value="MM" name="spread_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="spread_unit_scale"/>
+                <Option type="QString" name="blend_mode" value="0"/>
+                <Option type="QString" name="blur_level" value="2.645"/>
+                <Option type="QString" name="blur_unit" value="MM"/>
+                <Option type="QString" name="blur_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color1" value="69,116,40,255"/>
+                <Option type="QString" name="color2" value="188,220,60,255"/>
+                <Option type="QString" name="color_type" value="0"/>
+                <Option type="QString" name="direction" value="ccw"/>
+                <Option type="QString" name="discrete" value="0"/>
+                <Option type="QString" name="draw_mode" value="2"/>
+                <Option type="QString" name="enabled" value="1"/>
+                <Option type="QString" name="opacity" value="0.5"/>
+                <Option type="QString" name="rampType" value="gradient"/>
+                <Option type="QString" name="single_color" value="255,255,255,255"/>
+                <Option type="QString" name="spec" value="rgb"/>
+                <Option type="QString" name="spread" value="2"/>
+                <Option type="QString" name="spread_unit" value="MM"/>
+                <Option type="QString" name="spread_unit_scale" value="3x:0,0,0,0,0,0"/>
               </Option>
             </effect>
             <effect type="drawSource">
               <Option type="Map">
-                <Option type="QString" value="0" name="blend_mode"/>
-                <Option type="QString" value="2" name="draw_mode"/>
-                <Option type="QString" value="1" name="enabled"/>
-                <Option type="QString" value="1" name="opacity"/>
+                <Option type="QString" name="blend_mode" value="0"/>
+                <Option type="QString" name="draw_mode" value="2"/>
+                <Option type="QString" name="enabled" value="1"/>
+                <Option type="QString" name="opacity" value="1"/>
               </Option>
             </effect>
             <effect type="innerShadow">
               <Option type="Map">
-                <Option type="QString" value="13" name="blend_mode"/>
-                <Option type="QString" value="2.645" name="blur_level"/>
-                <Option type="QString" value="MM" name="blur_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="blur_unit_scale"/>
-                <Option type="QString" value="0,0,0,255" name="color"/>
-                <Option type="QString" value="2" name="draw_mode"/>
-                <Option type="QString" value="0" name="enabled"/>
-                <Option type="QString" value="135" name="offset_angle"/>
-                <Option type="QString" value="2" name="offset_distance"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_unit_scale"/>
-                <Option type="QString" value="1" name="opacity"/>
+                <Option type="QString" name="blend_mode" value="13"/>
+                <Option type="QString" name="blur_level" value="2.645"/>
+                <Option type="QString" name="blur_unit" value="MM"/>
+                <Option type="QString" name="blur_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color" value="0,0,0,255"/>
+                <Option type="QString" name="draw_mode" value="2"/>
+                <Option type="QString" name="enabled" value="0"/>
+                <Option type="QString" name="offset_angle" value="135"/>
+                <Option type="QString" name="offset_distance" value="2"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="offset_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="opacity" value="1"/>
               </Option>
             </effect>
             <effect type="innerGlow">
               <Option type="Map">
-                <Option type="QString" value="0" name="blend_mode"/>
-                <Option type="QString" value="2.645" name="blur_level"/>
-                <Option type="QString" value="MM" name="blur_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="blur_unit_scale"/>
-                <Option type="QString" value="69,116,40,255" name="color1"/>
-                <Option type="QString" value="188,220,60,255" name="color2"/>
-                <Option type="QString" value="0" name="color_type"/>
-                <Option type="QString" value="ccw" name="direction"/>
-                <Option type="QString" value="0" name="discrete"/>
-                <Option type="QString" value="2" name="draw_mode"/>
-                <Option type="QString" value="0" name="enabled"/>
-                <Option type="QString" value="0.5" name="opacity"/>
-                <Option type="QString" value="gradient" name="rampType"/>
-                <Option type="QString" value="255,255,255,255" name="single_color"/>
-                <Option type="QString" value="rgb" name="spec"/>
-                <Option type="QString" value="2" name="spread"/>
-                <Option type="QString" value="MM" name="spread_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="spread_unit_scale"/>
+                <Option type="QString" name="blend_mode" value="0"/>
+                <Option type="QString" name="blur_level" value="2.645"/>
+                <Option type="QString" name="blur_unit" value="MM"/>
+                <Option type="QString" name="blur_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color1" value="69,116,40,255"/>
+                <Option type="QString" name="color2" value="188,220,60,255"/>
+                <Option type="QString" name="color_type" value="0"/>
+                <Option type="QString" name="direction" value="ccw"/>
+                <Option type="QString" name="discrete" value="0"/>
+                <Option type="QString" name="draw_mode" value="2"/>
+                <Option type="QString" name="enabled" value="0"/>
+                <Option type="QString" name="opacity" value="0.5"/>
+                <Option type="QString" name="rampType" value="gradient"/>
+                <Option type="QString" name="single_color" value="255,255,255,255"/>
+                <Option type="QString" name="spec" value="rgb"/>
+                <Option type="QString" name="spread" value="2"/>
+                <Option type="QString" name="spread_unit" value="MM"/>
+                <Option type="QString" name="spread_unit_scale" value="3x:0,0,0,0,0,0"/>
               </Option>
             </effect>
           </effect>
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
         </layer>
@@ -696,46 +696,46 @@
       <symbol type="line" clip_to_extent="1" name="4" is_animated="0" alpha="1" force_rhr="0" frame_rate="10">
         <data_defined_properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data_defined_properties>
-        <layer pass="0" locked="0" class="SimpleLine" id="{e93f688b-bb8d-4146-a62e-39f70fac16ca}" enabled="1">
+        <layer class="SimpleLine" locked="0" enabled="1" id="{e93f688b-bb8d-4146-a62e-39f70fac16ca}" pass="0">
           <Option type="Map">
-            <Option type="QString" value="0" name="align_dash_pattern"/>
-            <Option type="QString" value="square" name="capstyle"/>
-            <Option type="QString" value="5;2" name="customdash"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-            <Option type="QString" value="MM" name="customdash_unit"/>
-            <Option type="QString" value="0" name="dash_pattern_offset"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-            <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-            <Option type="QString" value="0" name="draw_inside_polygon"/>
-            <Option type="QString" value="bevel" name="joinstyle"/>
-            <Option type="QString" value="225,89,137,255" name="line_color"/>
-            <Option type="QString" value="solid" name="line_style"/>
-            <Option type="QString" value="0.26" name="line_width"/>
-            <Option type="QString" value="MM" name="line_width_unit"/>
-            <Option type="QString" value="0" name="offset"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-            <Option type="QString" value="MM" name="offset_unit"/>
-            <Option type="QString" value="0" name="ring_filter"/>
-            <Option type="QString" value="0" name="trim_distance_end"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-            <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-            <Option type="QString" value="0" name="trim_distance_start"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-            <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-            <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-            <Option type="QString" value="0" name="use_custom_dash"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+            <Option type="QString" name="align_dash_pattern" value="0"/>
+            <Option type="QString" name="capstyle" value="square"/>
+            <Option type="QString" name="customdash" value="5;2"/>
+            <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="customdash_unit" value="MM"/>
+            <Option type="QString" name="dash_pattern_offset" value="0"/>
+            <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+            <Option type="QString" name="draw_inside_polygon" value="0"/>
+            <Option type="QString" name="joinstyle" value="bevel"/>
+            <Option type="QString" name="line_color" value="225,89,137,255"/>
+            <Option type="QString" name="line_style" value="solid"/>
+            <Option type="QString" name="line_width" value="0.26"/>
+            <Option type="QString" name="line_width_unit" value="MM"/>
+            <Option type="QString" name="offset" value="0"/>
+            <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="offset_unit" value="MM"/>
+            <Option type="QString" name="ring_filter" value="0"/>
+            <Option type="QString" name="trim_distance_end" value="0"/>
+            <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+            <Option type="QString" name="trim_distance_start" value="0"/>
+            <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+            <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+            <Option type="QString" name="use_custom_dash" value="0"/>
+            <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
           </Option>
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
         </layer>
@@ -744,86 +744,86 @@
     <effect type="effectStack" enabled="1">
       <effect type="dropShadow">
         <Option type="Map">
-          <Option type="QString" value="13" name="blend_mode"/>
-          <Option type="QString" value="2.645" name="blur_level"/>
-          <Option type="QString" value="MM" name="blur_unit"/>
-          <Option type="QString" value="3x:0,0,0,0,0,0" name="blur_unit_scale"/>
-          <Option type="QString" value="0,0,0,255" name="color"/>
-          <Option type="QString" value="2" name="draw_mode"/>
-          <Option type="QString" value="0" name="enabled"/>
-          <Option type="QString" value="135" name="offset_angle"/>
-          <Option type="QString" value="2" name="offset_distance"/>
-          <Option type="QString" value="MM" name="offset_unit"/>
-          <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_unit_scale"/>
-          <Option type="QString" value="1" name="opacity"/>
+          <Option type="QString" name="blend_mode" value="13"/>
+          <Option type="QString" name="blur_level" value="2.645"/>
+          <Option type="QString" name="blur_unit" value="MM"/>
+          <Option type="QString" name="blur_unit_scale" value="3x:0,0,0,0,0,0"/>
+          <Option type="QString" name="color" value="0,0,0,255"/>
+          <Option type="QString" name="draw_mode" value="2"/>
+          <Option type="QString" name="enabled" value="0"/>
+          <Option type="QString" name="offset_angle" value="135"/>
+          <Option type="QString" name="offset_distance" value="2"/>
+          <Option type="QString" name="offset_unit" value="MM"/>
+          <Option type="QString" name="offset_unit_scale" value="3x:0,0,0,0,0,0"/>
+          <Option type="QString" name="opacity" value="1"/>
         </Option>
       </effect>
       <effect type="outerGlow">
         <Option type="Map">
-          <Option type="QString" value="0" name="blend_mode"/>
-          <Option type="QString" value="1.845" name="blur_level"/>
-          <Option type="QString" value="MM" name="blur_unit"/>
-          <Option type="QString" value="3x:0,0,0,0,0,0" name="blur_unit_scale"/>
-          <Option type="QString" value="69,116,40,255" name="color1"/>
-          <Option type="QString" value="188,220,60,255" name="color2"/>
-          <Option type="QString" value="0" name="color_type"/>
-          <Option type="QString" value="ccw" name="direction"/>
-          <Option type="QString" value="0" name="discrete"/>
-          <Option type="QString" value="2" name="draw_mode"/>
-          <Option type="QString" value="1" name="enabled"/>
-          <Option type="QString" value="0.6" name="opacity"/>
-          <Option type="QString" value="gradient" name="rampType"/>
-          <Option type="QString" value="255,255,255,255" name="single_color"/>
-          <Option type="QString" value="rgb" name="spec"/>
-          <Option type="QString" value="1.4" name="spread"/>
-          <Option type="QString" value="MM" name="spread_unit"/>
-          <Option type="QString" value="3x:0,0,0,0,0,0" name="spread_unit_scale"/>
+          <Option type="QString" name="blend_mode" value="0"/>
+          <Option type="QString" name="blur_level" value="1.845"/>
+          <Option type="QString" name="blur_unit" value="MM"/>
+          <Option type="QString" name="blur_unit_scale" value="3x:0,0,0,0,0,0"/>
+          <Option type="QString" name="color1" value="69,116,40,255"/>
+          <Option type="QString" name="color2" value="188,220,60,255"/>
+          <Option type="QString" name="color_type" value="0"/>
+          <Option type="QString" name="direction" value="ccw"/>
+          <Option type="QString" name="discrete" value="0"/>
+          <Option type="QString" name="draw_mode" value="2"/>
+          <Option type="QString" name="enabled" value="1"/>
+          <Option type="QString" name="opacity" value="0.6"/>
+          <Option type="QString" name="rampType" value="gradient"/>
+          <Option type="QString" name="single_color" value="255,255,255,255"/>
+          <Option type="QString" name="spec" value="rgb"/>
+          <Option type="QString" name="spread" value="1.4"/>
+          <Option type="QString" name="spread_unit" value="MM"/>
+          <Option type="QString" name="spread_unit_scale" value="3x:0,0,0,0,0,0"/>
         </Option>
       </effect>
       <effect type="drawSource">
         <Option type="Map">
-          <Option type="QString" value="0" name="blend_mode"/>
-          <Option type="QString" value="2" name="draw_mode"/>
-          <Option type="QString" value="1" name="enabled"/>
-          <Option type="QString" value="1" name="opacity"/>
+          <Option type="QString" name="blend_mode" value="0"/>
+          <Option type="QString" name="draw_mode" value="2"/>
+          <Option type="QString" name="enabled" value="1"/>
+          <Option type="QString" name="opacity" value="1"/>
         </Option>
       </effect>
       <effect type="innerShadow">
         <Option type="Map">
-          <Option type="QString" value="13" name="blend_mode"/>
-          <Option type="QString" value="2.645" name="blur_level"/>
-          <Option type="QString" value="MM" name="blur_unit"/>
-          <Option type="QString" value="3x:0,0,0,0,0,0" name="blur_unit_scale"/>
-          <Option type="QString" value="0,0,0,255" name="color"/>
-          <Option type="QString" value="2" name="draw_mode"/>
-          <Option type="QString" value="0" name="enabled"/>
-          <Option type="QString" value="135" name="offset_angle"/>
-          <Option type="QString" value="2" name="offset_distance"/>
-          <Option type="QString" value="MM" name="offset_unit"/>
-          <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_unit_scale"/>
-          <Option type="QString" value="1" name="opacity"/>
+          <Option type="QString" name="blend_mode" value="13"/>
+          <Option type="QString" name="blur_level" value="2.645"/>
+          <Option type="QString" name="blur_unit" value="MM"/>
+          <Option type="QString" name="blur_unit_scale" value="3x:0,0,0,0,0,0"/>
+          <Option type="QString" name="color" value="0,0,0,255"/>
+          <Option type="QString" name="draw_mode" value="2"/>
+          <Option type="QString" name="enabled" value="0"/>
+          <Option type="QString" name="offset_angle" value="135"/>
+          <Option type="QString" name="offset_distance" value="2"/>
+          <Option type="QString" name="offset_unit" value="MM"/>
+          <Option type="QString" name="offset_unit_scale" value="3x:0,0,0,0,0,0"/>
+          <Option type="QString" name="opacity" value="1"/>
         </Option>
       </effect>
       <effect type="innerGlow">
         <Option type="Map">
-          <Option type="QString" value="0" name="blend_mode"/>
-          <Option type="QString" value="2.645" name="blur_level"/>
-          <Option type="QString" value="MM" name="blur_unit"/>
-          <Option type="QString" value="3x:0,0,0,0,0,0" name="blur_unit_scale"/>
-          <Option type="QString" value="69,116,40,255" name="color1"/>
-          <Option type="QString" value="188,220,60,255" name="color2"/>
-          <Option type="QString" value="0" name="color_type"/>
-          <Option type="QString" value="ccw" name="direction"/>
-          <Option type="QString" value="0" name="discrete"/>
-          <Option type="QString" value="2" name="draw_mode"/>
-          <Option type="QString" value="0" name="enabled"/>
-          <Option type="QString" value="0.5" name="opacity"/>
-          <Option type="QString" value="gradient" name="rampType"/>
-          <Option type="QString" value="255,255,255,255" name="single_color"/>
-          <Option type="QString" value="rgb" name="spec"/>
-          <Option type="QString" value="2" name="spread"/>
-          <Option type="QString" value="MM" name="spread_unit"/>
-          <Option type="QString" value="3x:0,0,0,0,0,0" name="spread_unit_scale"/>
+          <Option type="QString" name="blend_mode" value="0"/>
+          <Option type="QString" name="blur_level" value="2.645"/>
+          <Option type="QString" name="blur_unit" value="MM"/>
+          <Option type="QString" name="blur_unit_scale" value="3x:0,0,0,0,0,0"/>
+          <Option type="QString" name="color1" value="69,116,40,255"/>
+          <Option type="QString" name="color2" value="188,220,60,255"/>
+          <Option type="QString" name="color_type" value="0"/>
+          <Option type="QString" name="direction" value="ccw"/>
+          <Option type="QString" name="discrete" value="0"/>
+          <Option type="QString" name="draw_mode" value="2"/>
+          <Option type="QString" name="enabled" value="0"/>
+          <Option type="QString" name="opacity" value="0.5"/>
+          <Option type="QString" name="rampType" value="gradient"/>
+          <Option type="QString" name="single_color" value="255,255,255,255"/>
+          <Option type="QString" name="spec" value="rgb"/>
+          <Option type="QString" name="spread" value="2"/>
+          <Option type="QString" name="spread_unit" value="MM"/>
+          <Option type="QString" name="spread_unit_scale" value="3x:0,0,0,0,0,0"/>
         </Option>
       </effect>
     </effect>
@@ -834,46 +834,46 @@
       <symbol type="line" clip_to_extent="1" name="" is_animated="0" alpha="1" force_rhr="0" frame_rate="10">
         <data_defined_properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data_defined_properties>
-        <layer pass="0" locked="0" class="SimpleLine" id="{e1d9a5d4-9a85-47b9-ad34-a3fa51ba45e3}" enabled="1">
+        <layer class="SimpleLine" locked="0" enabled="1" id="{e1d9a5d4-9a85-47b9-ad34-a3fa51ba45e3}" pass="0">
           <Option type="Map">
-            <Option type="QString" value="0" name="align_dash_pattern"/>
-            <Option type="QString" value="square" name="capstyle"/>
-            <Option type="QString" value="5;2" name="customdash"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
-            <Option type="QString" value="MM" name="customdash_unit"/>
-            <Option type="QString" value="0" name="dash_pattern_offset"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
-            <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
-            <Option type="QString" value="0" name="draw_inside_polygon"/>
-            <Option type="QString" value="bevel" name="joinstyle"/>
-            <Option type="QString" value="35,35,35,255" name="line_color"/>
-            <Option type="QString" value="solid" name="line_style"/>
-            <Option type="QString" value="0.26" name="line_width"/>
-            <Option type="QString" value="MM" name="line_width_unit"/>
-            <Option type="QString" value="0" name="offset"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-            <Option type="QString" value="MM" name="offset_unit"/>
-            <Option type="QString" value="0" name="ring_filter"/>
-            <Option type="QString" value="0" name="trim_distance_end"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
-            <Option type="QString" value="MM" name="trim_distance_end_unit"/>
-            <Option type="QString" value="0" name="trim_distance_start"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
-            <Option type="QString" value="MM" name="trim_distance_start_unit"/>
-            <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
-            <Option type="QString" value="0" name="use_custom_dash"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
+            <Option type="QString" name="align_dash_pattern" value="0"/>
+            <Option type="QString" name="capstyle" value="square"/>
+            <Option type="QString" name="customdash" value="5;2"/>
+            <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="customdash_unit" value="MM"/>
+            <Option type="QString" name="dash_pattern_offset" value="0"/>
+            <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+            <Option type="QString" name="draw_inside_polygon" value="0"/>
+            <Option type="QString" name="joinstyle" value="bevel"/>
+            <Option type="QString" name="line_color" value="35,35,35,255"/>
+            <Option type="QString" name="line_style" value="solid"/>
+            <Option type="QString" name="line_width" value="0.26"/>
+            <Option type="QString" name="line_width_unit" value="MM"/>
+            <Option type="QString" name="offset" value="0"/>
+            <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="offset_unit" value="MM"/>
+            <Option type="QString" name="ring_filter" value="0"/>
+            <Option type="QString" name="trim_distance_end" value="0"/>
+            <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+            <Option type="QString" name="trim_distance_start" value="0"/>
+            <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+            <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+            <Option type="QString" name="use_custom_dash" value="0"/>
+            <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
           </Option>
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
         </layer>
@@ -882,46 +882,46 @@
   </selection>
   <labeling type="simple">
     <settings calloutType="simple">
-      <text-style fontStrikeout="0" legendString="Aa" isExpression="0" multilineHeightUnit="Percentage" allowHtml="0" fontKerning="1" fontSize="10" fontWeight="75" useSubstitutions="0" fontWordSpacing="0" fieldName="Structure Type" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" namedStyle="Bold" fontItalic="0" textOpacity="1" forcedItalic="0" textColor="50,50,50,255" fontFamily="Arial Narrow" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedBold="0" fontSizeUnit="Point" blendMode="0" fontUnderline="0" multilineHeight="1" capitalization="0" textOrientation="horizontal">
+      <text-style fieldName="Structure Type" capitalization="0" fontSizeUnit="Point" fontWeight="75" textColor="50,50,50,255" isExpression="0" previewBkgrdColor="255,255,255,255" multilineHeightUnit="Percentage" textOrientation="horizontal" fontItalic="0" blendMode="0" namedStyle="Bold" textOpacity="1" forcedBold="0" fontKerning="1" useSubstitutions="0" fontLetterSpacing="0" legendString="Aa" fontStrikeout="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" fontSize="10" fontFamily="Arial Narrow" fontUnderline="0" multilineHeight="1" allowHtml="0">
         <families/>
-        <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="250,250,250,255" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="0.5" bufferDraw="1"/>
-        <text-mask maskedSymbolLayers="" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskSizeUnits="MM" maskEnabled="0" maskJoinStyle="128" maskType="0"/>
-        <background shapeRadiiX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeSizeType="0" shapeBlendMode="0" shapeOffsetUnit="Point" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeRotationType="0" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetY="0" shapeRadiiUnit="Point" shapeSizeUnit="Point" shapeJoinStyle="64" shapeBorderWidthUnit="Point" shapeSVGFile="" shapeOffsetX="0" shapeRadiiY="0" shapeDraw="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeFillColor="255,255,255,255">
+        <text-buffer bufferColor="250,250,250,255" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="0.5" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferDraw="1" bufferBlendMode="0" bufferJoinStyle="128"/>
+        <text-mask maskOpacity="1" maskSize="0" maskType="0" maskJoinStyle="128" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskedSymbolLayers=""/>
+        <background shapeOffsetX="0" shapeOffsetUnit="Point" shapeDraw="0" shapeRotationType="0" shapeJoinStyle="64" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="Point" shapeSizeY="0" shapeRadiiUnit="Point" shapeBlendMode="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSizeType="0" shapeType="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeBorderWidthUnit="Point">
           <symbol type="marker" clip_to_extent="1" name="markerSymbol" is_animated="0" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" locked="0" class="SimpleMarker" id="" enabled="1">
+            <layer class="SimpleMarker" locked="0" enabled="1" id="" pass="0">
               <Option type="Map">
-                <Option type="QString" value="0" name="angle"/>
-                <Option type="QString" value="square" name="cap_style"/>
-                <Option type="QString" value="133,182,111,255" name="color"/>
-                <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="circle" name="name"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="35,35,35,255" name="outline_color"/>
-                <Option type="QString" value="solid" name="outline_style"/>
-                <Option type="QString" value="0" name="outline_width"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="diameter" name="scale_method"/>
-                <Option type="QString" value="2" name="size"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                <Option type="QString" value="MM" name="size_unit"/>
-                <Option type="QString" value="1" name="vertical_anchor_point"/>
+                <Option type="QString" name="angle" value="0"/>
+                <Option type="QString" name="cap_style" value="square"/>
+                <Option type="QString" name="color" value="133,182,111,255"/>
+                <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="name" value="circle"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="35,35,35,255"/>
+                <Option type="QString" name="outline_style" value="solid"/>
+                <Option type="QString" name="outline_width" value="0"/>
+                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="scale_method" value="diameter"/>
+                <Option type="QString" name="size" value="2"/>
+                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="size_unit" value="MM"/>
+                <Option type="QString" name="vertical_anchor_point" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -929,77 +929,77 @@
           <symbol type="fill" clip_to_extent="1" name="fillSymbol" is_animated="0" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" locked="0" class="SimpleFill" id="" enabled="1">
+            <layer class="SimpleFill" locked="0" enabled="1" id="" pass="0">
               <Option type="Map">
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                <Option type="QString" value="255,255,255,255" name="color"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="128,128,128,255" name="outline_color"/>
-                <Option type="QString" value="no" name="outline_style"/>
-                <Option type="QString" value="0" name="outline_width"/>
-                <Option type="QString" value="Point" name="outline_width_unit"/>
-                <Option type="QString" value="solid" name="style"/>
+                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color" value="255,255,255,255"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                <Option type="QString" name="outline_style" value="no"/>
+                <Option type="QString" name="outline_width" value="0"/>
+                <Option type="QString" name="outline_width_unit" value="Point"/>
+                <Option type="QString" name="style" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </background>
-        <shadow shadowOffsetUnit="MM" shadowDraw="0" shadowRadiusUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetAngle="135" shadowScale="100" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+        <shadow shadowRadius="1.5" shadowScale="100" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowOffsetUnit="MM"/>
         <dd_properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </dd_properties>
         <substitutions/>
       </text-style>
-      <text-format addDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" formatNumbers="0" wrapChar="" multilineAlign="0" placeDirectionSymbol="0" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" leftDirectionSymbol="&lt;" decimals="3"/>
-      <placement geometryGenerator="" dist="5" overrunDistance="0" overrunDistanceUnit="MM" repeatDistance="0" priority="6" rotationAngle="0" xOffset="0" lineAnchorClipping="0" layerType="LineGeometry" centroidInside="0" quadOffset="4" maxCurvedCharAngleOut="-25" allowDegraded="0" geometryGeneratorEnabled="0" overlapHandling="PreventOverlap" maxCurvedCharAngleIn="25" placement="4" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" fitInPolygonOnly="0" offsetUnits="MM" lineAnchorType="0" lineAnchorPercent="1" offsetType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placementFlags="2" rotationUnit="AngleDegrees" polygonPlacementFlags="2" distMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" preserveRotation="1" distUnits="MM" repeatDistanceUnits="MM" lineAnchorTextPoint="StartOfText"/>
-      <rendering unplacedVisibility="0" zIndex="0" drawLabels="1" upsidedownLabels="0" scaleMax="1000" fontMinPixelSize="3" fontMaxPixelSize="10000" obstacle="1" labelPerPart="0" maxNumLabels="2000" obstacleType="1" mergeLines="0" fontLimitPixelSize="0" scaleMin="0" obstacleFactor="2" minFeatureSize="0" limitNumLabels="0" scaleVisibility="1"/>
+      <text-format wrapChar="" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" reverseDirectionSymbol="0" decimals="3" rightDirectionSymbol=">" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" multilineAlign="0" autoWrapLength="0" plussign="0"/>
+      <placement maxCurvedCharAngleIn="25" polygonPlacementFlags="2" fitInPolygonOnly="0" layerType="LineGeometry" placementFlags="2" preserveRotation="1" centroidWhole="0" rotationAngle="0" offsetType="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="1" overrunDistance="0" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-25" distUnits="MM" geometryGenerator="" rotationUnit="AngleDegrees" placement="4" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGeneratorEnabled="0" centroidInside="0" offsetUnits="MM" yOffset="0" priority="6" overlapHandling="PreventOverlap" allowDegraded="0" quadOffset="4" xOffset="0" repeatDistanceUnits="MM" geometryGeneratorType="PointGeometry" lineAnchorClipping="0" dist="5" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="StartOfText" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorType="0" overrunDistanceUnit="MM"/>
+      <rendering scaleMax="1750" fontLimitPixelSize="0" limitNumLabels="0" drawLabels="1" scaleMin="0" obstacle="1" mergeLines="0" unplacedVisibility="0" fontMaxPixelSize="10000" fontMinPixelSize="3" obstacleType="1" upsidedownLabels="0" maxNumLabels="2000" minFeatureSize="0" scaleVisibility="1" obstacleFactor="2" labelPerPart="0" zIndex="0"/>
       <dd_properties>
         <Option type="Map">
-          <Option type="QString" value="" name="name"/>
+          <Option type="QString" name="name" value=""/>
           <Option name="properties"/>
-          <Option type="QString" value="collection" name="type"/>
+          <Option type="QString" name="type" value="collection"/>
         </Option>
       </dd_properties>
       <callout type="simple">
         <Option type="Map">
-          <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
-          <Option type="int" value="0" name="blendMode"/>
+          <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
+          <Option type="int" name="blendMode" value="0"/>
           <Option type="Map" name="ddProperties">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
-          <Option type="bool" value="false" name="drawToAllParts"/>
-          <Option type="QString" value="0" name="enabled"/>
-          <Option type="QString" value="point_on_exterior" name="labelAnchorPoint"/>
-          <Option type="QString" value="&lt;symbol type=&quot;line&quot; clip_to_extent=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer pass=&quot;0&quot; locked=&quot;0&quot; class=&quot;SimpleLine&quot; id=&quot;{8a8d070c-47a7-4803-b448-656ee24c1ecc}&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;square&quot; name=&quot;capstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;5;2&quot; name=&quot;customdash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;customdash_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;bevel&quot; name=&quot;joinstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;60,60,60,255&quot; name=&quot;line_color&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;solid&quot; name=&quot;line_style&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0.3&quot; name=&quot;line_width&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;line_width_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;ring_filter&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_end&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_start&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;use_custom_dash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol"/>
-          <Option type="double" value="0" name="minLength"/>
-          <Option type="QString" value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale"/>
-          <Option type="QString" value="MM" name="minLengthUnit"/>
-          <Option type="double" value="0" name="offsetFromAnchor"/>
-          <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale"/>
-          <Option type="QString" value="MM" name="offsetFromAnchorUnit"/>
-          <Option type="double" value="0" name="offsetFromLabel"/>
-          <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale"/>
-          <Option type="QString" value="MM" name="offsetFromLabelUnit"/>
+          <Option type="bool" name="drawToAllParts" value="false"/>
+          <Option type="QString" name="enabled" value="0"/>
+          <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
+          <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; clip_to_extent=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; id=&quot;{8a8d070c-47a7-4803-b448-656ee24c1ecc}&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+          <Option type="double" name="minLength" value="0"/>
+          <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+          <Option type="QString" name="minLengthUnit" value="MM"/>
+          <Option type="double" name="offsetFromAnchor" value="0"/>
+          <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+          <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+          <Option type="double" name="offsetFromLabel" value="0"/>
+          <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+          <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
         </Option>
       </callout>
     </settings>
diff --git a/Symbology/qgis/RiverscapesStudio/structure_points.qml b/Symbology/qgis/RiverscapesStudio/structure_points.qml
index 12fbff9c..7b8705fe 100644
--- a/Symbology/qgis/RiverscapesStudio/structure_points.qml
+++ b/Symbology/qgis/RiverscapesStudio/structure_points.qml
@@ -1,165 +1,165 @@
 <!DOCTYPE qgis PUBLIC 'http://mrcc.com/qgis.dtd' 'SYSTEM'>
-<qgis styleCategories="Symbology|Labeling" labelsEnabled="1" version="3.34.8-Prizren">
+<qgis version="3.34.8-Prizren" styleCategories="Symbology|Labeling" labelsEnabled="1">
   <renderer-v2 type="RuleRenderer" referencescale="-1" symbollevels="0" enableorderby="0" forceraster="0">
     <rules key="{96719773-fe41-4558-9e9e-7ab5324a8915}">
-      <rule filter="&quot;Structure Type&quot; = 'BDA' or &quot;Structure Type&quot; = 'Primary BDA' or &quot;Structure Type&quot; = 'Secondary BDA' or  &quot;Structure Type&quot; = 'BDA Postless' or &quot;Structure Type&quot; = 'Tight PALS (BDA without sod)'  or &quot;Structure Type&quot; = 'Postline Wicker Weave'" label="BDA" key="{cca9b65a-15a2-42ac-8b4b-abc780450914}" symbol="0"/>
-      <rule filter="&quot;Structure Type&quot; = 'PALS' or &quot;Structure Type&quot; = 'PALS - Bank Attached' or &quot;Structure Type&quot; = 'PALS - Right Bank Attached' or &quot;Structure Type&quot; = 'PALS - Left Bank Attached' or &quot;Structure Type&quot; = 'PALS - Bank Blaster' or &quot;Structure Type&quot; = 'PALS - Constriction Jet' or &quot;Structure Type&quot; = 'PALS - Mid Channel' or &quot;Structure Type&quot; = 'PALS - Rhino' or &quot;Structure Type&quot; = 'PALS - Channel Spanning' or &quot;Structure Type&quot; = 'Rhino'  or &quot;Structure Type&quot; = 'Leaky Dam' or &quot;Structure Type&quot; = 'Post and Brush Plug'  or &quot;Structure Type&quot; = 'Wicker Weirs' " label="PALS" key="{12d2e893-432f-4022-8e6c-e2bf38820cda}" symbol="1"/>
-      <rule filter="&quot;Structure Type&quot; = 'ALS' or  &quot;Structure Type&quot; = 'ALS - Bank Attached' or  &quot;Structure Type&quot; = 'ALS - Bank Blaster' or  &quot;Structure Type&quot; = 'ALS - Mid Channel' or  &quot;Structure Type&quot; = 'ALS - Rhino' or  &quot;Structure Type&quot; = 'ALS - Channel Spanning' or  &quot;Structure Type&quot; = 'Wood Jam' or  &quot;Structure Type&quot; = 'Full Tree' or  &quot;Structure Type&quot; = 'Strategic Felling' or  &quot;Structure Type&quot; = 'Grip Hoist Tree' or  &quot;Structure Type&quot; = 'Fell Tree' or  &quot;Structure Type&quot; = 'Tree Dam' or  &quot;Structure Type&quot; = 'Tree Plug'" label="ALS" key="{993ba800-3983-4ef9-9bbf-f9f8ac3a5392}" symbol="2"/>
-      <rule filter="&quot;Structure Type&quot; = 'One Rock Dam' or &quot;Structure Type&quot; = 'Zuni Bowl' or &quot;Structure Type&quot; = 'Spreaders' or &quot;Structure Type&quot; = 'Floodplain BDA' or &quot;Structure Type&quot; = 'Sedge Plugs' or &quot;Structure Type&quot; = 'Headcut Treatment' or  &quot;Structure Type&quot; = 'Bag Plugs' or  &quot;Structure Type&quot; = 'Floodplain LWD' or  &quot;Structure Type&quot; = 'Vanes'" label="Other" key="{3ab4d842-fcd6-466c-a7c5-8b1ed99497f9}" symbol="3"/>
-      <rule filter="ELSE" key="{19a20747-8666-41df-af78-01add866d22e}" symbol="4"/>
+      <rule symbol="0" filter="&quot;Structure Type&quot; = 'BDA' or &quot;Structure Type&quot; = 'Primary BDA' or &quot;Structure Type&quot; = 'Secondary BDA' or  &quot;Structure Type&quot; = 'BDA Postless' or &quot;Structure Type&quot; = 'Tight PALS (BDA without sod)'  or &quot;Structure Type&quot; = 'Postline Wicker Weave'" label="BDA" key="{cca9b65a-15a2-42ac-8b4b-abc780450914}"/>
+      <rule symbol="1" filter="&quot;Structure Type&quot; = 'PALS' or &quot;Structure Type&quot; = 'PALS - Bank Attached' or &quot;Structure Type&quot; = 'PALS - Right Bank Attached' or &quot;Structure Type&quot; = 'PALS - Left Bank Attached' or &quot;Structure Type&quot; = 'PALS - Bank Blaster' or &quot;Structure Type&quot; = 'PALS - Constriction Jet' or &quot;Structure Type&quot; = 'PALS - Mid Channel' or &quot;Structure Type&quot; = 'PALS - Rhino' or &quot;Structure Type&quot; = 'PALS - Channel Spanning' or &quot;Structure Type&quot; = 'Rhino'  or &quot;Structure Type&quot; = 'Leaky Dam' or &quot;Structure Type&quot; = 'Post and Brush Plug'  or &quot;Structure Type&quot; = 'Wicker Weirs' " label="PALS" key="{12d2e893-432f-4022-8e6c-e2bf38820cda}"/>
+      <rule symbol="2" filter="&quot;Structure Type&quot; = 'ALS' or  &quot;Structure Type&quot; = 'ALS - Bank Attached' or  &quot;Structure Type&quot; = 'ALS - Bank Blaster' or  &quot;Structure Type&quot; = 'ALS - Mid Channel' or  &quot;Structure Type&quot; = 'ALS - Rhino' or  &quot;Structure Type&quot; = 'ALS - Channel Spanning' or  &quot;Structure Type&quot; = 'Wood Jam' or  &quot;Structure Type&quot; = 'Full Tree' or  &quot;Structure Type&quot; = 'Strategic Felling' or  &quot;Structure Type&quot; = 'Grip Hoist Tree' or  &quot;Structure Type&quot; = 'Fell Tree' or  &quot;Structure Type&quot; = 'Tree Dam' or  &quot;Structure Type&quot; = 'Tree Plug'" label="ALS" key="{993ba800-3983-4ef9-9bbf-f9f8ac3a5392}"/>
+      <rule symbol="3" filter="&quot;Structure Type&quot; = 'One Rock Dam' or &quot;Structure Type&quot; = 'Zuni Bowl' or &quot;Structure Type&quot; = 'Spreaders' or &quot;Structure Type&quot; = 'Floodplain BDA' or &quot;Structure Type&quot; = 'Sedge Plugs' or &quot;Structure Type&quot; = 'Headcut Treatment' or  &quot;Structure Type&quot; = 'Bag Plugs' or  &quot;Structure Type&quot; = 'Floodplain LWD' or  &quot;Structure Type&quot; = 'Vanes'" label="Other" key="{3ab4d842-fcd6-466c-a7c5-8b1ed99497f9}"/>
+      <rule symbol="4" filter="ELSE" key="{19a20747-8666-41df-af78-01add866d22e}"/>
     </rules>
     <symbols>
       <symbol type="marker" clip_to_extent="1" name="0" is_animated="0" alpha="1" force_rhr="0" frame_rate="10">
         <data_defined_properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data_defined_properties>
-        <layer pass="0" locked="0" class="SimpleMarker" id="{425d6e35-1f57-4c71-ad99-eb34bfa68483}" enabled="1">
+        <layer class="SimpleMarker" locked="0" enabled="1" id="{425d6e35-1f57-4c71-ad99-eb34bfa68483}" pass="0">
           <Option type="Map">
-            <Option type="QString" value="0" name="angle"/>
-            <Option type="QString" value="square" name="cap_style"/>
-            <Option type="QString" value="255,0,0,0" name="color"/>
-            <Option type="QString" value="1" name="horizontal_anchor_point"/>
-            <Option type="QString" value="bevel" name="joinstyle"/>
-            <Option type="QString" value="circle" name="name"/>
-            <Option type="QString" value="0,0" name="offset"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-            <Option type="QString" value="MM" name="offset_unit"/>
-            <Option type="QString" value="255,255,255,255" name="outline_color"/>
-            <Option type="QString" value="solid" name="outline_style"/>
-            <Option type="QString" value="0.6" name="outline_width"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-            <Option type="QString" value="MM" name="outline_width_unit"/>
-            <Option type="QString" value="diameter" name="scale_method"/>
-            <Option type="QString" value="2.2" name="size"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-            <Option type="QString" value="MM" name="size_unit"/>
-            <Option type="QString" value="1" name="vertical_anchor_point"/>
+            <Option type="QString" name="angle" value="0"/>
+            <Option type="QString" name="cap_style" value="square"/>
+            <Option type="QString" name="color" value="255,0,0,0"/>
+            <Option type="QString" name="horizontal_anchor_point" value="1"/>
+            <Option type="QString" name="joinstyle" value="bevel"/>
+            <Option type="QString" name="name" value="circle"/>
+            <Option type="QString" name="offset" value="0,0"/>
+            <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="offset_unit" value="MM"/>
+            <Option type="QString" name="outline_color" value="255,255,255,255"/>
+            <Option type="QString" name="outline_style" value="solid"/>
+            <Option type="QString" name="outline_width" value="0.6"/>
+            <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="outline_width_unit" value="MM"/>
+            <Option type="QString" name="scale_method" value="diameter"/>
+            <Option type="QString" name="size" value="2.2"/>
+            <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="size_unit" value="MM"/>
+            <Option type="QString" name="vertical_anchor_point" value="1"/>
           </Option>
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
         </layer>
-        <layer pass="0" locked="0" class="SimpleMarker" id="{0eeffe98-6d88-4530-8d36-86fe1bff0bdb}" enabled="1">
+        <layer class="SimpleMarker" locked="0" enabled="1" id="{0eeffe98-6d88-4530-8d36-86fe1bff0bdb}" pass="0">
           <Option type="Map">
-            <Option type="QString" value="0" name="angle"/>
-            <Option type="QString" value="square" name="cap_style"/>
-            <Option type="QString" value="43,131,186,255" name="color"/>
-            <Option type="QString" value="1" name="horizontal_anchor_point"/>
-            <Option type="QString" value="bevel" name="joinstyle"/>
-            <Option type="QString" value="circle" name="name"/>
-            <Option type="QString" value="0,0" name="offset"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-            <Option type="QString" value="MM" name="offset_unit"/>
-            <Option type="QString" value="43,131,186,255" name="outline_color"/>
-            <Option type="QString" value="solid" name="outline_style"/>
-            <Option type="QString" value="0.8" name="outline_width"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-            <Option type="QString" value="MM" name="outline_width_unit"/>
-            <Option type="QString" value="diameter" name="scale_method"/>
-            <Option type="QString" value="1.6" name="size"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-            <Option type="QString" value="MM" name="size_unit"/>
-            <Option type="QString" value="1" name="vertical_anchor_point"/>
+            <Option type="QString" name="angle" value="0"/>
+            <Option type="QString" name="cap_style" value="square"/>
+            <Option type="QString" name="color" value="43,131,186,255"/>
+            <Option type="QString" name="horizontal_anchor_point" value="1"/>
+            <Option type="QString" name="joinstyle" value="bevel"/>
+            <Option type="QString" name="name" value="circle"/>
+            <Option type="QString" name="offset" value="0,0"/>
+            <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="offset_unit" value="MM"/>
+            <Option type="QString" name="outline_color" value="43,131,186,255"/>
+            <Option type="QString" name="outline_style" value="solid"/>
+            <Option type="QString" name="outline_width" value="0.8"/>
+            <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="outline_width_unit" value="MM"/>
+            <Option type="QString" name="scale_method" value="diameter"/>
+            <Option type="QString" name="size" value="1.6"/>
+            <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="size_unit" value="MM"/>
+            <Option type="QString" name="vertical_anchor_point" value="1"/>
           </Option>
           <effect type="effectStack" enabled="0">
             <effect type="dropShadow">
               <Option type="Map">
-                <Option type="QString" value="13" name="blend_mode"/>
-                <Option type="QString" value="2.645" name="blur_level"/>
-                <Option type="QString" value="MM" name="blur_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="blur_unit_scale"/>
-                <Option type="QString" value="0,0,0,255" name="color"/>
-                <Option type="QString" value="2" name="draw_mode"/>
-                <Option type="QString" value="0" name="enabled"/>
-                <Option type="QString" value="135" name="offset_angle"/>
-                <Option type="QString" value="2" name="offset_distance"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_unit_scale"/>
-                <Option type="QString" value="1" name="opacity"/>
+                <Option type="QString" name="blend_mode" value="13"/>
+                <Option type="QString" name="blur_level" value="2.645"/>
+                <Option type="QString" name="blur_unit" value="MM"/>
+                <Option type="QString" name="blur_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color" value="0,0,0,255"/>
+                <Option type="QString" name="draw_mode" value="2"/>
+                <Option type="QString" name="enabled" value="0"/>
+                <Option type="QString" name="offset_angle" value="135"/>
+                <Option type="QString" name="offset_distance" value="2"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="offset_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="opacity" value="1"/>
               </Option>
             </effect>
             <effect type="outerGlow">
               <Option type="Map">
-                <Option type="QString" value="0" name="blend_mode"/>
-                <Option type="QString" value="2.645" name="blur_level"/>
-                <Option type="QString" value="MM" name="blur_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="blur_unit_scale"/>
-                <Option type="QString" value="69,116,40,255" name="color1"/>
-                <Option type="QString" value="188,220,60,255" name="color2"/>
-                <Option type="QString" value="0" name="color_type"/>
-                <Option type="QString" value="ccw" name="direction"/>
-                <Option type="QString" value="0" name="discrete"/>
-                <Option type="QString" value="2" name="draw_mode"/>
-                <Option type="QString" value="1" name="enabled"/>
-                <Option type="QString" value="0.5" name="opacity"/>
-                <Option type="QString" value="gradient" name="rampType"/>
-                <Option type="QString" value="255,255,255,255" name="single_color"/>
-                <Option type="QString" value="rgb" name="spec"/>
-                <Option type="QString" value="2" name="spread"/>
-                <Option type="QString" value="MM" name="spread_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="spread_unit_scale"/>
+                <Option type="QString" name="blend_mode" value="0"/>
+                <Option type="QString" name="blur_level" value="2.645"/>
+                <Option type="QString" name="blur_unit" value="MM"/>
+                <Option type="QString" name="blur_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color1" value="69,116,40,255"/>
+                <Option type="QString" name="color2" value="188,220,60,255"/>
+                <Option type="QString" name="color_type" value="0"/>
+                <Option type="QString" name="direction" value="ccw"/>
+                <Option type="QString" name="discrete" value="0"/>
+                <Option type="QString" name="draw_mode" value="2"/>
+                <Option type="QString" name="enabled" value="1"/>
+                <Option type="QString" name="opacity" value="0.5"/>
+                <Option type="QString" name="rampType" value="gradient"/>
+                <Option type="QString" name="single_color" value="255,255,255,255"/>
+                <Option type="QString" name="spec" value="rgb"/>
+                <Option type="QString" name="spread" value="2"/>
+                <Option type="QString" name="spread_unit" value="MM"/>
+                <Option type="QString" name="spread_unit_scale" value="3x:0,0,0,0,0,0"/>
               </Option>
             </effect>
             <effect type="drawSource">
               <Option type="Map">
-                <Option type="QString" value="0" name="blend_mode"/>
-                <Option type="QString" value="2" name="draw_mode"/>
-                <Option type="QString" value="1" name="enabled"/>
-                <Option type="QString" value="1" name="opacity"/>
+                <Option type="QString" name="blend_mode" value="0"/>
+                <Option type="QString" name="draw_mode" value="2"/>
+                <Option type="QString" name="enabled" value="1"/>
+                <Option type="QString" name="opacity" value="1"/>
               </Option>
             </effect>
             <effect type="innerShadow">
               <Option type="Map">
-                <Option type="QString" value="13" name="blend_mode"/>
-                <Option type="QString" value="2.645" name="blur_level"/>
-                <Option type="QString" value="MM" name="blur_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="blur_unit_scale"/>
-                <Option type="QString" value="0,0,0,255" name="color"/>
-                <Option type="QString" value="2" name="draw_mode"/>
-                <Option type="QString" value="0" name="enabled"/>
-                <Option type="QString" value="135" name="offset_angle"/>
-                <Option type="QString" value="2" name="offset_distance"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_unit_scale"/>
-                <Option type="QString" value="1" name="opacity"/>
+                <Option type="QString" name="blend_mode" value="13"/>
+                <Option type="QString" name="blur_level" value="2.645"/>
+                <Option type="QString" name="blur_unit" value="MM"/>
+                <Option type="QString" name="blur_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color" value="0,0,0,255"/>
+                <Option type="QString" name="draw_mode" value="2"/>
+                <Option type="QString" name="enabled" value="0"/>
+                <Option type="QString" name="offset_angle" value="135"/>
+                <Option type="QString" name="offset_distance" value="2"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="offset_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="opacity" value="1"/>
               </Option>
             </effect>
             <effect type="innerGlow">
               <Option type="Map">
-                <Option type="QString" value="0" name="blend_mode"/>
-                <Option type="QString" value="2.645" name="blur_level"/>
-                <Option type="QString" value="MM" name="blur_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="blur_unit_scale"/>
-                <Option type="QString" value="69,116,40,255" name="color1"/>
-                <Option type="QString" value="188,220,60,255" name="color2"/>
-                <Option type="QString" value="0" name="color_type"/>
-                <Option type="QString" value="ccw" name="direction"/>
-                <Option type="QString" value="0" name="discrete"/>
-                <Option type="QString" value="2" name="draw_mode"/>
-                <Option type="QString" value="0" name="enabled"/>
-                <Option type="QString" value="0.5" name="opacity"/>
-                <Option type="QString" value="gradient" name="rampType"/>
-                <Option type="QString" value="255,255,255,255" name="single_color"/>
-                <Option type="QString" value="rgb" name="spec"/>
-                <Option type="QString" value="2" name="spread"/>
-                <Option type="QString" value="MM" name="spread_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="spread_unit_scale"/>
+                <Option type="QString" name="blend_mode" value="0"/>
+                <Option type="QString" name="blur_level" value="2.645"/>
+                <Option type="QString" name="blur_unit" value="MM"/>
+                <Option type="QString" name="blur_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color1" value="69,116,40,255"/>
+                <Option type="QString" name="color2" value="188,220,60,255"/>
+                <Option type="QString" name="color_type" value="0"/>
+                <Option type="QString" name="direction" value="ccw"/>
+                <Option type="QString" name="discrete" value="0"/>
+                <Option type="QString" name="draw_mode" value="2"/>
+                <Option type="QString" name="enabled" value="0"/>
+                <Option type="QString" name="opacity" value="0.5"/>
+                <Option type="QString" name="rampType" value="gradient"/>
+                <Option type="QString" name="single_color" value="255,255,255,255"/>
+                <Option type="QString" name="spec" value="rgb"/>
+                <Option type="QString" name="spread" value="2"/>
+                <Option type="QString" name="spread_unit" value="MM"/>
+                <Option type="QString" name="spread_unit_scale" value="3x:0,0,0,0,0,0"/>
               </Option>
             </effect>
           </effect>
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
         </layer>
@@ -167,154 +167,154 @@
       <symbol type="marker" clip_to_extent="1" name="1" is_animated="0" alpha="1" force_rhr="0" frame_rate="10">
         <data_defined_properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data_defined_properties>
-        <layer pass="0" locked="0" class="SimpleMarker" id="{56845f12-6d05-4f49-8308-ca43ff6325af}" enabled="1">
+        <layer class="SimpleMarker" locked="0" enabled="1" id="{56845f12-6d05-4f49-8308-ca43ff6325af}" pass="0">
           <Option type="Map">
-            <Option type="QString" value="0" name="angle"/>
-            <Option type="QString" value="square" name="cap_style"/>
-            <Option type="QString" value="255,0,0,0" name="color"/>
-            <Option type="QString" value="1" name="horizontal_anchor_point"/>
-            <Option type="QString" value="bevel" name="joinstyle"/>
-            <Option type="QString" value="circle" name="name"/>
-            <Option type="QString" value="0,0" name="offset"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-            <Option type="QString" value="MM" name="offset_unit"/>
-            <Option type="QString" value="255,255,255,255" name="outline_color"/>
-            <Option type="QString" value="solid" name="outline_style"/>
-            <Option type="QString" value="0.6" name="outline_width"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-            <Option type="QString" value="MM" name="outline_width_unit"/>
-            <Option type="QString" value="diameter" name="scale_method"/>
-            <Option type="QString" value="2.2" name="size"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-            <Option type="QString" value="MM" name="size_unit"/>
-            <Option type="QString" value="1" name="vertical_anchor_point"/>
+            <Option type="QString" name="angle" value="0"/>
+            <Option type="QString" name="cap_style" value="square"/>
+            <Option type="QString" name="color" value="255,0,0,0"/>
+            <Option type="QString" name="horizontal_anchor_point" value="1"/>
+            <Option type="QString" name="joinstyle" value="bevel"/>
+            <Option type="QString" name="name" value="circle"/>
+            <Option type="QString" name="offset" value="0,0"/>
+            <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="offset_unit" value="MM"/>
+            <Option type="QString" name="outline_color" value="255,255,255,255"/>
+            <Option type="QString" name="outline_style" value="solid"/>
+            <Option type="QString" name="outline_width" value="0.6"/>
+            <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="outline_width_unit" value="MM"/>
+            <Option type="QString" name="scale_method" value="diameter"/>
+            <Option type="QString" name="size" value="2.2"/>
+            <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="size_unit" value="MM"/>
+            <Option type="QString" name="vertical_anchor_point" value="1"/>
           </Option>
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
         </layer>
-        <layer pass="0" locked="0" class="SimpleMarker" id="{188f537f-f2b2-4916-98b7-1a427820274a}" enabled="1">
+        <layer class="SimpleMarker" locked="0" enabled="1" id="{188f537f-f2b2-4916-98b7-1a427820274a}" pass="0">
           <Option type="Map">
-            <Option type="QString" value="0" name="angle"/>
-            <Option type="QString" value="square" name="cap_style"/>
-            <Option type="QString" value="179,88,6,255" name="color"/>
-            <Option type="QString" value="1" name="horizontal_anchor_point"/>
-            <Option type="QString" value="bevel" name="joinstyle"/>
-            <Option type="QString" value="circle" name="name"/>
-            <Option type="QString" value="0,0" name="offset"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-            <Option type="QString" value="MM" name="offset_unit"/>
-            <Option type="QString" value="179,88,6,255" name="outline_color"/>
-            <Option type="QString" value="solid" name="outline_style"/>
-            <Option type="QString" value="0.8" name="outline_width"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-            <Option type="QString" value="MM" name="outline_width_unit"/>
-            <Option type="QString" value="diameter" name="scale_method"/>
-            <Option type="QString" value="1.6" name="size"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-            <Option type="QString" value="MM" name="size_unit"/>
-            <Option type="QString" value="1" name="vertical_anchor_point"/>
+            <Option type="QString" name="angle" value="0"/>
+            <Option type="QString" name="cap_style" value="square"/>
+            <Option type="QString" name="color" value="179,88,6,255"/>
+            <Option type="QString" name="horizontal_anchor_point" value="1"/>
+            <Option type="QString" name="joinstyle" value="bevel"/>
+            <Option type="QString" name="name" value="circle"/>
+            <Option type="QString" name="offset" value="0,0"/>
+            <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="offset_unit" value="MM"/>
+            <Option type="QString" name="outline_color" value="179,88,6,255"/>
+            <Option type="QString" name="outline_style" value="solid"/>
+            <Option type="QString" name="outline_width" value="0.8"/>
+            <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="outline_width_unit" value="MM"/>
+            <Option type="QString" name="scale_method" value="diameter"/>
+            <Option type="QString" name="size" value="1.6"/>
+            <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="size_unit" value="MM"/>
+            <Option type="QString" name="vertical_anchor_point" value="1"/>
           </Option>
           <effect type="effectStack" enabled="0">
             <effect type="dropShadow">
               <Option type="Map">
-                <Option type="QString" value="13" name="blend_mode"/>
-                <Option type="QString" value="2.645" name="blur_level"/>
-                <Option type="QString" value="MM" name="blur_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="blur_unit_scale"/>
-                <Option type="QString" value="0,0,0,255" name="color"/>
-                <Option type="QString" value="2" name="draw_mode"/>
-                <Option type="QString" value="0" name="enabled"/>
-                <Option type="QString" value="135" name="offset_angle"/>
-                <Option type="QString" value="2" name="offset_distance"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_unit_scale"/>
-                <Option type="QString" value="1" name="opacity"/>
+                <Option type="QString" name="blend_mode" value="13"/>
+                <Option type="QString" name="blur_level" value="2.645"/>
+                <Option type="QString" name="blur_unit" value="MM"/>
+                <Option type="QString" name="blur_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color" value="0,0,0,255"/>
+                <Option type="QString" name="draw_mode" value="2"/>
+                <Option type="QString" name="enabled" value="0"/>
+                <Option type="QString" name="offset_angle" value="135"/>
+                <Option type="QString" name="offset_distance" value="2"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="offset_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="opacity" value="1"/>
               </Option>
             </effect>
             <effect type="outerGlow">
               <Option type="Map">
-                <Option type="QString" value="0" name="blend_mode"/>
-                <Option type="QString" value="2.645" name="blur_level"/>
-                <Option type="QString" value="MM" name="blur_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="blur_unit_scale"/>
-                <Option type="QString" value="69,116,40,255" name="color1"/>
-                <Option type="QString" value="188,220,60,255" name="color2"/>
-                <Option type="QString" value="0" name="color_type"/>
-                <Option type="QString" value="ccw" name="direction"/>
-                <Option type="QString" value="0" name="discrete"/>
-                <Option type="QString" value="2" name="draw_mode"/>
-                <Option type="QString" value="1" name="enabled"/>
-                <Option type="QString" value="0.5" name="opacity"/>
-                <Option type="QString" value="gradient" name="rampType"/>
-                <Option type="QString" value="255,255,255,255" name="single_color"/>
-                <Option type="QString" value="rgb" name="spec"/>
-                <Option type="QString" value="2" name="spread"/>
-                <Option type="QString" value="MM" name="spread_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="spread_unit_scale"/>
+                <Option type="QString" name="blend_mode" value="0"/>
+                <Option type="QString" name="blur_level" value="2.645"/>
+                <Option type="QString" name="blur_unit" value="MM"/>
+                <Option type="QString" name="blur_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color1" value="69,116,40,255"/>
+                <Option type="QString" name="color2" value="188,220,60,255"/>
+                <Option type="QString" name="color_type" value="0"/>
+                <Option type="QString" name="direction" value="ccw"/>
+                <Option type="QString" name="discrete" value="0"/>
+                <Option type="QString" name="draw_mode" value="2"/>
+                <Option type="QString" name="enabled" value="1"/>
+                <Option type="QString" name="opacity" value="0.5"/>
+                <Option type="QString" name="rampType" value="gradient"/>
+                <Option type="QString" name="single_color" value="255,255,255,255"/>
+                <Option type="QString" name="spec" value="rgb"/>
+                <Option type="QString" name="spread" value="2"/>
+                <Option type="QString" name="spread_unit" value="MM"/>
+                <Option type="QString" name="spread_unit_scale" value="3x:0,0,0,0,0,0"/>
               </Option>
             </effect>
             <effect type="drawSource">
               <Option type="Map">
-                <Option type="QString" value="0" name="blend_mode"/>
-                <Option type="QString" value="2" name="draw_mode"/>
-                <Option type="QString" value="1" name="enabled"/>
-                <Option type="QString" value="1" name="opacity"/>
+                <Option type="QString" name="blend_mode" value="0"/>
+                <Option type="QString" name="draw_mode" value="2"/>
+                <Option type="QString" name="enabled" value="1"/>
+                <Option type="QString" name="opacity" value="1"/>
               </Option>
             </effect>
             <effect type="innerShadow">
               <Option type="Map">
-                <Option type="QString" value="13" name="blend_mode"/>
-                <Option type="QString" value="2.645" name="blur_level"/>
-                <Option type="QString" value="MM" name="blur_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="blur_unit_scale"/>
-                <Option type="QString" value="0,0,0,255" name="color"/>
-                <Option type="QString" value="2" name="draw_mode"/>
-                <Option type="QString" value="0" name="enabled"/>
-                <Option type="QString" value="135" name="offset_angle"/>
-                <Option type="QString" value="2" name="offset_distance"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_unit_scale"/>
-                <Option type="QString" value="1" name="opacity"/>
+                <Option type="QString" name="blend_mode" value="13"/>
+                <Option type="QString" name="blur_level" value="2.645"/>
+                <Option type="QString" name="blur_unit" value="MM"/>
+                <Option type="QString" name="blur_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color" value="0,0,0,255"/>
+                <Option type="QString" name="draw_mode" value="2"/>
+                <Option type="QString" name="enabled" value="0"/>
+                <Option type="QString" name="offset_angle" value="135"/>
+                <Option type="QString" name="offset_distance" value="2"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="offset_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="opacity" value="1"/>
               </Option>
             </effect>
             <effect type="innerGlow">
               <Option type="Map">
-                <Option type="QString" value="0" name="blend_mode"/>
-                <Option type="QString" value="2.645" name="blur_level"/>
-                <Option type="QString" value="MM" name="blur_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="blur_unit_scale"/>
-                <Option type="QString" value="69,116,40,255" name="color1"/>
-                <Option type="QString" value="188,220,60,255" name="color2"/>
-                <Option type="QString" value="0" name="color_type"/>
-                <Option type="QString" value="ccw" name="direction"/>
-                <Option type="QString" value="0" name="discrete"/>
-                <Option type="QString" value="2" name="draw_mode"/>
-                <Option type="QString" value="0" name="enabled"/>
-                <Option type="QString" value="0.5" name="opacity"/>
-                <Option type="QString" value="gradient" name="rampType"/>
-                <Option type="QString" value="255,255,255,255" name="single_color"/>
-                <Option type="QString" value="rgb" name="spec"/>
-                <Option type="QString" value="2" name="spread"/>
-                <Option type="QString" value="MM" name="spread_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="spread_unit_scale"/>
+                <Option type="QString" name="blend_mode" value="0"/>
+                <Option type="QString" name="blur_level" value="2.645"/>
+                <Option type="QString" name="blur_unit" value="MM"/>
+                <Option type="QString" name="blur_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color1" value="69,116,40,255"/>
+                <Option type="QString" name="color2" value="188,220,60,255"/>
+                <Option type="QString" name="color_type" value="0"/>
+                <Option type="QString" name="direction" value="ccw"/>
+                <Option type="QString" name="discrete" value="0"/>
+                <Option type="QString" name="draw_mode" value="2"/>
+                <Option type="QString" name="enabled" value="0"/>
+                <Option type="QString" name="opacity" value="0.5"/>
+                <Option type="QString" name="rampType" value="gradient"/>
+                <Option type="QString" name="single_color" value="255,255,255,255"/>
+                <Option type="QString" name="spec" value="rgb"/>
+                <Option type="QString" name="spread" value="2"/>
+                <Option type="QString" name="spread_unit" value="MM"/>
+                <Option type="QString" name="spread_unit_scale" value="3x:0,0,0,0,0,0"/>
               </Option>
             </effect>
           </effect>
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
         </layer>
@@ -322,154 +322,154 @@
       <symbol type="marker" clip_to_extent="1" name="2" is_animated="0" alpha="1" force_rhr="0" frame_rate="10">
         <data_defined_properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data_defined_properties>
-        <layer pass="0" locked="0" class="SimpleMarker" id="{301cc9cb-53b6-4e57-b580-fa579a22f0f5}" enabled="1">
+        <layer class="SimpleMarker" locked="0" enabled="1" id="{301cc9cb-53b6-4e57-b580-fa579a22f0f5}" pass="0">
           <Option type="Map">
-            <Option type="QString" value="0" name="angle"/>
-            <Option type="QString" value="square" name="cap_style"/>
-            <Option type="QString" value="255,0,0,0" name="color"/>
-            <Option type="QString" value="1" name="horizontal_anchor_point"/>
-            <Option type="QString" value="bevel" name="joinstyle"/>
-            <Option type="QString" value="circle" name="name"/>
-            <Option type="QString" value="0,0" name="offset"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-            <Option type="QString" value="MM" name="offset_unit"/>
-            <Option type="QString" value="255,255,255,255" name="outline_color"/>
-            <Option type="QString" value="solid" name="outline_style"/>
-            <Option type="QString" value="0.6" name="outline_width"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-            <Option type="QString" value="MM" name="outline_width_unit"/>
-            <Option type="QString" value="diameter" name="scale_method"/>
-            <Option type="QString" value="2.2" name="size"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-            <Option type="QString" value="MM" name="size_unit"/>
-            <Option type="QString" value="1" name="vertical_anchor_point"/>
+            <Option type="QString" name="angle" value="0"/>
+            <Option type="QString" name="cap_style" value="square"/>
+            <Option type="QString" name="color" value="255,0,0,0"/>
+            <Option type="QString" name="horizontal_anchor_point" value="1"/>
+            <Option type="QString" name="joinstyle" value="bevel"/>
+            <Option type="QString" name="name" value="circle"/>
+            <Option type="QString" name="offset" value="0,0"/>
+            <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="offset_unit" value="MM"/>
+            <Option type="QString" name="outline_color" value="255,255,255,255"/>
+            <Option type="QString" name="outline_style" value="solid"/>
+            <Option type="QString" name="outline_width" value="0.6"/>
+            <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="outline_width_unit" value="MM"/>
+            <Option type="QString" name="scale_method" value="diameter"/>
+            <Option type="QString" name="size" value="2.2"/>
+            <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="size_unit" value="MM"/>
+            <Option type="QString" name="vertical_anchor_point" value="1"/>
           </Option>
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
         </layer>
-        <layer pass="0" locked="0" class="SimpleMarker" id="{0436de3d-2b6a-4139-9981-e2642e1e88d8}" enabled="1">
+        <layer class="SimpleMarker" locked="0" enabled="1" id="{0436de3d-2b6a-4139-9981-e2642e1e88d8}" pass="0">
           <Option type="Map">
-            <Option type="QString" value="0" name="angle"/>
-            <Option type="QString" value="square" name="cap_style"/>
-            <Option type="QString" value="106,106,106,255" name="color"/>
-            <Option type="QString" value="1" name="horizontal_anchor_point"/>
-            <Option type="QString" value="bevel" name="joinstyle"/>
-            <Option type="QString" value="circle" name="name"/>
-            <Option type="QString" value="0,0" name="offset"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-            <Option type="QString" value="MM" name="offset_unit"/>
-            <Option type="QString" value="106,106,106,255" name="outline_color"/>
-            <Option type="QString" value="solid" name="outline_style"/>
-            <Option type="QString" value="0.8" name="outline_width"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-            <Option type="QString" value="MM" name="outline_width_unit"/>
-            <Option type="QString" value="diameter" name="scale_method"/>
-            <Option type="QString" value="1.6" name="size"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-            <Option type="QString" value="MM" name="size_unit"/>
-            <Option type="QString" value="1" name="vertical_anchor_point"/>
+            <Option type="QString" name="angle" value="0"/>
+            <Option type="QString" name="cap_style" value="square"/>
+            <Option type="QString" name="color" value="106,106,106,255"/>
+            <Option type="QString" name="horizontal_anchor_point" value="1"/>
+            <Option type="QString" name="joinstyle" value="bevel"/>
+            <Option type="QString" name="name" value="circle"/>
+            <Option type="QString" name="offset" value="0,0"/>
+            <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="offset_unit" value="MM"/>
+            <Option type="QString" name="outline_color" value="106,106,106,255"/>
+            <Option type="QString" name="outline_style" value="solid"/>
+            <Option type="QString" name="outline_width" value="0.8"/>
+            <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="outline_width_unit" value="MM"/>
+            <Option type="QString" name="scale_method" value="diameter"/>
+            <Option type="QString" name="size" value="1.6"/>
+            <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="size_unit" value="MM"/>
+            <Option type="QString" name="vertical_anchor_point" value="1"/>
           </Option>
           <effect type="effectStack" enabled="0">
             <effect type="dropShadow">
               <Option type="Map">
-                <Option type="QString" value="13" name="blend_mode"/>
-                <Option type="QString" value="2.645" name="blur_level"/>
-                <Option type="QString" value="MM" name="blur_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="blur_unit_scale"/>
-                <Option type="QString" value="0,0,0,255" name="color"/>
-                <Option type="QString" value="2" name="draw_mode"/>
-                <Option type="QString" value="0" name="enabled"/>
-                <Option type="QString" value="135" name="offset_angle"/>
-                <Option type="QString" value="2" name="offset_distance"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_unit_scale"/>
-                <Option type="QString" value="1" name="opacity"/>
+                <Option type="QString" name="blend_mode" value="13"/>
+                <Option type="QString" name="blur_level" value="2.645"/>
+                <Option type="QString" name="blur_unit" value="MM"/>
+                <Option type="QString" name="blur_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color" value="0,0,0,255"/>
+                <Option type="QString" name="draw_mode" value="2"/>
+                <Option type="QString" name="enabled" value="0"/>
+                <Option type="QString" name="offset_angle" value="135"/>
+                <Option type="QString" name="offset_distance" value="2"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="offset_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="opacity" value="1"/>
               </Option>
             </effect>
             <effect type="outerGlow">
               <Option type="Map">
-                <Option type="QString" value="0" name="blend_mode"/>
-                <Option type="QString" value="2.645" name="blur_level"/>
-                <Option type="QString" value="MM" name="blur_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="blur_unit_scale"/>
-                <Option type="QString" value="69,116,40,255" name="color1"/>
-                <Option type="QString" value="188,220,60,255" name="color2"/>
-                <Option type="QString" value="0" name="color_type"/>
-                <Option type="QString" value="ccw" name="direction"/>
-                <Option type="QString" value="0" name="discrete"/>
-                <Option type="QString" value="2" name="draw_mode"/>
-                <Option type="QString" value="1" name="enabled"/>
-                <Option type="QString" value="0.5" name="opacity"/>
-                <Option type="QString" value="gradient" name="rampType"/>
-                <Option type="QString" value="255,255,255,255" name="single_color"/>
-                <Option type="QString" value="rgb" name="spec"/>
-                <Option type="QString" value="2" name="spread"/>
-                <Option type="QString" value="MM" name="spread_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="spread_unit_scale"/>
+                <Option type="QString" name="blend_mode" value="0"/>
+                <Option type="QString" name="blur_level" value="2.645"/>
+                <Option type="QString" name="blur_unit" value="MM"/>
+                <Option type="QString" name="blur_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color1" value="69,116,40,255"/>
+                <Option type="QString" name="color2" value="188,220,60,255"/>
+                <Option type="QString" name="color_type" value="0"/>
+                <Option type="QString" name="direction" value="ccw"/>
+                <Option type="QString" name="discrete" value="0"/>
+                <Option type="QString" name="draw_mode" value="2"/>
+                <Option type="QString" name="enabled" value="1"/>
+                <Option type="QString" name="opacity" value="0.5"/>
+                <Option type="QString" name="rampType" value="gradient"/>
+                <Option type="QString" name="single_color" value="255,255,255,255"/>
+                <Option type="QString" name="spec" value="rgb"/>
+                <Option type="QString" name="spread" value="2"/>
+                <Option type="QString" name="spread_unit" value="MM"/>
+                <Option type="QString" name="spread_unit_scale" value="3x:0,0,0,0,0,0"/>
               </Option>
             </effect>
             <effect type="drawSource">
               <Option type="Map">
-                <Option type="QString" value="0" name="blend_mode"/>
-                <Option type="QString" value="2" name="draw_mode"/>
-                <Option type="QString" value="1" name="enabled"/>
-                <Option type="QString" value="1" name="opacity"/>
+                <Option type="QString" name="blend_mode" value="0"/>
+                <Option type="QString" name="draw_mode" value="2"/>
+                <Option type="QString" name="enabled" value="1"/>
+                <Option type="QString" name="opacity" value="1"/>
               </Option>
             </effect>
             <effect type="innerShadow">
               <Option type="Map">
-                <Option type="QString" value="13" name="blend_mode"/>
-                <Option type="QString" value="2.645" name="blur_level"/>
-                <Option type="QString" value="MM" name="blur_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="blur_unit_scale"/>
-                <Option type="QString" value="0,0,0,255" name="color"/>
-                <Option type="QString" value="2" name="draw_mode"/>
-                <Option type="QString" value="0" name="enabled"/>
-                <Option type="QString" value="135" name="offset_angle"/>
-                <Option type="QString" value="2" name="offset_distance"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_unit_scale"/>
-                <Option type="QString" value="1" name="opacity"/>
+                <Option type="QString" name="blend_mode" value="13"/>
+                <Option type="QString" name="blur_level" value="2.645"/>
+                <Option type="QString" name="blur_unit" value="MM"/>
+                <Option type="QString" name="blur_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color" value="0,0,0,255"/>
+                <Option type="QString" name="draw_mode" value="2"/>
+                <Option type="QString" name="enabled" value="0"/>
+                <Option type="QString" name="offset_angle" value="135"/>
+                <Option type="QString" name="offset_distance" value="2"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="offset_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="opacity" value="1"/>
               </Option>
             </effect>
             <effect type="innerGlow">
               <Option type="Map">
-                <Option type="QString" value="0" name="blend_mode"/>
-                <Option type="QString" value="2.645" name="blur_level"/>
-                <Option type="QString" value="MM" name="blur_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="blur_unit_scale"/>
-                <Option type="QString" value="69,116,40,255" name="color1"/>
-                <Option type="QString" value="188,220,60,255" name="color2"/>
-                <Option type="QString" value="0" name="color_type"/>
-                <Option type="QString" value="ccw" name="direction"/>
-                <Option type="QString" value="0" name="discrete"/>
-                <Option type="QString" value="2" name="draw_mode"/>
-                <Option type="QString" value="0" name="enabled"/>
-                <Option type="QString" value="0.5" name="opacity"/>
-                <Option type="QString" value="gradient" name="rampType"/>
-                <Option type="QString" value="255,255,255,255" name="single_color"/>
-                <Option type="QString" value="rgb" name="spec"/>
-                <Option type="QString" value="2" name="spread"/>
-                <Option type="QString" value="MM" name="spread_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="spread_unit_scale"/>
+                <Option type="QString" name="blend_mode" value="0"/>
+                <Option type="QString" name="blur_level" value="2.645"/>
+                <Option type="QString" name="blur_unit" value="MM"/>
+                <Option type="QString" name="blur_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color1" value="69,116,40,255"/>
+                <Option type="QString" name="color2" value="188,220,60,255"/>
+                <Option type="QString" name="color_type" value="0"/>
+                <Option type="QString" name="direction" value="ccw"/>
+                <Option type="QString" name="discrete" value="0"/>
+                <Option type="QString" name="draw_mode" value="2"/>
+                <Option type="QString" name="enabled" value="0"/>
+                <Option type="QString" name="opacity" value="0.5"/>
+                <Option type="QString" name="rampType" value="gradient"/>
+                <Option type="QString" name="single_color" value="255,255,255,255"/>
+                <Option type="QString" name="spec" value="rgb"/>
+                <Option type="QString" name="spread" value="2"/>
+                <Option type="QString" name="spread_unit" value="MM"/>
+                <Option type="QString" name="spread_unit_scale" value="3x:0,0,0,0,0,0"/>
               </Option>
             </effect>
           </effect>
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
         </layer>
@@ -477,154 +477,154 @@
       <symbol type="marker" clip_to_extent="1" name="3" is_animated="0" alpha="1" force_rhr="0" frame_rate="10">
         <data_defined_properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data_defined_properties>
-        <layer pass="0" locked="0" class="SimpleMarker" id="{649ff247-cc01-4940-911f-644819f0ed68}" enabled="1">
+        <layer class="SimpleMarker" locked="0" enabled="1" id="{649ff247-cc01-4940-911f-644819f0ed68}" pass="0">
           <Option type="Map">
-            <Option type="QString" value="0" name="angle"/>
-            <Option type="QString" value="square" name="cap_style"/>
-            <Option type="QString" value="255,0,0,0" name="color"/>
-            <Option type="QString" value="1" name="horizontal_anchor_point"/>
-            <Option type="QString" value="bevel" name="joinstyle"/>
-            <Option type="QString" value="circle" name="name"/>
-            <Option type="QString" value="0,0" name="offset"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-            <Option type="QString" value="MM" name="offset_unit"/>
-            <Option type="QString" value="255,255,255,255" name="outline_color"/>
-            <Option type="QString" value="solid" name="outline_style"/>
-            <Option type="QString" value="0.6" name="outline_width"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-            <Option type="QString" value="MM" name="outline_width_unit"/>
-            <Option type="QString" value="diameter" name="scale_method"/>
-            <Option type="QString" value="2.2" name="size"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-            <Option type="QString" value="MM" name="size_unit"/>
-            <Option type="QString" value="1" name="vertical_anchor_point"/>
+            <Option type="QString" name="angle" value="0"/>
+            <Option type="QString" name="cap_style" value="square"/>
+            <Option type="QString" name="color" value="255,0,0,0"/>
+            <Option type="QString" name="horizontal_anchor_point" value="1"/>
+            <Option type="QString" name="joinstyle" value="bevel"/>
+            <Option type="QString" name="name" value="circle"/>
+            <Option type="QString" name="offset" value="0,0"/>
+            <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="offset_unit" value="MM"/>
+            <Option type="QString" name="outline_color" value="255,255,255,255"/>
+            <Option type="QString" name="outline_style" value="solid"/>
+            <Option type="QString" name="outline_width" value="0.6"/>
+            <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="outline_width_unit" value="MM"/>
+            <Option type="QString" name="scale_method" value="diameter"/>
+            <Option type="QString" name="size" value="2.2"/>
+            <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="size_unit" value="MM"/>
+            <Option type="QString" name="vertical_anchor_point" value="1"/>
           </Option>
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
         </layer>
-        <layer pass="0" locked="0" class="SimpleMarker" id="{7ffa385b-5772-44d2-b01e-ad2a85dcbb1e}" enabled="1">
+        <layer class="SimpleMarker" locked="0" enabled="1" id="{7ffa385b-5772-44d2-b01e-ad2a85dcbb1e}" pass="0">
           <Option type="Map">
-            <Option type="QString" value="0" name="angle"/>
-            <Option type="QString" value="square" name="cap_style"/>
-            <Option type="QString" value="134,186,85,255" name="color"/>
-            <Option type="QString" value="1" name="horizontal_anchor_point"/>
-            <Option type="QString" value="bevel" name="joinstyle"/>
-            <Option type="QString" value="circle" name="name"/>
-            <Option type="QString" value="0,0" name="offset"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-            <Option type="QString" value="MM" name="offset_unit"/>
-            <Option type="QString" value="134,186,85,255" name="outline_color"/>
-            <Option type="QString" value="solid" name="outline_style"/>
-            <Option type="QString" value="0.8" name="outline_width"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-            <Option type="QString" value="MM" name="outline_width_unit"/>
-            <Option type="QString" value="diameter" name="scale_method"/>
-            <Option type="QString" value="1.6" name="size"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-            <Option type="QString" value="MM" name="size_unit"/>
-            <Option type="QString" value="1" name="vertical_anchor_point"/>
+            <Option type="QString" name="angle" value="0"/>
+            <Option type="QString" name="cap_style" value="square"/>
+            <Option type="QString" name="color" value="134,186,85,255"/>
+            <Option type="QString" name="horizontal_anchor_point" value="1"/>
+            <Option type="QString" name="joinstyle" value="bevel"/>
+            <Option type="QString" name="name" value="circle"/>
+            <Option type="QString" name="offset" value="0,0"/>
+            <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="offset_unit" value="MM"/>
+            <Option type="QString" name="outline_color" value="134,186,85,255"/>
+            <Option type="QString" name="outline_style" value="solid"/>
+            <Option type="QString" name="outline_width" value="0.8"/>
+            <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="outline_width_unit" value="MM"/>
+            <Option type="QString" name="scale_method" value="diameter"/>
+            <Option type="QString" name="size" value="1.6"/>
+            <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="size_unit" value="MM"/>
+            <Option type="QString" name="vertical_anchor_point" value="1"/>
           </Option>
           <effect type="effectStack" enabled="0">
             <effect type="dropShadow">
               <Option type="Map">
-                <Option type="QString" value="13" name="blend_mode"/>
-                <Option type="QString" value="2.645" name="blur_level"/>
-                <Option type="QString" value="MM" name="blur_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="blur_unit_scale"/>
-                <Option type="QString" value="0,0,0,255" name="color"/>
-                <Option type="QString" value="2" name="draw_mode"/>
-                <Option type="QString" value="0" name="enabled"/>
-                <Option type="QString" value="135" name="offset_angle"/>
-                <Option type="QString" value="2" name="offset_distance"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_unit_scale"/>
-                <Option type="QString" value="1" name="opacity"/>
+                <Option type="QString" name="blend_mode" value="13"/>
+                <Option type="QString" name="blur_level" value="2.645"/>
+                <Option type="QString" name="blur_unit" value="MM"/>
+                <Option type="QString" name="blur_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color" value="0,0,0,255"/>
+                <Option type="QString" name="draw_mode" value="2"/>
+                <Option type="QString" name="enabled" value="0"/>
+                <Option type="QString" name="offset_angle" value="135"/>
+                <Option type="QString" name="offset_distance" value="2"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="offset_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="opacity" value="1"/>
               </Option>
             </effect>
             <effect type="outerGlow">
               <Option type="Map">
-                <Option type="QString" value="0" name="blend_mode"/>
-                <Option type="QString" value="2.645" name="blur_level"/>
-                <Option type="QString" value="MM" name="blur_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="blur_unit_scale"/>
-                <Option type="QString" value="69,116,40,255" name="color1"/>
-                <Option type="QString" value="188,220,60,255" name="color2"/>
-                <Option type="QString" value="0" name="color_type"/>
-                <Option type="QString" value="ccw" name="direction"/>
-                <Option type="QString" value="0" name="discrete"/>
-                <Option type="QString" value="2" name="draw_mode"/>
-                <Option type="QString" value="1" name="enabled"/>
-                <Option type="QString" value="0.5" name="opacity"/>
-                <Option type="QString" value="gradient" name="rampType"/>
-                <Option type="QString" value="255,255,255,255" name="single_color"/>
-                <Option type="QString" value="rgb" name="spec"/>
-                <Option type="QString" value="2" name="spread"/>
-                <Option type="QString" value="MM" name="spread_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="spread_unit_scale"/>
+                <Option type="QString" name="blend_mode" value="0"/>
+                <Option type="QString" name="blur_level" value="2.645"/>
+                <Option type="QString" name="blur_unit" value="MM"/>
+                <Option type="QString" name="blur_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color1" value="69,116,40,255"/>
+                <Option type="QString" name="color2" value="188,220,60,255"/>
+                <Option type="QString" name="color_type" value="0"/>
+                <Option type="QString" name="direction" value="ccw"/>
+                <Option type="QString" name="discrete" value="0"/>
+                <Option type="QString" name="draw_mode" value="2"/>
+                <Option type="QString" name="enabled" value="1"/>
+                <Option type="QString" name="opacity" value="0.5"/>
+                <Option type="QString" name="rampType" value="gradient"/>
+                <Option type="QString" name="single_color" value="255,255,255,255"/>
+                <Option type="QString" name="spec" value="rgb"/>
+                <Option type="QString" name="spread" value="2"/>
+                <Option type="QString" name="spread_unit" value="MM"/>
+                <Option type="QString" name="spread_unit_scale" value="3x:0,0,0,0,0,0"/>
               </Option>
             </effect>
             <effect type="drawSource">
               <Option type="Map">
-                <Option type="QString" value="0" name="blend_mode"/>
-                <Option type="QString" value="2" name="draw_mode"/>
-                <Option type="QString" value="1" name="enabled"/>
-                <Option type="QString" value="1" name="opacity"/>
+                <Option type="QString" name="blend_mode" value="0"/>
+                <Option type="QString" name="draw_mode" value="2"/>
+                <Option type="QString" name="enabled" value="1"/>
+                <Option type="QString" name="opacity" value="1"/>
               </Option>
             </effect>
             <effect type="innerShadow">
               <Option type="Map">
-                <Option type="QString" value="13" name="blend_mode"/>
-                <Option type="QString" value="2.645" name="blur_level"/>
-                <Option type="QString" value="MM" name="blur_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="blur_unit_scale"/>
-                <Option type="QString" value="0,0,0,255" name="color"/>
-                <Option type="QString" value="2" name="draw_mode"/>
-                <Option type="QString" value="0" name="enabled"/>
-                <Option type="QString" value="135" name="offset_angle"/>
-                <Option type="QString" value="2" name="offset_distance"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_unit_scale"/>
-                <Option type="QString" value="1" name="opacity"/>
+                <Option type="QString" name="blend_mode" value="13"/>
+                <Option type="QString" name="blur_level" value="2.645"/>
+                <Option type="QString" name="blur_unit" value="MM"/>
+                <Option type="QString" name="blur_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color" value="0,0,0,255"/>
+                <Option type="QString" name="draw_mode" value="2"/>
+                <Option type="QString" name="enabled" value="0"/>
+                <Option type="QString" name="offset_angle" value="135"/>
+                <Option type="QString" name="offset_distance" value="2"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="offset_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="opacity" value="1"/>
               </Option>
             </effect>
             <effect type="innerGlow">
               <Option type="Map">
-                <Option type="QString" value="0" name="blend_mode"/>
-                <Option type="QString" value="2.645" name="blur_level"/>
-                <Option type="QString" value="MM" name="blur_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="blur_unit_scale"/>
-                <Option type="QString" value="69,116,40,255" name="color1"/>
-                <Option type="QString" value="188,220,60,255" name="color2"/>
-                <Option type="QString" value="0" name="color_type"/>
-                <Option type="QString" value="ccw" name="direction"/>
-                <Option type="QString" value="0" name="discrete"/>
-                <Option type="QString" value="2" name="draw_mode"/>
-                <Option type="QString" value="0" name="enabled"/>
-                <Option type="QString" value="0.5" name="opacity"/>
-                <Option type="QString" value="gradient" name="rampType"/>
-                <Option type="QString" value="255,255,255,255" name="single_color"/>
-                <Option type="QString" value="rgb" name="spec"/>
-                <Option type="QString" value="2" name="spread"/>
-                <Option type="QString" value="MM" name="spread_unit"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="spread_unit_scale"/>
+                <Option type="QString" name="blend_mode" value="0"/>
+                <Option type="QString" name="blur_level" value="2.645"/>
+                <Option type="QString" name="blur_unit" value="MM"/>
+                <Option type="QString" name="blur_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color1" value="69,116,40,255"/>
+                <Option type="QString" name="color2" value="188,220,60,255"/>
+                <Option type="QString" name="color_type" value="0"/>
+                <Option type="QString" name="direction" value="ccw"/>
+                <Option type="QString" name="discrete" value="0"/>
+                <Option type="QString" name="draw_mode" value="2"/>
+                <Option type="QString" name="enabled" value="0"/>
+                <Option type="QString" name="opacity" value="0.5"/>
+                <Option type="QString" name="rampType" value="gradient"/>
+                <Option type="QString" name="single_color" value="255,255,255,255"/>
+                <Option type="QString" name="spec" value="rgb"/>
+                <Option type="QString" name="spread" value="2"/>
+                <Option type="QString" name="spread_unit" value="MM"/>
+                <Option type="QString" name="spread_unit_scale" value="3x:0,0,0,0,0,0"/>
               </Option>
             </effect>
           </effect>
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
         </layer>
@@ -632,38 +632,38 @@
       <symbol type="marker" clip_to_extent="1" name="4" is_animated="0" alpha="1" force_rhr="0" frame_rate="10">
         <data_defined_properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data_defined_properties>
-        <layer pass="0" locked="0" class="SimpleMarker" id="{9d7980a9-9b5a-4d24-939c-bfdec188c428}" enabled="1">
+        <layer class="SimpleMarker" locked="0" enabled="1" id="{9d7980a9-9b5a-4d24-939c-bfdec188c428}" pass="0">
           <Option type="Map">
-            <Option type="QString" value="0" name="angle"/>
-            <Option type="QString" value="square" name="cap_style"/>
-            <Option type="QString" value="183,72,75,255" name="color"/>
-            <Option type="QString" value="1" name="horizontal_anchor_point"/>
-            <Option type="QString" value="bevel" name="joinstyle"/>
-            <Option type="QString" value="circle" name="name"/>
-            <Option type="QString" value="0,0" name="offset"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-            <Option type="QString" value="MM" name="offset_unit"/>
-            <Option type="QString" value="35,35,35,255" name="outline_color"/>
-            <Option type="QString" value="solid" name="outline_style"/>
-            <Option type="QString" value="0" name="outline_width"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-            <Option type="QString" value="MM" name="outline_width_unit"/>
-            <Option type="QString" value="diameter" name="scale_method"/>
-            <Option type="QString" value="2" name="size"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-            <Option type="QString" value="MM" name="size_unit"/>
-            <Option type="QString" value="1" name="vertical_anchor_point"/>
+            <Option type="QString" name="angle" value="0"/>
+            <Option type="QString" name="cap_style" value="square"/>
+            <Option type="QString" name="color" value="183,72,75,255"/>
+            <Option type="QString" name="horizontal_anchor_point" value="1"/>
+            <Option type="QString" name="joinstyle" value="bevel"/>
+            <Option type="QString" name="name" value="circle"/>
+            <Option type="QString" name="offset" value="0,0"/>
+            <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="offset_unit" value="MM"/>
+            <Option type="QString" name="outline_color" value="35,35,35,255"/>
+            <Option type="QString" name="outline_style" value="solid"/>
+            <Option type="QString" name="outline_width" value="0"/>
+            <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="outline_width_unit" value="MM"/>
+            <Option type="QString" name="scale_method" value="diameter"/>
+            <Option type="QString" name="size" value="2"/>
+            <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="size_unit" value="MM"/>
+            <Option type="QString" name="vertical_anchor_point" value="1"/>
           </Option>
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
         </layer>
@@ -672,86 +672,86 @@
     <effect type="effectStack" enabled="1">
       <effect type="dropShadow">
         <Option type="Map">
-          <Option type="QString" value="13" name="blend_mode"/>
-          <Option type="QString" value="2.645" name="blur_level"/>
-          <Option type="QString" value="MM" name="blur_unit"/>
-          <Option type="QString" value="3x:0,0,0,0,0,0" name="blur_unit_scale"/>
-          <Option type="QString" value="0,0,0,255" name="color"/>
-          <Option type="QString" value="2" name="draw_mode"/>
-          <Option type="QString" value="0" name="enabled"/>
-          <Option type="QString" value="135" name="offset_angle"/>
-          <Option type="QString" value="2" name="offset_distance"/>
-          <Option type="QString" value="MM" name="offset_unit"/>
-          <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_unit_scale"/>
-          <Option type="QString" value="1" name="opacity"/>
+          <Option type="QString" name="blend_mode" value="13"/>
+          <Option type="QString" name="blur_level" value="2.645"/>
+          <Option type="QString" name="blur_unit" value="MM"/>
+          <Option type="QString" name="blur_unit_scale" value="3x:0,0,0,0,0,0"/>
+          <Option type="QString" name="color" value="0,0,0,255"/>
+          <Option type="QString" name="draw_mode" value="2"/>
+          <Option type="QString" name="enabled" value="0"/>
+          <Option type="QString" name="offset_angle" value="135"/>
+          <Option type="QString" name="offset_distance" value="2"/>
+          <Option type="QString" name="offset_unit" value="MM"/>
+          <Option type="QString" name="offset_unit_scale" value="3x:0,0,0,0,0,0"/>
+          <Option type="QString" name="opacity" value="1"/>
         </Option>
       </effect>
       <effect type="outerGlow">
         <Option type="Map">
-          <Option type="QString" value="0" name="blend_mode"/>
-          <Option type="QString" value="1.845" name="blur_level"/>
-          <Option type="QString" value="MM" name="blur_unit"/>
-          <Option type="QString" value="3x:0,0,0,0,0,0" name="blur_unit_scale"/>
-          <Option type="QString" value="69,116,40,255" name="color1"/>
-          <Option type="QString" value="188,220,60,255" name="color2"/>
-          <Option type="QString" value="0" name="color_type"/>
-          <Option type="QString" value="ccw" name="direction"/>
-          <Option type="QString" value="0" name="discrete"/>
-          <Option type="QString" value="2" name="draw_mode"/>
-          <Option type="QString" value="1" name="enabled"/>
-          <Option type="QString" value="0.6" name="opacity"/>
-          <Option type="QString" value="gradient" name="rampType"/>
-          <Option type="QString" value="255,255,255,255" name="single_color"/>
-          <Option type="QString" value="rgb" name="spec"/>
-          <Option type="QString" value="1.4" name="spread"/>
-          <Option type="QString" value="MM" name="spread_unit"/>
-          <Option type="QString" value="3x:0,0,0,0,0,0" name="spread_unit_scale"/>
+          <Option type="QString" name="blend_mode" value="0"/>
+          <Option type="QString" name="blur_level" value="1.845"/>
+          <Option type="QString" name="blur_unit" value="MM"/>
+          <Option type="QString" name="blur_unit_scale" value="3x:0,0,0,0,0,0"/>
+          <Option type="QString" name="color1" value="69,116,40,255"/>
+          <Option type="QString" name="color2" value="188,220,60,255"/>
+          <Option type="QString" name="color_type" value="0"/>
+          <Option type="QString" name="direction" value="ccw"/>
+          <Option type="QString" name="discrete" value="0"/>
+          <Option type="QString" name="draw_mode" value="2"/>
+          <Option type="QString" name="enabled" value="1"/>
+          <Option type="QString" name="opacity" value="0.6"/>
+          <Option type="QString" name="rampType" value="gradient"/>
+          <Option type="QString" name="single_color" value="255,255,255,255"/>
+          <Option type="QString" name="spec" value="rgb"/>
+          <Option type="QString" name="spread" value="1.4"/>
+          <Option type="QString" name="spread_unit" value="MM"/>
+          <Option type="QString" name="spread_unit_scale" value="3x:0,0,0,0,0,0"/>
         </Option>
       </effect>
       <effect type="drawSource">
         <Option type="Map">
-          <Option type="QString" value="0" name="blend_mode"/>
-          <Option type="QString" value="2" name="draw_mode"/>
-          <Option type="QString" value="1" name="enabled"/>
-          <Option type="QString" value="1" name="opacity"/>
+          <Option type="QString" name="blend_mode" value="0"/>
+          <Option type="QString" name="draw_mode" value="2"/>
+          <Option type="QString" name="enabled" value="1"/>
+          <Option type="QString" name="opacity" value="1"/>
         </Option>
       </effect>
       <effect type="innerShadow">
         <Option type="Map">
-          <Option type="QString" value="13" name="blend_mode"/>
-          <Option type="QString" value="2.645" name="blur_level"/>
-          <Option type="QString" value="MM" name="blur_unit"/>
-          <Option type="QString" value="3x:0,0,0,0,0,0" name="blur_unit_scale"/>
-          <Option type="QString" value="0,0,0,255" name="color"/>
-          <Option type="QString" value="2" name="draw_mode"/>
-          <Option type="QString" value="0" name="enabled"/>
-          <Option type="QString" value="135" name="offset_angle"/>
-          <Option type="QString" value="2" name="offset_distance"/>
-          <Option type="QString" value="MM" name="offset_unit"/>
-          <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_unit_scale"/>
-          <Option type="QString" value="1" name="opacity"/>
+          <Option type="QString" name="blend_mode" value="13"/>
+          <Option type="QString" name="blur_level" value="2.645"/>
+          <Option type="QString" name="blur_unit" value="MM"/>
+          <Option type="QString" name="blur_unit_scale" value="3x:0,0,0,0,0,0"/>
+          <Option type="QString" name="color" value="0,0,0,255"/>
+          <Option type="QString" name="draw_mode" value="2"/>
+          <Option type="QString" name="enabled" value="0"/>
+          <Option type="QString" name="offset_angle" value="135"/>
+          <Option type="QString" name="offset_distance" value="2"/>
+          <Option type="QString" name="offset_unit" value="MM"/>
+          <Option type="QString" name="offset_unit_scale" value="3x:0,0,0,0,0,0"/>
+          <Option type="QString" name="opacity" value="1"/>
         </Option>
       </effect>
       <effect type="innerGlow">
         <Option type="Map">
-          <Option type="QString" value="0" name="blend_mode"/>
-          <Option type="QString" value="2.645" name="blur_level"/>
-          <Option type="QString" value="MM" name="blur_unit"/>
-          <Option type="QString" value="3x:0,0,0,0,0,0" name="blur_unit_scale"/>
-          <Option type="QString" value="69,116,40,255" name="color1"/>
-          <Option type="QString" value="188,220,60,255" name="color2"/>
-          <Option type="QString" value="0" name="color_type"/>
-          <Option type="QString" value="ccw" name="direction"/>
-          <Option type="QString" value="0" name="discrete"/>
-          <Option type="QString" value="2" name="draw_mode"/>
-          <Option type="QString" value="0" name="enabled"/>
-          <Option type="QString" value="0.5" name="opacity"/>
-          <Option type="QString" value="gradient" name="rampType"/>
-          <Option type="QString" value="255,255,255,255" name="single_color"/>
-          <Option type="QString" value="rgb" name="spec"/>
-          <Option type="QString" value="2" name="spread"/>
-          <Option type="QString" value="MM" name="spread_unit"/>
-          <Option type="QString" value="3x:0,0,0,0,0,0" name="spread_unit_scale"/>
+          <Option type="QString" name="blend_mode" value="0"/>
+          <Option type="QString" name="blur_level" value="2.645"/>
+          <Option type="QString" name="blur_unit" value="MM"/>
+          <Option type="QString" name="blur_unit_scale" value="3x:0,0,0,0,0,0"/>
+          <Option type="QString" name="color1" value="69,116,40,255"/>
+          <Option type="QString" name="color2" value="188,220,60,255"/>
+          <Option type="QString" name="color_type" value="0"/>
+          <Option type="QString" name="direction" value="ccw"/>
+          <Option type="QString" name="discrete" value="0"/>
+          <Option type="QString" name="draw_mode" value="2"/>
+          <Option type="QString" name="enabled" value="0"/>
+          <Option type="QString" name="opacity" value="0.5"/>
+          <Option type="QString" name="rampType" value="gradient"/>
+          <Option type="QString" name="single_color" value="255,255,255,255"/>
+          <Option type="QString" name="spec" value="rgb"/>
+          <Option type="QString" name="spread" value="2"/>
+          <Option type="QString" name="spread_unit" value="MM"/>
+          <Option type="QString" name="spread_unit_scale" value="3x:0,0,0,0,0,0"/>
         </Option>
       </effect>
     </effect>
@@ -762,38 +762,38 @@
       <symbol type="marker" clip_to_extent="1" name="" is_animated="0" alpha="1" force_rhr="0" frame_rate="10">
         <data_defined_properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data_defined_properties>
-        <layer pass="0" locked="0" class="SimpleMarker" id="{8421069b-8bd2-41c4-bda1-e09c8daacb97}" enabled="1">
+        <layer class="SimpleMarker" locked="0" enabled="1" id="{8421069b-8bd2-41c4-bda1-e09c8daacb97}" pass="0">
           <Option type="Map">
-            <Option type="QString" value="0" name="angle"/>
-            <Option type="QString" value="square" name="cap_style"/>
-            <Option type="QString" value="255,0,0,255" name="color"/>
-            <Option type="QString" value="1" name="horizontal_anchor_point"/>
-            <Option type="QString" value="bevel" name="joinstyle"/>
-            <Option type="QString" value="circle" name="name"/>
-            <Option type="QString" value="0,0" name="offset"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-            <Option type="QString" value="MM" name="offset_unit"/>
-            <Option type="QString" value="35,35,35,255" name="outline_color"/>
-            <Option type="QString" value="solid" name="outline_style"/>
-            <Option type="QString" value="0" name="outline_width"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-            <Option type="QString" value="MM" name="outline_width_unit"/>
-            <Option type="QString" value="diameter" name="scale_method"/>
-            <Option type="QString" value="2" name="size"/>
-            <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-            <Option type="QString" value="MM" name="size_unit"/>
-            <Option type="QString" value="1" name="vertical_anchor_point"/>
+            <Option type="QString" name="angle" value="0"/>
+            <Option type="QString" name="cap_style" value="square"/>
+            <Option type="QString" name="color" value="255,0,0,255"/>
+            <Option type="QString" name="horizontal_anchor_point" value="1"/>
+            <Option type="QString" name="joinstyle" value="bevel"/>
+            <Option type="QString" name="name" value="circle"/>
+            <Option type="QString" name="offset" value="0,0"/>
+            <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="offset_unit" value="MM"/>
+            <Option type="QString" name="outline_color" value="35,35,35,255"/>
+            <Option type="QString" name="outline_style" value="solid"/>
+            <Option type="QString" name="outline_width" value="0"/>
+            <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="outline_width_unit" value="MM"/>
+            <Option type="QString" name="scale_method" value="diameter"/>
+            <Option type="QString" name="size" value="2"/>
+            <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+            <Option type="QString" name="size_unit" value="MM"/>
+            <Option type="QString" name="vertical_anchor_point" value="1"/>
           </Option>
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" value="" name="name"/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
         </layer>
@@ -802,46 +802,46 @@
   </selection>
   <labeling type="simple">
     <settings calloutType="simple">
-      <text-style fontStrikeout="0" legendString="Aa" isExpression="0" multilineHeightUnit="Percentage" allowHtml="0" fontKerning="1" fontSize="10" fontWeight="75" useSubstitutions="0" fontWordSpacing="0" fieldName="Structure Type" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" namedStyle="Bold" fontItalic="0" textOpacity="1" forcedItalic="0" textColor="50,50,50,255" fontFamily="Arial Narrow" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedBold="0" fontSizeUnit="Point" blendMode="0" fontUnderline="0" multilineHeight="1" capitalization="0" textOrientation="horizontal">
+      <text-style fieldName="Structure Type" capitalization="0" fontSizeUnit="Point" fontWeight="75" textColor="50,50,50,255" isExpression="0" previewBkgrdColor="255,255,255,255" multilineHeightUnit="Percentage" textOrientation="horizontal" fontItalic="0" blendMode="0" namedStyle="Bold" textOpacity="1" forcedBold="0" fontKerning="1" useSubstitutions="0" fontLetterSpacing="0" legendString="Aa" fontStrikeout="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" fontSize="10" fontFamily="Arial Narrow" fontUnderline="0" multilineHeight="1" allowHtml="0">
         <families/>
-        <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferColor="250,250,250,255" bufferJoinStyle="128" bufferOpacity="1" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="0.5" bufferDraw="1"/>
-        <text-mask maskedSymbolLayers="" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskSizeUnits="MM" maskEnabled="0" maskJoinStyle="128" maskType="0"/>
-        <background shapeRadiiX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeSizeType="0" shapeBlendMode="0" shapeOffsetUnit="Point" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeRotationType="0" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeOffsetY="0" shapeRadiiUnit="Point" shapeSizeUnit="Point" shapeJoinStyle="64" shapeBorderWidthUnit="Point" shapeSVGFile="" shapeOffsetX="0" shapeRadiiY="0" shapeDraw="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeFillColor="255,255,255,255">
+        <text-buffer bufferColor="250,250,250,255" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="0.5" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferDraw="1" bufferBlendMode="0" bufferJoinStyle="128"/>
+        <text-mask maskOpacity="1" maskSize="0" maskType="0" maskJoinStyle="128" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskedSymbolLayers=""/>
+        <background shapeOffsetX="0" shapeOffsetUnit="Point" shapeDraw="0" shapeRotationType="0" shapeJoinStyle="64" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="Point" shapeSizeY="0" shapeRadiiUnit="Point" shapeBlendMode="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeBorderColor="128,128,128,255" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSizeType="0" shapeType="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeBorderWidthUnit="Point">
           <symbol type="marker" clip_to_extent="1" name="markerSymbol" is_animated="0" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" locked="0" class="SimpleMarker" id="" enabled="1">
+            <layer class="SimpleMarker" locked="0" enabled="1" id="" pass="0">
               <Option type="Map">
-                <Option type="QString" value="0" name="angle"/>
-                <Option type="QString" value="square" name="cap_style"/>
-                <Option type="QString" value="133,182,111,255" name="color"/>
-                <Option type="QString" value="1" name="horizontal_anchor_point"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="circle" name="name"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="35,35,35,255" name="outline_color"/>
-                <Option type="QString" value="solid" name="outline_style"/>
-                <Option type="QString" value="0" name="outline_width"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
-                <Option type="QString" value="MM" name="outline_width_unit"/>
-                <Option type="QString" value="diameter" name="scale_method"/>
-                <Option type="QString" value="2" name="size"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
-                <Option type="QString" value="MM" name="size_unit"/>
-                <Option type="QString" value="1" name="vertical_anchor_point"/>
+                <Option type="QString" name="angle" value="0"/>
+                <Option type="QString" name="cap_style" value="square"/>
+                <Option type="QString" name="color" value="133,182,111,255"/>
+                <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="name" value="circle"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="35,35,35,255"/>
+                <Option type="QString" name="outline_style" value="solid"/>
+                <Option type="QString" name="outline_width" value="0"/>
+                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option type="QString" name="scale_method" value="diameter"/>
+                <Option type="QString" name="size" value="2"/>
+                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="size_unit" value="MM"/>
+                <Option type="QString" name="vertical_anchor_point" value="1"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -849,77 +849,77 @@
           <symbol type="fill" clip_to_extent="1" name="fillSymbol" is_animated="0" alpha="1" force_rhr="0" frame_rate="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" value="" name="name"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" value="collection" name="type"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer pass="0" locked="0" class="SimpleFill" id="" enabled="1">
+            <layer class="SimpleFill" locked="0" enabled="1" id="" pass="0">
               <Option type="Map">
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
-                <Option type="QString" value="255,255,255,255" name="color"/>
-                <Option type="QString" value="bevel" name="joinstyle"/>
-                <Option type="QString" value="0,0" name="offset"/>
-                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
-                <Option type="QString" value="MM" name="offset_unit"/>
-                <Option type="QString" value="128,128,128,255" name="outline_color"/>
-                <Option type="QString" value="no" name="outline_style"/>
-                <Option type="QString" value="0" name="outline_width"/>
-                <Option type="QString" value="Point" name="outline_width_unit"/>
-                <Option type="QString" value="solid" name="style"/>
+                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="color" value="255,255,255,255"/>
+                <Option type="QString" name="joinstyle" value="bevel"/>
+                <Option type="QString" name="offset" value="0,0"/>
+                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="offset_unit" value="MM"/>
+                <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                <Option type="QString" name="outline_style" value="no"/>
+                <Option type="QString" name="outline_width" value="0"/>
+                <Option type="QString" name="outline_width_unit" value="Point"/>
+                <Option type="QString" name="style" value="solid"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </background>
-        <shadow shadowOffsetUnit="MM" shadowDraw="0" shadowRadiusUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetAngle="135" shadowScale="100" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+        <shadow shadowRadius="1.5" shadowScale="100" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowDraw="0" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowOffsetUnit="MM"/>
         <dd_properties>
           <Option type="Map">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </dd_properties>
         <substitutions/>
       </text-style>
-      <text-format addDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" formatNumbers="0" wrapChar="" multilineAlign="3" placeDirectionSymbol="0" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" leftDirectionSymbol="&lt;" decimals="3"/>
-      <placement geometryGenerator="" dist="0" overrunDistance="0" overrunDistanceUnit="MM" repeatDistance="0" priority="5" rotationAngle="0" xOffset="0" lineAnchorClipping="0" layerType="PointGeometry" centroidInside="0" quadOffset="4" maxCurvedCharAngleOut="-25" allowDegraded="0" geometryGeneratorEnabled="0" overlapHandling="PreventOverlap" maxCurvedCharAngleIn="25" placement="6" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" fitInPolygonOnly="0" offsetUnits="MM" lineAnchorType="0" lineAnchorPercent="0.5" offsetType="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" rotationUnit="AngleDegrees" polygonPlacementFlags="2" distMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" preserveRotation="1" distUnits="MM" repeatDistanceUnits="MM" lineAnchorTextPoint="FollowPlacement"/>
-      <rendering unplacedVisibility="0" zIndex="0" drawLabels="1" upsidedownLabels="0" scaleMax="0" fontMinPixelSize="3" fontMaxPixelSize="10000" obstacle="1" labelPerPart="0" maxNumLabels="2000" obstacleType="1" mergeLines="0" fontLimitPixelSize="0" scaleMin="0" obstacleFactor="1" minFeatureSize="0" limitNumLabels="0" scaleVisibility="0"/>
+      <text-format wrapChar="" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" reverseDirectionSymbol="0" decimals="3" rightDirectionSymbol=">" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" multilineAlign="3" autoWrapLength="0" plussign="0"/>
+      <placement maxCurvedCharAngleIn="25" polygonPlacementFlags="2" fitInPolygonOnly="0" layerType="PointGeometry" placementFlags="10" preserveRotation="1" centroidWhole="0" rotationAngle="0" offsetType="1" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" overrunDistance="0" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-25" distUnits="MM" geometryGenerator="" rotationUnit="AngleDegrees" placement="6" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGeneratorEnabled="0" centroidInside="0" offsetUnits="MM" yOffset="0" priority="5" overlapHandling="PreventOverlap" allowDegraded="0" quadOffset="4" xOffset="0" repeatDistanceUnits="MM" geometryGeneratorType="PointGeometry" lineAnchorClipping="0" dist="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="FollowPlacement" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorType="0" overrunDistanceUnit="MM"/>
+      <rendering scaleMax="1750" fontLimitPixelSize="0" limitNumLabels="0" drawLabels="1" scaleMin="0" obstacle="1" mergeLines="0" unplacedVisibility="0" fontMaxPixelSize="10000" fontMinPixelSize="3" obstacleType="1" upsidedownLabels="0" maxNumLabels="2000" minFeatureSize="0" scaleVisibility="1" obstacleFactor="1" labelPerPart="0" zIndex="0"/>
       <dd_properties>
         <Option type="Map">
-          <Option type="QString" value="" name="name"/>
+          <Option type="QString" name="name" value=""/>
           <Option name="properties"/>
-          <Option type="QString" value="collection" name="type"/>
+          <Option type="QString" name="type" value="collection"/>
         </Option>
       </dd_properties>
       <callout type="simple">
         <Option type="Map">
-          <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
-          <Option type="int" value="0" name="blendMode"/>
+          <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
+          <Option type="int" name="blendMode" value="0"/>
           <Option type="Map" name="ddProperties">
-            <Option type="QString" value="" name="name"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
-          <Option type="bool" value="false" name="drawToAllParts"/>
-          <Option type="QString" value="0" name="enabled"/>
-          <Option type="QString" value="point_on_exterior" name="labelAnchorPoint"/>
-          <Option type="QString" value="&lt;symbol type=&quot;line&quot; clip_to_extent=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer pass=&quot;0&quot; locked=&quot;0&quot; class=&quot;SimpleLine&quot; id=&quot;{895ab115-9350-454f-86d3-7f2ba2cf2352}&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;square&quot; name=&quot;capstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;5;2&quot; name=&quot;customdash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;customdash_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;bevel&quot; name=&quot;joinstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;60,60,60,255&quot; name=&quot;line_color&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;solid&quot; name=&quot;line_style&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0.3&quot; name=&quot;line_width&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;line_width_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;ring_filter&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_end&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_start&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;use_custom_dash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol"/>
-          <Option type="double" value="0" name="minLength"/>
-          <Option type="QString" value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale"/>
-          <Option type="QString" value="MM" name="minLengthUnit"/>
-          <Option type="double" value="0" name="offsetFromAnchor"/>
-          <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale"/>
-          <Option type="QString" value="MM" name="offsetFromAnchorUnit"/>
-          <Option type="double" value="0" name="offsetFromLabel"/>
-          <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale"/>
-          <Option type="QString" value="MM" name="offsetFromLabelUnit"/>
+          <Option type="bool" name="drawToAllParts" value="false"/>
+          <Option type="QString" name="enabled" value="0"/>
+          <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
+          <Option type="QString" name="lineSymbol" value="&lt;symbol type=&quot;line&quot; clip_to_extent=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; id=&quot;{895ab115-9350-454f-86d3-7f2ba2cf2352}&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+          <Option type="double" name="minLength" value="0"/>
+          <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+          <Option type="QString" name="minLengthUnit" value="MM"/>
+          <Option type="double" name="offsetFromAnchor" value="0"/>
+          <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+          <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+          <Option type="double" name="offsetFromLabel" value="0"/>
+          <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+          <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
         </Option>
       </callout>
     </settings>